You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by vi...@apache.org on 2014/04/10 00:20:56 UTC

[01/51] [abbrv] Updated the testing resources.

Repository: incubator-vxquery
Updated Branches:
  refs/heads/vxquery_0_3_staging ad002b58d -> a5c8adff4


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/AggregatePartition1Queries.xml b/vxquery-xtest/tests/cat/AggregatePartition1Queries.xml
deleted file mode 100644
index b058d7d..0000000
--- a/vxquery-xtest/tests/cat/AggregatePartition1Queries.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="aggregate-partition-1-avg" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">sum.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/AggregatePartition2Queries.xml b/vxquery-xtest/tests/cat/AggregatePartition2Queries.xml
deleted file mode 100644
index a4ac807..0000000
--- a/vxquery-xtest/tests/cat/AggregatePartition2Queries.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">sum.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/AggregatePartition4Queries.xml b/vxquery-xtest/tests/cat/AggregatePartition4Queries.xml
deleted file mode 100644
index d920d31..0000000
--- a/vxquery-xtest/tests/cat/AggregatePartition4Queries.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">sum.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/tests/cat/GhcndCountPartition1Queries.xml
deleted file mode 100644
index 515738e..0000000
--- a/vxquery-xtest/tests/cat/GhcndCountPartition1Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/tests/cat/GhcndCountPartition2Queries.xml
deleted file mode 100644
index 8bb590b..0000000
--- a/vxquery-xtest/tests/cat/GhcndCountPartition2Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/tests/cat/GhcndCountPartition4Queries.xml
deleted file mode 100644
index ff75d3a..0000000
--- a/vxquery-xtest/tests/cat/GhcndCountPartition4Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/GhcndPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndPartition1Queries.xml b/vxquery-xtest/tests/cat/GhcndPartition1Queries.xml
deleted file mode 100644
index 1237971..0000000
--- a/vxquery-xtest/tests/cat/GhcndPartition1Queries.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 1 partition.</description>
-      <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 1 partition.</description>
-      <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 1 partition.</description>
-      <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 1 partition.</description>
-      <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/GhcndPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndPartition2Queries.xml b/vxquery-xtest/tests/cat/GhcndPartition2Queries.xml
deleted file mode 100644
index 86b5cf0..0000000
--- a/vxquery-xtest/tests/cat/GhcndPartition2Queries.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 2 partitions.</description>
-      <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 2 partitions.</description>
-      <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 2 partitions.</description>
-      <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 2 partitions.</description>
-      <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/GhcndPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndPartition4Queries.xml b/vxquery-xtest/tests/cat/GhcndPartition4Queries.xml
deleted file mode 100644
index 232a7b0..0000000
--- a/vxquery-xtest/tests/cat/GhcndPartition4Queries.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 4 partitions.</description>
-      <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 4 partitions.</description>
-      <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 4 partitions.</description>
-      <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 4 partitions.</description>
-      <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/tests/cat/GhcndRecordsPartition1Queries.xml
deleted file mode 100644
index 0c22422..0000000
--- a/vxquery-xtest/tests/cat/GhcndRecordsPartition1Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/tests/cat/GhcndRecordsPartition2Queries.xml
deleted file mode 100644
index 929ff28..0000000
--- a/vxquery-xtest/tests/cat/GhcndRecordsPartition2Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/tests/cat/GhcndRecordsPartition4Queries.xml
deleted file mode 100644
index 03eea78..0000000
--- a/vxquery-xtest/tests/cat/GhcndRecordsPartition4Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file


[18/51] [abbrv] git commit: add NullableTypeComputer to avoid NPE

Posted by vi...@apache.org.
add NullableTypeComputer to avoid NPE


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/44faa1f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/44faa1f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/44faa1f3

Branch: refs/heads/vxquery_0_3_staging
Commit: 44faa1f3f369268fd05b04fd3348a8404c112eee
Parents: a09d1f5
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 10:47:21 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Thu Apr 3 10:47:21 2014 -0700

----------------------------------------------------------------------
 .../org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java   | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/44faa1f3/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 e6a9007..a3f5e93 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
@@ -41,6 +41,7 @@ import org.apache.vxquery.xmlquery.translator.XMLQueryTranslator;
 
 import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
 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;
@@ -142,6 +143,12 @@ public class XMLQueryCompiler {
                 return null;
             }
         });
+        builder.setNullableTypeComputer(new INullableTypeComputer() {
+            @Override
+            public Object makeNullableType(Object type) throws AlgebricksException {
+                throw new NotImplementedException("NullableTypeComputer is not implented");
+            }
+        });
         builder.setNullWriterFactory(new VXQueryNullWriterFactory());
         builder.setClusterLocations(new AlgebricksAbsolutePartitionConstraint(nodeList));
         cFactory = builder.create();


[10/51] [abbrv] make tests location-independent - use source elements in the catalog to identify partitions for collections - more test resources from src/tests/resources to src/test/resources

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml
deleted file mode 100644
index c901468..0000000
--- a/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="aggregate-partition-1-avg" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <output-file compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <output-file compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <output-file compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <output-file compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <output-file compare="Text">sum.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml
deleted file mode 100644
index a4ac807..0000000
--- a/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">sum.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml
deleted file mode 100644
index d920d31..0000000
--- a/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">sum.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml
deleted file mode 100644
index 515738e..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml
deleted file mode 100644
index 8bb590b..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml
deleted file mode 100644
index ff75d3a..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml
deleted file mode 100644
index 1237971..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 1 partition.</description>
-      <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 1 partition.</description>
-      <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 1 partition.</description>
-      <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 1 partition.</description>
-      <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml
deleted file mode 100644
index 86b5cf0..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 2 partitions.</description>
-      <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 2 partitions.</description>
-      <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 2 partitions.</description>
-      <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 2 partitions.</description>
-      <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml
deleted file mode 100644
index 232a7b0..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 4 partitions.</description>
-      <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 4 partitions.</description>
-      <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 4 partitions.</description>
-      <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 4 partitions.</description>
-      <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml
deleted file mode 100644
index 0c22422..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml
deleted file mode 100644
index 929ff28..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml
deleted file mode 100644
index 03eea78..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file


[13/51] [abbrv] make tests location-independent - use source elements in the catalog to identify partitions for collections - more test resources from src/tests/resources to src/test/resources

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
new file mode 100644
index 0000000..f1095fd
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the number of wind sensor readings.                                            :)
+fn:count(
+    let $collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "AWND" 
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/max.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
new file mode 100644
index 0000000..3f283cb
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest max temperature.                                            :)
+fn:max(
+    let $collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX" 
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/min.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
new file mode 100644
index 0000000..a702462
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the lowest min temperature.                                            :)
+fn:min(
+    let $collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
new file mode 100644
index 0000000..ce0c562
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the total precipitation.                                            :)
+fn:sum(
+    let $collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "PRCP" 
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
new file mode 100644
index 0000000..44a6112
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the average minimum temperature.                                            :)
+fn:avg(
+    let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
new file mode 100644
index 0000000..ab92c73
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the number of wind sensor readings.                                            :)
+fn:count(
+    let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "AWND" 
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/max.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
new file mode 100644
index 0000000..1dd6f64
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest max temperature.                                            :)
+fn:max(
+    let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX" 
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/min.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
new file mode 100644
index 0000000..1d90584
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the lowest min temperature.                                            :)
+fn:min(
+    let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
new file mode 100644
index 0000000..77efe89
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the total precipitation.                                            :)
+fn:sum(
+    let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "PRCP" 
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
new file mode 100644
index 0000000..80204c1
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
@@ -0,0 +1,11 @@
+(: XQuery Filter Query :)
+(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
+(: the weather readings for December 25 over the last 10 years.               :)
+let $collection := "ghcnd"
+for $r in collection($collection)/dataCollection/data
+let $datetime := xs:dateTime(fn:data($r/date))
+where $r/station eq "GHCND:AS000000003" 
+    and fn:year-from-dateTime($datetime) ge 2000
+    and fn:month-from-dateTime($datetime) eq 3 
+    and fn:day-from-dateTime($datetime) eq 3
+return $r

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
new file mode 100644
index 0000000..95ec33f
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
@@ -0,0 +1,8 @@
+(: 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 := "ghcnd"
+for $r in collection($collection)/dataCollection/data
+where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
+return $r

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
new file mode 100644
index 0000000..c9afa04
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:sum(
+    let $collection := "ghcnd"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+) div 10

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
new file mode 100644
index 0000000..96aea81
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:max(
+    let $collection := "ghcnd"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+) div 10

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
new file mode 100644
index 0000000..46e665f
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find all the weather readings for Washington state for a specific day    :)
+(: 2002-2-2.                                                                  :)
+let $station_collection := "ghcnd"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "ghcnd"
+for $r in collection($sensor_collection)/dataCollection/data
+    
+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 "STATE 1"))
+    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
+return $r

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
new file mode 100644
index 0000000..9f7b896
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
@@ -0,0 +1,8 @@
+(: XQuery Join Query :)
+(: Find all the weather readings for Washington state for a specific day    :)
+(: 2002-2-2.                                                                  :)
+let $sensor_collection := "ghcnd"
+for $r in collection($sensor_collection)/dataCollection/data
+    
+where xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
+return $r

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
new file mode 100644
index 0000000..b8ae9e3
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
@@ -0,0 +1,8 @@
+(: XQuery Join Query :)
+(: Find all the weather readings for Washington state for a specific day    :)
+(: 2002-2-2.                                                                  :)
+let $station_collection := "ghcnd"
+for $s in collection($station_collection)/stationCollection/station
+
+where (some $x in $s/locationLabels satisfies ($x/type eq "ST" and fn:upper-case(fn:data($x/displayName)) eq "STATE 1"))
+return $s

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
new file mode 100644
index 0000000..efaa1aa
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:min(
+    let $station_collection := "ghcnd"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "ghcnd"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
new file mode 100644
index 0000000..930f78a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find the highest recorded temperature (TMAX) for each station for each     :)
+(: day over the year 2002.                                                    :)
+let $station_collection := "ghcnd"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "ghcnd"
+for $r in collection($sensor_collection)/dataCollection/data
+
+where $s/id eq $r/station
+    and $r/dataType eq "TMAX" 
+    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+return ($s/displayName, $r/date, $r/value)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
new file mode 100644
index 0000000..bf71241
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:avg(
+    let $sensor_collection_min := "ghcnd"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "ghcnd"
+    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
new file mode 100644
index 0000000..2d068c2
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
@@ -0,0 +1,11 @@
+(: XQuery Filter Query :)
+(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
+(: the weather readings for December 25 over the last 10 years.               :)
+let $collection := "ghcnd_half_1|ghcnd_half_2"
+for $r in collection($collection)/dataCollection/data
+let $datetime := xs:dateTime(fn:data($r/date))
+where $r/station eq "GHCND:AS000000003" 
+    and fn:year-from-dateTime($datetime) ge 2000
+    and fn:month-from-dateTime($datetime) eq 3 
+    and fn:day-from-dateTime($datetime) eq 3
+return $r

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
new file mode 100644
index 0000000..44d1179
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
@@ -0,0 +1,8 @@
+(: 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 := "ghcnd_half_1|ghcnd_half_2"
+for $r in collection($collection)/dataCollection/data
+where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
+return $r

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
new file mode 100644
index 0000000..df63040
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:sum(
+    let $collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+) div 10

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
new file mode 100644
index 0000000..703937a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:max(
+    let $collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+) div 10

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
new file mode 100644
index 0000000..0339b12
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find all the weather readings for Washington state for a specific day    :)
+(: 2002-2-2.                                                                  :)
+let $station_collection := "ghcnd_half_1|ghcnd_half_2"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "ghcnd_half_1|ghcnd_half_2"
+for $r in collection($sensor_collection)/dataCollection/data
+    
+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 "STATE 1"))
+    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
+return $r

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
new file mode 100644
index 0000000..66c6af8
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:min(
+    let $station_collection := "ghcnd_half_1|ghcnd_half_2"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
new file mode 100644
index 0000000..d618697
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find the highest recorded temperature (TMAX) for each station for each     :)
+(: day over the year 2002.                                                    :)
+let $station_collection := "ghcnd_half_1|ghcnd_half_2"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "ghcnd_half_1|ghcnd_half_2"
+for $r in collection($sensor_collection)/dataCollection/data
+
+where $s/id eq $r/station
+    and $r/dataType eq "TMAX" 
+    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+return ($s/displayName, $r/date, $r/value)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
new file mode 100644
index 0000000..ac64d8b
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:avg(
+    let $sensor_collection_min := "ghcnd_half_1|ghcnd_half_2"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "ghcnd_half_1|ghcnd_half_2"
+    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
new file mode 100644
index 0000000..17c6021
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
@@ -0,0 +1,11 @@
+(: XQuery Filter Query :)
+(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
+(: the weather readings for December 25 over the last 10 years.               :)
+let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+for $r in collection($collection)/dataCollection/data
+let $datetime := xs:dateTime(fn:data($r/date))
+where $r/station eq "GHCND:AS000000003" 
+    and fn:year-from-dateTime($datetime) ge 2000
+    and fn:month-from-dateTime($datetime) eq 3 
+    and fn:day-from-dateTime($datetime) eq 3
+return $r

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
new file mode 100644
index 0000000..a5506e0
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
@@ -0,0 +1,8 @@
+(: 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 := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+for $r in collection($collection)/dataCollection/data
+where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
+return $r

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
new file mode 100644
index 0000000..3e5c9c7
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:sum(
+    let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+) div 10

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
new file mode 100644
index 0000000..1234a74
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:max(
+    let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+) div 10

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
new file mode 100644
index 0000000..2a01c70
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find all the weather readings for Washington state for a specific day    :)
+(: 2002-2-2.                                                                  :)
+let $station_collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+for $r in collection($sensor_collection)/dataCollection/data
+    
+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 "STATE 1"))
+    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
+return $r

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
new file mode 100644
index 0000000..3bc7d8b
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:min(
+    let $station_collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
new file mode 100644
index 0000000..e7db76a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find the highest recorded temperature (TMAX) for each station for each     :)
+(: day over the year 2002.                                                    :)
+let $station_collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+for $r in collection($sensor_collection)/dataCollection/data
+
+where $s/id eq $r/station
+    and $r/dataType eq "TMAX" 
+    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+return ($s/displayName, $r/date, $r/value)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
new file mode 100644
index 0000000..2e16d96
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:avg(
+    let $sensor_collection_min := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
new file mode 100644
index 0000000..c47b146
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:count(
+    let $collection := "ghcnd"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
new file mode 100644
index 0000000..d6af8d4
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:count(
+    let $collection := "ghcnd"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
new file mode 100644
index 0000000..298b22a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:count(
+    let $station_collection := "ghcnd"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "ghcnd"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
new file mode 100644
index 0000000..80c0f9d
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:count(
+    let $sensor_collection_min := "ghcnd"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "ghcnd"
+    for $r_max in collection($sensor_collection_max)/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
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
new file mode 100644
index 0000000..175e8a9
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:count(
+    let $collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
new file mode 100644
index 0000000..35f1f9f
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:count(
+    let $collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
new file mode 100644
index 0000000..c4c2b3e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:count(
+    let $station_collection := "ghcnd_half_1|ghcnd_half_2"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
new file mode 100644
index 0000000..2e96ae7
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:count(
+    let $sensor_collection_min := "ghcnd_half_1|ghcnd_half_2"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "ghcnd_half_1|ghcnd_half_2"
+    for $r_max in collection($sensor_collection_max)/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
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
new file mode 100644
index 0000000..a4646df
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:count(
+    let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
new file mode 100644
index 0000000..50984ea
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:count(
+    let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
new file mode 100644
index 0000000..0ad6e4a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:count(
+    let $station_collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
new file mode 100644
index 0000000..d21ee34
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:count(
+    let $sensor_collection_min := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r_max in collection($sensor_collection_max)/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
+)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
new file mode 100644
index 0000000..9c59e82
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
@@ -0,0 +1,9 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+    let $collection := "ghcnd"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
new file mode 100644
index 0000000..27f98aa
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
@@ -0,0 +1,6 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+    let $collection := "ghcnd"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
new file mode 100644
index 0000000..d1e80de
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+    let $station_collection := "ghcnd"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "ghcnd"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
new file mode 100644
index 0000000..1c0a14b
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+    let $sensor_collection_min := "ghcnd"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "ghcnd"
+    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
new file mode 100644
index 0000000..30d68c2
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
@@ -0,0 +1,9 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+    let $collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
new file mode 100644
index 0000000..090b56a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
@@ -0,0 +1,6 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+    let $collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
new file mode 100644
index 0000000..dae3b01
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+    let $station_collection := "ghcnd_half_1|ghcnd_half_2"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
new file mode 100644
index 0000000..71176b0
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+    let $sensor_collection_min := "ghcnd_half_1|ghcnd_half_2"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "ghcnd_half_1|ghcnd_half_2"
+    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
new file mode 100644
index 0000000..a4eb414
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
@@ -0,0 +1,9 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+    let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
new file mode 100644
index 0000000..cab55cd
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
@@ -0,0 +1,6 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+    let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
new file mode 100644
index 0000000..193974d
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+    let $station_collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
new file mode 100644
index 0000000..686ae9e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+    let $sensor_collection_min := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"
+    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
new file mode 100644
index 0000000..cc2fd33
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2001-01-01T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000001</station><value>11.25</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000001</station><value>31</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
new file mode 100644
index 0000000..213f748
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
new file mode 100644
index 0000000..c095726
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
new file mode 100644
index 0000000..3bcec27
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000004</id><displayName>Station 4</displayName><latitude>40.000</latitude><longitude>-40.000</longitude><elevation>4000.0</elevation><locationLabels><type>ST</type><id>FIPS:1</id><displayName>State 4</displayName></locationLabels><locationLabels><type>CNTY</type><id>FIPS:-9999</id><displayName>County 4</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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
new file mode 100644
index 0000000..3a540d3
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
new file mode 100644
index 0000000..e9dc6e9
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000002</id><displayName>Station 2</displayName><latitude>20.000</latitude><longitude>-20.000</longitude><elevation>2000.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 2</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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
new file mode 100644
index 0000000..2dbe586
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2004-04-04T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000004</station><value>40</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2004-04-04T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000004</station><value>4</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
new file mode 100644
index 0000000..4919c20
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:AS000000003</id><displayName>Station 3</displayName><latitude>-30.000</latitude><longitude>30.000</longitude><locationLabels><type>CNTRY</type><id>FIPS:AS</id><displayName>AUSTRALIA</displayName></locationLabels></station></stationCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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
new file mode 100644
index 0000000..cb20a4d
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE test-suite [
+
+<!ENTITY AggregatePartition1Queries SYSTEM "cat/AggregatePartition1Queries.xml">
+<!ENTITY AggregatePartition2Queries SYSTEM "cat/AggregatePartition2Queries.xml">
+<!ENTITY AggregatePartition4Queries SYSTEM "cat/AggregatePartition4Queries.xml">
+
+<!ENTITY GhcndPartition1Queries SYSTEM "cat/GhcndPartition1Queries.xml">
+<!ENTITY GhcndPartition2Queries SYSTEM "cat/GhcndPartition2Queries.xml">
+<!ENTITY GhcndPartition4Queries SYSTEM "cat/GhcndPartition4Queries.xml">
+
+<!ENTITY GhcndRecordsPartition1Queries SYSTEM "cat/GhcndRecordsPartition1Queries.xml">
+<!ENTITY GhcndRecordsPartition2Queries SYSTEM "cat/GhcndRecordsPartition2Queries.xml">
+<!ENTITY GhcndRecordsPartition4Queries SYSTEM "cat/GhcndRecordsPartition4Queries.xml">
+
+<!ENTITY GhcndCountPartition1Queries SYSTEM "cat/GhcndCountPartition1Queries.xml">
+<!ENTITY GhcndCountPartition2Queries SYSTEM "cat/GhcndCountPartition2Queries.xml">
+<!ENTITY GhcndCountPartition4Queries SYSTEM "cat/GhcndCountPartition4Queries.xml">
+
+]>
+<test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            CatalogDesignDate="2014-04-01"
+            version="0.0.1"
+            SourceOffsetPath="./"
+            ResultOffsetPath="ExpectedTestResults/"
+            XQueryQueryOffsetPath="Queries/XQuery/"
+            XQueryXQueryOffsetPath="Queries/XQueryX/"
+            XQueryFileExtension=".xq"
+            XQueryXFileExtension=".xqx"
+            xsi:schemaLocation="http://www.w3.org/2005/02/query-test-XQTSCatalog XQTSCatalog.xsd">
+   <test-suite-info>
+      <title>VXQuery Test Suite</title>
+      <description>
+         Test Suite for VXQuery.
+      </description>
+   </test-suite-info>
+   <sources>
+     <source ID="VXQueryCatalog" FileName="VXQueryCatalog.xml" Creator="VXQuery team">
+       <description last-mod="2014-04-02">VXQuery Test Suite Catalog</description>
+     </source>
+     <source ID="ghcnd" FileName="TestSources/ghcnd" Creator="Preston Carman">
+       <description last-mod="2014-04-02">Collection of files</description>
+     </source>
+     <source ID="ghcnd_half_1" FileName="TestSources/ghcnd/half_1" Creator="Preston Carman">
+       <description last-mod="2014-04-02">Collection of files</description>
+     </source>
+     <source ID="ghcnd_half_2" FileName="TestSources/ghcnd/half_2" Creator="Preston Carman">
+       <description last-mod="2014-04-02">Collection of files</description>
+     </source>
+     <source ID="ghcnd_quarter_1" FileName="TestSources/ghcnd/half_1/quarter_1" Creator="Preston Carman">
+       <description last-mod="2014-04-02">Collection of files</description>
+     </source>
+     <source ID="ghcnd_quarter_2" FileName="TestSources/ghcnd/half_1/quarter_2" Creator="Preston Carman">
+       <description last-mod="2014-04-02">Collection of files</description>
+     </source>
+     <source ID="ghcnd_quarter_3" FileName="TestSources/ghcnd/half_2/quarter_3" Creator="Preston Carman">
+       <description last-mod="2014-04-02">Collection of files</description>
+     </source>
+     <source ID="ghcnd_quarter_4" FileName="TestSources/ghcnd/half_2/quarter_4" Creator="Preston Carman">
+       <description last-mod="2014-04-02">Collection of files</description>
+     </source>
+   </sources>
+   <test-group name="AggregatePartitionQueries" featureOwner="Preston Carman">
+      <GroupInfo>
+         <title>Aggregate Partition Queries</title>
+         <description/>
+      </GroupInfo>
+      <test-group name="AggregateParallelExecutionTests" featureOwner="Preston Carman">
+         <GroupInfo>
+            <title>Aggregate Parallel Execution Tests</title>
+            <description/>
+         </GroupInfo>
+         &AggregatePartition1Queries;
+         &AggregatePartition2Queries;
+         &AggregatePartition4Queries;
+      </test-group>
+   </test-group>
+   <test-group name="GhcndPartitionQueries" featureOwner="Preston Carman">
+      <GroupInfo>
+         <title>GHCND Partition Queries</title>
+         <description/>
+      </GroupInfo>
+      <test-group name="ParallelExecutionTests" featureOwner="Preston Carman">
+         <GroupInfo>
+            <title>Parallel Execution Tests</title>
+            <description/>
+         </GroupInfo>
+         &GhcndPartition1Queries;
+         &GhcndPartition2Queries;
+         &GhcndPartition4Queries;
+      </test-group>
+   </test-group>
+   <test-group name="GhcndCountPartitionQueries" featureOwner="Preston Carman">
+      <GroupInfo>
+         <title>GHCND Count Partition Queries</title>
+         <description/>
+      </GroupInfo>
+      <test-group name="CountParallelExecutionTests" featureOwner="Preston Carman">
+         <GroupInfo>
+            <title>Parallel Execution Tests</title>
+            <description/>
+         </GroupInfo>
+         &GhcndCountPartition1Queries;
+         &GhcndCountPartition2Queries;
+         &GhcndCountPartition4Queries;
+      </test-group>
+   </test-group>
+   <test-group name="GhcndRecordsPartitionQueries" featureOwner="Preston Carman">
+      <GroupInfo>
+         <title>GHCND Records Partition Queries</title>
+         <description/>
+      </GroupInfo>
+      <test-group name="RecordsParallelExecutionTests" featureOwner="Preston Carman">
+         <GroupInfo>
+            <title>Records Parallel Execution Tests</title>
+            <description/>
+         </GroupInfo>
+         &GhcndRecordsPartition1Queries;
+         &GhcndRecordsPartition2Queries;
+         &GhcndRecordsPartition4Queries;
+      </test-group>
+   </test-group>
+</test-suite>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
new file mode 100644
index 0000000..c901468
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
@@ -0,0 +1,31 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>Aggregate Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="aggregate-partition-1-avg" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="avg" date="2014-04-01"/>
+      <output-file compare="Text">avg.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="count" date="2014-04-01"/>
+      <output-file compare="Text">count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+      <query name="min" date="2014-04-01"/>
+      <output-file compare="Text">min.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+      <query name="max" date="2014-04-01"/>
+      <output-file compare="Text">max.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+      <query name="sum" date="2014-04-01"/>
+      <output-file compare="Text">sum.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
new file mode 100644
index 0000000..a4ac807
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
@@ -0,0 +1,36 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition2Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>Aggregate Partition 2</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
+      <query name="avg" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">avg.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
+      <query name="count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 2 partition.</description>
+      <query name="min" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">min.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 2 partition.</description>
+      <query name="max" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">max.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 2 partition.</description>
+      <query name="sum" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">sum.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
new file mode 100644
index 0000000..d920d31
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
@@ -0,0 +1,36 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>Aggregate Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
+      <query name="avg" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">avg.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
+      <query name="count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 4 partition.</description>
+      <query name="min" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">min.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 4 partition.</description>
+      <query name="max" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">max.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 4 partition.</description>
+      <query name="sum" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">sum.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file


[40/51] [abbrv] git commit: Adding hour and minute to the benchmark log files.

Posted by vi...@apache.org.
Adding hour and minute to the benchmark log files.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/e8d3f8bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/e8d3f8bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/e8d3f8bc

Branch: refs/heads/vxquery_0_3_staging
Commit: e8d3f8bcffd5e96e047776dbdc2a5957f1dd38cf
Parents: 1eb4aea
Author: Preston Carman <pr...@apache.org>
Authored: Tue Apr 8 12:32:57 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Apr 8 12:32:57 2014 -0700

----------------------------------------------------------------------
 .../noaa-ghcn-daily/scripts/run_benchmark.sh    |  4 +-
 .../scripts/run_benchmark_cluster.sh            | 63 ++++++++++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e8d3f8bc/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
index 036f697..2dd070c 100755
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
@@ -37,10 +37,10 @@ do
     if [ -z "${3}" ] || [[ "${j}" =~ "${3}" ]] 
     then
         echo "Running query: ${j}"
-        log_file="$(basename ${j}).$(date +%Y%m%d).log"
+        log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log"
         log_base_path=$(dirname ${j/queries/query_logs})
         mkdir -p ${log_base_path}
-        time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -frame-size 10000 -repeatexec 10 > ${log_base_path}/${log_file} 2>&1
+    	time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -showoet -showrp -frame-size 10000 -repeatexec 10 > ${log_base_path}/${log_file} 2>&1
     fi;
 done
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e8d3f8bc/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
new file mode 100644
index 0000000..6dc9714
--- /dev/null
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.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.
+#
+
+# Run all the queries and save a log. 
+# First argument: Supply the folder which houses all the queries (recursive).
+# Second argument: adds options to the VXQuery CLI.
+#
+# run_benchmark.sh ./noaa-ghcn-daily/benchmarks/local_speed_up/queries/
+# run_benchmark.sh ./noaa-ghcn-daily/benchmarks/local_speed_up/queries/ "-client-net-ip-address 169.235.27.138"
+# run_benchmark.sh ./noaa-ghcn-daily/benchmarks/local_speed_up/queries/ "" q03
+#
+
+CLUSTER_COUNT=5
+
+if [ -z "${1}" ]
+then
+    echo "Please supply a directory for query files to be found."
+    exit
+fi
+
+# Run queries for each number of nodes.
+for (( i = 0; i < ${CLUSTER_COUNT}; i++ ))
+do 
+	echo "Starting ${i} cluster nodes"
+	python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${i}nodes.xml -a start
+	
+	for j in $(find ${1} -name '*q??.xq')
+	do
+		# Only work with i nodes.
+		if [[ "${j}" =~ "${i}nodes" ]] 
+		then
+			# Only run for specified queries.
+			if [ -z "${3}" ] || [[ "${j}" =~ "${3}" ]] 
+			then
+				echo "Running query: ${j}"
+				log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log"
+				log_base_path=$(dirname ${j/queries/query_logs})
+				mkdir -p ${log_base_path}
+				time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -showoet -showrp -frame-size 10000 -repeatexec 10 > ${log_base_path}/${log_file} 2>&1
+			fi;
+		fi;
+	done
+	
+	# Stop cluster.
+	python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${i}nodes.xml -a stop
+done
+


[12/51] [abbrv] make tests location-independent - use source elements in the catalog to identify partitions for collections - more test resources from src/tests/resources to src/test/resources

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
new file mode 100644
index 0000000..515738e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Count Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="q02_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+      <query name="q03_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+      <query name="q05_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+      <query name="q07_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_count.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
new file mode 100644
index 0000000..8bb590b
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition2Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Count Partition 2</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
+      <query name="q02_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
+      <query name="q03_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
+      <query name="q05_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
+      <query name="q07_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_count.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
new file mode 100644
index 0000000..ff75d3a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Count Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
+      <query name="q02_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
+      <query name="q03_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
+      <query name="q05_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
+      <query name="q07_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_count.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
new file mode 100644
index 0000000..1237971
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
@@ -0,0 +1,54 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q00 from the weather benchmark with 1 partition.</description>
+      <query name="q00" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q00.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q01 from the weather benchmark with 1 partition.</description>
+      <query name="q01" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q01.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q02 from the weather benchmark with 1 partition.</description>
+      <query name="q02" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q03 from the weather benchmark with 1 partition.</description>
+      <query name="q03" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q04 from the weather benchmark with 1 partition.</description>
+      <query name="q04" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q04.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q05 from the weather benchmark with 1 partition.</description>
+      <query name="q05" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q06 from the weather benchmark with 1 partition.</description>
+      <query name="q06" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q06.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q07 from the weather benchmark with 1 partition.</description>
+      <query name="q07" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
new file mode 100644
index 0000000..86b5cf0
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
@@ -0,0 +1,54 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q00 from the weather benchmark with 2 partitions.</description>
+      <query name="q00" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q00.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q01 from the weather benchmark with 2 partitions.</description>
+      <query name="q01" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q01.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q02 from the weather benchmark with 2 partitions.</description>
+      <query name="q02" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q03 from the weather benchmark with 2 partitions.</description>
+      <query name="q03" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q04 from the weather benchmark with 2 partitions.</description>
+      <query name="q04" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q04.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q05 from the weather benchmark with 2 partitions.</description>
+      <query name="q05" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q06 from the weather benchmark with 2 partitions.</description>
+      <query name="q06" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q06.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q07 from the weather benchmark with 2 partitions.</description>
+      <query name="q07" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
new file mode 100644
index 0000000..232a7b0
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
@@ -0,0 +1,54 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q00 from the weather benchmark with 4 partitions.</description>
+      <query name="q00" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q00.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q01 from the weather benchmark with 4 partitions.</description>
+      <query name="q01" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q01.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q02 from the weather benchmark with 4 partitions.</description>
+      <query name="q02" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q03 from the weather benchmark with 4 partitions.</description>
+      <query name="q03" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q04 from the weather benchmark with 4 partitions.</description>
+      <query name="q04" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q04.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q05 from the weather benchmark with 4 partitions.</description>
+      <query name="q05" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q06 from the weather benchmark with 4 partitions.</description>
+      <query name="q06" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q06.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q07 from the weather benchmark with 4 partitions.</description>
+      <query name="q07" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
new file mode 100644
index 0000000..0c22422
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Records Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="q02_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+      <query name="q03_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+      <query name="q05_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+      <query name="q07_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_records.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
new file mode 100644
index 0000000..929ff28
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition2Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Records Partition 2</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
+      <query name="q02_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
+      <query name="q03_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
+      <query name="q05_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
+      <query name="q07_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_records.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
new file mode 100644
index 0000000..03eea78
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Records Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
+      <query name="q02_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
+      <query name="q03_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
+      <query name="q05_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
+      <query name="q07_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_records.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt
deleted file mode 100644
index 7ef6ffe..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt
+++ /dev/null
@@ -1 +0,0 @@
-12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt
deleted file mode 100644
index dc7b54a..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt
+++ /dev/null
@@ -1 +0,0 @@
-33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt
deleted file mode 100644
index ea1acb6..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt
+++ /dev/null
@@ -1 +0,0 @@
-11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt
deleted file mode 100644
index 2b82dfe..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt
+++ /dev/null
@@ -1 +0,0 @@
-60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt
deleted file mode 100644
index 7ef6ffe..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt
+++ /dev/null
@@ -1 +0,0 @@
-12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt
deleted file mode 100644
index dc7b54a..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt
+++ /dev/null
@@ -1 +0,0 @@
-33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt
deleted file mode 100644
index ea1acb6..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt
+++ /dev/null
@@ -1 +0,0 @@
-11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt
deleted file mode 100644
index 2b82dfe..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt
+++ /dev/null
@@ -1 +0,0 @@
-60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt
deleted file mode 100644
index 7ef6ffe..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt
+++ /dev/null
@@ -1 +0,0 @@
-12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt
deleted file mode 100644
index dc7b54a..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt
+++ /dev/null
@@ -1 +0,0 @@
-33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt
deleted file mode 100644
index ea1acb6..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt
+++ /dev/null
@@ -1 +0,0 @@
-11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt
deleted file mode 100644
index 2b82dfe..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt
+++ /dev/null
@@ -1 +0,0 @@
-60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
deleted file mode 100644
index e6116d0..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
deleted file mode 100644
index ff4bc9b..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
+++ /dev/null
@@ -1 +0,0 @@
-<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
deleted file mode 100644
index f30101c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
deleted file mode 100644
index c5b9925..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
deleted file mode 100644
index 9f5aceb..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
deleted file mode 100644
index ca942fc..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<displayName>Station 2</displayName>
-<date>2002-02-02T00:00:00.000</date>
-<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
deleted file mode 100644
index bfda7af..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
deleted file mode 100644
index e6116d0..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
deleted file mode 100644
index ff4bc9b..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
+++ /dev/null
@@ -1 +0,0 @@
-<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
deleted file mode 100644
index f30101c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
deleted file mode 100644
index c5b9925..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
deleted file mode 100644
index 9f5aceb..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
deleted file mode 100644
index ca942fc..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<displayName>Station 2</displayName>
-<date>2002-02-02T00:00:00.000</date>
-<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
deleted file mode 100644
index bfda7af..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
deleted file mode 100644
index e6116d0..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
deleted file mode 100644
index ff4bc9b..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
+++ /dev/null
@@ -1 +0,0 @@
-<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
deleted file mode 100644
index f30101c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
deleted file mode 100644
index c5b9925..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
deleted file mode 100644
index 9f5aceb..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
deleted file mode 100644
index ca942fc..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<displayName>Station 2</displayName>
-<date>2002-02-02T00:00:00.000</date>
-<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
deleted file mode 100644
index bfda7af..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
deleted file mode 100644
index a533a86..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
deleted file mode 100644
index 8d77b4d..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<value>31</value>
-<value>32</value>
-<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
deleted file mode 100644
index 802ab3c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
deleted file mode 100644
index fdd1637..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-19.75
-19.5
-19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
deleted file mode 100644
index a533a86..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
deleted file mode 100644
index 8d77b4d..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<value>31</value>
-<value>32</value>
-<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
deleted file mode 100644
index 802ab3c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
deleted file mode 100644
index fdd1637..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-19.75
-19.5
-19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
deleted file mode 100644
index a533a86..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
deleted file mode 100644
index 8d77b4d..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<value>31</value>
-<value>32</value>
-<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
deleted file mode 100644
index 802ab3c..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
deleted file mode 100644
index fdd1637..0000000
--- a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-19.75
-19.5
-19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
deleted file mode 100644
index 498baaf..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the average minimum temperature.                                            :)
-fn:avg(
-    let $collection := "TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
deleted file mode 100644
index 3a2609b..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the number of wind sensor readings.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "AWND" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/max.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
deleted file mode 100644
index 161b409..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest max temperature.                                            :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/min.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
deleted file mode 100644
index 0a135d1..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the lowest min temperature.                                            :)
-fn:min(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
deleted file mode 100644
index 91a2c4c..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the total precipitation.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
deleted file mode 100644
index 864fdb9..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the average minimum temperature.                                            :)
-fn:avg(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
deleted file mode 100644
index 3ad16b6..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the number of wind sensor readings.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "AWND" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/max.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
deleted file mode 100644
index 82b1061..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest max temperature.                                            :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/min.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
deleted file mode 100644
index d990aff..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the lowest min temperature.                                            :)
-fn:min(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
deleted file mode 100644
index 8c9bea9..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the total precipitation.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
deleted file mode 100644
index d50166d..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the average minimum temperature.                                            :)
-fn:avg(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
deleted file mode 100644
index cebf3e6..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the number of wind sensor readings.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "AWND" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/max.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
deleted file mode 100644
index ba4f771..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest max temperature.                                            :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/min.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
deleted file mode 100644
index b37f462..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the lowest min temperature.                                            :)
-fn:min(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file


[42/51] [abbrv] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-vxquery

Posted by vi...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-vxquery


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/43e6daad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/43e6daad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/43e6daad

Branch: refs/heads/vxquery_0_3_staging
Commit: 43e6daad781a16c230210812f6e6ffeb7aa55936
Parents: 5367a26 9ab4c6d
Author: Preston Carman <pr...@apache.org>
Authored: Tue Apr 8 15:15:18 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Apr 8 15:15:18 2014 -0700

----------------------------------------------------------------------

----------------------------------------------------------------------



[35/51] [abbrv] git commit: Updated testing suite for recent changes to masters.

Posted by vi...@apache.org.
Updated testing suite for recent changes to masters.

* changed result for empty tags
* added alternate results
* fixed the available processors command line option


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/215d9e10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/215d9e10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/215d9e10

Branch: refs/heads/vxquery_0_3_staging
Commit: 215d9e1027a11946272e6517c13fff7e7d3874ab
Parents: 6512b00
Author: Preston Carman <pr...@apache.org>
Authored: Mon Apr 7 09:45:23 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Mon Apr 7 09:45:23 2014 -0700

----------------------------------------------------------------------
 vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java  | 2 +-
 .../resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt    | 4 ++--
 .../resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt    | 2 +-
 .../resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt    | 6 +++---
 .../resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt    | 4 ++--
 .../resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt    | 2 +-
 .../resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt    | 6 +++---
 .../resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt    | 4 ++--
 .../resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt    | 2 +-
 .../resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt    | 6 +++---
 .../GhcndRecords/Partition-1/q07_records-1.txt                 | 3 +++
 .../GhcndRecords/Partition-1/q07_records-2.txt                 | 3 +++
 .../GhcndRecords/Partition-1/q07_records-3.txt                 | 3 +++
 .../GhcndRecords/Partition-1/q07_records-4.txt                 | 3 +++
 .../GhcndRecords/Partition-1/q07_records-5.txt                 | 3 +++
 .../GhcndRecords/Partition-2/q07_records-1.txt                 | 3 +++
 .../GhcndRecords/Partition-2/q07_records-2.txt                 | 3 +++
 .../GhcndRecords/Partition-2/q07_records-3.txt                 | 3 +++
 .../GhcndRecords/Partition-2/q07_records-4.txt                 | 3 +++
 .../GhcndRecords/Partition-2/q07_records-5.txt                 | 3 +++
 .../GhcndRecords/Partition-4/q07_records-1.txt                 | 3 +++
 .../GhcndRecords/Partition-4/q07_records-2.txt                 | 3 +++
 .../GhcndRecords/Partition-4/q07_records-3.txt                 | 3 +++
 .../GhcndRecords/Partition-4/q07_records-4.txt                 | 3 +++
 .../GhcndRecords/Partition-4/q07_records-5.txt                 | 3 +++
 .../src/test/resources/cat/GhcndRecordsPartition1Queries.xml   | 5 +++++
 .../src/test/resources/cat/GhcndRecordsPartition2Queries.xml   | 5 +++++
 .../src/test/resources/cat/GhcndRecordsPartition4Queries.xml   | 5 +++++
 28 files changed, 79 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/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 f882899..ec3ed68 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
@@ -253,7 +253,7 @@ public class VXQuery {
             };
 
             start = opts.timing ? new Date() : null;
-            XMLQueryCompiler compiler = new XMLQueryCompiler(listener, getNodeList(), opts.frameSize);
+            XMLQueryCompiler compiler = new XMLQueryCompiler(listener, getNodeList(), opts.frameSize, opts.availableProcessors);
             resultSetId = createResultSetId();
             CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl(RootStaticContextImpl.INSTANCE),
                     resultSetId, null);

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
index e6116d0..28001eb 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
@@ -1,2 +1,2 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
index ff4bc9b..82de09d 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
@@ -1 +1 @@
-<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file
+<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
index c5b9925..e6134af 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
@@ -1,3 +1,3 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
index e6116d0..28001eb 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
@@ -1,2 +1,2 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
index ff4bc9b..82de09d 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
@@ -1 +1 @@
-<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file
+<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
index c5b9925..e6134af 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
@@ -1,3 +1,3 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
index e6116d0..28001eb 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
@@ -1,2 +1,2 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
index ff4bc9b..82de09d 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
@@ -1 +1 @@
-<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file
+<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
index c5b9925..e6134af 100644
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
@@ -1,3 +1,3 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-1.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-1.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-1.txt
new file mode 100644
index 0000000..f72ff5e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-1.txt
@@ -0,0 +1,3 @@
+19.75
+19.25
+19.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-2.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-2.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-2.txt
new file mode 100644
index 0000000..b95a51e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-2.txt
@@ -0,0 +1,3 @@
+19.5
+19.75
+19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-3.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-3.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-3.txt
new file mode 100644
index 0000000..e5e2462
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-3.txt
@@ -0,0 +1,3 @@
+19.5
+19.25
+19.75
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-4.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-4.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-4.txt
new file mode 100644
index 0000000..5225394
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-4.txt
@@ -0,0 +1,3 @@
+19.25
+19.75
+19.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-5.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-5.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-5.txt
new file mode 100644
index 0000000..c1727b5
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-5.txt
@@ -0,0 +1,3 @@
+19.25
+19.5
+19.75
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-1.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-1.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-1.txt
new file mode 100644
index 0000000..f72ff5e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-1.txt
@@ -0,0 +1,3 @@
+19.75
+19.25
+19.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-2.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-2.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-2.txt
new file mode 100644
index 0000000..b95a51e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-2.txt
@@ -0,0 +1,3 @@
+19.5
+19.75
+19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-3.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-3.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-3.txt
new file mode 100644
index 0000000..e5e2462
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-3.txt
@@ -0,0 +1,3 @@
+19.5
+19.25
+19.75
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-4.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-4.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-4.txt
new file mode 100644
index 0000000..5225394
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-4.txt
@@ -0,0 +1,3 @@
+19.25
+19.75
+19.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-5.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-5.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-5.txt
new file mode 100644
index 0000000..c1727b5
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-5.txt
@@ -0,0 +1,3 @@
+19.25
+19.5
+19.75
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-1.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-1.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-1.txt
new file mode 100644
index 0000000..f72ff5e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-1.txt
@@ -0,0 +1,3 @@
+19.75
+19.25
+19.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-2.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-2.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-2.txt
new file mode 100644
index 0000000..b95a51e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-2.txt
@@ -0,0 +1,3 @@
+19.5
+19.75
+19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-3.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-3.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-3.txt
new file mode 100644
index 0000000..e5e2462
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-3.txt
@@ -0,0 +1,3 @@
+19.5
+19.25
+19.75
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-4.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-4.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-4.txt
new file mode 100644
index 0000000..5225394
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-4.txt
@@ -0,0 +1,3 @@
+19.25
+19.75
+19.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-5.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-5.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-5.txt
new file mode 100644
index 0000000..c1727b5
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-5.txt
@@ -0,0 +1,3 @@
+19.25
+19.5
+19.75
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
index 31f6a13..2a77991 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
@@ -22,5 +22,10 @@
       <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
       <query name="q07_records" date="2014-04-01"/>
       <output-file compare="Text">q07_records.txt</output-file>
+      <output-file compare="Text">q07_records-1.txt</output-file>
+      <output-file compare="Text">q07_records-2.txt</output-file>
+      <output-file compare="Text">q07_records-3.txt</output-file>
+      <output-file compare="Text">q07_records-4.txt</output-file>
+      <output-file compare="Text">q07_records-5.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
index 41b1966..e3a53cf 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
@@ -22,5 +22,10 @@
       <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
       <query name="q07_records" date="2014-04-01"/>
       <output-file compare="Text">q07_records.txt</output-file>
+      <output-file compare="Text">q07_records-1.txt</output-file>
+      <output-file compare="Text">q07_records-2.txt</output-file>
+      <output-file compare="Text">q07_records-3.txt</output-file>
+      <output-file compare="Text">q07_records-4.txt</output-file>
+      <output-file compare="Text">q07_records-5.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
index f1b99ed..f2707f3 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
@@ -22,5 +22,10 @@
       <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
       <query name="q07_records" date="2014-04-01"/>
       <output-file compare="Text">q07_records.txt</output-file>
+      <output-file compare="Text">q07_records-1.txt</output-file>
+      <output-file compare="Text">q07_records-2.txt</output-file>
+      <output-file compare="Text">q07_records-3.txt</output-file>
+      <output-file compare="Text">q07_records-4.txt</output-file>
+      <output-file compare="Text">q07_records-5.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file


[11/51] [abbrv] make tests location-independent - use source elements in the catalog to identify partitions for collections - more test resources from src/tests/resources to src/test/resources

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
deleted file mode 100644
index c41c7b6..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the total precipitation.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
deleted file mode 100644
index 86241cd..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Filter Query :)
-(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
-(: the weather readings for December 25 over the last 10 years.               :)
-let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $r in collection($collection)/dataCollection/data
-let $datetime := xs:dateTime(fn:data($r/date))
-where $r/station eq "GHCND:AS000000003" 
-    and fn:year-from-dateTime($datetime) ge 2000
-    and fn:month-from-dateTime($datetime) eq 3 
-    and fn:day-from-dateTime($datetime) eq 3
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
deleted file mode 100644
index 1572994..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: 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 := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $r in collection($collection)/dataCollection/data
-where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
deleted file mode 100644
index d363fbf..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
deleted file mode 100644
index 75a8935..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
deleted file mode 100644
index 61452fb..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find all the weather readings for Washington state for a specific day    :)
-(: 2002-2-2.                                                                  :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $r in collection($sensor_collection)/dataCollection/data
-    
-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 "STATE 1"))
-    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
deleted file mode 100644
index 18f5929..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Join Query :)
-(: Find all the weather readings for Washington state for a specific day    :)
-(: 2002-2-2.                                                                  :)
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $r in collection($sensor_collection)/dataCollection/data
-    
-where xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
deleted file mode 100644
index d7630f0..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Join Query :)
-(: Find all the weather readings for Washington state for a specific day    :)
-(: 2002-2-2.                                                                  :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $s in collection($station_collection)/stationCollection/station
-
-where (some $x in $s/locationLabels satisfies ($x/type eq "ST" and fn:upper-case(fn:data($x/displayName)) eq "STATE 1"))
-return $s
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
deleted file mode 100644
index df822a1..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:min(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
deleted file mode 100644
index ed9bdb0..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find the highest recorded temperature (TMAX) for each station for each     :)
-(: day over the year 2002.                                                    :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $r in collection($sensor_collection)/dataCollection/data
-
-where $s/id eq $r/station
-    and $r/dataType eq "TMAX" 
-    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-return ($s/displayName, $r/date, $r/value)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
deleted file mode 100644
index d0e8c48..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:avg(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_max in collection($sensor_collection_max)/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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
deleted file mode 100644
index 64636bc..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Filter Query :)
-(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
-(: the weather readings for December 25 over the last 10 years.               :)
-let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $r in collection($collection)/dataCollection/data
-let $datetime := xs:dateTime(fn:data($r/date))
-where $r/station eq "GHCND:AS000000003" 
-    and fn:year-from-dateTime($datetime) ge 2000
-    and fn:month-from-dateTime($datetime) eq 3 
-    and fn:day-from-dateTime($datetime) eq 3
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
deleted file mode 100644
index 4e1edc5..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: 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 := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $r in collection($collection)/dataCollection/data
-where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
deleted file mode 100644
index fac6bf0..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
deleted file mode 100644
index ce3d0d3..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
deleted file mode 100644
index 5d6d1d1..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find all the weather readings for Washington state for a specific day    :)
-(: 2002-2-2.                                                                  :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $r in collection($sensor_collection)/dataCollection/data
-    
-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 "STATE 1"))
-    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
deleted file mode 100644
index 15b98c1..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:min(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
deleted file mode 100644
index df17713..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find the highest recorded temperature (TMAX) for each station for each     :)
-(: day over the year 2002.                                                    :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $r in collection($sensor_collection)/dataCollection/data
-
-where $s/id eq $r/station
-    and $r/dataType eq "TMAX" 
-    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-return ($s/displayName, $r/date, $r/value)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
deleted file mode 100644
index 2debae0..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:avg(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_max in collection($sensor_collection_max)/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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
deleted file mode 100644
index e130e2a..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Filter Query :)
-(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
-(: the weather readings for December 25 over the last 10 years.               :)
-let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $r in collection($collection)/dataCollection/data
-let $datetime := xs:dateTime(fn:data($r/date))
-where $r/station eq "GHCND:AS000000003" 
-    and fn:year-from-dateTime($datetime) ge 2000
-    and fn:month-from-dateTime($datetime) eq 3 
-    and fn:day-from-dateTime($datetime) eq 3
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
deleted file mode 100644
index bad94e4..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: 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 := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $r in collection($collection)/dataCollection/data
-where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
deleted file mode 100644
index f4c2722..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
deleted file mode 100644
index 7199c97..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
deleted file mode 100644
index cdf85dd..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find all the weather readings for Washington state for a specific day    :)
-(: 2002-2-2.                                                                  :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $r in collection($sensor_collection)/dataCollection/data
-    
-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 "STATE 1"))
-    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
deleted file mode 100644
index 5036305..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:min(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
deleted file mode 100644
index 51c474d..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find the highest recorded temperature (TMAX) for each station for each     :)
-(: day over the year 2002.                                                    :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $r in collection($sensor_collection)/dataCollection/data
-
-where $s/id eq $r/station
-    and $r/dataType eq "TMAX" 
-    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-return ($s/displayName, $r/date, $r/value)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
deleted file mode 100644
index a508e52..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:avg(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_max in collection($sensor_collection_max)/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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
deleted file mode 100644
index 73e8aea..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
deleted file mode 100644
index 0d327d1..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
deleted file mode 100644
index 9f2ac93..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:count(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
deleted file mode 100644
index 917b7c6..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:count(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_max in collection($sensor_collection_max)/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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
deleted file mode 100644
index 52e7790..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
deleted file mode 100644
index 619c6d1..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
deleted file mode 100644
index c32bcd1..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:count(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
deleted file mode 100644
index fd3431f..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:count(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_max in collection($sensor_collection_max)/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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
deleted file mode 100644
index 2940380..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
deleted file mode 100644
index eb6ff10..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
deleted file mode 100644
index 768e35d..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:count(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
deleted file mode 100644
index 8ea026b..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:count(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_max in collection($sensor_collection_max)/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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
deleted file mode 100644
index 68b87b5..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
+++ /dev/null
@@ -1,9 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
deleted file mode 100644
index 8a22c5e..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
+++ /dev/null
@@ -1,6 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
deleted file mode 100644
index 0cd735d..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
deleted file mode 100644
index 793fbba..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
deleted file mode 100644
index 4b14f55..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
+++ /dev/null
@@ -1,9 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
deleted file mode 100644
index 581644a..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
+++ /dev/null
@@ -1,6 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
deleted file mode 100644
index 83b4683..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
deleted file mode 100644
index 1948ba0..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
deleted file mode 100644
index 8fb560b..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
+++ /dev/null
@@ -1,9 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
deleted file mode 100644
index 835e3b2..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
+++ /dev/null
@@ -1,6 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
deleted file mode 100644
index 664e91b..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
deleted file mode 100644
index 6f8c165..0000000
--- a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
deleted file mode 100644
index cc2fd33..0000000
--- a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2001-01-01T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000001</station><value>11.25</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000001</station><value>31</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
deleted file mode 100644
index 213f748..0000000
--- a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
deleted file mode 100644
index c095726..0000000
--- a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
deleted file mode 100644
index 3bcec27..0000000
--- a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000004</id><displayName>Station 4</displayName><latitude>40.000</latitude><longitude>-40.000</longitude><elevation>4000.0</elevation><locationLabels><type>ST</type><id>FIPS:1</id><displayName>State 4</displayName></locationLabels><locationLabels><type>CNTY</type><id>FIPS:-9999</id><displayName>County 4</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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
deleted file mode 100644
index 3a540d3..0000000
--- a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
deleted file mode 100644
index e9dc6e9..0000000
--- a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000002</id><displayName>Station 2</displayName><latitude>20.000</latitude><longitude>-20.000</longitude><elevation>2000.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 2</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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
deleted file mode 100644
index 2dbe586..0000000
--- a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2004-04-04T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000004</station><value>40</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2004-04-04T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000004</station><value>4</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
deleted file mode 100644
index 4919c20..0000000
--- a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:AS000000003</id><displayName>Station 3</displayName><latitude>-30.000</latitude><longitude>30.000</longitude><locationLabels><type>CNTRY</type><id>FIPS:AS</id><displayName>AUSTRALIA</displayName></locationLabels></station></stationCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/VXQueryCatalog.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/VXQueryCatalog.xml b/vxquery-xtest/src/tests/resources/VXQueryCatalog.xml
deleted file mode 100644
index f396f98..0000000
--- a/vxquery-xtest/src/tests/resources/VXQueryCatalog.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE test-suite [
-
-<!ENTITY AggregatePartition1Queries SYSTEM "cat/AggregatePartition1Queries.xml">
-<!ENTITY AggregatePartition2Queries SYSTEM "cat/AggregatePartition2Queries.xml">
-<!ENTITY AggregatePartition4Queries SYSTEM "cat/AggregatePartition4Queries.xml">
-
-<!ENTITY GhcndPartition1Queries SYSTEM "cat/GhcndPartition1Queries.xml">
-<!ENTITY GhcndPartition2Queries SYSTEM "cat/GhcndPartition2Queries.xml">
-<!ENTITY GhcndPartition4Queries SYSTEM "cat/GhcndPartition4Queries.xml">
-
-<!ENTITY GhcndRecordsPartition1Queries SYSTEM "cat/GhcndRecordsPartition1Queries.xml">
-<!ENTITY GhcndRecordsPartition2Queries SYSTEM "cat/GhcndRecordsPartition2Queries.xml">
-<!ENTITY GhcndRecordsPartition4Queries SYSTEM "cat/GhcndRecordsPartition4Queries.xml">
-
-<!ENTITY GhcndCountPartition1Queries SYSTEM "cat/GhcndCountPartition1Queries.xml">
-<!ENTITY GhcndCountPartition2Queries SYSTEM "cat/GhcndCountPartition2Queries.xml">
-<!ENTITY GhcndCountPartition4Queries SYSTEM "cat/GhcndCountPartition4Queries.xml">
-
-]>
-<test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            CatalogDesignDate="2014-04-01"
-            version="0.0.1"
-            SourceOffsetPath="./"
-            ResultOffsetPath="ExpectedTestResults/"
-            XQueryQueryOffsetPath="Queries/XQuery/"
-            XQueryXQueryOffsetPath="Queries/XQueryX/"
-            XQueryFileExtension=".xq"
-            XQueryXFileExtension=".xqx"
-            xsi:schemaLocation="http://www.w3.org/2005/02/query-test-XQTSCatalog XQTSCatalog.xsd">
-   <test-suite-info>
-      <title>VXQuery Test Suite</title>
-      <description> 
-         Test Suite for VXQuery. 
-      </description>
-   </test-suite-info>
-   <test-group name="AggregatePartitionQueries" featureOwner="Preston Carman">
-      <GroupInfo>
-         <title>Aggregate Partition Queries</title>
-         <description/>
-      </GroupInfo>
-      <test-group name="AggregateParallelExecutionTests" featureOwner="Preston Carman">
-         <GroupInfo>
-            <title>Aggregate Parallel Execution Tests</title>
-            <description/>
-         </GroupInfo>
-         &AggregatePartition1Queries;
-         &AggregatePartition2Queries;
-         &AggregatePartition4Queries;
-      </test-group>
-   </test-group>
-   <test-group name="GhcndPartitionQueries" featureOwner="Preston Carman">
-      <GroupInfo>
-         <title>GHCND Partition Queries</title>
-         <description/>
-      </GroupInfo>
-      <test-group name="ParallelExecutionTests" featureOwner="Preston Carman">
-         <GroupInfo>
-            <title>Parallel Execution Tests</title>
-            <description/>
-         </GroupInfo>
-         &GhcndPartition1Queries;
-         &GhcndPartition2Queries;
-         &GhcndPartition4Queries;
-      </test-group>
-   </test-group>
-   <test-group name="GhcndCountPartitionQueries" featureOwner="Preston Carman">
-      <GroupInfo>
-         <title>GHCND Count Partition Queries</title>
-         <description/>
-      </GroupInfo>
-      <test-group name="CountParallelExecutionTests" featureOwner="Preston Carman">
-         <GroupInfo>
-            <title>Parallel Execution Tests</title>
-            <description/>
-         </GroupInfo>
-         &GhcndCountPartition1Queries;
-         &GhcndCountPartition2Queries;
-         &GhcndCountPartition4Queries;
-      </test-group>
-   </test-group>
-   <test-group name="GhcndRecordsPartitionQueries" featureOwner="Preston Carman">
-      <GroupInfo>
-         <title>GHCND Records Partition Queries</title>
-         <description/>
-      </GroupInfo>
-      <test-group name="RecordsParallelExecutionTests" featureOwner="Preston Carman">
-         <GroupInfo>
-            <title>Records Parallel Execution Tests</title>
-            <description/>
-         </GroupInfo>
-         &GhcndRecordsPartition1Queries;
-         &GhcndRecordsPartition2Queries;
-         &GhcndRecordsPartition4Queries;
-      </test-group>
-   </test-group>
-</test-suite>


[47/51] [abbrv] git commit: Merge branch 'westmann/licenses' of https://git-wip-us.apache.org/repos/asf/incubator-vxquery into prestonc/site

Posted by vi...@apache.org.
Merge branch 'westmann/licenses' of https://git-wip-us.apache.org/repos/asf/incubator-vxquery into prestonc/site


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/45ab836c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/45ab836c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/45ab836c

Branch: refs/heads/vxquery_0_3_staging
Commit: 45ab836cc1de0e11ddae4755b7b87468316f0415
Parents: 7ad806f afca3af
Author: Preston Carman <pr...@apache.org>
Authored: Tue Apr 8 17:14:47 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Apr 8 17:14:47 2014 -0700

----------------------------------------------------------------------
 .../resources/noaa-ghcn-daily/queries/q00.xq     | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q01.xq     | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q02.xq     | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q03.xq     | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q04.xq     | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q04_sensor.xq        | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q04_station.xq       | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q05.xq     | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q05_sensor.xq        | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q05_station.xq       | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q06.xq     | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q06_sensor.xq        | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q06_station.xq       | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q07.xq     | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q07_tmax.xq          | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q07_tmin.xq          | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/sensor_count.xq      | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/station_count.xq     | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/scripts/README.md  | 17 +++++++++++++++++
 .../src/main/resources/util/README.md            | 17 +++++++++++++++++
 .../src/main/resources/util/vxquery_functions.xq | 17 +++++++++++++++++
 .../src/main/resources/util/vxquery_operators.xq | 17 +++++++++++++++++
 .../src/main/resources/scripts/README.md         | 17 +++++++++++++++++
 .../src/main/resources/scripts/startcc.sh        | 17 +++++++++++++++++
 .../src/main/resources/scripts/startnc.sh        | 17 +++++++++++++++++
 .../src/main/resources/scripts/stopcc.sh         | 17 +++++++++++++++++
 .../src/main/resources/scripts/stopnc.sh         | 17 +++++++++++++++++
 vxquery-xtest/results/README.md                  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-1/avg.xq  | 17 +++++++++++++++++
 .../XQuery/Aggregate/Partition-1/count.xq        | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-1/max.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-1/min.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-1/sum.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-2/avg.xq  | 17 +++++++++++++++++
 .../XQuery/Aggregate/Partition-2/count.xq        | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-2/max.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-2/min.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-2/sum.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-4/avg.xq  | 17 +++++++++++++++++
 .../XQuery/Aggregate/Partition-4/count.xq        | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-4/max.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-4/min.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-4/sum.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q00.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q01.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q02.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q03.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q04.xq      | 17 +++++++++++++++++
 .../XQuery/Ghcnd/Partition-1/q04_sensors.xq      | 17 +++++++++++++++++
 .../XQuery/Ghcnd/Partition-1/q04_stations.xq     | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q05.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q06.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q07.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q00.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q01.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q02.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q03.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q04.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q05.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q06.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q07.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q00.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q01.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q02.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q03.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q04.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q05.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q06.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q07.xq      | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-1/q02_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-1/q03_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-1/q05_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-1/q07_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-2/q02_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-2/q03_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-2/q05_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-2/q07_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-4/q02_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-4/q03_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-4/q05_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-4/q07_count.xq   | 17 +++++++++++++++++
 .../GhcndRecords/Partition-1/q02_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-1/q03_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-1/q05_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-1/q07_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-2/q02_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-2/q03_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-2/q05_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-2/q07_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-4/q02_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-4/q03_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-4/q05_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-4/q07_records.xq      | 17 +++++++++++++++++
 .../quarter_1/sensors/US000000001_200101_0.xml   | 19 ++++++++++++++++++-
 .../half_1/quarter_1/stations/US000000001.xml    | 19 ++++++++++++++++++-
 .../quarter_2/sensors/US000000002_200202_0.xml   | 19 ++++++++++++++++++-
 .../half_1/quarter_2/stations/US000000004.xml    | 19 ++++++++++++++++++-
 .../quarter_3/sensors/AS000000003_200303_0.xml   | 19 ++++++++++++++++++-
 .../half_2/quarter_3/stations/US000000002.xml    | 19 ++++++++++++++++++-
 .../quarter_4/sensors/US000000004_200404_0.xml   | 19 ++++++++++++++++++-
 .../half_2/quarter_4/stations/AS000000003.xml    | 19 ++++++++++++++++++-
 .../src/test/resources/VXQueryCatalog.xml        | 17 +++++++++++++++++
 .../resources/cat/AggregatePartition1Queries.xml | 17 +++++++++++++++++
 .../resources/cat/AggregatePartition2Queries.xml | 17 +++++++++++++++++
 .../resources/cat/AggregatePartition4Queries.xml | 17 +++++++++++++++++
 .../cat/GhcndCountPartition1Queries.xml          | 17 +++++++++++++++++
 .../cat/GhcndCountPartition2Queries.xml          | 17 +++++++++++++++++
 .../cat/GhcndCountPartition4Queries.xml          | 17 +++++++++++++++++
 .../resources/cat/GhcndPartition1Queries.xml     | 17 +++++++++++++++++
 .../resources/cat/GhcndPartition2Queries.xml     | 17 +++++++++++++++++
 .../resources/cat/GhcndPartition4Queries.xml     | 17 +++++++++++++++++
 .../cat/GhcndRecordsPartition1Queries.xml        | 17 +++++++++++++++++
 .../cat/GhcndRecordsPartition2Queries.xml        | 17 +++++++++++++++++
 .../cat/GhcndRecordsPartition4Queries.xml        | 17 +++++++++++++++++
 114 files changed, 1946 insertions(+), 8 deletions(-)
----------------------------------------------------------------------



[19/51] [abbrv] git commit: Cleaned up the XML file by removing unnecessary information.

Posted by vi...@apache.org.
Cleaned up the XML file by removing unnecessary information.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/0febd9c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/0febd9c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/0febd9c4

Branch: refs/heads/vxquery_0_3_staging
Commit: 0febd9c4c0fbb15b90d974af09810d6d867f1b7c
Parents: c8f9462
Author: Preston Carman <pr...@apache.org>
Authored: Thu Apr 3 11:00:25 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Apr 3 11:00:25 2014 -0700

----------------------------------------------------------------------
 .../cat/AggregatePartition1Queries.xml          |  8 ++--
 .../cat/AggregatePartition2Queries.xml          | 25 +++++-------
 .../cat/AggregatePartition4Queries.xml          | 25 +++++-------
 .../cat/GhcndCountPartition1Queries.xml         | 20 ++++------
 .../cat/GhcndCountPartition2Queries.xml         | 20 ++++------
 .../cat/GhcndCountPartition4Queries.xml         | 20 ++++------
 .../resources/cat/GhcndPartition1Queries.xml    | 40 ++++++++------------
 .../resources/cat/GhcndPartition2Queries.xml    | 40 ++++++++------------
 .../resources/cat/GhcndPartition4Queries.xml    | 40 ++++++++------------
 .../cat/GhcndRecordsPartition1Queries.xml       | 20 ++++------
 .../cat/GhcndRecordsPartition2Queries.xml       | 20 ++++------
 .../cat/GhcndRecordsPartition4Queries.xml       | 20 ++++------
 12 files changed, 120 insertions(+), 178 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
index c901468..b3ed2fc 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
@@ -8,22 +8,22 @@
       <query name="avg" date="2014-04-01"/>
       <output-file compare="Text">avg.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
       <query name="count" date="2014-04-01"/>
       <output-file compare="Text">count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
       <query name="min" date="2014-04-01"/>
       <output-file compare="Text">min.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
       <query name="max" date="2014-04-01"/>
       <output-file compare="Text">max.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
       <query name="sum" date="2014-04-01"/>
       <output-file compare="Text">sum.txt</output-file>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
index a4ac807..efa93d0 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
@@ -3,34 +3,29 @@
       <title>Aggregate Partition 2</title>
       <description/>
    </GroupInfo>
-   <test-case is-XPath2="true" name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
       <query name="avg" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">avg.txt</output-file>
+      <output-file compare="Text">avg.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
       <query name="count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">count.txt</output-file>
+      <output-file compare="Text">count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q05 from the weather benchmark with 2 partition.</description>
       <query name="min" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">min.txt</output-file>
+      <output-file compare="Text">min.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q07 from the weather benchmark with 2 partition.</description>
       <query name="max" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">max.txt</output-file>
+      <output-file compare="Text">max.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q03 from the weather benchmark with 2 partition.</description>
       <query name="sum" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">sum.txt</output-file>
+      <output-file compare="Text">sum.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
index d920d31..800de1c 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
@@ -3,34 +3,29 @@
       <title>Aggregate Partition 4</title>
       <description/>
    </GroupInfo>
-   <test-case is-XPath2="true" name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
       <query name="avg" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">avg.txt</output-file>
+      <output-file compare="Text">avg.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
       <query name="count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">count.txt</output-file>
+      <output-file compare="Text">count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q05 from the weather benchmark with 4 partition.</description>
       <query name="min" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">min.txt</output-file>
+      <output-file compare="Text">min.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q07 from the weather benchmark with 4 partition.</description>
       <query name="max" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">max.txt</output-file>
+      <output-file compare="Text">max.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q03 from the weather benchmark with 4 partition.</description>
       <query name="sum" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">sum.txt</output-file>
+      <output-file compare="Text">sum.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
index 515738e..6a5b609 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
@@ -3,28 +3,24 @@
       <title>GHCND Count Partition 1</title>
       <description/>
    </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
       <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
+      <output-file compare="Text">q02_count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
       <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
+      <output-file compare="Text">q03_count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
       <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
+      <output-file compare="Text">q05_count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
       <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
+      <output-file compare="Text">q07_count.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
index 8bb590b..99fee09 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
@@ -3,28 +3,24 @@
       <title>GHCND Count Partition 2</title>
       <description/>
    </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
       <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
+      <output-file compare="Text">q02_count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
       <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
+      <output-file compare="Text">q03_count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
       <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
+      <output-file compare="Text">q05_count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
       <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
+      <output-file compare="Text">q07_count.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
index ff75d3a..8f1b3f0 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
@@ -3,28 +3,24 @@
       <title>GHCND Count Partition 4</title>
       <description/>
    </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
       <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
+      <output-file compare="Text">q02_count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
       <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
+      <output-file compare="Text">q03_count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
       <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
+      <output-file compare="Text">q05_count.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
       <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
+      <output-file compare="Text">q07_count.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
index 1237971..94c45dc 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
@@ -3,52 +3,44 @@
       <title>GHCND Partition 1</title>
       <description/>
    </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
       <description>Execution of q00 from the weather benchmark with 1 partition.</description>
       <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
+      <output-file compare="Text">q00.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
       <description>Execution of q01 from the weather benchmark with 1 partition.</description>
       <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
+      <output-file compare="Text">q01.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
       <description>Execution of q02 from the weather benchmark with 1 partition.</description>
       <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
+      <output-file compare="Text">q02.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
       <description>Execution of q03 from the weather benchmark with 1 partition.</description>
       <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
+      <output-file compare="Text">q03.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
       <description>Execution of q04 from the weather benchmark with 1 partition.</description>
       <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
+      <output-file compare="Text">q04.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
       <description>Execution of q05 from the weather benchmark with 1 partition.</description>
       <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
+      <output-file compare="Text">q05.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
       <description>Execution of q06 from the weather benchmark with 1 partition.</description>
       <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
+      <output-file compare="Text">q06.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
       <description>Execution of q07 from the weather benchmark with 1 partition.</description>
       <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
+      <output-file compare="Text">q07.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
index 86b5cf0..a35c153 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
@@ -3,52 +3,44 @@
       <title>GHCND Partition 1</title>
       <description/>
    </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
       <description>Execution of q00 from the weather benchmark with 2 partitions.</description>
       <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
+      <output-file compare="Text">q00.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
       <description>Execution of q01 from the weather benchmark with 2 partitions.</description>
       <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
+      <output-file compare="Text">q01.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
       <description>Execution of q02 from the weather benchmark with 2 partitions.</description>
       <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
+      <output-file compare="Text">q02.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
       <description>Execution of q03 from the weather benchmark with 2 partitions.</description>
       <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
+      <output-file compare="Text">q03.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
       <description>Execution of q04 from the weather benchmark with 2 partitions.</description>
       <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
+      <output-file compare="Text">q04.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
       <description>Execution of q05 from the weather benchmark with 2 partitions.</description>
       <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
+      <output-file compare="Text">q05.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
       <description>Execution of q06 from the weather benchmark with 2 partitions.</description>
       <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
+      <output-file compare="Text">q06.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
       <description>Execution of q07 from the weather benchmark with 2 partitions.</description>
       <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
+      <output-file compare="Text">q07.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
index 232a7b0..fcbf3d5 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
@@ -3,52 +3,44 @@
       <title>GHCND Partition 4</title>
       <description/>
    </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
       <description>Execution of q00 from the weather benchmark with 4 partitions.</description>
       <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
+      <output-file compare="Text">q00.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
       <description>Execution of q01 from the weather benchmark with 4 partitions.</description>
       <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
+      <output-file compare="Text">q01.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
       <description>Execution of q02 from the weather benchmark with 4 partitions.</description>
       <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
+      <output-file compare="Text">q02.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
       <description>Execution of q03 from the weather benchmark with 4 partitions.</description>
       <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
+      <output-file compare="Text">q03.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
       <description>Execution of q04 from the weather benchmark with 4 partitions.</description>
       <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
+      <output-file compare="Text">q04.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
       <description>Execution of q05 from the weather benchmark with 4 partitions.</description>
       <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
+      <output-file compare="Text">q05.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
       <description>Execution of q06 from the weather benchmark with 4 partitions.</description>
       <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
+      <output-file compare="Text">q06.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
       <description>Execution of q07 from the weather benchmark with 4 partitions.</description>
       <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
+      <output-file compare="Text">q07.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
index 0c22422..31f6a13 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
@@ -3,28 +3,24 @@
       <title>GHCND Records Partition 1</title>
       <description/>
    </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
       <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
+      <output-file compare="Text">q02_records.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
       <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
+      <output-file compare="Text">q03_records.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
       <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
+      <output-file compare="Text">q05_records.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
       <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
       <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
+      <output-file compare="Text">q07_records.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
index 929ff28..41b1966 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
@@ -3,28 +3,24 @@
       <title>GHCND Records Partition 2</title>
       <description/>
    </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
       <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
+      <output-file compare="Text">q02_records.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
       <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
+      <output-file compare="Text">q03_records.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
       <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
+      <output-file compare="Text">q05_records.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
       <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
       <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
+      <output-file compare="Text">q07_records.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
index 03eea78..f1b99ed 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
@@ -3,28 +3,24 @@
       <title>GHCND Records Partition 4</title>
       <description/>
    </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
       <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
+      <output-file compare="Text">q02_records.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
       <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
+      <output-file compare="Text">q03_records.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
       <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
+      <output-file compare="Text">q05_records.txt</output-file>
    </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+   <test-case name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
       <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
       <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
+      <output-file compare="Text">q07_records.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file


[39/51] [abbrv] git commit: Removed extra imports.

Posted by vi...@apache.org.
Removed extra imports.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/1eb4aeaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/1eb4aeaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/1eb4aeaf

Branch: refs/heads/vxquery_0_3_staging
Commit: 1eb4aeaf67c974664eae6526988aea9059d2c5e2
Parents: 9b90734
Author: Preston Carman <pr...@apache.org>
Authored: Mon Apr 7 20:49:50 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Mon Apr 7 20:49:50 2014 -0700

----------------------------------------------------------------------
 .../vxquery/metadata/VXQueryCollectionOperatorDescriptor.java      | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/1eb4aeaf/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 44e6ad6..1ca0ea6 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
@@ -27,8 +27,6 @@ import org.apache.vxquery.datamodel.accessors.PointablePool;
 import org.apache.vxquery.datamodel.accessors.PointablePoolFactory;
 import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
 import org.apache.vxquery.exceptions.SystemException;
-import org.apache.vxquery.exceptions.VXQueryFileNotFoundException;
-import org.apache.vxquery.exceptions.VXQueryParseException;
 import org.apache.vxquery.runtime.functions.step.ChildPathStepOperatorDescriptor;
 import org.apache.vxquery.xmlparser.ITreeNodeIdProvider;
 import org.apache.vxquery.xmlparser.TreeNodeIdProvider;


[33/51] [abbrv] updated XQTS results

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/6512b009/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index ea1a37c..b8eba23 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -15,6 +15,19 @@ Appendices/Appendix-A4//appendix-A4-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Appendices/Appendix-A4//appendix-A4-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Appendices/Appendix-A4//appendix-A4-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Appendices/Appendix-A4//appendix-A4-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/EQNames//eqname-001, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-002, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-003, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-004, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-005, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-006, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-007, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-008, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-009, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-010, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-901, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+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-10, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -37,6 +50,9 @@ 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//Catalog002, EXPECTED_RESULT_GOT_FAILURE
+Catalog//Catalog003, EXPECTED_RESULT_GOT_FAILURE
 CondExpr//K2-CondExpr-1, EXPECTED_ERROR_GOT_FAILURE
 CondExpr//K2-CondExpr-2, EXPECTED_RESULT_GOT_FAILURE
 CondExpr//K2-CondExpr-3, EXPECTED_RESULT_GOT_ERROR
@@ -121,7 +137,7 @@ Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-1, EXPECTED_ERROR_GOT_SAM
 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_DIFFERENT_RESULT
+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
@@ -159,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_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-19, EXPECTED_RESULT_GOT_FAILURE
 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
+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-23, EXPECTED_RESULT_GOT_ERROR
-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-24, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-25, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-30, EXPECTED_RESULT_GOT_FAILURE
 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
@@ -217,18 +233,18 @@ 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_DIFFERENT_RESULT
+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_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_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_FAILURE
 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_DIFFERENT_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
@@ -238,9 +254,9 @@ Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_FAILURE
 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-47, EXPECTED_ERROR_GOT_FAILURE
 Construct/DirectConElem//K2-DirectConElem-48, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_DIFFERENT_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
@@ -324,7 +340,7 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-70, EXPECTED_RES
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-71, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-72, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-73, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-74, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-74, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-75, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-76, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -371,7 +387,7 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-44, EXPECT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-45, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-46, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-47, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-48, EXPECTED_RESULT_GOT_FAILURE
+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
@@ -413,7 +429,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-35, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-36, EXPECTED_ERROR_GOT_RESULT
 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_FAILURE
+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
@@ -424,19 +440,19 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-45, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-46, EXPECTED_RESULT_GOT_FAILURE
 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_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-5, EXPECTED_RESULT_GOT_FAILURE
+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
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-53, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-54, EXPECTED_RESULT_GOT_ERROR
+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-55, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-56, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 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_FAILURE
+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
@@ -470,15 +486,15 @@ Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-17,
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-21, 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_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_FAILURE
@@ -537,10 +553,10 @@ Construct/DirectConOther//K2-DirectConOther-54, EXPECTED_RESULT_GOT_DIFFERENT_RE
 Construct/DirectConOther//K2-DirectConOther-55, EXPECTED_ERROR_GOT_SAME_ERROR
 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_DIFFERENT_RESULT
+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_DIFFERENT_RESULT
+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
 Construct/DirectConOther//K2-DirectConOther-63, EXPECTED_ERROR_GOT_RESULT
@@ -596,9 +612,9 @@ Expressions/CondExpr//K-CondExpr-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/CondExpr//K-CondExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/CondExpr//K-CondExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-1, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-12, EXPECTED_RESULT_GOT_DIFFERENT_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
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-14, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-15, EXPECTED_RESULT_GOT_FAILURE
@@ -613,16 +629,16 @@ Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-5, EXP
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-6, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-2, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-2, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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
@@ -684,7 +700,7 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-7, EX
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-8, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-data-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-doc-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-3, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -692,11 +708,11 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-name-1, EXPECTE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-name-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-name-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nested-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nested-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-4, 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-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_FAILURE
@@ -749,21 +765,21 @@ Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-attr-2, EXPECTED_ERR
 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_DIFFERENT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+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-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_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-3, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-4, 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-5, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-parent-1, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-string-1, EXPECTED_RESULT_GOT_ERROR
@@ -791,10 +807,10 @@ Expressions/Construct/ConInScopeNamespace//Constr-inscope-1, EXPECTED_RESULT_GOT
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-10, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-11, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-12, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-13, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-15, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-16, EXPECTED_RESULT_GOT_SAME_RESULT
 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
@@ -813,15 +829,15 @@ Expressions/Construct/DirectConElem//Constr-elem-curlybr-3, EXPECTED_RESULT_GOT_
 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_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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-5, EXPECTED_RESULT_GOT_DIFFERENT_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_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-4, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -834,13 +850,13 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-1, E
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-2, EXPECTED_RESULT_GOT_FAILURE
 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-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-6, 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-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-1, 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_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-1, EXPECTED_RESULT_GOT_DIFFERENT_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
@@ -848,17 +864,17 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-1, EXPE
 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_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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-3, EXPECTED_RESULT_GOT_DIFFERENT_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_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-9, EXPECTED_RESULT_GOT_DIFFERENT_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
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -893,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_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-2, EXPECTED_RESULT_GOT_ERROR
+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-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-document-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-5, 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
@@ -916,15 +932,15 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-1,
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-2, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-4, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-4, 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-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
@@ -951,19 +967,19 @@ Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-14,
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-15, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-16, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-18, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-19, 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_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-22, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-23, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-24, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-25, EXPECTED_ERROR_GOT_RESULT
 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_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
@@ -990,9 +1006,9 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-
 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_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-23, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-24, EXPECTED_RESULT_GOT_DIFFERENT_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
@@ -1241,7 +1257,7 @@ Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-55, EXPECTED_RESU
 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-8, EXPECTED_RESULT_GOT_DIFFERENT_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
@@ -1576,6 +1592,72 @@ Expressions/FunctionCallExpr//K2-FunctionCallExpr-6, EXPECTED_ERROR_GOT_SAME_ERR
 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
@@ -5469,12 +5551,12 @@ Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeCheckin
 Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-8, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-9, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodecomparisonerr-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodeexpression33, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodeexpression34, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeAfter//nodecomparisonerr-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeAfter//nodeexpression33, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeAfter//nodeexpression34, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression35, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression36, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodeexpression37, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeAfter//nodeexpression37, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression38, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression39, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression40, EXPECTED_RESULT_GOT_FAILURE
@@ -5491,12 +5573,12 @@ Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc12, EXPECTED_RESULT_GOT_
 Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc13, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc14, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodecomparisonerr-2, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodeexpression17, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodeexpression18, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeBefore//nodecomparisonerr-2, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeBefore//nodeexpression17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeBefore//nodeexpression18, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression19, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression20, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodeexpression21, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeBefore//nodeexpression21, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression22, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression23, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression24, EXPECTED_RESULT_GOT_FAILURE
@@ -5513,8 +5595,8 @@ Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc6, EXPECTED_RESULT_GOT_
 Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc8, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodecomparisonerr-1, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression1, EXPECTED_ERROR_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
@@ -5522,10 +5604,10 @@ Expressions/Operators/NodeOp/NodeSame//nodeexpression13, EXPECTED_ERROR_GOT_FAIL
 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//nodeexpression2, EXPECTED_ERROR_GOT_FAILURE
+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//nodeexpression5, EXPECTED_ERROR_GOT_FAILURE
+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
@@ -5559,9 +5641,9 @@ Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-001, EXPECTED_RESULT_
 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-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-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-009, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-010, EXPECTED_RESULT_GOT_ERROR
@@ -5582,9 +5664,9 @@ Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-001, EXPECTED_R
 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-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-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-009, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-010, EXPECTED_RESULT_GOT_ERROR
@@ -5671,19 +5753,19 @@ Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-6, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-8, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-10, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-11, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-12, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-13, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/PathExpressions//PathExpr-14, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-16, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-14, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/PathExpressions//PathExpr-15, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/PathExpressions//PathExpr-16, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/PathExpressions//PathExpr-2, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/PathExpressions//PathExpr-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/PathExpressions//PathExpr-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-6, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-8, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-9, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -5771,8 +5853,8 @@ 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//Axes015, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes016, EXPECTED_RESULT_GOT_FAILURE
+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
@@ -5913,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_ERROR
-Expressions/PathExpr/Steps/Axes//Axes087, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes086, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes087, EXPECTED_RESULT_GOT_FAILURE
 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
@@ -5969,7 +6051,7 @@ 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-10, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/NodeTest//nametest-11, EXPECTED_RESULT_GOT_FAILURE
+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-13, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//nametest-14, EXPECTED_RESULT_GOT_FAILURE
@@ -6214,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_ERROR
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-16, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-18, 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-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_ERROR
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-20, EXPECTED_RESULT_GOT_FAILURE
 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
@@ -6232,7 +6314,7 @@ Expressions/PrologExpr/BaseURIProlog//K-BaseURIProlog-1, EXPECTED_RESULT_GOT_ERR
 Expressions/PrologExpr/BaseURIProlog//K-BaseURIProlog-2, EXPECTED_ERROR_GOT_RESULT
 Expressions/PrologExpr/BaseURIProlog//K-BaseURIProlog-3, EXPECTED_ERROR_GOT_RESULT
 Expressions/PrologExpr/BaseURIProlog//base-URI-1, EXPECTED_ERROR_GOT_RESULT
-Expressions/PrologExpr/BaseURIProlog//base-URI-10, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/BaseURIProlog//base-URI-10, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/BaseURIProlog//base-URI-11, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/BaseURIProlog//base-URI-12, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PrologExpr/BaseURIProlog//base-URI-13, EXPECTED_RESULT_GOT_ERROR
@@ -6337,10 +6419,10 @@ Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-2, EXPECTED_RESULT_GO
 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_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-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-7, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-8, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-9, EXPECTED_RESULT_GOT_ERROR
@@ -6730,7 +6812,7 @@ Expressions/PrologExpr/VersionProlog//prolog-version-12, EXPECTED_ERROR_GOT_SAME
 Expressions/PrologExpr/VersionProlog//prolog-version-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PrologExpr/VersionProlog//prolog-version-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/PrologExpr/VersionProlog//prolog-version-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/PrologExpr/VersionProlog//prolog-version-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/PrologExpr/VersionProlog//prolog-version-5, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrologExpr/VersionProlog//prolog-version-6, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrologExpr/VersionProlog//prolog-version-7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrologExpr/VersionProlog//prolog-version-9, EXPECTED_ERROR_GOT_RESULT
@@ -6933,9 +7015,9 @@ Expressions/QuantExpr/QuantExprWithout//quantexpr-58, EXPECTED_RESULT_GOT_SAME_R
 Expressions/QuantExpr/QuantExprWithout//quantexpr-59, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc1, EXPECTED_RESULT_GOT_ERROR
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc2, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc4, EXPECTED_RESULT_GOT_ERROR
+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
@@ -6947,8 +7029,8 @@ 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//combiningnodeseqintersecthc1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc2, EXPECTED_ERROR_GOT_FAILURE
+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//combiningnodeseqintersecthc4, EXPECTED_RESULT_GOT_ERROR
 Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-1, EXPECTED_ERROR_GOT_RESULT
@@ -7164,6 +7246,28 @@ Expressions/SeqExpr/RangeExpr//rangeExpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/SeqExpr/RangeExpr//rangeExpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/SeqExpr/RangeExpr//rangeExpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/SeqExpr/RangeExpr//rangeExpr-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SwitchExpr//switch-001, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-002, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-003, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-004, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-005, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-006, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-007, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-008, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-009, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-010, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-011, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-012, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-013, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-901, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-902, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-903, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-904, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-905, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-906, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-907, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-908, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-909, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//K-XQueryComment-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -7184,14 +7288,14 @@ Expressions/XQueryComment//K-XQueryComment-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-8, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//K-XQueryComment-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/XQueryComment//XQueryComment001, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/XQueryComment//XQueryComment001, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//XQueryComment002, EXPECTED_RESULT_GOT_FAILURE
-Expressions/XQueryComment//XQueryComment003, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment004, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment005, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment006, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment007, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment008, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/XQueryComment//XQueryComment003, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment004, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment005, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment006, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment007, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment008, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//XQueryComment009, EXPECTED_RESULT_GOT_FAILURE
 Expressions/XQueryComment//XQueryComment010, EXPECTED_RESULT_GOT_FAILURE
 Expressions/XQueryComment//XQueryComment011, EXPECTED_RESULT_GOT_FAILURE
@@ -7203,7 +7307,7 @@ Expressions/XQueryComment//XQueryComment016, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//XQueryComment017, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//XQueryComment018, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//XQueryComment019, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/XQueryComment//XQueryComment020, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/XQueryComment//XQueryComment020, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//CastAs001, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//CastAs002, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//CastAs003, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -9083,7 +9187,7 @@ Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-74, EXPECTED_RESULT_GOT_SAME
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-740, EXPECTED_ERROR_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-741, EXPECTED_ERROR_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-742, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-743, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-743, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-744, EXPECTED_RESULT_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-745, EXPECTED_ERROR_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-746, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10421,8 +10525,8 @@ FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-1, EXPECTED_ERROR_GOT_SAME_E
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-10, EXPECTED_ERROR_GOT_FAILURE
 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_DIFFERENT_RESULT
-FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-13, EXPECTED_RESULT_GOT_FAILURE
+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
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-17, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10475,8 +10579,8 @@ FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-18, EXPECTED_RESULT_GOT_ERRO
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-19, EXPECTED_ERROR_GOT_RESULT
 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_DIFFERENT_RESULT
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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_FAILURE
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-24, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-25, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10540,7 +10644,7 @@ 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_DIFFERENT_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-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10553,7 +10657,7 @@ FullAxis/ancestor-or-selfAxis//ancestorself-18, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-19, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-2, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-20, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-21, EXPECTED_RESULT_GOT_ERROR
+FullAxis/ancestor-or-selfAxis//ancestorself-21, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-3, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-4, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-5, EXPECTED_RESULT_GOT_FAILURE
@@ -10562,7 +10666,7 @@ FullAxis/ancestor-or-selfAxis//ancestorself-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//unabbreviatedSyntax-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestorAxis//ancestor-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/ancestorAxis//ancestor-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10584,7 +10688,7 @@ FullAxis/ancestorAxis//ancestor-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//unabbreviatedSyntax-10, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/following-siblingAxis//followingsibling-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/following-siblingAxis//followingsibling-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10606,7 +10710,7 @@ FullAxis/following-siblingAxis//followingsibling-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//unabbreviatedSyntax-24, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/followingAxis//following-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/followingAxis//following-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/followingAxis//following-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10627,7 +10731,7 @@ FullAxis/followingAxis//following-6, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-9, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/preceding-siblingAxis//preceding-sibling-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/preceding-siblingAxis//preceding-sibling-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10649,7 +10753,7 @@ FullAxis/preceding-siblingAxis//preceding-sibling-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//unabbreviatedSyntax-25, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/precedingAxis//preceding-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/precedingAxis//preceding-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/precedingAxis//preceding-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/precedingAxis//preceding-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/precedingAxis//preceding-12, EXPECTED_RESULT_GOT_FAILURE
@@ -11302,7 +11406,7 @@ 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_FAILURE
 FunctX/functx-functx-distinct-element-paths//functx-functx-distinct-element-paths-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-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-duration-from-timezone//functx-functx-duration-from-timezone-1, EXPECTED_RESULT_GOT_ERROR
@@ -11514,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_ERROR
+FunctX/functx-functx-max-string//functx-functx-max-string-1, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+FunctX/functx-functx-max-string//functx-functx-max-string-all, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+FunctX/functx-functx-min-string//functx-functx-min-string-1, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+FunctX/functx-functx-min-string//functx-functx-min-string-all, EXPECTED_RESULT_GOT_FAILURE
 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
@@ -11550,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_ERROR
-FunctX/functx-functx-node-kind//functx-functx-node-kind-4, 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-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_ERROR
+FunctX/functx-functx-node-kind//functx-functx-node-kind-all, EXPECTED_RESULT_GOT_FAILURE
 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
@@ -11641,29 +11745,29 @@ 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_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-2, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-3, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-3, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-all, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-11, 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-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_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-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-siblings-same-name//functx-functx-siblings-same-name-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-siblings-same-name//functx-functx-siblings-same-name-2, EXPECTED_RESULT_GOT_FAILURE
@@ -11672,15 +11776,15 @@ FunctX/functx-functx-siblings//functx-functx-siblings-1, EXPECTED_RESULT_GOT_FAI
 FunctX/functx-functx-siblings//functx-functx-siblings-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-siblings//functx-functx-siblings-all, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
-FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-all, 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-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_ERROR
-FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-all, 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-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_ERROR
-FunctX/functx-functx-sort//functx-functx-sort-all, 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-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-funct

<TRUNCATED>

[05/51] [abbrv] Updated the testing resources.

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/XQTSCatalog.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/XQTSCatalog.xml b/vxquery-xtest/tests/XQTSCatalog.xml
deleted file mode 100644
index 7f6554f..0000000
--- a/vxquery-xtest/tests/XQTSCatalog.xml
+++ /dev/null
@@ -1,1013 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="XQTSCatalog.xsl" ?>
-<!DOCTYPE test-suite [
-
-<!ELEMENT GroupInfo ( title, description ) >
-
-<!ELEMENT citation-spec ( description | note | spec-URI )* >
-<!ATTLIST citation-spec name NMTOKEN #REQUIRED >
-
-<!ELEMENT citations ( citation-spec+ ) >
-
-<!ELEMENT collection ( description, input-document+ ) >
-<!ATTLIST collection Creator CDATA #REQUIRED >
-<!ATTLIST collection ID NMTOKEN #REQUIRED >
-
-<!ELEMENT comparison ( description ) >
-<!ATTLIST comparison name NMTOKEN #REQUIRED >
-
-<!ELEMENT comparisons ( comparison+ ) >
-
-<!ELEMENT context-properties ( context-property+ ) >
-
-<!ELEMENT context-property EMPTY >
-<!ATTLIST context-property context-type ( dynamic | static ) #REQUIRED >
-<!ATTLIST context-property name CDATA #REQUIRED >
-
-<!ELEMENT contextItem ( #PCDATA ) >
-<!ATTLIST contextItem role NMTOKEN #FIXED "principal-data" >
-
-<!ELEMENT defaultCollection ( #PCDATA ) >
-<!ATTLIST defaultCollection role NMTOKEN #REQUIRED >
-
-<!ELEMENT description ( #PCDATA ) >
-<!ATTLIST description last-mod NMTOKEN #IMPLIED >
-
-<!ELEMENT expected-error ( #PCDATA ) >
-<!ATTLIST expected-error input-document NMTOKEN #IMPLIED >
-<!ATTLIST expected-error spec-version NMTOKENS #IMPLIED >
-
-<!ELEMENT feature EMPTY >
-<!ATTLIST feature name CDATA #REQUIRED >
-
-<!ELEMENT features ( feature+ ) >
-
-<!ELEMENT implementation-defined-item ( description ) >
-<!ATTLIST implementation-defined-item name ID #REQUIRED >
-<!ATTLIST implementation-defined-item spec ( DataModel | FuncOps | Serialization | XQuery ) #REQUIRED >
-
-<!ELEMENT implementation-defined-items ( implementation-defined-item+ ) >
-
-<!ELEMENT input-URI ( #PCDATA ) >
-<!ATTLIST input-URI role NMTOKEN #FIXED "principal-data" >
-<!ATTLIST input-URI variable ( input-context | input-context1 | input-context2 ) #REQUIRED >
-
-<!ELEMENT input-document ( #PCDATA ) >
-
-<!ELEMENT input-file ( #PCDATA ) >
-<!ATTLIST input-file role NMTOKEN #FIXED "principal-data" >
-<!ATTLIST input-file variable ( input-context | input-context1 | input-context2 | input-context3 | inputDocument | var ) #REQUIRED >
-
-<!ELEMENT input-query EMPTY >
-<!ATTLIST input-query date CDATA #REQUIRED >
-<!ATTLIST input-query name ID #REQUIRED >
-<!ATTLIST input-query variable NMTOKEN #FIXED "x" >
-
-<!ELEMENT module ( #PCDATA | description )* >
-<!ATTLIST module Creator CDATA #IMPLIED >
-<!ATTLIST module FileName CDATA #IMPLIED >
-<!ATTLIST module ID ID #IMPLIED >
-<!ATTLIST module namespace CDATA #IMPLIED >
-
-<!ELEMENT note ( #PCDATA ) >
-
-<!ELEMENT output-file ( #PCDATA ) >
-<!ATTLIST output-file compare ( Fragment | Ignore | Inspect | Text | XML ) #REQUIRED >
-<!ATTLIST output-file input-document NMTOKEN #IMPLIED >
-<!ATTLIST output-file spec-version NMTOKENS #IMPLIED >
-<!ATTLIST output-file role NMTOKEN #FIXED "principal" >
-
-<!ELEMENT query ( description? ) >
-<!ATTLIST query date CDATA #REQUIRED >
-<!ATTLIST query name NMTOKEN #REQUIRED >
-<!ATTLIST query static-name NMTOKEN #IMPLIED >
-
-<!ELEMENT reflects-resolution ( #PCDATA ) >
-
-<!ELEMENT role ( description, note? ) >
-<!ATTLIST role name NMTOKEN #REQUIRED >
-
-<!ELEMENT roles ( role+ ) >
-
-<!ELEMENT scenario ( description ) >
-<!ATTLIST scenario name NMTOKEN #REQUIRED >
-
-<!ELEMENT scenarios ( scenario+ ) >
-
-<!ELEMENT schema ( description ) >
-<!ATTLIST schema FileName CDATA #REQUIRED >
-<!ATTLIST schema ID ID #REQUIRED >
-<!ATTLIST schema uri CDATA #REQUIRED >
-
-<!ELEMENT source ( description, note* ) >
-<!ATTLIST source Creator CDATA #REQUIRED >
-<!ATTLIST source FileName CDATA #REQUIRED >
-<!ATTLIST source ID ID #REQUIRED >
-<!ATTLIST source schema NMTOKEN #IMPLIED >
-
-<!ELEMENT sources ( source+, schema+, collection+, module+ ) >
-
-<!ELEMENT spec-URI ( #PCDATA ) >
-
-<!ELEMENT spec-citation EMPTY >
-<!ATTLIST spec-citation section-number NMTOKEN #REQUIRED >
-<!ATTLIST spec-citation section-pointer NMTOKEN #REQUIRED >
-<!ATTLIST spec-citation section-title CDATA #REQUIRED >
-<!ATTLIST spec-citation spec ( DataModel | FuncOps | UseCases | XQuery ) #REQUIRED >
-
-<!ELEMENT test-case ( contextItem | defaultCollection | description | expected-error | input-URI | input-file | input-query | module | output-file | query | reflects-resolution | spec-citation )* >
-<!ATTLIST test-case Creator CDATA #REQUIRED >
-<!ATTLIST test-case FilePath CDATA #REQUIRED >
-<!ATTLIST test-case is-XPath2 ( false | true ) #IMPLIED >
-<!ATTLIST test-case name ID #REQUIRED >
-<!ATTLIST test-case scenario ( parse-error | runtime-error | standard ) #REQUIRED >
-
-<!ELEMENT test-group ( GroupInfo | test-case | test-group )* >
-<!ATTLIST test-group featureOwner CDATA #IMPLIED >
-<!ATTLIST test-group is-XPath2 ( false | true ) #IMPLIED >
-<!ATTLIST test-group name ID #REQUIRED >
-<!ATTLIST test-group xmlns CDATA #IMPLIED >
-
-<!ELEMENT test-suite ( test-suite-info, citations, comparisons, roles, scenarios, sources, implementation-defined-items, features, context-properties, test-group+ ) >
-<!ATTLIST test-suite CatalogDesignDate NMTOKEN #REQUIRED >
-<!ATTLIST test-suite ResultOffsetPath CDATA #REQUIRED >
-<!ATTLIST test-suite SourceOffsetPath CDATA #REQUIRED >
-<!ATTLIST test-suite XQueryFileExtension NMTOKEN #REQUIRED >
-<!ATTLIST test-suite XQueryQueryOffsetPath CDATA #REQUIRED >
-<!ATTLIST test-suite XQueryXFileExtension NMTOKEN #REQUIRED >
-<!ATTLIST test-suite XQueryXQueryOffsetPath CDATA #REQUIRED >
-<!ATTLIST test-suite version CDATA #REQUIRED >
-<!ATTLIST test-suite xmlns CDATA #REQUIRED >
-<!ATTLIST test-suite xmlns:xsi CDATA #REQUIRED >
-<!ATTLIST test-suite xsi:schemaLocation CDATA #REQUIRED >
-
-<!ELEMENT test-suite-info ( title, description ) >
-
-<!ELEMENT title ( #PCDATA ) >
-
-<!ENTITY AggregatePartition1Queries SYSTEM "cat/AggregatePartition1Queries.xml">
-<!ENTITY AggregatePartition2Queries SYSTEM "cat/AggregatePartition2Queries.xml">
-<!ENTITY AggregatePartition4Queries SYSTEM "cat/AggregatePartition4Queries.xml">
-
-<!ENTITY GhcndPartition1Queries SYSTEM "cat/GhcndPartition1Queries.xml">
-<!ENTITY GhcndPartition2Queries SYSTEM "cat/GhcndPartition2Queries.xml">
-<!ENTITY GhcndPartition4Queries SYSTEM "cat/GhcndPartition4Queries.xml">
-
-<!ENTITY GhcndRecordsPartition1Queries SYSTEM "cat/GhcndRecordsPartition1Queries.xml">
-<!ENTITY GhcndRecordsPartition2Queries SYSTEM "cat/GhcndRecordsPartition2Queries.xml">
-<!ENTITY GhcndRecordsPartition4Queries SYSTEM "cat/GhcndRecordsPartition4Queries.xml">
-
-<!ENTITY GhcndCountPartition1Queries SYSTEM "cat/GhcndCountPartition1Queries.xml">
-<!ENTITY GhcndCountPartition2Queries SYSTEM "cat/GhcndCountPartition2Queries.xml">
-<!ENTITY GhcndCountPartition4Queries SYSTEM "cat/GhcndCountPartition4Queries.xml">
-
-]>
-<test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            CatalogDesignDate="2003-04-03"
-            version="1.0.3"
-            SourceOffsetPath="./"
-            ResultOffsetPath="ExpectedTestResults/"
-            XQueryQueryOffsetPath="Queries/XQuery/"
-            XQueryXQueryOffsetPath="Queries/XQueryX/"
-            XQueryFileExtension=".xq"
-            XQueryXFileExtension=".xqx"
-            xsi:schemaLocation="http://www.w3.org/2005/02/query-test-XQTSCatalog XQTSCatalog.xsd">
-   <test-suite-info>
-      <title>VXQuery Test Suite</title>
-      <description> 
-         Test Suite for VXQuery. 
-      </description>
-   </test-suite-info>
-   <citations>
-      <citation-spec name="XQuery">
-         <description last-mod="2007-01-23">XQuery 1.0: An XML Query Language</description>
-         <spec-URI>http://www.w3.org/TR/xquery/</spec-URI>
-      </citation-spec>
-      <citation-spec name="FuncOps">
-         <description last-mod="2007-01-23">XQuery 1.0 and XPath 2.0 Functions and Operators</description>
-         <spec-URI>http://www.w3.org/TR/xpath-functions/</spec-URI>
-      </citation-spec>
-      <citation-spec name="DataModel">
-         <description last-mod="2007-01-23">XQuery 1.0 and XPath 2.0 Data Model</description>
-         <spec-URI>http://www.w3.org/TR/xpath-datamodel/</spec-URI>
-      </citation-spec>
-      <citation-spec name="FormalSemantics">
-         <description last-mod="2007-01-23">XQuery 1.0 and XPath 2.0 Formal Semantics</description>
-         <spec-URI>http://www.w3.org/TR/xquery-semantics/</spec-URI>
-      </citation-spec>
-      <citation-spec name="SchemaPart2">
-         <description last-mod="2003-03-25">XML Schema Part 2: Datatypes</description>
-         <spec-URI>http://www.w3.org/TR/xmlschema-2/</spec-URI>
-      </citation-spec>
-      <citation-spec name="Schema-Errata">
-         <description last-mod="2003-03-25">XML Schema Errata</description>
-         <note>Current practice is to have one Errata document for all parts of Schema.</note>
-         <spec-URI>http://www.w3.org/2001/05/xmlschema-errata</spec-URI>
-      </citation-spec>
-      <citation-spec name="UseCases">
-         <description last-mod="2006-07-12">XML Query Use Cases</description>
-         <spec-URI>http://www.w3c.org/TR/xquery-use-cases/</spec-URI>
-      </citation-spec>
-      <citation-spec name="XQueryX">
-         <description last-mod="2007-01-23">XML Syntax for XQuery 1.0 (XQueryX)</description>
-         <spec-URI>http://www.w3.org/TR/xqueryx/</spec-URI>
-      </citation-spec>
-      <citation-spec name="Serialization">
-         <description last-mod="2007-01-23">XSLT 2.0 and XQuery 1.0 Serialization</description>
-         <spec-URI>http://www.w3.org/TR/xslt-xquery-serialization/</spec-URI>
-      </citation-spec>
-   </citations>
-   <comparisons>
-      <comparison name="XML">
-         <description last-mod="2003-03-25">The XML InfoSets should be canonicalized and compared.</description>
-      </comparison>
-      <comparison name="Fragment">
-         <description last-mod="2004-10-20">
-            A 'fragment' refers to an XML based instance which has multiple top-level elements and NO XML declaration.
-            The comparator for this should simply wrap the entire fragment in a container element and perform XML comparison.
-         </description>
-      </comparison>
-      <comparison name="Text">
-         <description last-mod="2003-03-25">
-            Each line of non-whitespace text should match. New-line sequences
-            may vary and should be neutralized. Due to issues with the XML serialization of certain characters (e.g. '&lt;'),
-            it is not possible to simply compare the actual and expected results. Rather (as is the case with the 'Fragment' comparator)
-            the test harness should convert the results into valid XML (by adding a container element) and perform comparison
-            on the XML canonicalized versions of the results.
-         </description>
-      </comparison>
-      <comparison name="Ignore">
-         <description last-mod="2003-03-25">
-            Only the presence/absence of this file is significant,
-            not its content.
-         </description>
-      </comparison>
-      <comparison name="Inspect">
-         <description last-mod="2003-03-25">
-            Automated comparison is not possible. the output should be
-            inspected by a human.
-         </description>
-      </comparison>
-   </comparisons>
-   <roles>
-      <role name="principal-data">
-         <description last-mod="2003-03-25">
-            This is the source that is handed in to the processor as the
-            initial input sequence, setting the "evaluation context" as described in XQuery chapter 2.
-         </description>
-      </role>
-      <role name="supplemental-data">
-         <description last-mod="2003-03-25">
-            These are sources that may be read by functions such as
-            fn:document() as the query is evaluated.
-         </description>
-      </role>
-      <role name="schema">
-         <description last-mod="2003-03-25">
-            These are schema definitions that may be referenced by sources
-            or in the query.
-         </description>
-      </role>
-      <role name="dtd">
-         <description last-mod="2003-03-25">
-            These are dtd definitions that may be referenced by sources
-            or in the query.
-         </description>
-      </role>
-      <role name="principal">
-         <description last-mod="2003-03-25">
-            This is an output (either text or XML) that will contain the
-            query results. If the processor invocation sequence accepts a filename for results, this name may be
-            passed, possibly prefixed by a partial directory path to allow storage of the results in a separate
-            directory tree.
-         </description>
-      </role>
-      <role name="console-log">
-         <description last-mod="2003-03-25">
-            This is an output (text file tagged .log) that will contain the
-            captured "console" output for a command-line invocation, or equivalent messages from a harness. The
-            main goal is to capture error messages that came from the processor.
-         </description>
-         <note>
-            A test lab may choose to capture console output for every test case, in which case the presence
-            of this element is a signal that the console log of this test contains messages that are significant to
-            the pass/fail determination.
-         </note>
-      </role>
-   </roles>
-   <scenarios>
-      <scenario name="standard">
-         <description last-mod="2005-06-10">
-            A query this is expected to produce valid results. Principal input should always be specified, even if the query doesn't have any PathExpr.
-         </description>
-      </scenario>
-      <scenario name="parse-error">
-         <description last-mod="2005-06-10">
-            A query this is expected to raise a parsing/syntax error at query parse time. Principal input should always be specified, even if the query doesn't have any PathExpr.
-         </description>
-      </scenario>
-      <scenario name="runtime-error">
-         <description last-mod="2005-06-10">
-            A query this is expected to raise a runtime error at query parse time. Runtime errors in this case include those raised by static typing rules. Principal input should always be specified, even if the query doesn't have any PathExpr.
-         </description>
-      </scenario>
-      <scenario name="trivial">
-         <description last-mod="2006-03-29">
-            A query this is expected to produce valid results. Principal input should always be specified, even if the query doesn't have any PathExpr.
-            The initial query returns an &lt;xqx:xquery&gt; element (Trivial Embedding of XQuery).
-            This embedded query is then executed to produce the final result.
-         </description>
-      </scenario>
-   </scenarios>
-   <sources>
-      <source ID="XQTSCatalog" FileName="XQTSCatalog.xml" Creator="XQuery Test Task Force"
-              schema="XQTSCatalogxsd">
-         <description last-mod="2005-04-14">XQuery Test Suite Catalog</description>
-      </source>
-      <source ID="bib2" FileName="TestSources/bib2.xml" Creator="spec-authors">
-         <description last-mod="2003-03-25">Bibliography example with extra comments and PIs.</description>
-      </source>
-      <source ID="emptydoc" FileName="TestSources/emptydoc.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">Contains just a "doc" element, no comments/text/PIs.</description>
-      </source>
-      <source ID="fsx" FileName="TestSources/fsx.xml" Creator="Mike Rorke">
-         <description last-mod="2003-03-25">Data about a filesystem represented in XML.</description>
-      </source>
-      <source ID="fsx_NS" FileName="TestSources/fsx_NS.xml" Creator="Mike Rorke">
-         <description last-mod="2003-03-25">Data about a filesystem represented in XML with namespace-qualified names.</description>
-      </source>
-      <source ID="MixNS" FileName="TestSources/MixNS.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">Small tree with element names in mixed namespaces.</description>
-         <note>Use @index to identify elements precisely.</note>
-      </source>
-      <source ID="nw_Customers" FileName="TestSources/nw_Customers.xml" Creator="Kuen Siew">
-         <description last-mod="2003-03-25">Customer name/address file with some non-ASCII characters.</description>
-      </source>
-      <source ID="TopMany" FileName="TestSources/TopMany.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">Like TreeCompass, but with comments and PIs off the root. PI targets vary.</description>
-         <note>All text nodes must have non-whitespace characters.</note>
-      </source>
-      <source ID="Tree1Child" FileName="TestSources/Tree1Child.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">A "compass" tree that has just one child, of an abnormal name, off the center node.</description>
-         <note>One attribute each on west and center.</note>
-      </source>
-      <source ID="Tree1Text" FileName="TestSources/Tree1Text.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">A "compass" tree that has just a text node and no child element off the center node.</description>
-      </source>
-      <source ID="TreeCompass" FileName="TestSources/TreeCompass.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">A tree intended to allow many kinds of path expressions.</description>
-         <note>Need multiple attributes on center, west, and south, plus @mark scattered around.</note>
-         <note>Mix of text and element children in many places, but east should have only a text node.</note>
-         <note>All text nodes must have non-whitespace characters.</note>
-         <note>Top element is far-north.</note>
-      </source>
-      <source ID="TreeEmpty" FileName="TestSources/TreeEmpty.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">A "compass" tree that has just one "south" element at the top, bearing one "mark" attribute.</description>
-      </source>
-      <source ID="TreeRepeat" FileName="TestSources/TreeRepeat.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">A "compass" tree that has center elements off the real center node.</description>
-         <note>Use @mark to distinguish center elements.</note>
-         <note>"Real" center must have multiple element children, some with duplicate names (south-east).</note>
-         <note>Repeating attribute names used, including same name on elements of the same name.</note>
-         <note>Comments and text nodes are strewn about. All text nodes must have non-whitespace characters.</note>
-      </source>
-      <source ID="TreeStack" FileName="TestSources/TreeStack.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">A "compass" tree that has several "south" elements, some stacked within each other.</description>
-         <note>Use "mark" attributes at several levels and on all south elements.</note>
-      </source>
-      <source ID="TreeTrunc" FileName="TestSources/TreeTrunc.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">A "compass" tree that has no content at all in center or west, no attributes anywhere.</description>
-      </source>
-      <source ID="xq311A" FileName="TestSources/xq311A.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">Data that fits first example in XQuery 3.11.</description>
-      </source>
-      <source ID="xq311B" FileName="TestSources/xq311B.xml" Creator="David Marston">
-         <description last-mod="2003-03-25">Data that fits later examples in XQuery 3.11.</description>
-      </source>
-      <source ID="DupNode" FileName="TestSources/DupNode.xml" Creator="Andreas Behm">
-         <description last-mod="2005-04-26">Simple document with all node kinds</description>
-      </source>
-      <source ID="inscope" FileName="TestSources/inscope.xml" Creator="Andreas Behm">
-         <description last-mod="2005-08-26">Simple document with namespaces</description>
-      </source>
-      <source ID="nsmode" FileName="TestSources/nsmode.xml" Creator="Andreas Behm">
-         <description last-mod="2005-04-26">Source document for namespace copy modes</description>
-      </source>
-      <source ID="works" FileName="TestSources/works.xml" Creator="Carmelo Montanez">
-         <description last-mod="2005-03-04">Data for various NIST tests</description>
-      </source>
-      <source ID="examples" FileName="TestSources/examples.xml" Creator="Carmelo Montanez"
-              schema="examplesxsd">
-         <description last-mod="2006-05-19">Data for fn-data-1 test.</description>
-      </source>
-      <source ID="works-mod" FileName="TestSources/works-mod.xml" Creator="Carmelo Montanez">
-         <description last-mod="2005-03-04">Data for various NIST tests (abbreviated, unabbreviated syntax)</description>
-      </source>
-      <source ID="lang" FileName="TestSources/lang.xml" Creator="Carmelo Montanez">
-         <description last-mod="2005-10-19">Data for fn:lang tests.</description>
-      </source>
-      <source ID="staff" FileName="TestSources/staff.xml" Creator="Carmelo Montanez">
-         <description last-mod="2005-03-04">Data for various NIST tests</description>
-      </source>
-      <source ID="acme_corp" FileName="TestSources/acme_corp.xml"
-              Creator="Ravindranath Chennoju">
-         <description last-mod="2005-08-30">Source document for Function Declaration tests</description>
-      </source>
-      <source ID="bib" FileName="TestSources/bib.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-      </source>
-      <source ID="reviews" FileName="TestSources/reviews.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-      </source>
-      <source ID="books" FileName="TestSources/books.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-      </source>
-      <source ID="prices" FileName="TestSources/prices.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-      </source>
-      <source ID="book" FileName="TestSources/book.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query TREE use cases</description>
-      </source>
-      <source ID="report1" FileName="TestSources/report1.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query SEQ use cases</description>
-      </source>
-      <source ID="items" FileName="TestSources/items.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query RDB use cases</description>
-      </source>
-      <source ID="bids" FileName="TestSources/bids.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query RDB use cases</description>
-      </source>
-      <source ID="users" FileName="TestSources/users.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query RDB use cases</description>
-      </source>
-      <source ID="string" FileName="TestSources/string.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query STRING use cases</description>
-      </source>
-      <source ID="company-data" FileName="TestSources/company-data.xml"
-              Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query STRING use cases</description>
-      </source>
-      <source ID="auction" FileName="TestSources/auction.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query NS use cases</description>
-      </source>
-      <source ID="partlist" FileName="TestSources/partlist.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query PARTS use cases</description>
-      </source>
-      <source ID="sgml" FileName="TestSources/sgml.xml" Creator="XML Query WG">
-         <description last-mod="2005-02-11">Data for the the XML Query SGML use cases</description>
-      </source>
-      <source ID="atomic" FileName="TestSources/atomic.xml" Creator="Carmelo Montanez"
-              schema="atomicxsd">
-         <description last-mod="2005-03-08">A Schema validated xml file, that contains values for data types. Can be used by any test.</description>
-      </source>
-      <source ID="id-idref-dtd" FileName="TestSources/iddtd.xml" Creator="Carmelo Montanez">
-         <description last-mod="2006-06-28">A DTD validated xml file, that contains data for the ID/IDREF function tests.</description>
-      </source>
-      <source ID="atomicns" FileName="TestSources/atomicns.xml" Creator="Carmelo Montanez">
-         <description last-mod="2006-03-15">A non schema validated xml file, that contains values for data types. Can be used by any test.</description>
-      </source>
-      <source ID="orderData" FileName="TestSources/orderData.xml" Creator="Carmelo Montanez"
-              schema="orderDataxsd">
-         <description last-mod="2005-06-01">A Schema validated xml file, that contains values for some of the order by tests generated by NIST.</description>
-      </source>
-      <source ID="id-idref" FileName="TestSources/id.xml" Creator="Carmelo Montanez"
-              schema="idxsd">
-         <description last-mod="2006-05-12">Data for id and idref related functions (schema-based).</description>
-      </source>
-      <source ID="id-idref2" FileName="TestSources/id2.xml" Creator="Michael Kay"
-              schema="idxsd">
-         <description last-mod="2009-03-06">More data for id and idref related functions (schema-based).</description>
-      </source>
-      <source ID="SpecialTypes" FileName="TestSources/SpecialTypes.xml" Creator="Mike Rorke"
-              schema="SpecialTypesXSD">
-         <description last-mod="2005-06-01">A Schema validated XML file containing certain special types e.g. interleave types, union types, anySimpleType</description>
-      </source>
-      <source ID="QNameSource" FileName="TestSources/QName-source.xml" Creator="Mike Rorke"
-              schema="QNameSourceXSD">
-         <description last-mod="2005-09-28">A schema validated XML file containing QName and QName derived types.</description>
-      </source>
-      <source ID="notation" FileName="TestSources/notation.xml" Creator="Andreas Behm"
-              schema="notationschema">
-         <description last-mod="2005-10-10">A Scehma validated xml file with NOTATION elements</description>
-      </source>
-      <source ID="textWithSpaces" FileName="TestSources/textWithSpaces.xml"
-              Creator="Joanne Tong">
-         <description last-mod="2005-09-29">Data for normalize-space functions</description>
-      </source>
-      <source ID="XMarkAuction" FileName="TestSources/XMarkAuction.xml"
-              Creator="Frans Englich">
-         <description last-mod="2007-03-09">Source file generated XML Benchmark Project's xmlgen utility. See http://www.xml-benchmark.org/.</description>
-      </source>
-      <source ID="CPPGlobals" FileName="TestSources/CPPGlobals.xml" Creator="Frans Englich">
-         <description last-mod="2007-06-27">The declarations of a C++ file described in XML.</description>
-      </source>
-      <source ID="MainWindow" FileName="TestSources/MainWindow.ui" Creator="Frans Englich">
-         <description last-mod="2007-07-09">A description of an graphical user interface.</description>
-      </source>
-      <source ID="ComplexWhitespace" FileName="TestSources/ComplexWhitespace.xml"
-              Creator="Frans Englich">
-         <description last-mod="2007-07-09">A file containing different forms of whitespace.</description>
-      </source>
-      <source ID="SpaceBracket" FileName="TestSources/SpaceBracket.xml"
-              Creator="Frans Englich">
-         <description last-mod="2007-12-20">A file containing ' ]' as a text node.</description>
-      </source>
-      <source ID="HighUnicode" FileName="TestSources/HighUnicode.xml" Creator="Frans Englich">
-         <description last-mod="2007-12-20">Corner case unicode codepoints.</description>
-      </source>
-      <source ID="HighUnicode2" FileName="TestSources/HighUnicode2.xml"
-              Creator="Frans Englich">
-         <description last-mod="2007-12-21">Corner case unicode codepoints, second case.</description>
-      </source>
-      <source ID="BCIsInvalid" FileName="TestSources/BCisInvalid.xml" Creator="Frans Englich">
-         <description last-mod="2007-12-21">An element name containing 0xBC.</description>
-      </source>
-      <source ID="InvalidUmlaut" FileName="TestSources/InvalidUmlaut.xml"
-              Creator="Frans Englich">
-         <description last-mod="2007-12-27">Contains the codepoint 188 in an NCName.</description>
-      </source>
-      <source ID="NamespaceSuppliedInternally"
-              FileName="TestSources/NamespaceSuppliedInternally.xml"
-              Creator="Frans Englich">
-         <description last-mod="2007-12-27">A namespace declared with a namespace declaration, as well as in the internal subset.</description>
-      </source>
-      <source ID="XMLIdDuplicated" FileName="TestSources/XMLIdDuplicated.xml"
-              Creator="Frans Englich">
-         <description last-mod="2008-01-15">An XML file which has two xml:id attributes with the same value.</description>
-      </source>
-      <source ID="InvalidXMLId" FileName="TestSources/InvalidXMLId.xml"
-              Creator="Frans Englich">
-         <description last-mod="2008-01-15">An XML file which has an invalid xml:id attribute.</description>
-      </source>
-      <source ID="UsingXMLId" FileName="TestSources/UsingXMLId.xml" Creator="Frans Englich">
-         <description last-mod="2008-01-15">An XML file which has xml:id attributes.</description>
-      </source>
-      <source ID="Books2" FileName="TestSources/Books2.xml" Creator="Frans Englich">
-         <description last-mod="2008-01-17">An XML which is in ISO-8859-1 encoding.</description>
-      </source>
-      <source ID="QObject" FileName="TestSources/QObject.xml" Creator="Frans Englich">
-         <description last-mod="2008-02-19"/>
-      </source>
-      <source ID="Char010D" FileName="TestSources/0x010D.xml" Creator="Frans Englich">
-         <description last-mod="2008-02-28"/>
-      </source>
-      <source ID="SmallTree" FileName="TestSources/SmallTree.xml" Creator="Frans Englich">
-         <description last-mod="2008-04-03"/>
-      </source>
-      <source ID="AttributesAndElements" FileName="TestSources/AttributesAndElements.xml"
-              Creator="Frans Englich">
-         <description last-mod="2008-04-03"/>
-      </source>
-      <source ID="functx_prices" FileName="TestSources/functx_prices.xml"
-              Creator="Frans Englich">
-         <description last-mod="2008-05-16"/>
-      </source>
-      <source ID="functx_order" FileName="TestSources/functx_order.xml"
-              Creator="Frans Englich">
-         <description last-mod="2008-05-16"/>
-      </source>
-      <source ID="functx_cats" FileName="TestSources/functx_cats.xml" Creator="Frans Englich">
-         <description last-mod="2008-05-16"/>
-      </source>
-      <source ID="functx_catalog" FileName="TestSources/functx_catalog.xml"
-              Creator="Frans Englich">
-         <description last-mod="2008-05-16"/>
-      </source>
-      <source ID="functx_book" FileName="TestSources/functx_book.xml" Creator="Frans Englich">
-         <description last-mod="2008-06-25"/>
-      </source>
-      <source ID="badxml" FileName="TestSources/badxml.xml" Creator="Frans Englich">
-         <description last-mod="2008-05-19"/>
-      </source>
-      <source ID="builtinEntities" FileName="TestSources/builtinEntities.xml"
-              Creator="Frans Englich">
-         <description last-mod="2008-05-26"/>
-      </source>
-      <source ID="XMLIdWhitespace" FileName="TestSources/XMLIdWhitespace.xml"
-              Creator="Frans Englich">
-         <description last-mod="2008-05-27"/>
-      </source>
-      <source ID="XMLIDMany" FileName="TestSources/XMLIDMany.xml" Creator="Frans Englich">
-         <description last-mod="2008-10-24"/>
-      </source>
-      <source ID="OneTopElement" FileName="TestSources/OneTopElement.xml" Creator="Nicolae Brinza">
-         <description last-mod="2009-04-01"/>
-      </source>
-      <source ID="namespace-sensitive" FileName="TestSources/namespace-sensitive.xml" schema="namespace-sensitive-schema" Creator="Oliver Hallam">
-        <description last-mod="2007-02-26">Document containing namespace-sensitive constructs.</description>
-      </source>
-      <source ID="dm-e005" FileName="TestSources/dm-e005.xml" schema="dm-e005-schema" Creator="Norm Walsh">
-        <description last-mod="2010-03-10">Document to test erratum DM.E05.</description>
-      </source>
-		  <source ID="extendedTypes" FileName="TestSources/extendedTypes.xml" schema="extendedTypes-schema" Creator="Oliver Hallam">
-			  <description last-mod="2010-03-17">Document containing elements with various restricted and extended types.</description>
-		  </source>
-		 	<source ID="mixed" FileName="TestSources/mixed.xml" schema="mixedcontent" Creator="Oliver Hallam">
-		 	 <description last-mod="2010-03-17">Document containing an element with mixed content but statically could have element only content.</description>
-	    </source>
-      <schema ID="XQTSCatalogxsd" uri="http://www.w3.org/2005/02/query-test-XQTSCatalog"
-              FileName="XQTSCatalog.xsd">
-         <description last-mod="2005-04-14">Schema for XQTSCatalog</description>
-      </schema>
-      <schema ID="atomicxsd" uri="http://www.w3.org/XQueryTest"
-              FileName="TestSources/atomic.xsd">
-         <description last-mod="2005-03-08">A Schema for atomic.xml</description>
-      </schema>
-      <schema ID="orderDataxsd" uri="http://www.w3.org/XQueryTestOrderBy"
-              FileName="TestSources/orderData.xsd">
-         <description last-mod="2005-06-01">A Schema for orderData.xml</description>
-      </schema>
-      <schema ID="SpecialTypesXSD" uri="http://www.example.com/typedecl"
-              FileName="TestSources/SpecialTypes.xsd">
-         <description last-mod="2005-06-01">A Schema containing certain special types e.g. interleave types, union types, anySimpleType</description>
-      </schema>
-      <schema ID="QNameSourceXSD" uri="http://www.example.com/QNameXSD"
-              FileName="TestSources/QName-schema.xsd">
-         <description last-mod="2005-09-28">A schema containing QName and QName derived types</description>
-      </schema>
-      <schema ID="notationschema" uri="http://www.example.com/notation"
-              FileName="TestSources/notationschema.xsd">
-         <description last-mod="2005-10-10">A Schema for NOTATION data</description>
-      </schema>
-      <schema ID="idxsd" uri="http://www.w3.org/XQueryTest/ididrefs"
-              FileName="TestSources/id.xsd">
-         <description last-mod="2009-03-06">A schema for the id/idref functions tests</description>
-      </schema>
-      <schema ID="simplexsd" uri="http://www.w3.org/XQueryTest/simple"
-              FileName="TestSources/simple.xsd">
-         <description last-mod="2005-12-07">A schema for simple context tests</description>
-      </schema>
-      <schema ID="examplesxsd" uri="http://www.w3.org/XQueryTest/someExamples"
-              FileName="TestSources/examples.xsd">
-         <description last-mod="2006-05-19">A schema for examples.xml.</description>
-      </schema>
-      <schema ID="userdefined" uri="http://www.w3.org/XQueryTest/userDefinedTypes"
-              FileName="TestSources/userdefined.xsd">
-         <description last-mod="2006-04-03">A schema user defined types and constructor tests</description>
-      </schema>
-      <schema ID="listunion" uri="http://www.w3.org/XQueryTest/ListUnionTypes"
-              FileName="TestSources/listunion.xsd">
-         <description last-mod="2006-06-07">A schema defining a list of unions.</description>
-      </schema>
-      <schema ID="examples2xsd" uri="http://www.w3.org/XQueryTest/someExamples2"
-              FileName="TestSources/examples2.xsd">
-         <description last-mod="2009-10-01">Test schema for Errata XQ.E6.</description>
-      </schema>
-      <schema ID="attribute" uri="http://www.w3.org/XQueryTest/sample"
-         FileName="TestSources/attribute.xsd">
-         <description last-mod="2009-04-01">Test schema that contains an attribute declaration.</description>
-      </schema>
-      <schema ID="mixedcontent" uri="http://www.w3.org/XQueryTest/mixedcontent"
-         FileName="TestSources/mixedcontent.xsd">
-         <description last-mod="2009-04-01">Test schema that contains two complex types, one of them with a mixed content.</description>
-      </schema>
-      <schema ID="simpleContent" uri="http://www.w3.org/query-test/complexSimple"
-              FileName="TestSources/simpleContent.xsd">
-         <description last-mod="2009-11-20">Schema for complex types with
-         simple content</description>
-      </schema>
-      <schema ID="namespace-sensitive-schema" uri="http://www.example.com/test/namespace-sensitive" FileName="TestSources/namespace-sensitive.xsd">
-         <description last-mod="2007-02-26">Schema illustrating various namespace-sensitive constructs.</description>
-      </schema>
-      <schema ID="dm-e005-schema" uri="http://www.example.com/ns/test" FileName="TestSources/dm-e005.xsd">
-         <description last-mod="2010-03-10">Schema to test erratum DM.E05.</description>
-      </schema>
-      <schema ID="xq-e18-schema" uri="http://www.example.com/ns/test/xq-e18" FileName="TestSources/xq-e18.xsd">
-         <description last-mod="2010-03-11">Schema to test erratum XQ.E18.</description>
-      </schema>
-			<schema ID="extendedTypes-schema" uri="http://www.example.com/XQueryTest/extendedTypes" FileName="TestSources/extendedTypes.xsd">
-				<description last-mod="2010-03-17">Schema containing extended and restricted types.</description>
-			</schema>
-			<schema ID="constraints" uri="http://www.w3.org/constraints" FileName="TestSources/constraints.xsd">
-				<description last-mod="2010-06-10">Schema with unique/id/idref constraints.</description>
-			</schema>
-      <collection ID="collection1" Creator="Andrew Eisenberg">
-         <description last-mod="2006-06-07">A simple collection of documents.</description>
-         <input-document>bib</input-document>
-         <input-document>reviews</input-document>
-      </collection>
-      <collection ID="collection2" Creator="Andrew Eisenberg">
-         <description last-mod="2006-06-07">A simple collection of documents.</description>
-         <input-document>bib</input-document>
-         <input-document>reviews</input-document>
-         <input-document>books</input-document>
-      </collection>
-      <module ID="module1-lib" FileName="TestSources/module1-lib" Creator="Carmelo Montanez">
-         <description last-mod="2006-07-13">Library module for "modules-18" query</description>
-      </module>
-      <module ID="module2-lib" FileName="TestSources/module2-lib" Creator="Carmelo Montanez">
-         <description last-mod="2006-07-13">Library module for "modules-18" query</description>
-      </module>
-      <module ID="empty-lib" FileName="TestSources/empty-lib" Creator="Mary Holstege">
-         <description last-mod="2005-12-05">Library module for "modules-none" query</description>
-      </module>
-      <module ID="emptyns-lib" FileName="TestSources/emptyns-lib" Creator="Mary Holstege">
-         <description last-mod="2005-12-05">Library module with empty namespace</description>
-      </module>
-      <module ID="test1-lib" FileName="TestSources/test1-lib" Creator="Mary Holstege">
-         <description last-mod="2005-12-05">Simple library module</description>
-      </module>
-      <module ID="test2-lib" FileName="TestSources/test2-lib" Creator="Carmelo Montanez">
-         <description last-mod="2006-01-19">Library module with namespace URI set to empty string.</description>
-      </module>
-      <module ID="test1a-lib" FileName="TestSources/test1a-lib" Creator="Mary Holstege">
-         <description last-mod="2005-12-05">Simple library module</description>
-      </module>
-      <module ID="test1collide1-lib" FileName="TestSources/test1collide1-lib"
-              Creator="Mary Holstege">
-         <description last-mod="2005-12-05">Library module with colliding definitions</description>
-      </module>
-      <module ID="test1collide2-lib" FileName="TestSources/test1collide2-lib"
-              Creator="Mary Holstege">
-         <description last-mod="2005-12-05">Library module with colliding definitions</description>
-      </module>
-      <module ID="test1c1-lib" FileName="TestSources/test1c1-lib" Creator="Mary Holstege">
-         <description last-mod="2005-12-05">Library module with circular includes</description>
-      </module>
-      <module ID="test2c1-lib" FileName="TestSources/test2c1-lib" Creator="Mary Holstege">
-         <description last-mod="2005-12-05">Library module with circular includes</description>
-      </module>
-      <module ID="context-lib" FileName="TestSources/context-lib" Creator="Mary Holstege">
-         <description last-mod="2005-12-05">Library module with interesting context</description>
-      </module>
-      <module ID="module-defs" FileName="TestSources/moduleDefs-lib"
-              Creator="Carmelo Montanez">
-         <description last-mod="2006-01-06">Library module with definitions for various NIST tests.</description>
-      </module>
-      <module ID="modulewrongprefix-lib" FileName="TestSources/moduleDefs-lib"
-              Creator="Carmelo Montanez">
-         <description last-mod="2006-03-21">Library module with invalid namespace prefix ("xml")</description>
-      </module>
-      <module ID="modulesdiffns" FileName="TestSources/modulesdiffns-lib"
-              Creator="Carmelo Montanez">
-         <description last-mod="2006-04-11">Library module with variable on different namespace than target.</description>
-      </module>
-      <module ID="errata6-module1" FileName="TestSources/errata6-module1" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-      </module>
-      <module ID="errata6-module2" FileName="TestSources/errata6-module2" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-      </module>
-      <module ID="errata6-module4" FileName="TestSources/errata6-module4" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-      </module>
-      <module ID="errata6-module5" FileName="TestSources/errata6-module5" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-      </module>
-      <module ID="errata6-module6" FileName="TestSources/errata6-module6" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-      </module>
-      <module ID="errata6-module7" FileName="TestSources/errata6-module7" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-      </module>
-      <module ID="errata8-module1a" FileName="TestSources/errata8-module1a" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports another module and uses a variable from it, testing circular dependencies.</description>
-      </module>
-      <module ID="errata8-module1b" FileName="TestSources/errata8-module1b" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports another module and uses a function from it, testing circular dependencies.</description>
-      </module>
-      <module ID="errata8-module2a" FileName="TestSources/errata8-module2a" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports another module and uses a variable from it, testing circular dependencies.</description>
-      </module>
-      <module ID="errata8-module2b" FileName="TestSources/errata8-module2b" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports another module and uses a function from it, testing circular dependencies.</description>
-      </module>
-      <module ID="errata8-module3a" FileName="TestSources/errata8-module3a" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports another module and uses a variable from it, testing circular dependencies pass case.</description>
-      </module>
-      <module ID="errata8-module3b" FileName="TestSources/errata8-module3b" Creator="John Snelson">
-         <description last-mod="2009-10-01">Module that imports another module and uses a function from it, testing circular dependencies pass case.</description>
-      </module>
-      <module ID="module3-lib" FileName="TestSources/module3-lib" Creator="Nicolae Brinza">
-         <description last-mod="2009-04-01">Module with simple and schema-element() types, used for functions'parameters and return results.</description>
-      </module>
-      <module ID="module4-lib" FileName="TestSources/module4-lib" Creator="Nicolae Brinza">
-         <description last-mod="2009-04-01">Module with schema-attribute() types, used for functions' parameters and return results.</description>
-      </module>
-      <module ID="modules-recursive1" FileName="TestSources/modules-recursive1" Creator="Nicolae Brinza">
-         <description last-mod="2009-04-01">Module with cyclic recursive imports.</description>
-      </module>
-      <module ID="modules-recursive2" FileName="TestSources/modules-recursive2" Creator="Nicolae Brinza">
-         <description last-mod="2009-04-01">Module with cyclic recursive imports.</description>
-      </module>
-      <module ID="module-pub-priv" FileName="TestSources/module-pub-priv" Creator="Michael Kay">
-         <description last-mod="2009-10-01">Module that contains both private and public function declarations (XQuery 1.1).</description>
-      </module>
-   </sources>
-   <implementation-defined-items>
-      <implementation-defined-item name="expressionUnicode" spec="XQuery">
-         <description last-mod="2005-04-04">The version of Unicode that is used to construct expressions.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="collations" spec="XQuery">
-         <description last-mod="2005-04-04">The statically-known collations.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="implicitTimezone" spec="XQuery">
-         <description last-mod="2005-04-04">The implicit timezone.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="warningsMethod" spec="XQuery">
-         <description last-mod="2005-04-04">The circumstances in which warnings are raised, and the ways in which warnings are handled.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="errorsMethod" spec="XQuery">
-         <description last-mod="2005-04-04">The method by which errors are reported to the external processing environment.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="XMLVersion" spec="XQuery">
-         <description last-mod="2005-10-10">Whether the implementation is based on the rules of [XML 1.0] and [XML Names] or the rules of [XML 1.1] and [XML Names 1.1]. One of these sets of rules must be applied consistently by all aspects of the implementation.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="overwrittenContextComponents" spec="XQuery">
-         <description last-mod="2005-04-04">Any components of the static context or dynamic context that are overwritten or augmented by the implementation.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="axes" spec="XQuery">
-         <description last-mod="2005-04-04">Which of the optional axes are supported by the implementation, if the Full-Axis Feature is not supported.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="defaultOrderEmpty" spec="XQuery">
-         <description last-mod="2005-04-04">The default handling of empty sequences returned by an ordering key (sortspec) in an order by clause (empty least or empty greatest).</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="pragmas" spec="XQuery">
-         <description last-mod="2005-04-04">The names and semantics of any extension expressions (pragmas) recognized by the implementation.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="optionDeclarations" spec="XQuery">
-         <description last-mod="2005-04-04">The names and semantics of any option declarations recognized by the implementation.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="externalFunctionProtocols" spec="XQuery">
-         <description last-mod="2005-04-04">Protocols (if any) by which parameters can be passed to an external function, and the result of the function can returned to the invoking query.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="moduleLocationHints" spec="XQuery">
-         <description last-mod="2005-11-01">The process by which the specific modules to be imported by a module import are identified, if the Module Feature is supported (includes processing of location hints, if any.)</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="staticTypingExtensions" spec="XQuery">
-         <description last-mod="2005-04-04">Any static typing extensions supported by the implementation, if the Static Typing Feature is supported.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="serializationInvocation" spec="XQuery">
-         <description last-mod="2005-04-04">The means by which serialization is invoked, if the Serialization Feature is supported.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="serializationDefaults" spec="XQuery">
-         <description last-mod="2005-10-10">The default values for the byte-order-mark, encoding, media-type, normalization-form, omit-xml-declaration, standalone, and version parameters, if the Serialization Feature is supported.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="externalFunctionCall" spec="XQuery">
-         <description last-mod="2006-08-09">The result of an unsuccessful call to an external function (for example, if the function implementation cannot be found or does not return a value of the declared type).</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="limits" spec="XQuery">
-         <description last-mod="2005-11-01">Limits on ranges of values for various data types, as enumerated in 5.3 Data Model Conformance.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="traceDestination" spec="FuncOps">
-         <description last-mod="2005-10-10">The destination of the trace output is implementation-defined. See 4 The Trace Function.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="integerOperations" spec="FuncOps">
-         <description last-mod="2005-10-10">For xs:integer operations, implementations that support limited-precision integer operations must either raise an error [err:FOAR0002] or provide an implementation-defined mechanism that allows users to choose between raising an error and returning a result that is modulo the largest representable integer value. See 6.2 Operators on Numeric Values.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="decimalDigits" spec="FuncOps">
-         <description last-mod="2005-11-01">For xs:decimal values the number of digits of precision returned by the numeric operators is implementation-defined. See 6.2 Operators on Numeric Values. See also 17.1.3.3 Casting to xs:decimal and 17.1.3.4 Casting to xs:integer.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="roundOrTruncate" spec="FuncOps">
-         <description last-mod="2005-10-10">If the number of digits in the result exceeds the number of digits that the implementation supports, the result is truncated or rounded in an implementation-defined manner. See 6.2 Operators on Numeric Values. See also 17.1.3.3 Casting to xs:decimal and 17.1.3.4 Casting to xs:integer.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="Unicode" spec="FuncOps">
-         <description last-mod="2005-11-01">It is implementation-defined which version of Unicode is supported by the features defined in this specification, but it is recommended that the most recent version of Unicode be used. See 7.1 String Types.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="normalizationForms" spec="FuncOps">
-         <description last-mod="2005-10-10">For 7.4.6 fn:normalize-unicode, conforming implementations must support normalization form "NFC" and may support normalization forms "NFD", "NFKC", "NFKD", "FULLY-NORMALIZED". They may also support other normalization forms with implementation-defined semantics.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="collationUnits" spec="FuncOps">
-         <description last-mod="2005-10-10">The ability to decompose strings into collation units suitable for substring matching is an implementation-defined property of a collation. See 7.5 Functions Based on Substring Matching.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="secondsDigits" spec="FuncOps">
-         <description last-mod="2005-10-10">All minimally conforming processors must support year values with a minimum of 4 digits (i.e., YYYY) and a minimum fractional second precision of 1 millisecond or three digits (i.e., s.sss). However, conforming processors may set larger implementation-defined limits on the maximum number of digits they support in these two situations. See 10.1.1 Limits and Precision.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="stringToDecimal" spec="FuncOps">
-         <description last-mod="2006-08-09">The result of casting a string to xs:decimal, when the resulting value is not too large or too small but nevertheless has too many decimal digits to be accurately represented, is implementation-defined. See 17.1.1 Casting from xs:string and xs:untypedAtomic.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="docProcessing" spec="FuncOps">
-         <description last-mod="2005-10-10">Various aspects of the processing provided by 15.5.4 fn:doc are implementation-defined. Implementations may provide external configuration options that allow any aspect of the processing to be controlled by the user.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="weakenStable" spec="FuncOps">
-         <description last-mod="2006-08-09">The manner in which implementations provide options to weaken the stable characteristic of 15.5.6 fn:collection and 15.5.4 fn:doc are implementation-defined.</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="additionalTypes" spec="DataModel">
-         <description last-mod="2005-04-04">Support for additional user-defined or implementation-defined types is implementation-defined. (See 2.6.1 Representation of Types)</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="undefinedProperties" spec="DataModel">
-         <description last-mod="2005-04-04">Some typed values in the data model are undefined. Attempting to access an undefined property is always an error. Behavior in these cases is implementation-defined and the host language is responsible for determining the result. (See 5 Accessors)</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="sequenceNormalization" spec="Serialization">
-         <description last-mod="2005-04-04">For any implementation-defined output method, it is implementation-defined whether sequence normalization process takes place. (See 2 Sequence Normalization)</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="outputMethods" spec="Serialization">
-         <description last-mod="2005-04-04">If the namespace URI is non-null for the method serialization parameter, then the parameter specifies an implementation-defined output method. (See 3 Serialization Parameters)</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="normalizationFormBehavior" spec="Serialization">
-         <description last-mod="2005-04-04">If the value of the normalization-form form parameter is not NFC, NFD, NFKC, NFKD, fully-normalized, or none then the meaning of the value and it's effect is implementation-defined. (See 4 Phases of Serialization)</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="additionalParams" spec="Serialization">
-         <description last-mod="2005-11-01">The effect of additional serialization parameters on the output of the serializer, where the name of such a parameter must be namespace-qualified, is implementation-defined or implementation-dependent. The extent of this effect on the output must not override the provisions of this specification. (See 3 Serialization Parameters)</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="encodingPhase" spec="Serialization">
-         <description last-mod="2005-04-04">The effect of providing an option that allows the encoding phase to be skipped, so that the result of serialization is a stream of Unicode characters, is implementation-defined. The serializer is not required to support such an option. (See 4 Phases of Serialization)</description>
-      </implementation-defined-item>
-      <implementation-defined-item name="CDATASerialization" spec="Serialization">
-         <description last-mod="2005-04-04">An serializer may provide an implementation-defined mechanism to place CDATA sections in the result tree. (See 5.1.4 XML Output Method: the cdata-section-elements Parameter)</description>
-      </implementation-defined-item>
-   </implementation-defined-items>
-   <features>
-      <feature name="Minimal Conformance"/>
-      <feature name="Schema Import"/>
-      <feature name="Schema Validation"/>
-      <feature name="Static Typing"/>
-      <feature name="Static Typing Extensions"/>
-      <feature name="Full Axis"/>
-      <feature name="Module"/>
-      <feature name="Serialization"/>
-   </features>
-   <context-properties>
-      <context-property name="Statically known namespaces" context-type="static"/>
-      <context-property name="Default element/type namespace" context-type="static"/>
-      <context-property name="Default function namespace" context-type="static"/>
-      <context-property name="In-scope schema types" context-type="static"/>
-      <context-property name="In-scope element declarations" context-type="static"/>
-      <context-property name="In-scope attribute declarations" context-type="static"/>
-      <context-property name="In-scope variables" context-type="static"/>
-      <context-property name="Context item static type" context-type="static"/>
-      <context-property name="Function signatures" context-type="static"/>
-      <context-property name="Statically known collations" context-type="static"/>
-      <context-property name="Default collation" context-type="static"/>
-      <context-property name="Construction mode" context-type="static"/>
-      <context-property name="Ordering mode" context-type="static"/>
-      <context-property name="Default order for empty sequences" context-type="static"/>
-      <context-property name="Boundary-space policy" context-type="static"/>
-      <context-property name="Copy-namespaces mode" context-type="static"/>
-      <context-property name="Base URI" context-type="static"/>
-      <context-property name="Statically known documents" context-type="static"/>
-      <context-property name="Statically known collections" context-type="static"/>
-      <context-property name="Statically known default collection type" context-type="static"/>
-      <context-property name="Context item" context-type="dynamic"/>
-      <context-property name="Context position" context-type="dynamic"/>
-      <context-property name="Context size" context-type="dynamic"/>
-      <context-property name="Variable values" context-type="dynamic"/>
-      <context-property name="Function implementations" context-type="dynamic"/>
-      <context-property name="Current dateTime" context-type="dynamic"/>
-      <context-property name="Implicit timezone" context-type="dynamic"/>
-      <context-property name="Available documents" context-type="dynamic"/>
-      <context-property name="Available collections" context-type="dynamic"/>
-      <context-property name="Default collection" context-type="dynamic"/>
-   </context-properties>
-   <test-group name="AggregatePartitionQueries" featureOwner="Preston Carman">
-      <GroupInfo>
-         <title>Aggregate Partition Queries</title>
-         <description/>
-      </GroupInfo>
-      <test-group name="AggregateParallelExecutionTests" featureOwner="Preston Carman">
-         <GroupInfo>
-            <title>Aggregate Parallel Execution Tests</title>
-            <description/>
-         </GroupInfo>
-         &AggregatePartition1Queries;
-         &AggregatePartition2Queries;
-         &AggregatePartition4Queries;
-      </test-group>
-   </test-group>
-   <test-group name="GhcndPartitionQueries" featureOwner="Preston Carman">
-      <GroupInfo>
-         <title>GHCND Partition Queries</title>
-         <description/>
-      </GroupInfo>
-      <test-group name="ParallelExecutionTests" featureOwner="Preston Carman">
-         <GroupInfo>
-            <title>Parallel Execution Tests</title>
-            <description/>
-         </GroupInfo>
-         &GhcndPartition1Queries;
-         &GhcndPartition2Queries;
-         &GhcndPartition4Queries;
-      </test-group>
-   </test-group>
-   <test-group name="GhcndCountPartitionQueries" featureOwner="Preston Carman">
-      <GroupInfo>
-         <title>GHCND Count Partition Queries</title>
-         <description/>
-      </GroupInfo>
-      <test-group name="CountParallelExecutionTests" featureOwner="Preston Carman">
-         <GroupInfo>
-            <title>Parallel Execution Tests</title>
-            <description/>
-         </GroupInfo>
-         &GhcndCountPartition1Queries;
-         &GhcndCountPartition2Queries;
-         &GhcndCountPartition4Queries;
-      </test-group>
-   </test-group>
-   <test-group name="GhcndRecordsPartitionQueries" featureOwner="Preston Carman">
-      <GroupInfo>
-         <title>GHCND Records Partition Queries</title>
-         <description/>
-      </GroupInfo>
-      <test-group name="RecordsParallelExecutionTests" featureOwner="Preston Carman">
-         <GroupInfo>
-            <title>Records Parallel Execution Tests</title>
-            <description/>
-         </GroupInfo>
-         &GhcndRecordsPartition1Queries;
-         &GhcndRecordsPartition2Queries;
-         &GhcndRecordsPartition4Queries;
-      </test-group>
-   </test-group>
-</test-suite>


[37/51] [abbrv] git commit: Cleaned up the new exceptions and made them a little cleaner.

Posted by vi...@apache.org.
Cleaned up the new exceptions and made them a little cleaner.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/a0a837aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/a0a837aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/a0a837aa

Branch: refs/heads/vxquery_0_3_staging
Commit: a0a837aab741a95ec1507c5ab4209a401f72fc4c
Parents: 98f9597
Author: Preston Carman <pr...@apache.org>
Authored: Mon Apr 7 20:48:18 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Mon Apr 7 20:48:18 2014 -0700

----------------------------------------------------------------------
 .../exceptions/VXQueryDataException.java        | 41 ++++++++++++++++++++
 .../VXQueryFileNotFoundException.java           | 30 ++++++--------
 .../exceptions/VXQueryParseException.java       | 30 ++++++--------
 .../VXQueryCollectionOperatorDescriptor.java    | 18 +--------
 .../org/apache/vxquery/xmlparser/XMLParser.java |  5 +--
 5 files changed, 69 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/a0a837aa/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
new file mode 100644
index 0000000..79a37af
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java
@@ -0,0 +1,41 @@
+/*
+ * 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.exceptions;
+
+import java.io.File;
+
+import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
+
+public class VXQueryDataException extends HyracksDataException {
+
+    private static final long serialVersionUID = 1L;
+
+    private File file;
+
+    public VXQueryDataException(String message, Exception ex, File file) {
+        super(message, ex);
+        this.file = file;
+    }
+
+    @Override
+    public String getMessage() {
+        String message = super.getMessage();
+        message = message.replaceAll("\\[nodeId\\]", getNodeId());
+        message = message.replaceAll("\\[path\\]", file.getAbsolutePath());
+        return message;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/a0a837aa/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryFileNotFoundException.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryFileNotFoundException.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryFileNotFoundException.java
index 27a0a2e..2856178 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryFileNotFoundException.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryFileNotFoundException.java
@@ -1,11 +1,13 @@
 /*
- * Copyright 2009-2013 by The Regents of the University of California
- * Licensed 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 from
- * 
+ * 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.
@@ -14,22 +16,14 @@
  */
 package org.apache.vxquery.exceptions;
 
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
+import java.io.File;
 
-public class VXQueryFileNotFoundException extends HyracksDataException {
+public class VXQueryFileNotFoundException extends VXQueryDataException {
 
     private static final long serialVersionUID = 1L;
 
-    public VXQueryFileNotFoundException() {
-        super();
-    }
-
-    public VXQueryFileNotFoundException(Exception ex) {
-        super(ex);
-    }
-
-    public VXQueryFileNotFoundException(String msg) {
-        super(msg);
+    public VXQueryFileNotFoundException(Exception ex, File file) {
+        super("The file ([nodeId]:[path]) can not be found.", ex, file);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/a0a837aa/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryParseException.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryParseException.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryParseException.java
index f1b4155..f0d66fb 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryParseException.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryParseException.java
@@ -1,11 +1,13 @@
 /*
- * Copyright 2009-2013 by The Regents of the University of California
- * Licensed 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 from
- * 
+ * 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.
@@ -14,22 +16,14 @@
  */
 package org.apache.vxquery.exceptions;
 
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
+import java.io.File;
 
-public class VXQueryParseException extends HyracksDataException {
+public class VXQueryParseException extends VXQueryDataException {
 
     private static final long serialVersionUID = 1L;
 
-    public VXQueryParseException() {
-        super();
-    }
-
-    public VXQueryParseException(Exception ex) {
-        super(ex);
-    }
-
-    public VXQueryParseException(String msg) {
-        super(msg);
+    public VXQueryParseException(Exception ex, File file) {
+        super("The file ([nodeId]:[path]) threw a SAXException during parsing.", ex, file);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/a0a837aa/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 54007c8..44e6ad6 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
@@ -123,23 +123,9 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO
                 abvsFileNode.reset();
                 try {
                     parser.parseFile(file, in, abvsFileNode);
-                } catch (VXQueryFileNotFoundException e) {
-                    String message = "The file (" + nodeId + ":" + file.getAbsolutePath() + ") can not be found.";
-                    HyracksDataException hde = new HyracksDataException(message, e.getCause());
-                    hde.setNodeId(nodeId);
-                    throw hde;
-                } catch (VXQueryParseException e) {
-                    String message = "The file (" + nodeId + ":" + file.getAbsolutePath()
-                            + ") throw a SAXException durring parsing.";
-                    HyracksDataException hde = new HyracksDataException(message, e.getCause());
-                    hde.setNodeId(nodeId);
-                    throw hde;
                 } catch (HyracksDataException e) {
-                    String message = "The file (" + nodeId + ":" + file.getAbsolutePath()
-                            + ") throw the following error during parsing: " + e.getMessage();
-                    HyracksDataException hde = new HyracksDataException(message, e.getCause());
-                    hde.setNodeId(nodeId);
-                    throw hde;
+                    e.setNodeId(nodeId);
+                    throw e;
                 }
 
                 TaggedValuePointable tvp = ppool.takeOne(TaggedValuePointable.class);

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/a0a837aa/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 125557b..445915b 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
@@ -46,7 +46,6 @@ public class XMLParser {
         }
     }
 
-
     public void parseFile(File file, InputSource in, ArrayBackedValueStorage abvs) throws HyracksDataException {
         try {
             if (file.getName().toLowerCase().endsWith(".xml.gz")) {
@@ -57,9 +56,9 @@ public class XMLParser {
             parser.parse(in);
             handler.write(abvs);
         } catch (FileNotFoundException e) {
-            throw new VXQueryFileNotFoundException(e);
+            throw new VXQueryFileNotFoundException(e, file);
         } catch (SAXException e) {
-            throw new VXQueryParseException(e);
+            throw new VXQueryParseException(e, file);
         } catch (IOException e) {
             throw new HyracksDataException(e);
         }


[38/51] [abbrv] git commit: Licence formatting.

Posted by vi...@apache.org.
Licence formatting.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/9b90734f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/9b90734f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/9b90734f

Branch: refs/heads/vxquery_0_3_staging
Commit: 9b90734fe4e08d4c3b2a4f45d21f2f20b324e434
Parents: a0a837a
Author: Preston Carman <pr...@apache.org>
Authored: Mon Apr 7 20:49:35 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Mon Apr 7 20:49:35 2014 -0700

----------------------------------------------------------------------
 .../DefaultSystemExceptionFactory.java          | 30 ++++++++++----------
 .../apache/vxquery/exceptions/ErrorCode.java    | 30 ++++++++++----------
 .../vxquery/exceptions/ErrorMessages.java       | 30 ++++++++++----------
 .../vxquery/exceptions/ErrorReporter.java       | 30 ++++++++++----------
 .../vxquery/exceptions/SystemException.java     | 30 ++++++++++----------
 .../exceptions/SystemExceptionFactory.java      | 30 ++++++++++----------
 .../vxquery/exceptions/WarningReporter.java     | 30 ++++++++++----------
 7 files changed, 105 insertions(+), 105 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9b90734f/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 0548f09..3c0e143 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
@@ -1,19 +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.
-*/
+ * 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.exceptions;
 
 import org.apache.vxquery.util.SourceLocation;

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9b90734f/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorCode.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorCode.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorCode.java
index c43c38c..302ba9e 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorCode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorCode.java
@@ -1,19 +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.
-*/
+ * 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.exceptions;
 
 import javax.xml.namespace.QName;

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9b90734f/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorMessages.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorMessages.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorMessages.java
index e10fd04..8b9fe97 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorMessages.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorMessages.java
@@ -1,19 +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.
-*/
+ * 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.exceptions;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9b90734f/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 66977b4..d271095 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
@@ -1,19 +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.
-*/
+ * 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.exceptions;
 
 public interface ErrorReporter {

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9b90734f/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 990dc59..697d76c 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
@@ -1,19 +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.
-*/
+ * 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.exceptions;
 
 import java.text.MessageFormat;

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9b90734f/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 c751488..d26f5af 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
@@ -1,19 +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.
-*/
+ * 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.exceptions;
 
 import org.apache.vxquery.util.SourceLocation;

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9b90734f/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 020ff48..419b6ed 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
@@ -1,19 +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.
-*/
+ * 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.exceptions;
 
 public interface WarningReporter {


[27/51] [abbrv] git commit: updated XQTS results

Posted by vi...@apache.org.
updated XQTS results


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/9ab4c6d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/9ab4c6d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/9ab4c6d9

Branch: refs/heads/vxquery_0_3_staging
Commit: 9ab4c6d9bee9bd39d27652435ecd2316193c2832
Parents: 80436f8
Author: Till Westmann <we...@gmail.com>
Authored: Fri Apr 4 14:23:40 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Fri Apr 4 14:23:40 2014 -0700

----------------------------------------------------------------------
 vxquery-xtest/results/xqts.txt | 987 ++++++++++++++++++++++--------------
 1 file changed, 596 insertions(+), 391 deletions(-)
----------------------------------------------------------------------



[03/51] [abbrv] Updated the testing resources.

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/XQTSCatalogSecondEdition.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/XQTSCatalogSecondEdition.xml b/vxquery-xtest/tests/XQTSCatalogSecondEdition.xml
deleted file mode 100644
index e076557..0000000
--- a/vxquery-xtest/tests/XQTSCatalogSecondEdition.xml
+++ /dev/null
@@ -1,3816 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="XQTSCatalog.xsl" ?><test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" CatalogDesignDate="2003-04-03" version="1.0.3" SourceOffsetPath="./" ResultOffsetPath="ExpectedTestResults/" XQueryQueryOffsetPath="Queries/XQuery/" XQueryXQueryOffsetPath="Queries/XQueryX/" XQueryFileExtension=".xq" XQueryXFileExtension=".xqx" xsi:schemaLocation="http://www.w3.org/2005/02/query-test-XQTSCatalog XQTSCatalog.xsd">
-<xqts:test-suite-info xmlns:xqts="http://www.w3.org/2005/02/query-test-XQTSCatalog" xmlns:atom="http://www.w3.org/2005/Atom">
-<xqts:title>XQTS 1.0.3 Second Edition Subset</xqts:title>
-<xqts:description>
-            Test Suite for XQuery 1.0 Second Edition.
-            This catalog contains only test cases that reflect changes made in XQuery 1.0 Second Edition.
-            This XQTS subset was generated on 09/17/2010 15:10.
-         </xqts:description>
-</xqts:test-suite-info>
-<citations>
-<citation-spec name="XQuery">
-<description last-mod="2007-01-23">XQuery 1.0: An XML Query Language</description>
-<spec-URI>http://www.w3.org/TR/xquery/</spec-URI>
-</citation-spec>
-<citation-spec name="FuncOps">
-<description last-mod="2007-01-23">XQuery 1.0 and XPath 2.0 Functions and Operators</description>
-<spec-URI>http://www.w3.org/TR/xpath-functions/</spec-URI>
-</citation-spec>
-<citation-spec name="DataModel">
-<description last-mod="2007-01-23">XQuery 1.0 and XPath 2.0 Data Model</description>
-<spec-URI>http://www.w3.org/TR/xpath-datamodel/</spec-URI>
-</citation-spec>
-<citation-spec name="FormalSemantics">
-<description last-mod="2007-01-23">XQuery 1.0 and XPath 2.0 Formal Semantics</description>
-<spec-URI>http://www.w3.org/TR/xquery-semantics/</spec-URI>
-</citation-spec>
-<citation-spec name="SchemaPart2">
-<description last-mod="2003-03-25">XML Schema Part 2: Datatypes</description>
-<spec-URI>http://www.w3.org/TR/xmlschema-2/</spec-URI>
-</citation-spec>
-<citation-spec name="Schema-Errata">
-<description last-mod="2003-03-25">XML Schema Errata</description>
-<note>Current practice is to have one Errata document for all parts of Schema.</note>
-<spec-URI>http://www.w3.org/2001/05/xmlschema-errata</spec-URI>
-</citation-spec>
-<citation-spec name="UseCases">
-<description last-mod="2006-07-12">XML Query Use Cases</description>
-<spec-URI>http://www.w3c.org/TR/xquery-use-cases/</spec-URI>
-</citation-spec>
-<citation-spec name="XQueryX">
-<description last-mod="2007-01-23">XML Syntax for XQuery 1.0 (XQueryX)</description>
-<spec-URI>http://www.w3.org/TR/xqueryx/</spec-URI>
-</citation-spec>
-<citation-spec name="Serialization">
-<description last-mod="2007-01-23">XSLT 2.0 and XQuery 1.0 Serialization</description>
-<spec-URI>http://www.w3.org/TR/xslt-xquery-serialization/</spec-URI>
-</citation-spec>
-</citations>
-<comparisons>
-<comparison name="XML">
-<description last-mod="2003-03-25">The XML InfoSets should be canonicalized and compared.</description>
-</comparison>
-<comparison name="Fragment">
-<description last-mod="2004-10-20">
-            A 'fragment' refers to an XML based instance which has multiple top-level elements and NO XML declaration.
-            The comparator for this should simply wrap the entire fragment in a container element and perform XML comparison.
-         </description>
-</comparison>
-<comparison name="Text">
-<description last-mod="2003-03-25">
-            Each line of non-whitespace text should match. New-line sequences
-            may vary and should be neutralized. Due to issues with the XML serialization of certain characters (e.g. '&lt;'),
-            it is not possible to simply compare the actual and expected results. Rather (as is the case with the 'Fragment' comparator)
-            the test harness should convert the results into valid XML (by adding a container element) and perform comparison
-            on the XML canonicalized versions of the results.
-         </description>
-</comparison>
-<comparison name="Ignore">
-<description last-mod="2003-03-25">
-            Only the presence/absence of this file is significant,
-            not its content.
-         </description>
-</comparison>
-<comparison name="Inspect">
-<description last-mod="2003-03-25">
-            Automated comparison is not possible. the output should be
-            inspected by a human.
-         </description>
-</comparison>
-</comparisons>
-<roles>
-<role name="principal-data">
-<description last-mod="2003-03-25">
-            This is the source that is handed in to the processor as the
-            initial input sequence, setting the "evaluation context" as described in XQuery chapter 2.
-         </description>
-</role>
-<role name="supplemental-data">
-<description last-mod="2003-03-25">
-            These are sources that may be read by functions such as
-            fn:document() as the query is evaluated.
-         </description>
-</role>
-<role name="schema">
-<description last-mod="2003-03-25">
-            These are schema definitions that may be referenced by sources
-            or in the query.
-         </description>
-</role>
-<role name="dtd">
-<description last-mod="2003-03-25">
-            These are dtd definitions that may be referenced by sources
-            or in the query.
-         </description>
-</role>
-<role name="principal">
-<description last-mod="2003-03-25">
-            This is an output (either text or XML) that will contain the
-            query results. If the processor invocation sequence accepts a filename for results, this name may be
-            passed, possibly prefixed by a partial directory path to allow storage of the results in a separate
-            directory tree.
-         </description>
-</role>
-<role name="console-log">
-<description last-mod="2003-03-25">
-            This is an output (text file tagged .log) that will contain the
-            captured "console" output for a command-line invocation, or equivalent messages from a harness. The
-            main goal is to capture error messages that came from the processor.
-         </description>
-<note>
-            A test lab may choose to capture console output for every test case, in which case the presence
-            of this element is a signal that the console log of this test contains messages that are significant to
-            the pass/fail determination.
-         </note>
-</role>
-</roles>
-<scenarios>
-<scenario name="standard">
-<description last-mod="2005-06-10">
-            A query this is expected to produce valid results. Principal input should always be specified, even if the query doesn't have any PathExpr.
-         </description>
-</scenario>
-<scenario name="parse-error">
-<description last-mod="2005-06-10">
-            A query this is expected to raise a parsing/syntax error at query parse time. Principal input should always be specified, even if the query doesn't have any PathExpr.
-         </description>
-</scenario>
-<scenario name="runtime-error">
-<description last-mod="2005-06-10">
-            A query this is expected to raise a runtime error at query parse time. Runtime errors in this case include those raised by static typing rules. Principal input should always be specified, even if the query doesn't have any PathExpr.
-         </description>
-</scenario>
-<scenario name="trivial">
-<description last-mod="2006-03-29">
-            A query this is expected to produce valid results. Principal input should always be specified, even if the query doesn't have any PathExpr.
-            The initial query returns an &lt;xqx:xquery&gt; element (Trivial Embedding of XQuery).
-            This embedded query is then executed to produce the final result.
-         </description>
-</scenario>
-</scenarios>
-<sources>
-<source ID="XQTSCatalog" FileName="XQTSCatalog.xml" Creator="XQuery Test Task Force" schema="XQTSCatalogxsd">
-<description last-mod="2005-04-14">XQuery Test Suite Catalog</description>
-</source>
-<source ID="bib2" FileName="TestSources/bib2.xml" Creator="spec-authors">
-<description last-mod="2003-03-25">Bibliography example with extra comments and PIs.</description>
-</source>
-<source ID="emptydoc" FileName="TestSources/emptydoc.xml" Creator="David Marston">
-<description last-mod="2003-03-25">Contains just a "doc" element, no comments/text/PIs.</description>
-</source>
-<source ID="fsx" FileName="TestSources/fsx.xml" Creator="Mike Rorke">
-<description last-mod="2003-03-25">Data about a filesystem represented in XML.</description>
-</source>
-<source ID="fsx_NS" FileName="TestSources/fsx_NS.xml" Creator="Mike Rorke">
-<description last-mod="2003-03-25">Data about a filesystem represented in XML with namespace-qualified names.</description>
-</source>
-<source ID="MixNS" FileName="TestSources/MixNS.xml" Creator="David Marston">
-<description last-mod="2003-03-25">Small tree with element names in mixed namespaces.</description>
-<note>Use @index to identify elements precisely.</note>
-</source>
-<source ID="nw_Customers" FileName="TestSources/nw_Customers.xml" Creator="Kuen Siew">
-<description last-mod="2003-03-25">Customer name/address file with some non-ASCII characters.</description>
-</source>
-<source ID="TopMany" FileName="TestSources/TopMany.xml" Creator="David Marston">
-<description last-mod="2003-03-25">Like TreeCompass, but with comments and PIs off the root. PI targets vary.</description>
-<note>All text nodes must have non-whitespace characters.</note>
-</source>
-<source ID="Tree1Child" FileName="TestSources/Tree1Child.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has just one child, of an abnormal name, off the center node.</description>
-<note>One attribute each on west and center.</note>
-</source>
-<source ID="Tree1Text" FileName="TestSources/Tree1Text.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has just a text node and no child element off the center node.</description>
-</source>
-<source ID="TreeCompass" FileName="TestSources/TreeCompass.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A tree intended to allow many kinds of path expressions.</description>
-<note>Need multiple attributes on center, west, and south, plus @mark scattered around.</note>
-<note>Mix of text and element children in many places, but east should have only a text node.</note>
-<note>All text nodes must have non-whitespace characters.</note>
-<note>Top element is far-north.</note>
-</source>
-<source ID="TreeEmpty" FileName="TestSources/TreeEmpty.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has just one "south" element at the top, bearing one "mark" attribute.</description>
-</source>
-<source ID="TreeRepeat" FileName="TestSources/TreeRepeat.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has center elements off the real center node.</description>
-<note>Use @mark to distinguish center elements.</note>
-<note>"Real" center must have multiple element children, some with duplicate names (south-east).</note>
-<note>Repeating attribute names used, including same name on elements of the same name.</note>
-<note>Comments and text nodes are strewn about. All text nodes must have non-whitespace characters.</note>
-</source>
-<source ID="TreeStack" FileName="TestSources/TreeStack.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has several "south" elements, some stacked within each other.</description>
-<note>Use "mark" attributes at several levels and on all south elements.</note>
-</source>
-<source ID="TreeTrunc" FileName="TestSources/TreeTrunc.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has no content at all in center or west, no attributes anywhere.</description>
-</source>
-<source ID="xq311A" FileName="TestSources/xq311A.xml" Creator="David Marston">
-<description last-mod="2003-03-25">Data that fits first example in XQuery 3.11.</description>
-</source>
-<source ID="xq311B" FileName="TestSources/xq311B.xml" Creator="David Marston">
-<description last-mod="2003-03-25">Data that fits later examples in XQuery 3.11.</description>
-</source>
-<source ID="DupNode" FileName="TestSources/DupNode.xml" Creator="Andreas Behm">
-<description last-mod="2005-04-26">Simple document with all node kinds</description>
-</source>
-<source ID="inscope" FileName="TestSources/inscope.xml" Creator="Andreas Behm">
-<description last-mod="2005-08-26">Simple document with namespaces</description>
-</source>
-<source ID="nsmode" FileName="TestSources/nsmode.xml" Creator="Andreas Behm">
-<description last-mod="2005-04-26">Source document for namespace copy modes</description>
-</source>
-<source ID="works" FileName="TestSources/works.xml" Creator="Carmelo Montanez">
-<description last-mod="2005-03-04">Data for various NIST tests</description>
-</source>
-<source ID="examples" FileName="TestSources/examples.xml" Creator="Carmelo Montanez" schema="examplesxsd">
-<description last-mod="2006-05-19">Data for fn-data-1 test.</description>
-</source>
-<source ID="works-mod" FileName="TestSources/works-mod.xml" Creator="Carmelo Montanez">
-<description last-mod="2005-03-04">Data for various NIST tests (abbreviated, unabbreviated syntax)</description>
-</source>
-<source ID="lang" FileName="TestSources/lang.xml" Creator="Carmelo Montanez">
-<description last-mod="2005-10-19">Data for fn:lang tests.</description>
-</source>
-<source ID="staff" FileName="TestSources/staff.xml" Creator="Carmelo Montanez">
-<description last-mod="2005-03-04">Data for various NIST tests</description>
-</source>
-<source ID="acme_corp" FileName="TestSources/acme_corp.xml" Creator="Ravindranath Chennoju">
-<description last-mod="2005-08-30">Source document for Function Declaration tests</description>
-</source>
-<source ID="bib" FileName="TestSources/bib.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-</source>
-<source ID="reviews" FileName="TestSources/reviews.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-</source>
-<source ID="books" FileName="TestSources/books.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-</source>
-<source ID="prices" FileName="TestSources/prices.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-</source>
-<source ID="book" FileName="TestSources/book.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query TREE use cases</description>
-</source>
-<source ID="report1" FileName="TestSources/report1.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query SEQ use cases</description>
-</source>
-<source ID="items" FileName="TestSources/items.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query RDB use cases</description>
-</source>
-<source ID="bids" FileName="TestSources/bids.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query RDB use cases</description>
-</source>
-<source ID="users" FileName="TestSources/users.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query RDB use cases</description>
-</source>
-<source ID="string" FileName="TestSources/string.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query STRING use cases</description>
-</source>
-<source ID="company-data" FileName="TestSources/company-data.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query STRING use cases</description>
-</source>
-<source ID="auction" FileName="TestSources/auction.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query NS use cases</description>
-</source>
-<source ID="partlist" FileName="TestSources/partlist.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query PARTS use cases</description>
-</source>
-<source ID="sgml" FileName="TestSources/sgml.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query SGML use cases</description>
-</source>
-<source ID="atomic" FileName="TestSources/atomic.xml" Creator="Carmelo Montanez" schema="atomicxsd">
-<description last-mod="2005-03-08">A Schema validated xml file, that contains values for data types. Can be used by any test.</description>
-</source>
-<source ID="id-idref-dtd" FileName="TestSources/iddtd.xml" Creator="Carmelo Montanez">
-<description last-mod="2006-06-28">A DTD validated xml file, that contains data for the ID/IDREF function tests.</description>
-</source>
-<source ID="atomicns" FileName="TestSources/atomicns.xml" Creator="Carmelo Montanez">
-<description last-mod="2006-03-15">A non schema validated xml file, that contains values for data types. Can be used by any test.</description>
-</source>
-<source ID="orderData" FileName="TestSources/orderData.xml" Creator="Carmelo Montanez" schema="orderDataxsd">
-<description last-mod="2005-06-01">A Schema validated xml file, that contains values for some of the order by tests generated by NIST.</description>
-</source>
-<source ID="id-idref" FileName="TestSources/id.xml" Creator="Carmelo Montanez" schema="idxsd">
-<description last-mod="2006-05-12">Data for id and idref related functions (schema-based).</description>
-</source>
-<source ID="id-idref2" FileName="TestSources/id2.xml" Creator="Michael Kay" schema="idxsd">
-<description last-mod="2009-03-06">More data for id and idref related functions (schema-based).</description>
-</source>
-<source ID="SpecialTypes" FileName="TestSources/SpecialTypes.xml" Creator="Mike Rorke" schema="SpecialTypesXSD">
-<description last-mod="2005-06-01">A Schema validated XML file containing certain special types e.g. interleave types, union types, anySimpleType</description>
-</source>
-<source ID="QNameSource" FileName="TestSources/QName-source.xml" Creator="Mike Rorke" schema="QNameSourceXSD">
-<description last-mod="2005-09-28">A schema validated XML file containing QName and QName derived types.</description>
-</source>
-<source ID="notation" FileName="TestSources/notation.xml" Creator="Andreas Behm" schema="notationschema">
-<description last-mod="2005-10-10">A Scehma validated xml file with NOTATION elements</description>
-</source>
-<source ID="textWithSpaces" FileName="TestSources/textWithSpaces.xml" Creator="Joanne Tong">
-<description last-mod="2005-09-29">Data for normalize-space functions</description>
-</source>
-<source ID="XMarkAuction" FileName="TestSources/XMarkAuction.xml" Creator="Frans Englich">
-<description last-mod="2007-03-09">Source file generated XML Benchmark Project's xmlgen utility. See http://www.xml-benchmark.org/.</description>
-</source>
-<source ID="CPPGlobals" FileName="TestSources/CPPGlobals.xml" Creator="Frans Englich">
-<description last-mod="2007-06-27">The declarations of a C++ file described in XML.</description>
-</source>
-<source ID="MainWindow" FileName="TestSources/MainWindow.ui" Creator="Frans Englich">
-<description last-mod="2007-07-09">A description of an graphical user interface.</description>
-</source>
-<source ID="ComplexWhitespace" FileName="TestSources/ComplexWhitespace.xml" Creator="Frans Englich">
-<description last-mod="2007-07-09">A file containing different forms of whitespace.</description>
-</source>
-<source ID="SpaceBracket" FileName="TestSources/SpaceBracket.xml" Creator="Frans Englich">
-<description last-mod="2007-12-20">A file containing ' ]' as a text node.</description>
-</source>
-<source ID="HighUnicode" FileName="TestSources/HighUnicode.xml" Creator="Frans Englich">
-<description last-mod="2007-12-20">Corner case unicode codepoints.</description>
-</source>
-<source ID="HighUnicode2" FileName="TestSources/HighUnicode2.xml" Creator="Frans Englich">
-<description last-mod="2007-12-21">Corner case unicode codepoints, second case.</description>
-</source>
-<source ID="BCIsInvalid" FileName="TestSources/BCisInvalid.xml" Creator="Frans Englich">
-<description last-mod="2007-12-21">An element name containing 0xBC.</description>
-</source>
-<source ID="InvalidUmlaut" FileName="TestSources/InvalidUmlaut.xml" Creator="Frans Englich">
-<description last-mod="2007-12-27">Contains the codepoint 188 in an NCName.</description>
-</source>
-<source ID="NamespaceSuppliedInternally" FileName="TestSources/NamespaceSuppliedInternally.xml" Creator="Frans Englich">
-<description last-mod="2007-12-27">A namespace declared with a namespace declaration, as well as in the internal subset.</description>
-</source>
-<source ID="XMLIdDuplicated" FileName="TestSources/XMLIdDuplicated.xml" Creator="Frans Englich">
-<description last-mod="2008-01-15">An XML file which has two xml:id attributes with the same value.</description>
-</source>
-<source ID="InvalidXMLId" FileName="TestSources/InvalidXMLId.xml" Creator="Frans Englich">
-<description last-mod="2008-01-15">An XML file which has an invalid xml:id attribute.</description>
-</source>
-<source ID="UsingXMLId" FileName="TestSources/UsingXMLId.xml" Creator="Frans Englich">
-<description last-mod="2008-01-15">An XML file which has xml:id attributes.</description>
-</source>
-<source ID="Books2" FileName="TestSources/Books2.xml" Creator="Frans Englich">
-<description last-mod="2008-01-17">An XML which is in ISO-8859-1 encoding.</description>
-</source>
-<source ID="QObject" FileName="TestSources/QObject.xml" Creator="Frans Englich">
-<description last-mod="2008-02-19"/>
-</source>
-<source ID="Char010D" FileName="TestSources/0x010D.xml" Creator="Frans Englich">
-<description last-mod="2008-02-28"/>
-</source>
-<source ID="SmallTree" FileName="TestSources/SmallTree.xml" Creator="Frans Englich">
-<description last-mod="2008-04-03"/>
-</source>
-<source ID="AttributesAndElements" FileName="TestSources/AttributesAndElements.xml" Creator="Frans Englich">
-<description last-mod="2008-04-03"/>
-</source>
-<source ID="functx_prices" FileName="TestSources/functx_prices.xml" Creator="Frans Englich">
-<description last-mod="2008-05-16"/>
-</source>
-<source ID="functx_order" FileName="TestSources/functx_order.xml" Creator="Frans Englich">
-<description last-mod="2008-05-16"/>
-</source>
-<source ID="functx_cats" FileName="TestSources/functx_cats.xml" Creator="Frans Englich">
-<description last-mod="2008-05-16"/>
-</source>
-<source ID="functx_catalog" FileName="TestSources/functx_catalog.xml" Creator="Frans Englich">
-<description last-mod="2008-05-16"/>
-</source>
-<source ID="functx_book" FileName="TestSources/functx_book.xml" Creator="Frans Englich">
-<description last-mod="2008-06-25"/>
-</source>
-<source ID="badxml" FileName="TestSources/badxml.xml" Creator="Frans Englich">
-<description last-mod="2008-05-19"/>
-</source>
-<source ID="builtinEntities" FileName="TestSources/builtinEntities.xml" Creator="Frans Englich">
-<description last-mod="2008-05-26"/>
-</source>
-<source ID="XMLIdWhitespace" FileName="TestSources/XMLIdWhitespace.xml" Creator="Frans Englich">
-<description last-mod="2008-05-27"/>
-</source>
-<source ID="XMLIDMany" FileName="TestSources/XMLIDMany.xml" Creator="Frans Englich">
-<description last-mod="2008-10-24"/>
-</source>
-<source ID="OneTopElement" FileName="TestSources/OneTopElement.xml" Creator="Nicolae Brinza">
-<description last-mod="2009-04-01"/>
-</source>
-<source ID="namespace-sensitive" FileName="TestSources/namespace-sensitive.xml" schema="namespace-sensitive-schema" Creator="Oliver Hallam">
-<description last-mod="2007-02-26">Document containing namespace-sensitive constructs.</description>
-</source>
-<source ID="dm-e005" FileName="TestSources/dm-e005.xml" schema="dm-e005-schema" Creator="Norm Walsh">
-<description last-mod="2010-03-10">Document to test erratum DM.E05.</description>
-</source>
-<source ID="extendedTypes" FileName="TestSources/extendedTypes.xml" schema="extendedTypes-schema" Creator="Oliver Hallam">
-<description last-mod="2010-03-17">Document containing elements with various restricted and extended types.</description>
-</source>
-<source ID="mixed" FileName="TestSources/mixed.xml" schema="mixedcontent" Creator="Oliver Hallam">
-<description last-mod="2010-03-17">Document containing an element with mixed content but statically could have element only content.</description>
-</source>
-<schema ID="XQTSCatalogxsd" uri="http://www.w3.org/2005/02/query-test-XQTSCatalog" FileName="XQTSCatalog.xsd">
-<description last-mod="2005-04-14">Schema for XQTSCatalog</description>
-</schema>
-<schema ID="atomicxsd" uri="http://www.w3.org/XQueryTest" FileName="TestSources/atomic.xsd">
-<description last-mod="2005-03-08">A Schema for atomic.xml</description>
-</schema>
-<schema ID="orderDataxsd" uri="http://www.w3.org/XQueryTestOrderBy" FileName="TestSources/orderData.xsd">
-<description last-mod="2005-06-01">A Schema for orderData.xml</description>
-</schema>
-<schema ID="SpecialTypesXSD" uri="http://www.example.com/typedecl" FileName="TestSources/SpecialTypes.xsd">
-<description last-mod="2005-06-01">A Schema containing certain special types e.g. interleave types, union types, anySimpleType</description>
-</schema>
-<schema ID="QNameSourceXSD" uri="http://www.example.com/QNameXSD" FileName="TestSources/QName-schema.xsd">
-<description last-mod="2005-09-28">A schema containing QName and QName derived types</description>
-</schema>
-<schema ID="notationschema" uri="http://www.example.com/notation" FileName="TestSources/notationschema.xsd">
-<description last-mod="2005-10-10">A Schema for NOTATION data</description>
-</schema>
-<schema ID="idxsd" uri="http://www.w3.org/XQueryTest/ididrefs" FileName="TestSources/id.xsd">
-<description last-mod="2009-03-06">A schema for the id/idref functions tests</description>
-</schema>
-<schema ID="simplexsd" uri="http://www.w3.org/XQueryTest/simple" FileName="TestSources/simple.xsd">
-<description last-mod="2005-12-07">A schema for simple context tests</description>
-</schema>
-<schema ID="examplesxsd" uri="http://www.w3.org/XQueryTest/someExamples" FileName="TestSources/examples.xsd">
-<description last-mod="2006-05-19">A schema for examples.xml.</description>
-</schema>
-<schema ID="userdefined" uri="http://www.w3.org/XQueryTest/userDefinedTypes" FileName="TestSources/userdefined.xsd">
-<description last-mod="2006-04-03">A schema user defined types and constructor tests</description>
-</schema>
-<schema ID="listunion" uri="http://www.w3.org/XQueryTest/ListUnionTypes" FileName="TestSources/listunion.xsd">
-<description last-mod="2006-06-07">A schema defining a list of unions.</description>
-</schema>
-<schema ID="examples2xsd" uri="http://www.w3.org/XQueryTest/someExamples2" FileName="TestSources/examples2.xsd">
-<description last-mod="2009-10-01">Test schema for Errata XQ.E6.</description>
-</schema>
-<schema ID="attribute" uri="http://www.w3.org/XQueryTest/sample" FileName="TestSources/attribute.xsd">
-<description last-mod="2009-04-01">Test schema that contains an attribute declaration.</description>
-</schema>
-<schema ID="mixedcontent" uri="http://www.w3.org/XQueryTest/mixedcontent" FileName="TestSources/mixedcontent.xsd">
-<description last-mod="2009-04-01">Test schema that contains two complex types, one of them with a mixed content.</description>
-</schema>
-<schema ID="simpleContent" uri="http://www.w3.org/query-test/complexSimple" FileName="TestSources/simpleContent.xsd">
-<description last-mod="2009-11-20">Schema for complex types with
-         simple content</description>
-</schema>
-<schema ID="namespace-sensitive-schema" uri="http://www.example.com/test/namespace-sensitive" FileName="TestSources/namespace-sensitive.xsd">
-<description last-mod="2007-02-26">Schema illustrating various namespace-sensitive constructs.</description>
-</schema>
-<schema ID="dm-e005-schema" uri="http://www.example.com/ns/test" FileName="TestSources/dm-e005.xsd">
-<description last-mod="2010-03-10">Schema to test erratum DM.E05.</description>
-</schema>
-<schema ID="xq-e18-schema" uri="http://www.example.com/ns/test/xq-e18" FileName="TestSources/xq-e18.xsd">
-<description last-mod="2010-03-11">Schema to test erratum XQ.E18.</description>
-</schema>
-<schema ID="extendedTypes-schema" uri="http://www.example.com/XQueryTest/extendedTypes" FileName="TestSources/extendedTypes.xsd">
-<description last-mod="2010-03-17">Schema containing extended and restricted types.</description>
-</schema>
-<schema ID="constraints" uri="http://www.w3.org/constraints" FileName="TestSources/constraints.xsd">
-<description last-mod="2010-06-10">Schema with unique/id/idref constraints.</description>
-</schema>
-<collection ID="collection1" Creator="Andrew Eisenberg">
-<description last-mod="2006-06-07">A simple collection of documents.</description>
-<input-document>bib</input-document>
-<input-document>reviews</input-document>
-</collection>
-<collection ID="collection2" Creator="Andrew Eisenberg">
-<description last-mod="2006-06-07">A simple collection of documents.</description>
-<input-document>bib</input-document>
-<input-document>reviews</input-document>
-<input-document>books</input-document>
-</collection>
-<module ID="module1-lib" FileName="TestSources/module1-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-07-13">Library module for "modules-18" query</description>
-</module>
-<module ID="module2-lib" FileName="TestSources/module2-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-07-13">Library module for "modules-18" query</description>
-</module>
-<module ID="empty-lib" FileName="TestSources/empty-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module for "modules-none" query</description>
-</module>
-<module ID="emptyns-lib" FileName="TestSources/emptyns-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with empty namespace</description>
-</module>
-<module ID="test1-lib" FileName="TestSources/test1-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Simple library module</description>
-</module>
-<module ID="test2-lib" FileName="TestSources/test2-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-01-19">Library module with namespace URI set to empty string.</description>
-</module>
-<module ID="test1a-lib" FileName="TestSources/test1a-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Simple library module</description>
-</module>
-<module ID="test1collide1-lib" FileName="TestSources/test1collide1-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with colliding definitions</description>
-</module>
-<module ID="test1collide2-lib" FileName="TestSources/test1collide2-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with colliding definitions</description>
-</module>
-<module ID="test1c1-lib" FileName="TestSources/test1c1-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with circular includes</description>
-</module>
-<module ID="test2c1-lib" FileName="TestSources/test2c1-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with circular includes</description>
-</module>
-<module ID="context-lib" FileName="TestSources/context-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with interesting context</description>
-</module>
-<module ID="module-defs" FileName="TestSources/moduleDefs-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-01-06">Library module with definitions for various NIST tests.</description>
-</module>
-<module ID="modulewrongprefix-lib" FileName="TestSources/moduleDefs-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-03-21">Library module with invalid namespace prefix ("xml")</description>
-</module>
-<module ID="modulesdiffns" FileName="TestSources/modulesdiffns-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-04-11">Library module with variable on different namespace than target.</description>
-</module>
-<module ID="errata6-module1" FileName="TestSources/errata6-module1" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata6-module2" FileName="TestSources/errata6-module2" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata6-module4" FileName="TestSources/errata6-module4" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata6-module5" FileName="TestSources/errata6-module5" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata6-module6" FileName="TestSources/errata6-module6" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata6-module7" FileName="TestSources/errata6-module7" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata8-module1a" FileName="TestSources/errata8-module1a" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a variable from it, testing circular dependencies.</description>
-</module>
-<module ID="errata8-module1b" FileName="TestSources/errata8-module1b" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a function from it, testing circular dependencies.</description>
-</module>
-<module ID="errata8-module2a" FileName="TestSources/errata8-module2a" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a variable from it, testing circular dependencies.</description>
-</module>
-<module ID="errata8-module2b" FileName="TestSources/errata8-module2b" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a function from it, testing circular dependencies.</description>
-</module>
-<module ID="errata8-module3a" FileName="TestSources/errata8-module3a" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a variable from it, testing circular dependencies pass case.</description>
-</module>
-<module ID="errata8-module3b" FileName="TestSources/errata8-module3b" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a function from it, testing circular dependencies pass case.</description>
-</module>
-<module ID="module3-lib" FileName="TestSources/module3-lib" Creator="Nicolae Brinza">
-<description last-mod="2009-04-01">Module with simple and schema-element() types, used for functions'parameters and return results.</description>
-</module>
-<module ID="module4-lib" FileName="TestSources/module4-lib" Creator="Nicolae Brinza">
-<description last-mod="2009-04-01">Module with schema-attribute() types, used for functions' parameters and return results.</description>
-</module>
-<module ID="modules-recursive1" FileName="TestSources/modules-recursive1" Creator="Nicolae Brinza">
-<description last-mod="2009-04-01">Module with cyclic recursive imports.</description>
-</module>
-<module ID="modules-recursive2" FileName="TestSources/modules-recursive2" Creator="Nicolae Brinza">
-<description last-mod="2009-04-01">Module with cyclic recursive imports.</description>
-</module>
-<module ID="module-pub-priv" FileName="TestSources/module-pub-priv" Creator="Michael Kay">
-<description last-mod="2009-10-01">Module that contains both private and public function declarations (XQuery 1.1).</description>
-</module>
-</sources>
-<implementation-defined-items>
-<implementation-defined-item name="expressionUnicode" spec="XQuery">
-<description last-mod="2005-04-04">The version of Unicode that is used to construct expressions.</description>
-</implementation-defined-item>
-<implementation-defined-item name="collations" spec="XQuery">
-<description last-mod="2005-04-04">The statically-known collations.</description>
-</implementation-defined-item>
-<implementation-defined-item name="implicitTimezone" spec="XQuery">
-<description last-mod="2005-04-04">The implicit timezone.</description>
-</implementation-defined-item>
-<implementation-defined-item name="warningsMethod" spec="XQuery">
-<description last-mod="2005-04-04">The circumstances in which warnings are raised, and the ways in which warnings are handled.</description>
-</implementation-defined-item>
-<implementation-defined-item name="errorsMethod" spec="XQuery">
-<description last-mod="2005-04-04">The method by which errors are reported to the external processing environment.</description>
-</implementation-defined-item>
-<implementation-defined-item name="XMLVersion" spec="XQuery">
-<description last-mod="2005-10-10">Whether the implementation is based on the rules of [XML 1.0] and [XML Names] or the rules of [XML 1.1] and [XML Names 1.1]. One of these sets of rules must be applied consistently by all aspects of the implementation.</description>
-</implementation-defined-item>
-<implementation-defined-item name="overwrittenContextComponents" spec="XQuery">
-<description last-mod="2005-04-04">Any components of the static context or dynamic context that are overwritten or augmented by the implementation.</description>
-</implementation-defined-item>
-<implementation-defined-item name="axes" spec="XQuery">
-<description last-mod="2005-04-04">Which of the optional axes are supported by the implementation, if the Full-Axis Feature is not supported.</description>
-</implementation-defined-item>
-<implementation-defined-item name="defaultOrderEmpty" spec="XQuery">
-<description last-mod="2005-04-04">The default handling of empty sequences returned by an ordering key (sortspec) in an order by clause (empty least or empty greatest).</description>
-</implementation-defined-item>
-<implementation-defined-item name="pragmas" spec="XQuery">
-<description last-mod="2005-04-04">The names and semantics of any extension expressions (pragmas) recognized by the implementation.</description>
-</implementation-defined-item>
-<implementation-defined-item name="optionDeclarations" spec="XQuery">
-<description last-mod="2005-04-04">The names and semantics of any option declarations recognized by the implementation.</description>
-</implementation-defined-item>
-<implementation-defined-item name="externalFunctionProtocols" spec="XQuery">
-<description last-mod="2005-04-04">Protocols (if any) by which parameters can be passed to an external function, and the result of the function can returned to the invoking query.</description>
-</implementation-defined-item>
-<implementation-defined-item name="moduleLocationHints" spec="XQuery">
-<description last-mod="2005-11-01">The process by which the specific modules to be imported by a module import are identified, if the Module Feature is supported (includes processing of location hints, if any.)</description>
-</implementation-defined-item>
-<implementation-defined-item name="staticTypingExtensions" spec="XQuery">
-<description last-mod="2005-04-04">Any static typing extensions supported by the implementation, if the Static Typing Feature is supported.</description>
-</implementation-defined-item>
-<implementation-defined-item name="serializationInvocation" spec="XQuery">
-<description last-mod="2005-04-04">The means by which serialization is invoked, if the Serialization Feature is supported.</description>
-</implementation-defined-item>
-<implementation-defined-item name="serializationDefaults" spec="XQuery">
-<description last-mod="2005-10-10">The default values for the byte-order-mark, encoding, media-type, normalization-form, omit-xml-declaration, standalone, and version parameters, if the Serialization Feature is supported.</description>
-</implementation-defined-item>
-<implementation-defined-item name="externalFunctionCall" spec="XQuery">
-<description last-mod="2006-08-09">The result of an unsuccessful call to an external function (for example, if the function implementation cannot be found or does not return a value of the declared type).</description>
-</implementation-defined-item>
-<implementation-defined-item name="limits" spec="XQuery">
-<description last-mod="2005-11-01">Limits on ranges of values for various data types, as enumerated in 5.3 Data Model Conformance.</description>
-</implementation-defined-item>
-<implementation-defined-item name="traceDestination" spec="FuncOps">
-<description last-mod="2005-10-10">The destination of the trace output is implementation-defined. See 4 The Trace Function.</description>
-</implementation-defined-item>
-<implementation-defined-item name="integerOperations" spec="FuncOps">
-<description last-mod="2005-10-10">For xs:integer operations, implementations that support limited-precision integer operations must either raise an error [err:FOAR0002] or provide an implementation-defined mechanism that allows users to choose between raising an error and returning a result that is modulo the largest representable integer value. See 6.2 Operators on Numeric Values.</description>
-</implementation-defined-item>
-<implementation-defined-item name="decimalDigits" spec="FuncOps">
-<description last-mod="2005-11-01">For xs:decimal values the number of digits of precision returned by the numeric operators is implementation-defined. See 6.2 Operators on Numeric Values. See also 17.1.3.3 Casting to xs:decimal and 17.1.3.4 Casting to xs:integer.</description>
-</implementation-defined-item>
-<implementation-defined-item name="roundOrTruncate" spec="FuncOps">
-<description last-mod="2005-10-10">If the number of digits in the result exceeds the number of digits that the implementation supports, the result is truncated or rounded in an implementation-defined manner. See 6.2 Operators on Numeric Values. See also 17.1.3.3 Casting to xs:decimal and 17.1.3.4 Casting to xs:integer.</description>
-</implementation-defined-item>
-<implementation-defined-item name="Unicode" spec="FuncOps">
-<description last-mod="2005-11-01">It is implementation-defined which version of Unicode is supported by the features defined in this specification, but it is recommended that the most recent version of Unicode be used. See 7.1 String Types.</description>
-</implementation-defined-item>
-<implementation-defined-item name="normalizationForms" spec="FuncOps">
-<description last-mod="2005-10-10">For 7.4.6 fn:normalize-unicode, conforming implementations must support normalization form "NFC" and may support normalization forms "NFD", "NFKC", "NFKD", "FULLY-NORMALIZED". They may also support other normalization forms with implementation-defined semantics.</description>
-</implementation-defined-item>
-<implementation-defined-item name="collationUnits" spec="FuncOps">
-<description last-mod="2005-10-10">The ability to decompose strings into collation units suitable for substring matching is an implementation-defined property of a collation. See 7.5 Functions Based on Substring Matching.</description>
-</implementation-defined-item>
-<implementation-defined-item name="secondsDigits" spec="FuncOps">
-<description last-mod="2005-10-10">All minimally conforming processors must support year values with a minimum of 4 digits (i.e., YYYY) and a minimum fractional second precision of 1 millisecond or three digits (i.e., s.sss). However, conforming processors may set larger implementation-defined limits on the maximum number of digits they support in these two situations. See 10.1.1 Limits and Precision.</description>
-</implementation-defined-item>
-<implementation-defined-item name="stringToDecimal" spec="FuncOps">
-<description last-mod="2006-08-09">The result of casting a string to xs:decimal, when the resulting value is not too large or too small but nevertheless has too many decimal digits to be accurately represented, is implementation-defined. See 17.1.1 Casting from xs:string and xs:untypedAtomic.</description>
-</implementation-defined-item>
-<implementation-defined-item name="docProcessing" spec="FuncOps">
-<description last-mod="2005-10-10">Various aspects of the processing provided by 15.5.4 fn:doc are implementation-defined. Implementations may provide external configuration options that allow any aspect of the processing to be controlled by the user.</description>
-</implementation-defined-item>
-<implementation-defined-item name="weakenStable" spec="FuncOps">
-<description last-mod="2006-08-09">The manner in which implementations provide options to weaken the stable characteristic of 15.5.6 fn:collection and 15.5.4 fn:doc are implementation-defined.</description>
-</implementation-defined-item>
-<implementation-defined-item name="additionalTypes" spec="DataModel">
-<description last-mod="2005-04-04">Support for additional user-defined or implementation-defined types is implementation-defined. (See 2.6.1 Representation of Types)</description>
-</implementation-defined-item>
-<implementation-defined-item name="undefinedProperties" spec="DataModel">
-<description last-mod="2005-04-04">Some typed values in the data model are undefined. Attempting to access an undefined property is always an error. Behavior in these cases is implementation-defined and the host language is responsible for determining the result. (See 5 Accessors)</description>
-</implementation-defined-item>
-<implementation-defined-item name="sequenceNormalization" spec="Serialization">
-<description last-mod="2005-04-04">For any implementation-defined output method, it is implementation-defined whether sequence normalization process takes place. (See 2 Sequence Normalization)</description>
-</implementation-defined-item>
-<implementation-defined-item name="outputMethods" spec="Serialization">
-<description last-mod="2005-04-04">If the namespace URI is non-null for the method serialization parameter, then the parameter specifies an implementation-defined output method. (See 3 Serialization Parameters)</description>
-</implementation-defined-item>
-<implementation-defined-item name="normalizationFormBehavior" spec="Serialization">
-<description last-mod="2005-04-04">If the value of the normalization-form form parameter is not NFC, NFD, NFKC, NFKD, fully-normalized, or none then the meaning of the value and it's effect is implementation-defined. (See 4 Phases of Serialization)</description>
-</implementation-defined-item>
-<implementation-defined-item name="additionalParams" spec="Serialization">
-<description last-mod="2005-11-01">The effect of additional serialization parameters on the output of the serializer, where the name of such a parameter must be namespace-qualified, is implementation-defined or implementation-dependent. The extent of this effect on the output must not override the provisions of this specification. (See 3 Serialization Parameters)</description>
-</implementation-defined-item>
-<implementation-defined-item name="encodingPhase" spec="Serialization">
-<description last-mod="2005-04-04">The effect of providing an option that allows the encoding phase to be skipped, so that the result of serialization is a stream of Unicode characters, is implementation-defined. The serializer is not required to support such an option. (See 4 Phases of Serialization)</description>
-</implementation-defined-item>
-<implementation-defined-item name="CDATASerialization" spec="Serialization">
-<description last-mod="2005-04-04">An serializer may provide an implementation-defined mechanism to place CDATA sections in the result tree. (See 5.1.4 XML Output Method: the cdata-section-elements Parameter)</description>
-</implementation-defined-item>
-</implementation-defined-items>
-<features>
-<feature name="Minimal Conformance"/>
-<feature name="Schema Import"/>
-<feature name="Schema Validation"/>
-<feature name="Static Typing"/>
-<feature name="Static Typing Extensions"/>
-<feature name="Full Axis"/>
-<feature name="Module"/>
-<feature name="Serialization"/>
-</features>
-<context-properties>
-<context-property name="Statically known namespaces" context-type="static"/>
-<context-property name="Default element/type namespace" context-type="static"/>
-<context-property name="Default function namespace" context-type="static"/>
-<context-property name="In-scope schema types" context-type="static"/>
-<context-property name="In-scope element declarations" context-type="static"/>
-<context-property name="In-scope attribute declarations" context-type="static"/>
-<context-property name="In-scope variables" context-type="static"/>
-<context-property name="Context item static type" context-type="static"/>
-<context-property name="Function signatures" context-type="static"/>
-<context-property name="Statically known collations" context-type="static"/>
-<context-property name="Default collation" context-type="static"/>
-<context-property name="Construction mode" context-type="static"/>
-<context-property name="Ordering mode" context-type="static"/>
-<context-property name="Default order for empty sequences" context-type="static"/>
-<context-property name="Boundary-space policy" context-type="static"/>
-<context-property name="Copy-namespaces mode" context-type="static"/>
-<context-property name="Base URI" context-type="static"/>
-<context-property name="Statically known documents" context-type="static"/>
-<context-property name="Statically known collections" context-type="static"/>
-<context-property name="Statically known default collection type" context-type="static"/>
-<context-property name="Context item" context-type="dynamic"/>
-<context-property name="Context position" context-type="dynamic"/>
-<context-property name="Context size" context-type="dynamic"/>
-<context-property name="Variable values" context-type="dynamic"/>
-<context-property name="Function implementations" context-type="dynamic"/>
-<context-property name="Current dateTime" context-type="dynamic"/>
-<context-property name="Implicit timezone" context-type="dynamic"/>
-<context-property name="Available documents" context-type="dynamic"/>
-<context-property name="Available collections" context-type="dynamic"/>
-<context-property name="Default collection" context-type="dynamic"/>
-</context-properties>
-<xqts:test-group xmlns:xqts="http://www.w3.org/2005/02/query-test-XQTSCatalog" xmlns:atom="http://www.w3.org/2005/Atom" name="MinimalConformance">
-<xqts:GroupInfo>
-<xqts:title>Minimal Conformance</xqts:title>
-<xqts:description/>
-</xqts:GroupInfo>
-</xqts:test-group>
-<xqts:test-group xmlns:xqts="http://www.w3.org/2005/02/query-test-XQTSCatalog" xmlns:atom="http://www.w3.org/2005/Atom" name="XQuery2ed">
-<xqts:GroupInfo>
-<xqts:title>Optional Features</xqts:title>
-<xqts:description/>
-</xqts:GroupInfo>
-<xqts:test-group name="DM.E002">
-<xqts:GroupInfo>
-<xqts:title>DM.E002</xqts:title>
-<xqts:description/>
-</xqts:GroupInfo>
-<test-case is-XPath2="false" Creator="Mary Holstege" name="validate-sc-1" FilePath="SchemaValidation/ValidateExpression/" scenario="standard">
-<description>Test validation of elements of simple content</description>
-<spec-citation spec="DataModel" section-number="3.3.1.2" section-title="Typed Value Determination" section-pointer="TypedValueDetermination"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4413</reflects-resolution>
-<query name="validateexpr-sc-1" date="2009-11-20"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<!-- role=schema forbidden by DTD, but this is the schema to use:
-     <input-file role="schema" variable="dummy">simpleContent</input-file> -->
-<output-file role="principal" compare="Fragment">validateexpr-sc-1.txt</output-file>
-</test-case>
-<test-case is-XPath2="false" Creator="Mary Holstege" name="validateexpr-sc-2" FilePath="SchemaValidation/ValidateExpression/" scenario="standard">
-<description>Test validation of elements of simple content</description>
-<spec-citation spec="DataModel" section-number="3.3.1.2" section-title="Typed Value Determination" section-pointer="TypedValueDetermination"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4413</reflects-resolution>
-<query name="validateexpr-sc-2" date="2009-11-20"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<!-- role=schema forbidden by DTD, but this is the schema to use:
-     <input-file role="schema" variable="dummy">simpleContent</input-file> -->
-<output-file role="principal" compare="Fragment">validateexpr-sc-2.txt</output-file>
-</test-case>
-<test-case is-XPath2="false" Creator="Mary Holstege" name="validateexpr-sc-4" FilePath="SchemaValidation/ValidateExpression/" scenario="standard">
-<description>Test validation of elements of simple content</description>
-<spec-citation spec="DataModel" section-number="3.3.1.2" section-title="Typed Value Determination" section-pointer="TypedValueDetermination"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4413</reflects-resolution>
-<query name="validateexpr-sc-4" date="2009-11-20"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<!-- role=schema forbidden by DTD, but this is the schema to use:
-     <input-file role="schema" variable="dummy">simpleContent</input-file> -->
-<output-file role="principal" compare="Fragment">validateexpr-sc-4.txt</output-file>
-</test-case>
-<test-case is-XPath2="false" Creator="Mary Holstege" name="validateexpr-sc-5" FilePath="SchemaValidation/ValidateExpression/" scenario="standard">
-<description>Test validation of elements of simple content</description>
-<spec-citation spec="DataModel" section-number="3.3.1.2" section-title="Typed Value Determination" section-pointer="TypedValueDetermination"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4413</reflects-resolution>
-<query name="validateexpr-sc-5" date="2009-11-20"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<!-- role=schema forbidden by DTD, but this is the schema to use:
-     <input-file role="schema" variable="dummy">simpleContent</input-file> -->
-<output-file role="principal" compare="Fragment">validateexpr-sc-5.txt</output-file>
-</test-case>
-<test-case is-XPath2="false" Creator="Mary Holstege" name="validateexpr-sc-6" FilePath="SchemaValidation/ValidateExpression/" scenario="standard">
-<description>Test validation of elements of simple content</description>
-<spec-citation spec="DataModel" section-number="3.3.1.2" section-title="Typed Value Determination" section-pointer="TypedValueDetermination"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4413</reflects-resolution>
-<query name="validateexpr-sc-6" date="2009-11-20"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<!-- role=schema forbidden by DTD, but this is the schema to use:
-     <input-file role="schema" variable="dummy">simpleContent</input-file> -->
-<output-file role="principal" compare="Fragment">validateexpr-sc-6.txt</output-file>
-</test-case>
-<test-case is-XPath2="false" Creator="Mary Holstege" name="validateexpr-sc-7" FilePath="SchemaValidation/ValidateExpression/" scenario="standard">
-<description>Test validation of elements of simple content</description>
-<spec-citation spec="DataModel" section-number="3.3.1.2" section-title="Typed Value Determination" section-pointer="TypedValueDetermination"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4413</reflects-resolution>
-<query name="validateexpr-sc-7" date="2009-11-20"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<!-- role=schema forbidden by DTD, but this is the schema to use:
-     <input-file role="schema" variable="dummy">simpleContent</input-file> -->
-<output-file role="principal" compare="Fragment">validateexpr-sc-7.txt</output-file>
-</test-case>
-<test-case is-XPath2="false" Creator="Mary Holstege" name="validateexpr-sc-8" FilePath="SchemaValidation/ValidateExpression/" scenario="standard">
-<description>Test validation of elements of simple content</description>
-<spec-citation spec="DataModel" section-number="3.3.1.2" section-title="Typed Value Determination" section-pointer="TypedValueDetermination"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4413</reflects-resolution>
-<query name="validateexpr-sc-8" date="2009-11-20"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<!-- role=schema forbidden by DTD, but this is the schema to use:
-     <input-file role="schema" variable="dummy">simpleContent</input-file> -->
-<output-file role="principal" compare="Fragment">validateexpr-sc-8.txt</output-file>
-</test-case>
-<test-case is-XPath2="false" Creator="Mary Holstege" name="validateexpr-sc-9" FilePath="SchemaValidation/ValidateExpression/" scenario="standard">
-<description>Test validation of elements of simple content</description>
-<spec-citation spec="DataModel" section-number="3.3.1.2" section-title="Typed Value Determination" section-pointer="TypedValueDetermination"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4413</reflects-resolution>
-<query name="validateexpr-sc-9" date="2009-11-20"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<!-- role=schema forbidden by DTD, but this is the schema to use:
-     <input-file role="schema" variable="dummy">simpleContent</input-file> -->
-<output-file role="principal" compare="Fragment">validateexpr-sc-9.txt</output-file>
-</test-case>
-</xqts:test-group>
-<xqts:test-group name="DM.E005">
-<xqts:GroupInfo>
-<xqts:title>DM.E005</xqts:title>
-<xqts:description/>
-</xqts:GroupInfo>
-<test-case is-XPath2="false" name="validateexpr-27" FilePath="SchemaValidation/ValidateExpression/" scenario="standard" Creator="Norm Walsh">
-<description>Test Bug 4519, [DM] Definition of is-id property</description>
-<spec-citation spec="XQuery" section-number="3.13" section-title="Validate Expressions" section-pointer="id-validate"/>
-<spec-citation spec="DataModel" section-number="6.3.4" section-title="Construction from a PSVI" section-pointer="const-psvi-attribute"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4519</reflects-resolution>
-<query name="validateexpr-27" date="2010-03-10"/>
-<input-file role="principal-data" variable="input-context">dm-e005</input-file>
-<output-file role="principal" compare="XML">validateexpr-27.xml</output-file>
-</test-case>
-</xqts:test-group>
-<xqts:test-group name="FO.E1">
-<xqts:GroupInfo>
-<xqts:title>FO.E1</xqts:title>
-<xqts:description/>
-</xqts:GroupInfo>
-<test-case is-XPath2="true" name="fn-resolve-uri-24" FilePath="Functions/URIFunc/ResolveURIFunc/" scenario="runtime-error" Creator="Michael Kay">
-<description>Evaluation of "fn:resolve-uri" function with second argument ($base) being a relative URI. See erratum FO.E1</description>
-<spec-citation spec="FuncOps" section-number="8.1" section-title="fn:resolve-uri" section-pointer="func-resolve-uri"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4373</reflects-resolution>
-<query name="fn-resolve-uri-24" date="2010-01-04"/>
-<expected-error>FORG0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" name="fn-resolve-uri-25" FilePath="Functions/URIFunc/ResolveURIFunc/" scenario="standard" Creator="Michael Kay">
-<description>Evaluation of "fn:resolve-uri" function with first argument ($relative) being an absolute URI and
-                   second argument ($base) being a relative URI. See erratum FO.E1</description>
-<spec-citation spec="FuncOps" section-number="8.1" section-title="fn:resolve-uri" section-pointer="func-resolve-uri"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4373</reflects-resolution>
-<query name="fn-resolve-uri-25" date="2010-01-04"/>
-<output-file role="principal" compare="Text">fn-resolve-uri-25.txt</output-file>
-</test-case>
-</xqts:test-group>
-<xqts:test-group name="FO.E4">
-<xqts:GroupInfo>
-<xqts:title>FO.E4</xqts:title>
-<xqts:description/>
-</xqts:GroupInfo>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-11" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-MatchesFunc-11" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-12" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#2).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-MatchesFunc-12" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-13" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#3).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-MatchesFunc-13" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-14" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#3).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-MatchesFunc-14" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-ReplaceFunc-4" FilePath="Functions/AllStringFunc/MatchStringFunc/ReplaceFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-ReplaceFunc-4" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-ReplaceFunc-5" FilePath="Functions/AllStringFunc/MatchStringFunc/ReplaceFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#2).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-ReplaceFunc-5" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-ReplaceFunc-6" FilePath="Functions/AllStringFunc/MatchStringFunc/ReplaceFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#3).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-ReplaceFunc-6" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-ReplaceFunc-7" FilePath="Functions/AllStringFunc/MatchStringFunc/ReplaceFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#3).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-ReplaceFunc-7" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-8" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Since no string is captured by the back-reference, the single character is matched.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4634</reflects-resolution>
-<query name="K2-MatchesFunc-8" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-9" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Since no string is captured by the back-reference, the single character is matched(#2).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4634</reflects-resolution>
-<query name="K2-MatchesFunc-9" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-10" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>A non-matching backwards-reference matches the empty string.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4634</reflects-resolution>
-<query name="K2-MatchesFunc-10" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-ReplaceFunc-3" FilePath="Functions/AllStringFunc/MatchStringFunc/ReplaceFunc/" scenario="runtime-error">
-<description>Use a back reference that isn't preceeded by sufficiently many captures, and therefore match the empty sequence.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4634</reflects-resolution>
-<query name="K2-ReplaceFunc-3" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-</xqts:test-group>
-<xqts:test-group name="FO.E6">
-<xqts:GroupInfo>
-<xqts:title>FO.E6</xqts:title>
-<xqts:description/>
-</xqts:GroupInfo>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K-SeqExprCast-232" FilePath="Expressions/exprSeqTypes/SeqExprCast/" scenario="standard">
-<description>Ensure casting xs:gYear to xs:string, with timezone '+00:00' is properly handled.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4471</reflects-resolution>
-<query name="K-SeqExprCast-232" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<output-file role="principal" compare="Text">K-SeqExprCast-232.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K-SeqExprCast-254" FilePath="Expressions/exprSeqTypes/SeqExprCast/" scenario="standard">
-<description>Ensure casting xs:gDay to xs:string, with timezone '+00:00' is properly handled.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4471</reflects-resolution>
-<query name="K-SeqExprCast-254" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<output-file role="principal" compare="Text">K-SeqExprCast-254.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K-SeqExprCast-269" FilePath="Expressions/exprSeqTypes/SeqExprCast/" scenario="standard">
-<description>Ensure casting xs:gMonth to xs:string, with timezone '+00:00' is properly handled.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4471</reflects-resolution>
-<query name="K-SeqExprCast-269" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<output-file role="principal" compare="Text">K-SeqExprCast-269.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K-SeqExprCast-284" FilePath="Expressions/exprSeqTypes/SeqExprCast/" scenario="standard">
-<description>Ensure casting xs:gYearMonth to xs:string, with timezone '+00:00' is properly handled.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4471</reflects-resolution>
-<query name="K-SeqExprCast-284" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<output-file role="principal" compare="Text">K-SeqExprCast-284.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K-SeqExprCast-305" FilePath="Expressions/exprSeqTypes/SeqExprCast/" scenario="standard">
-<description>Ensure casting xs:gMonthDay to xs:string, with timezone '+00:00' is properly handled.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4471</reflects-resolution>
-<query name="K-SeqExprCast-305" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<output-file role="principal" compare="Text">K-SeqExprCast-305.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K-SeqExprCast-341" FilePath="Expressions/exprSeqTypes/SeqExprCast/" scenario="standard">
-<description>Ensure casting xs:dateTime to xs:string, with timezone '+00:00' is properly handled.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4471</reflects-resolution>
-<query name="K-SeqExprCast-341" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<output-file role="principal" compare="Text">K-SeqExprCast-341.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K-SeqExprCast-366" FilePath="Expressions/exprSeqTypes/SeqExprCast/" scenario="standard">
-<description>Ensure casting xs:time to xs:string, with timezone '+00:00' is properly handled.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4471</reflects-resolution>
-<query name="K-SeqExprCast-366" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<output-file role="principal" compare="Text">K-SeqExprCast-366.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K-SeqExprCast-402" FilePath="Expressions/exprSeqTypes/SeqExprCast/" scenario="standard">
-<description>Ensure casting xs:date to xs:string, with timezone '+00:00' is properly handled.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4471</reflects-resolution>
-<query name="K-SeqExprCast-402" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<output-file role="principal" compare="Text">K-SeqExprCast-402.txt</output-file>
-</test-case>
-</xqts:test-group>
-<xqts:test-group name="FO.E7">
-<xqts:GroupInfo>
-<xqts:title>FO.E7</xqts:title>
-<xqts:description/>
-</xqts:GroupInfo>
-<test-case is-XPath2="true" name="fn-matches-26" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="standard" Creator="Andrew Eisenberg">
-<description>Check for the correct behavior of ^ and $ in multi-line mode</description>
-<spec-citation spec="FuncOps" section-number="7.6.2" section-title="fn:matches" section-pointer="func-matches"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4543</reflects-resolution>
-<query name="fn-matches-26" date="2006-09-25"/>
-<input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-<output-file role="principal" compare="Text">fn-matches-26.txt</output-file>
-</test-case>
-<test-case is-XPath2="false" name="fn-matches-27" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="standard" Creator="Andrew Eisenberg">
-<description>Check for the correct behavior of ^ and $ in multi-line mode</description>
-<spec-citation spec="FuncOps" section-number="7.6.2" section-title="fn:matches" section-pointer="func-matches"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4543</reflects-resolution>
-<query name="fn-matches-27" date="2006-09-25"/>
-<input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-<output-file role="principal" compare="Text">fn-matches-27.txt</output-file>
-</test-case>
-<test-case is-XPath2="false" name="fn-matches-28" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="standard" Creator="Andrew Eisenberg">
-<description>Check for the correct behavior of ^ and $ in multi-line mode</description>
-<spec-citation spec="FuncOps" section-number="7.6.2" section-title="fn:matches" section-pointer="func-matches"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4543</reflects-resolution>
-<query name="fn-matches-28" date="2006-09-25"/>
-<input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-<output-file role="principal" compare="Text">fn-matches-28.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" name="fn-matches-29" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="standard" Creator="Michael Kay">
-<description>Two digits not treated as back-reference</description>
-<spec-citation spec="FuncOps" section-number="7.6.2" section-title="fn:matches" section-pointer="func-matches"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4543</reflects-resolution>
-<query name="fn-matches-29" date="2009-03-05"/>
-<input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-<output-file role="principal" compare="Text">fn-matches-29.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" name="fn-matches-30" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="standard" Creator="Michael Kay">
-<description>Two digits treated as back-reference</description>
-<spec-citation spec="FuncOps" section-number="7.6.2" section-title="fn:matches" section-pointer="func-matches"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4543</reflects-resolution>
-<query name="fn-matches-30" date="2009-03-05"/>
-<input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-<output-file role="principal" compare="Text">fn-matches-30.txt</output-file>
-</test-case>
-</xqts:test-group>
-<xqts:test-group name="FO.E12">
-<xqts:GroupInfo>
-<xqts:title>FO.E12</xqts:title>
-<xqts:description/>
-</xqts:GroupInfo>
-<test-case is-XPath2="true" name="op-multiply-yearMonthDuration-1" FilePath="Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply/" scenario="standard" Creator="Carmelo Montanez">
-<description>Evaluates the "op:multiply-yearMonthDuration" operator as per example 1 (for this function) of the Functions and Operators spec.</description>
-<spec-citation spec="FuncOps" section-number="10.6.3" section-title="op:multiply-yearMonthDuration" section-pointer="func-multiply-yearMonthDuration"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4621</reflects-resolution>
-<query name="op-multiply-yearMonthDuration-1" date="2005-06-29"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<output-file role="principal" compare="Text">op-multiply-yearMonthDuration-1.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" name="op-multiply-yearMonthDuration-20" FilePath="Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiply/" scenario="standard" Creator="Michael Kay, Saxonica">
-<description>Tests rounding of the result of the "op:multiply-yearMonthDuration" operator. See erratum E12.</description>
-<spec-citation spec="FuncOps" section-number="10.6.3" section-title="op:multiply-yearMonthDuration" section-pointer="func-multiply-yearMonthDuration"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4621</reflects-resolution>
-<query name="op-multiply-yearMonthDuration-20" date="2009-03-05"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<output-file role="principal" compare="Text">op-multiply-yearMonthDuration-20.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" name="op-divide-yearMonthDuration-17" FilePath="Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivide/" scenario="standard" Creator="Michael Kay">
-<description>Tests rounding behaviour for the "op:divide-yearMonthDuration" function, see erratum FO.E12.</description>
-<spec-citation spec="FuncOps" section-number="10.6.4" section-title="op:divide-yearMonthDuration" section-pointer="func-divide-yearMonthDuration"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4621</reflects-resolution>
-<query name="op-divide-yearMonthDuration-17" date="2009-03-05"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<output-file role="principal" compare="Text">op-divide-yearMonthDuration-17.txt</output-file>
-</test-case>
-</xqts:test-group>
-<xqts:test-group name="FO.E13">
-<xqts:GroupInfo>
-<xqts:title>FO.E13</xqts:title>
-<xqts:description/>
-</xqts:GroupInfo>
-<test-case is-XPath2="false" name="validateexpr-27" FilePath="SchemaValidation/ValidateExpression/" scenario="standard" Creator="Norm Walsh">
-<description>Test Bug 4519, [DM] Definition of is-id property</description>
-<spec-citation spec="XQuery" section-number="3.13" section-title="Validate Expressions" section-pointer="id-validate"/>
-<spec-citation spec="DataModel" section-number="6.3.4" section-title="Construction from a PSVI" section-pointer="const-psvi-attribute"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4519</reflects-resolution>
-<query name="validateexpr-27" date="2010-03-10"/>
-<input-file role="principal-data" variable="input-context">dm-e005</input-file>
-<output-file role="principal" compare="XML">validateexpr-27.xml</output-file>
-</test-case>
-</xqts:test-group>
-<xqts:test-group name="FO.E24">
-<xqts:GroupInfo>
-<xqts:title>FO.E24</xqts:title>
-<xqts:description/>
-</xqts:GroupInfo>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-11" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-MatchesFunc-11" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-12" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#2).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-MatchesFunc-12" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-13" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#3).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-MatchesFunc-13" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-14" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#3).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-MatchesFunc-14" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-ReplaceFunc-4" FilePath="Functions/AllStringFunc/MatchStringFunc/ReplaceFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-ReplaceFunc-4" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-ReplaceFunc-5" FilePath="Functions/AllStringFunc/MatchStringFunc/ReplaceFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#2).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-ReplaceFunc-5" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-ReplaceFunc-6" FilePath="Functions/AllStringFunc/MatchStringFunc/ReplaceFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#3).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-ReplaceFunc-6" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-ReplaceFunc-7" FilePath="Functions/AllStringFunc/MatchStringFunc/ReplaceFunc/" scenario="runtime-error">
-<description>Use a back reference inside a character class(#3).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4106</reflects-resolution>
-<query name="K2-ReplaceFunc-7" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-8" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Since no string is captured by the back-reference, the single character is matched.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4634</reflects-resolution>
-<query name="K2-MatchesFunc-8" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-9" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>Since no string is captured by the back-reference, the single character is matched(#2).</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4634</reflects-resolution>
-<query name="K2-MatchesFunc-9" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-MatchesFunc-10" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error">
-<description>A non-matching backwards-reference matches the empty string.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4634</reflects-resolution>
-<query name="K2-MatchesFunc-10" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" Creator="Frans Englich" name="K2-ReplaceFunc-3" FilePath="Functions/AllStringFunc/MatchStringFunc/ReplaceFunc/" scenario="runtime-error">
-<description>Use a back reference that isn't preceeded by sufficiently many captures, and therefore match the empty sequence.</description>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=4634</reflects-resolution>
-<query name="K2-ReplaceFunc-3" date="2007-11-26+01:00"/>
-<input-file role="principal-data" variable="input-context">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" name="fn-matches-35" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error" Creator="Zhen Hua  Liu">
-<description>Test for bug fix of 5348 in Errata for FO</description>
-<spec-citation spec="FuncOps" section-number="7.6.2" section-title="fn:matches" section-pointer="func-matches"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=5348</reflects-resolution>
-<query name="fn-matches-35" date="2009-11-15"/>
-<input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-<expected-error>FORX0002</expected-error>
-</test-case>
-<test-case is-XPath2="true" name="fn-matches-36" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="standard" Creator="Zhen Hua  Liu">
-<description>Test for bug fix of 5348 in Errata for FO</description>
-<spec-citation spec="FuncOps" section-number="7.6.2" section-title="fn:matches" section-pointer="func-matches"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=5348</reflects-resolution>
-<query name="fn-matches-36" date="2009-11-15"/>
-<input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-<output-file role="principal" compare="Text">fn-matches-36.txt</output-file>
-</test-case>
-<test-case is-XPath2="true" name="fn-matches-37" FilePath="Functions/AllStringFunc/MatchStringFunc/MatchesFunc/" scenario="runtime-error" Creator="Zhen Hua  Liu">
-<description>Test for bug fix of 5348 in Errata for FO</description>
-<spec-citation spec="FuncOps" section-number="7.6.2" section-title="fn:matches" section-pointer="func-matches"/>
-<reflects-resolution>http://www.w3.org/Bugs/Public/show_bug.cgi?id=5348<

<TRUNCATED>

[24/51] [abbrv] git commit: small fixes

Posted by vi...@apache.org.
small fixes


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/3b603b86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/3b603b86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/3b603b86

Branch: refs/heads/vxquery_0_3_staging
Commit: 3b603b86a8e53b600ae3b90aa63e95674c35bb7a
Parents: bc54c0d 44faa1f
Author: Till Westmann <we...@gmail.com>
Authored: Fri Apr 4 12:21:25 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Fri Apr 4 12:21:25 2014 -0700

----------------------------------------------------------------------
 .../org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java   | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------



[23/51] [abbrv] git commit: replace tabs with spaces

Posted by vi...@apache.org.
replace tabs with spaces


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/55c809b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/55c809b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/55c809b1

Branch: refs/heads/vxquery_0_3_staging
Commit: 55c809b15efdc0b65c2a20605931881d3ddab5f5
Parents: 5272458
Author: Till Westmann <we...@gmail.com>
Authored: Fri Apr 4 00:11:01 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Fri Apr 4 00:11:01 2014 -0700

----------------------------------------------------------------------
 .../noaa-ghcn-daily/scripts/run_benchmark.sh        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/55c809b1/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
old mode 100644
new mode 100755
index f283cba..036f697
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh
@@ -34,13 +34,13 @@ fi
 
 for j in $(find ${1} -name '*q??.xq')
 do
-	if [ -z "${3}" ] || [[ "${j}" =~ "${3}" ]] 
-	then
-		echo "Running query: ${j}"
-		log_file="$(basename ${j}).$(date +%Y%m%d).log"
-		log_base_path=$(dirname ${j/queries/query_logs})
-		mkdir -p ${log_base_path}
-		time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -frame-size 10000 -repeatexec 10 > ${log_base_path}/${log_file} 2>&1
-	fi;
+    if [ -z "${3}" ] || [[ "${j}" =~ "${3}" ]] 
+    then
+        echo "Running query: ${j}"
+        log_file="$(basename ${j}).$(date +%Y%m%d).log"
+        log_base_path=$(dirname ${j/queries/query_logs})
+        mkdir -p ${log_base_path}
+        time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -frame-size 10000 -repeatexec 10 > ${log_base_path}/${log_file} 2>&1
+    fi;
 done
 


[22/51] [abbrv] git commit: avoid a few exceptions

Posted by vi...@apache.org.
avoid a few exceptions


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/bc54c0d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/bc54c0d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/bc54c0d8

Branch: refs/heads/vxquery_0_3_staging
Commit: bc54c0d83ae55c6b8fc67c454b5fc3b959a99f26
Parents: a09d1f5
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 22:05:49 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Thu Apr 3 22:05:49 2014 -0700

----------------------------------------------------------------------
 ...ueryLogicalExpressionPrettyPrintVisitor.java | 28 ++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/bc54c0d8/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 c630837..e6d8dd1 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
@@ -40,6 +40,7 @@ import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.StatefulFunctionC
 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;
 
@@ -90,7 +91,23 @@ public class VXQueryLogicalExpressionPrettyPrintVisitor implements ILogicalExpre
     @Override
     public String visitAggregateFunctionCallExpression(AggregateFunctionCallExpression expr, Integer indent)
             throws AlgebricksException {
-        return appendFunction(new StringBuilder(), expr, indent).toString();
+        if (expr.isTwoStep()) {
+            IFunctionInfo step1Agg = expr.getStepOneAggregate();
+            String step1 = (step1Agg != null ? step1Agg.getFunctionIdentifier().toString() : "null");
+            IFunctionInfo step2Agg = expr.getStepTwoAggregate();
+            String step2 = (step2Agg != null ? step2Agg.getFunctionIdentifier().toString() : "null");
+            StringBuilder sb = new StringBuilder();
+            sb.append("function-call: [" + step1 + "|" + step2 + "], Args:");
+            appendArguments(sb, expr.getArguments(), indent + 2);
+            return sb.toString();
+        } else if (expr.getFunctionInfo() == null) {
+            StringBuilder sb = new StringBuilder();
+            sb.append("function-call: [null], Args:");
+            appendArguments(sb, expr.getArguments(), indent + 2);
+            return sb.toString();
+        } else {
+            return appendFunction(new StringBuilder(), expr, indent).toString();
+        }
     }
 
     @Override
@@ -138,15 +155,16 @@ public class VXQueryLogicalExpressionPrettyPrintVisitor implements ILogicalExpre
             throws AlgebricksException {
         assert expr.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL;
         FunctionIdentifier fi = expr.getFunctionIdentifier();
-        if (identifiesTypeOperator(fi) || identifiesPathStep(fi)) {
-            final ILogicalExpression typeEx = expr.getArguments().get(1).getValue();
+        List<Mutable<ILogicalExpression>> args = expr.getArguments();
+        if ((identifiesTypeOperator(fi) || identifiesPathStep(fi)) && args.size() > 1) {
+            final ILogicalExpression typeEx = args.get(1).getValue();
             assert typeEx.getExpressionTag() == LogicalExpressionTag.CONSTANT;
             SequenceType type = getSequenceType((ConstantExpression) typeEx);
             sb.append(fi + " <" + type + ">, Args:");
-            appendArgument(sb, expr.getArguments().get(0), indent + 2);
+            appendArgument(sb, args.get(0), indent + 2);
         } else {
             sb.append("function-call: " + fi + ", Args:");
-            appendArguments(sb, expr.getArguments(), indent + 2);            
+            appendArguments(sb, args, indent + 2);
         }
         return sb;
     }


[07/51] [abbrv] Updated the testing resources.

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml
new file mode 100644
index 0000000..d920d31
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml
@@ -0,0 +1,36 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>Aggregate Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
+      <query name="avg" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">avg.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
+      <query name="count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 4 partition.</description>
+      <query name="min" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">min.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 4 partition.</description>
+      <query name="max" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">max.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 4 partition.</description>
+      <query name="sum" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">sum.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml
new file mode 100644
index 0000000..515738e
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Count Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="q02_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+      <query name="q03_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+      <query name="q05_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+      <query name="q07_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_count.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml
new file mode 100644
index 0000000..8bb590b
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition2Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Count Partition 2</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
+      <query name="q02_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
+      <query name="q03_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
+      <query name="q05_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
+      <query name="q07_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_count.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml
new file mode 100644
index 0000000..ff75d3a
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Count Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
+      <query name="q02_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
+      <query name="q03_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
+      <query name="q05_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
+      <query name="q07_count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_count.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml
new file mode 100644
index 0000000..1237971
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml
@@ -0,0 +1,54 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q00 from the weather benchmark with 1 partition.</description>
+      <query name="q00" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q00.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q01 from the weather benchmark with 1 partition.</description>
+      <query name="q01" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q01.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q02 from the weather benchmark with 1 partition.</description>
+      <query name="q02" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q03 from the weather benchmark with 1 partition.</description>
+      <query name="q03" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q04 from the weather benchmark with 1 partition.</description>
+      <query name="q04" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q04.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q05 from the weather benchmark with 1 partition.</description>
+      <query name="q05" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q06 from the weather benchmark with 1 partition.</description>
+      <query name="q06" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q06.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q07 from the weather benchmark with 1 partition.</description>
+      <query name="q07" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml
new file mode 100644
index 0000000..86b5cf0
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml
@@ -0,0 +1,54 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q00 from the weather benchmark with 2 partitions.</description>
+      <query name="q00" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q00.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q01 from the weather benchmark with 2 partitions.</description>
+      <query name="q01" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q01.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q02 from the weather benchmark with 2 partitions.</description>
+      <query name="q02" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q03 from the weather benchmark with 2 partitions.</description>
+      <query name="q03" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q04 from the weather benchmark with 2 partitions.</description>
+      <query name="q04" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q04.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q05 from the weather benchmark with 2 partitions.</description>
+      <query name="q05" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q06 from the weather benchmark with 2 partitions.</description>
+      <query name="q06" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q06.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q07 from the weather benchmark with 2 partitions.</description>
+      <query name="q07" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml
new file mode 100644
index 0000000..232a7b0
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml
@@ -0,0 +1,54 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q00 from the weather benchmark with 4 partitions.</description>
+      <query name="q00" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q00.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q01 from the weather benchmark with 4 partitions.</description>
+      <query name="q01" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q01.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q02 from the weather benchmark with 4 partitions.</description>
+      <query name="q02" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q03 from the weather benchmark with 4 partitions.</description>
+      <query name="q03" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q04 from the weather benchmark with 4 partitions.</description>
+      <query name="q04" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q04.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q05 from the weather benchmark with 4 partitions.</description>
+      <query name="q05" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q06 from the weather benchmark with 4 partitions.</description>
+      <query name="q06" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q06.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Execution of q07 from the weather benchmark with 4 partitions.</description>
+      <query name="q07" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml
new file mode 100644
index 0000000..0c22422
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Records Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="q02_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+      <query name="q03_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+      <query name="q05_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+      <query name="q07_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_records.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml
new file mode 100644
index 0000000..929ff28
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition2Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Records Partition 2</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
+      <query name="q02_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
+      <query name="q03_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
+      <query name="q05_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
+      <query name="q07_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_records.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml
new file mode 100644
index 0000000..03eea78
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml
@@ -0,0 +1,30 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Records Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
+      <query name="q02_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q02_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
+      <query name="q03_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q03_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
+      <query name="q05_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q05_records.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
+      <query name="q07_records" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">q07_records.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/avg.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/avg.txt
deleted file mode 100644
index 7ef6ffe..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/avg.txt
+++ /dev/null
@@ -1 +0,0 @@
-12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/count.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/count.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/count.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/max.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/max.txt
deleted file mode 100644
index dc7b54a..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/max.txt
+++ /dev/null
@@ -1 +0,0 @@
-33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/min.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/min.txt
deleted file mode 100644
index ea1acb6..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/min.txt
+++ /dev/null
@@ -1 +0,0 @@
-11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/sum.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/sum.txt
deleted file mode 100644
index 2b82dfe..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-1/sum.txt
+++ /dev/null
@@ -1 +0,0 @@
-60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/avg.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/avg.txt
deleted file mode 100644
index 7ef6ffe..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/avg.txt
+++ /dev/null
@@ -1 +0,0 @@
-12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/count.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/count.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/count.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/max.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/max.txt
deleted file mode 100644
index dc7b54a..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/max.txt
+++ /dev/null
@@ -1 +0,0 @@
-33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/min.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/min.txt
deleted file mode 100644
index ea1acb6..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/min.txt
+++ /dev/null
@@ -1 +0,0 @@
-11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/sum.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/sum.txt
deleted file mode 100644
index 2b82dfe..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-2/sum.txt
+++ /dev/null
@@ -1 +0,0 @@
-60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/avg.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/avg.txt
deleted file mode 100644
index 7ef6ffe..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/avg.txt
+++ /dev/null
@@ -1 +0,0 @@
-12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/count.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/count.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/count.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/max.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/max.txt
deleted file mode 100644
index dc7b54a..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/max.txt
+++ /dev/null
@@ -1 +0,0 @@
-33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/min.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/min.txt
deleted file mode 100644
index ea1acb6..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/min.txt
+++ /dev/null
@@ -1 +0,0 @@
-11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/sum.txt b/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/sum.txt
deleted file mode 100644
index 2b82dfe..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Aggregate/Partition-4/sum.txt
+++ /dev/null
@@ -1 +0,0 @@
-60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q00.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
deleted file mode 100644
index e6116d0..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q01.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
deleted file mode 100644
index ff4bc9b..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
+++ /dev/null
@@ -1 +0,0 @@
-<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q02.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q03.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
deleted file mode 100644
index f30101c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q04.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
deleted file mode 100644
index c5b9925..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q05.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
deleted file mode 100644
index 9f5aceb..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q06.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
deleted file mode 100644
index ca942fc..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<displayName>Station 2</displayName>
-<date>2002-02-02T00:00:00.000</date>
-<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q07.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
deleted file mode 100644
index bfda7af..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q00.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
deleted file mode 100644
index e6116d0..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q01.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
deleted file mode 100644
index ff4bc9b..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
+++ /dev/null
@@ -1 +0,0 @@
-<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q02.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q03.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
deleted file mode 100644
index f30101c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q04.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
deleted file mode 100644
index c5b9925..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q05.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
deleted file mode 100644
index 9f5aceb..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q06.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
deleted file mode 100644
index ca942fc..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<displayName>Station 2</displayName>
-<date>2002-02-02T00:00:00.000</date>
-<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q07.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
deleted file mode 100644
index bfda7af..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q00.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
deleted file mode 100644
index e6116d0..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q01.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
deleted file mode 100644
index ff4bc9b..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
+++ /dev/null
@@ -1 +0,0 @@
-<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q02.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q03.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
deleted file mode 100644
index f30101c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q04.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
deleted file mode 100644
index c5b9925..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
-<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q05.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
deleted file mode 100644
index 9f5aceb..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q06.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
deleted file mode 100644
index ca942fc..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<displayName>Station 2</displayName>
-<date>2002-02-02T00:00:00.000</date>
-<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q07.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
deleted file mode 100644
index bfda7af..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
deleted file mode 100644
index a533a86..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
deleted file mode 100644
index 8d77b4d..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<value>31</value>
-<value>32</value>
-<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
deleted file mode 100644
index 802ab3c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
deleted file mode 100644
index fdd1637..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-19.75
-19.5
-19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
deleted file mode 100644
index a533a86..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
deleted file mode 100644
index 8d77b4d..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<value>31</value>
-<value>32</value>
-<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
deleted file mode 100644
index 802ab3c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
deleted file mode 100644
index fdd1637..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-19.75
-19.5
-19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
deleted file mode 100644
index a533a86..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
deleted file mode 100644
index 8d77b4d..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<value>31</value>
-<value>32</value>
-<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
deleted file mode 100644
index 802ab3c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
+++ /dev/null
@@ -1 +0,0 @@
-<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
deleted file mode 100644
index fdd1637..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-19.75
-19.5
-19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/avg.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/avg.xq
deleted file mode 100644
index 12cfc02..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/avg.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the average minimum temperature.                                            :)
-fn:avg(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/count.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/count.xq
deleted file mode 100644
index 3a2609b..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the number of wind sensor readings.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "AWND" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/max.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/max.xq
deleted file mode 100644
index 161b409..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/max.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest max temperature.                                            :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/min.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/min.xq
deleted file mode 100644
index 0a135d1..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/min.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the lowest min temperature.                                            :)
-fn:min(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/sum.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/sum.xq
deleted file mode 100644
index 91a2c4c..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-1/sum.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the total precipitation.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    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/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/avg.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/avg.xq
deleted file mode 100644
index 864fdb9..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/avg.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the average minimum temperature.                                            :)
-fn:avg(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/count.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/count.xq
deleted file mode 100644
index 3ad16b6..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the number of wind sensor readings.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "AWND" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/max.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/max.xq
deleted file mode 100644
index 82b1061..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/max.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest max temperature.                                            :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/min.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/min.xq
deleted file mode 100644
index d990aff..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/min.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the lowest min temperature.                                            :)
-fn:min(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/sum.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/sum.xq
deleted file mode 100644
index 8c9bea9..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-2/sum.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the total precipitation.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    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/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/avg.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/avg.xq
deleted file mode 100644
index d50166d..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/avg.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the average minimum temperature.                                            :)
-fn:avg(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/count.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/count.xq
deleted file mode 100644
index cebf3e6..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the number of wind sensor readings.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "AWND" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/max.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/max.xq
deleted file mode 100644
index ba4f771..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/max.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest max temperature.                                            :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/min.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/min.xq
deleted file mode 100644
index b37f462..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/min.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the lowest min temperature.                                            :)
-fn:min(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMIN" 
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/sum.xq b/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/sum.xq
deleted file mode 100644
index c41c7b6..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Aggregate/Partition-4/sum.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the total precipitation.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "PRCP" 
-    return $r/value
-)
\ No newline at end of file


[28/51] [abbrv] git commit: Fixed benchmark reference to query files.

Posted by vi...@apache.org.
Fixed benchmark reference to query files.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/e2295023
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/e2295023
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/e2295023

Branch: refs/heads/vxquery_0_3_staging
Commit: e2295023bf6b063ed9d0bd52677fec935508a32d
Parents: 55c809b
Author: Preston Carman <pr...@apache.org>
Authored: Sun Apr 6 08:37:54 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:09:08 2014 -0700

----------------------------------------------------------------------
 .../main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e2295023/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
index be95ef8..081f80a 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py
@@ -35,7 +35,7 @@ class WeatherBenchmark:
     QUERY_REPLACEMENT_KEY = "/tmp/1.0_partition_ghcnd_all_xml/"
     QUERY_MASTER_FOLDER = "../queries/"
     QUERY_FILE_LIST = ["q00.xq", "q01.xq", "q02.xq", "q03.xq", "q04.xq", "q05.xq", "q06.xq", "q07.xq"] 
-    QUERY_UTILITY_LIST = ["sensor_count.xq", "station_count.xq", "q04_sensor.xq", "q04_station.xq", "q05_sensor.xq", "q05_station.xq", "q06_tmin.xq", "q06_tmax.xq", "q07_sensor.xq", "q07_station.xq"] 
+    QUERY_UTILITY_LIST = ["sensor_count.xq", "station_count.xq", "q04_sensor.xq", "q04_station.xq", "q05_sensor.xq", "q05_station.xq", "q06_sensor.xq", "q06_station.xq", "q07_tmin.xq", "q07_tmax.xq"] 
     BENCHMARK_LOCAL_TESTS = ["local_speed_up", "local_batch_scale_out"] 
     BENCHMARK_CLUSTER_TESTS = ["speed_up", "batch_scale_out"] 
     QUERY_COLLECTIONS = ["sensors", "stations"]


[02/51] [abbrv] Updated the testing resources.

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/XQTSCatalogSubmission.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/XQTSCatalogSubmission.xml b/vxquery-xtest/tests/XQTSCatalogSubmission.xml
deleted file mode 100644
index 1ce710e..0000000
--- a/vxquery-xtest/tests/XQTSCatalogSubmission.xml
+++ /dev/null
@@ -1,4774 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type="text/xsl" href="XQTSCatalog.xsl" ?><test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" CatalogDesignDate="2003-04-03" version="1.0.3" SourceOffsetPath="./" ResultOffsetPath="ExpectedTestResults/" XQueryQueryOffsetPath="Queries/XQuery/" XQueryXQueryOffsetPath="Queries/XQueryX/" XQueryFileExtension=".xq" XQueryXFileExtension=".xqx" xsi:schemaLocation="http://www.w3.org/2005/02/query-test-XQTSCatalog XQTSCatalog.xsd">
-<test-suite-info>
-<title>XQuery Test Suite 1.0.3 (under development)</title>
-<description> 
-         Test Suite for XQuery 1.0. 
-         See http://www.w3.org/XML/Query/test-suite/. 
-    </description>
-</test-suite-info>
-<citations>
-<citation-spec name="XQuery">
-<description last-mod="2007-01-23">XQuery 1.0: An XML Query Language</description>
-<spec-URI>http://www.w3.org/TR/xquery/</spec-URI>
-</citation-spec>
-<citation-spec name="FuncOps">
-<description last-mod="2007-01-23">XQuery 1.0 and XPath 2.0 Functions and Operators</description>
-<spec-URI>http://www.w3.org/TR/xpath-functions/</spec-URI>
-</citation-spec>
-<citation-spec name="DataModel">
-<description last-mod="2007-01-23">XQuery 1.0 and XPath 2.0 Data Model</description>
-<spec-URI>http://www.w3.org/TR/xpath-datamodel/</spec-URI>
-</citation-spec>
-<citation-spec name="FormalSemantics">
-<description last-mod="2007-01-23">XQuery 1.0 and XPath 2.0 Formal Semantics</description>
-<spec-URI>http://www.w3.org/TR/xquery-semantics/</spec-URI>
-</citation-spec>
-<citation-spec name="SchemaPart2">
-<description last-mod="2003-03-25">XML Schema Part 2: Datatypes</description>
-<spec-URI>http://www.w3.org/TR/xmlschema-2/</spec-URI>
-</citation-spec>
-<citation-spec name="Schema-Errata">
-<description last-mod="2003-03-25">XML Schema Errata</description>
-<note>Current practice is to have one Errata document for all parts of Schema.</note>
-<spec-URI>http://www.w3.org/2001/05/xmlschema-errata</spec-URI>
-</citation-spec>
-<citation-spec name="UseCases">
-<description last-mod="2006-07-12">XML Query Use Cases</description>
-<spec-URI>http://www.w3c.org/TR/xquery-use-cases/</spec-URI>
-</citation-spec>
-<citation-spec name="XQueryX">
-<description last-mod="2007-01-23">XML Syntax for XQuery 1.0 (XQueryX)</description>
-<spec-URI>http://www.w3.org/TR/xqueryx/</spec-URI>
-</citation-spec>
-<citation-spec name="Serialization">
-<description last-mod="2007-01-23">XSLT 2.0 and XQuery 1.0 Serialization</description>
-<spec-URI>http://www.w3.org/TR/xslt-xquery-serialization/</spec-URI>
-</citation-spec>
-</citations>
-<comparisons>
-<comparison name="XML">
-<description last-mod="2003-03-25">The XML InfoSets should be canonicalized and compared.</description>
-</comparison>
-<comparison name="Fragment">
-<description last-mod="2004-10-20">
-            A 'fragment' refers to an XML based instance which has multiple top-level elements and NO XML declaration.
-            The comparator for this should simply wrap the entire fragment in a container element and perform XML comparison.
-         </description>
-</comparison>
-<comparison name="Text">
-<description last-mod="2003-03-25">
-            Each line of non-whitespace text should match. New-line sequences
-            may vary and should be neutralized. Due to issues with the XML serialization of certain characters (e.g. '&lt;'),
-            it is not possible to simply compare the actual and expected results. Rather (as is the case with the 'Fragment' comparator)
-            the test harness should convert the results into valid XML (by adding a container element) and perform comparison
-            on the XML canonicalized versions of the results.
-         </description>
-</comparison>
-<comparison name="Ignore">
-<description last-mod="2003-03-25">
-            Only the presence/absence of this file is significant,
-            not its content.
-         </description>
-</comparison>
-<comparison name="Inspect">
-<description last-mod="2003-03-25">
-            Automated comparison is not possible. the output should be
-            inspected by a human.
-         </description>
-</comparison>
-</comparisons>
-<roles>
-<role name="principal-data">
-<description last-mod="2003-03-25">
-            This is the source that is handed in to the processor as the
-            initial input sequence, setting the "evaluation context" as described in XQuery chapter 2.
-         </description>
-</role>
-<role name="supplemental-data">
-<description last-mod="2003-03-25">
-            These are sources that may be read by functions such as
-            fn:document() as the query is evaluated.
-         </description>
-</role>
-<role name="schema">
-<description last-mod="2003-03-25">
-            These are schema definitions that may be referenced by sources
-            or in the query.
-         </description>
-</role>
-<role name="dtd">
-<description last-mod="2003-03-25">
-            These are dtd definitions that may be referenced by sources
-            or in the query.
-         </description>
-</role>
-<role name="principal">
-<description last-mod="2003-03-25">
-            This is an output (either text or XML) that will contain the
-            query results. If the processor invocation sequence accepts a filename for results, this name may be
-            passed, possibly prefixed by a partial directory path to allow storage of the results in a separate
-            directory tree.
-         </description>
-</role>
-<role name="console-log">
-<description last-mod="2003-03-25">
-            This is an output (text file tagged .log) that will contain the
-            captured "console" output for a command-line invocation, or equivalent messages from a harness. The
-            main goal is to capture error messages that came from the processor.
-         </description>
-<note>
-            A test lab may choose to capture console output for every test case, in which case the presence
-            of this element is a signal that the console log of this test contains messages that are significant to
-            the pass/fail determination.
-         </note>
-</role>
-</roles>
-<scenarios>
-<scenario name="standard">
-<description last-mod="2005-06-10">
-            A query this is expected to produce valid results. Principal input should always be specified, even if the query doesn't have any PathExpr.
-         </description>
-</scenario>
-<scenario name="parse-error">
-<description last-mod="2005-06-10">
-            A query this is expected to raise a parsing/syntax error at query parse time. Principal input should always be specified, even if the query doesn't have any PathExpr.
-         </description>
-</scenario>
-<scenario name="runtime-error">
-<description last-mod="2005-06-10">
-            A query this is expected to raise a runtime error at query parse time. Runtime errors in this case include those raised by static typing rules. Principal input should always be specified, even if the query doesn't have any PathExpr.
-         </description>
-</scenario>
-<scenario name="trivial">
-<description last-mod="2006-03-29">
-            A query this is expected to produce valid results. Principal input should always be specified, even if the query doesn't have any PathExpr.
-            The initial query returns an &lt;xqx:xquery&gt; element (Trivial Embedding of XQuery).
-            This embedded query is then executed to produce the final result.
-         </description>
-</scenario>
-</scenarios>
-<sources>
-<source ID="XQTSCatalog" FileName="XQTSCatalog.xml" Creator="XQuery Test Task Force" schema="XQTSCatalogxsd">
-<description last-mod="2005-04-14">XQuery Test Suite Catalog</description>
-</source>
-<source ID="bib2" FileName="TestSources/bib2.xml" Creator="spec-authors">
-<description last-mod="2003-03-25">Bibliography example with extra comments and PIs.</description>
-</source>
-<source ID="emptydoc" FileName="TestSources/emptydoc.xml" Creator="David Marston">
-<description last-mod="2003-03-25">Contains just a "doc" element, no comments/text/PIs.</description>
-</source>
-<source ID="fsx" FileName="TestSources/fsx.xml" Creator="Mike Rorke">
-<description last-mod="2003-03-25">Data about a filesystem represented in XML.</description>
-</source>
-<source ID="fsx_NS" FileName="TestSources/fsx_NS.xml" Creator="Mike Rorke">
-<description last-mod="2003-03-25">Data about a filesystem represented in XML with namespace-qualified names.</description>
-</source>
-<source ID="MixNS" FileName="TestSources/MixNS.xml" Creator="David Marston">
-<description last-mod="2003-03-25">Small tree with element names in mixed namespaces.</description>
-<note>Use @index to identify elements precisely.</note>
-</source>
-<source ID="nw_Customers" FileName="TestSources/nw_Customers.xml" Creator="Kuen Siew">
-<description last-mod="2003-03-25">Customer name/address file with some non-ASCII characters.</description>
-</source>
-<source ID="TopMany" FileName="TestSources/TopMany.xml" Creator="David Marston">
-<description last-mod="2003-03-25">Like TreeCompass, but with comments and PIs off the root. PI targets vary.</description>
-<note>All text nodes must have non-whitespace characters.</note>
-</source>
-<source ID="Tree1Child" FileName="TestSources/Tree1Child.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has just one child, of an abnormal name, off the center node.</description>
-<note>One attribute each on west and center.</note>
-</source>
-<source ID="Tree1Text" FileName="TestSources/Tree1Text.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has just a text node and no child element off the center node.</description>
-</source>
-<source ID="TreeCompass" FileName="TestSources/TreeCompass.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A tree intended to allow many kinds of path expressions.</description>
-<note>Need multiple attributes on center, west, and south, plus @mark scattered around.</note>
-<note>Mix of text and element children in many places, but east should have only a text node.</note>
-<note>All text nodes must have non-whitespace characters.</note>
-<note>Top element is far-north.</note>
-</source>
-<source ID="TreeEmpty" FileName="TestSources/TreeEmpty.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has just one "south" element at the top, bearing one "mark" attribute.</description>
-</source>
-<source ID="TreeRepeat" FileName="TestSources/TreeRepeat.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has center elements off the real center node.</description>
-<note>Use @mark to distinguish center elements.</note>
-<note>"Real" center must have multiple element children, some with duplicate names (south-east).</note>
-<note>Repeating attribute names used, including same name on elements of the same name.</note>
-<note>Comments and text nodes are strewn about. All text nodes must have non-whitespace characters.</note>
-</source>
-<source ID="TreeStack" FileName="TestSources/TreeStack.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has several "south" elements, some stacked within each other.</description>
-<note>Use "mark" attributes at several levels and on all south elements.</note>
-</source>
-<source ID="TreeTrunc" FileName="TestSources/TreeTrunc.xml" Creator="David Marston">
-<description last-mod="2003-03-25">A "compass" tree that has no content at all in center or west, no attributes anywhere.</description>
-</source>
-<source ID="xq311A" FileName="TestSources/xq311A.xml" Creator="David Marston">
-<description last-mod="2003-03-25">Data that fits first example in XQuery 3.11.</description>
-</source>
-<source ID="xq311B" FileName="TestSources/xq311B.xml" Creator="David Marston">
-<description last-mod="2003-03-25">Data that fits later examples in XQuery 3.11.</description>
-</source>
-<source ID="DupNode" FileName="TestSources/DupNode.xml" Creator="Andreas Behm">
-<description last-mod="2005-04-26">Simple document with all node kinds</description>
-</source>
-<source ID="inscope" FileName="TestSources/inscope.xml" Creator="Andreas Behm">
-<description last-mod="2005-08-26">Simple document with namespaces</description>
-</source>
-<source ID="nsmode" FileName="TestSources/nsmode.xml" Creator="Andreas Behm">
-<description last-mod="2005-04-26">Source document for namespace copy modes</description>
-</source>
-<source ID="works" FileName="TestSources/works.xml" Creator="Carmelo Montanez">
-<description last-mod="2005-03-04">Data for various NIST tests</description>
-</source>
-<source ID="examples" FileName="TestSources/examples.xml" Creator="Carmelo Montanez" schema="examplesxsd">
-<description last-mod="2006-05-19">Data for fn-data-1 test.</description>
-</source>
-<source ID="works-mod" FileName="TestSources/works-mod.xml" Creator="Carmelo Montanez">
-<description last-mod="2005-03-04">Data for various NIST tests (abbreviated, unabbreviated syntax)</description>
-</source>
-<source ID="lang" FileName="TestSources/lang.xml" Creator="Carmelo Montanez">
-<description last-mod="2005-10-19">Data for fn:lang tests.</description>
-</source>
-<source ID="staff" FileName="TestSources/staff.xml" Creator="Carmelo Montanez">
-<description last-mod="2005-03-04">Data for various NIST tests</description>
-</source>
-<source ID="acme_corp" FileName="TestSources/acme_corp.xml" Creator="Ravindranath Chennoju">
-<description last-mod="2005-08-30">Source document for Function Declaration tests</description>
-</source>
-<source ID="bib" FileName="TestSources/bib.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-</source>
-<source ID="reviews" FileName="TestSources/reviews.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-</source>
-<source ID="books" FileName="TestSources/books.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-</source>
-<source ID="prices" FileName="TestSources/prices.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query XMP use cases</description>
-</source>
-<source ID="book" FileName="TestSources/book.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query TREE use cases</description>
-</source>
-<source ID="report1" FileName="TestSources/report1.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query SEQ use cases</description>
-</source>
-<source ID="items" FileName="TestSources/items.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query RDB use cases</description>
-</source>
-<source ID="bids" FileName="TestSources/bids.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query RDB use cases</description>
-</source>
-<source ID="users" FileName="TestSources/users.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query RDB use cases</description>
-</source>
-<source ID="string" FileName="TestSources/string.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query STRING use cases</description>
-</source>
-<source ID="company-data" FileName="TestSources/company-data.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query STRING use cases</description>
-</source>
-<source ID="auction" FileName="TestSources/auction.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query NS use cases</description>
-</source>
-<source ID="partlist" FileName="TestSources/partlist.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query PARTS use cases</description>
-</source>
-<source ID="sgml" FileName="TestSources/sgml.xml" Creator="XML Query WG">
-<description last-mod="2005-02-11">Data for the the XML Query SGML use cases</description>
-</source>
-<source ID="atomic" FileName="TestSources/atomic.xml" Creator="Carmelo Montanez" schema="atomicxsd">
-<description last-mod="2005-03-08">A Schema validated xml file, that contains values for data types. Can be used by any test.</description>
-</source>
-<source ID="id-idref-dtd" FileName="TestSources/iddtd.xml" Creator="Carmelo Montanez">
-<description last-mod="2006-06-28">A DTD validated xml file, that contains data for the ID/IDREF function tests.</description>
-</source>
-<source ID="atomicns" FileName="TestSources/atomicns.xml" Creator="Carmelo Montanez">
-<description last-mod="2006-03-15">A non schema validated xml file, that contains values for data types. Can be used by any test.</description>
-</source>
-<source ID="orderData" FileName="TestSources/orderData.xml" Creator="Carmelo Montanez" schema="orderDataxsd">
-<description last-mod="2005-06-01">A Schema validated xml file, that contains values for some of the order by tests generated by NIST.</description>
-</source>
-<source ID="id-idref" FileName="TestSources/id.xml" Creator="Carmelo Montanez" schema="idxsd">
-<description last-mod="2006-05-12">Data for id and idref related functions (schema-based).</description>
-</source>
-<source ID="id-idref2" FileName="TestSources/id2.xml" Creator="Michael Kay" schema="idxsd">
-<description last-mod="2009-03-06">More data for id and idref related functions (schema-based).</description>
-</source>
-<source ID="SpecialTypes" FileName="TestSources/SpecialTypes.xml" Creator="Mike Rorke" schema="SpecialTypesXSD">
-<description last-mod="2005-06-01">A Schema validated XML file containing certain special types e.g. interleave types, union types, anySimpleType</description>
-</source>
-<source ID="QNameSource" FileName="TestSources/QName-source.xml" Creator="Mike Rorke" schema="QNameSourceXSD">
-<description last-mod="2005-09-28">A schema validated XML file containing QName and QName derived types.</description>
-</source>
-<source ID="notation" FileName="TestSources/notation.xml" Creator="Andreas Behm" schema="notationschema">
-<description last-mod="2005-10-10">A Scehma validated xml file with NOTATION elements</description>
-</source>
-<source ID="textWithSpaces" FileName="TestSources/textWithSpaces.xml" Creator="Joanne Tong">
-<description last-mod="2005-09-29">Data for normalize-space functions</description>
-</source>
-<source ID="XMarkAuction" FileName="TestSources/XMarkAuction.xml" Creator="Frans Englich">
-<description last-mod="2007-03-09">Source file generated XML Benchmark Project's xmlgen utility. See http://www.xml-benchmark.org/.</description>
-</source>
-<source ID="CPPGlobals" FileName="TestSources/CPPGlobals.xml" Creator="Frans Englich">
-<description last-mod="2007-06-27">The declarations of a C++ file described in XML.</description>
-</source>
-<source ID="MainWindow" FileName="TestSources/MainWindow.ui" Creator="Frans Englich">
-<description last-mod="2007-07-09">A description of an graphical user interface.</description>
-</source>
-<source ID="ComplexWhitespace" FileName="TestSources/ComplexWhitespace.xml" Creator="Frans Englich">
-<description last-mod="2007-07-09">A file containing different forms of whitespace.</description>
-</source>
-<source ID="SpaceBracket" FileName="TestSources/SpaceBracket.xml" Creator="Frans Englich">
-<description last-mod="2007-12-20">A file containing ' ]' as a text node.</description>
-</source>
-<source ID="HighUnicode" FileName="TestSources/HighUnicode.xml" Creator="Frans Englich">
-<description last-mod="2007-12-20">Corner case unicode codepoints.</description>
-</source>
-<source ID="HighUnicode2" FileName="TestSources/HighUnicode2.xml" Creator="Frans Englich">
-<description last-mod="2007-12-21">Corner case unicode codepoints, second case.</description>
-</source>
-<source ID="BCIsInvalid" FileName="TestSources/BCisInvalid.xml" Creator="Frans Englich">
-<description last-mod="2007-12-21">An element name containing 0xBC.</description>
-</source>
-<source ID="InvalidUmlaut" FileName="TestSources/InvalidUmlaut.xml" Creator="Frans Englich">
-<description last-mod="2007-12-27">Contains the codepoint 188 in an NCName.</description>
-</source>
-<source ID="NamespaceSuppliedInternally" FileName="TestSources/NamespaceSuppliedInternally.xml" Creator="Frans Englich">
-<description last-mod="2007-12-27">A namespace declared with a namespace declaration, as well as in the internal subset.</description>
-</source>
-<source ID="XMLIdDuplicated" FileName="TestSources/XMLIdDuplicated.xml" Creator="Frans Englich">
-<description last-mod="2008-01-15">An XML file which has two xml:id attributes with the same value.</description>
-</source>
-<source ID="InvalidXMLId" FileName="TestSources/InvalidXMLId.xml" Creator="Frans Englich">
-<description last-mod="2008-01-15">An XML file which has an invalid xml:id attribute.</description>
-</source>
-<source ID="UsingXMLId" FileName="TestSources/UsingXMLId.xml" Creator="Frans Englich">
-<description last-mod="2008-01-15">An XML file which has xml:id attributes.</description>
-</source>
-<source ID="Books2" FileName="TestSources/Books2.xml" Creator="Frans Englich">
-<description last-mod="2008-01-17">An XML which is in ISO-8859-1 encoding.</description>
-</source>
-<source ID="QObject" FileName="TestSources/QObject.xml" Creator="Frans Englich">
-<description last-mod="2008-02-19"/>
-</source>
-<source ID="Char010D" FileName="TestSources/0x010D.xml" Creator="Frans Englich">
-<description last-mod="2008-02-28"/>
-</source>
-<source ID="SmallTree" FileName="TestSources/SmallTree.xml" Creator="Frans Englich">
-<description last-mod="2008-04-03"/>
-</source>
-<source ID="AttributesAndElements" FileName="TestSources/AttributesAndElements.xml" Creator="Frans Englich">
-<description last-mod="2008-04-03"/>
-</source>
-<source ID="functx_prices" FileName="TestSources/functx_prices.xml" Creator="Frans Englich">
-<description last-mod="2008-05-16"/>
-</source>
-<source ID="functx_order" FileName="TestSources/functx_order.xml" Creator="Frans Englich">
-<description last-mod="2008-05-16"/>
-</source>
-<source ID="functx_cats" FileName="TestSources/functx_cats.xml" Creator="Frans Englich">
-<description last-mod="2008-05-16"/>
-</source>
-<source ID="functx_catalog" FileName="TestSources/functx_catalog.xml" Creator="Frans Englich">
-<description last-mod="2008-05-16"/>
-</source>
-<source ID="functx_book" FileName="TestSources/functx_book.xml" Creator="Frans Englich">
-<description last-mod="2008-06-25"/>
-</source>
-<source ID="badxml" FileName="TestSources/badxml.xml" Creator="Frans Englich">
-<description last-mod="2008-05-19"/>
-</source>
-<source ID="builtinEntities" FileName="TestSources/builtinEntities.xml" Creator="Frans Englich">
-<description last-mod="2008-05-26"/>
-</source>
-<source ID="XMLIdWhitespace" FileName="TestSources/XMLIdWhitespace.xml" Creator="Frans Englich">
-<description last-mod="2008-05-27"/>
-</source>
-<source ID="XMLIDMany" FileName="TestSources/XMLIDMany.xml" Creator="Frans Englich">
-<description last-mod="2008-10-24"/>
-</source>
-<source ID="OneTopElement" FileName="TestSources/OneTopElement.xml" Creator="Nicolae Brinza">
-<description last-mod="2009-04-01"/>
-</source>
-<source ID="namespace-sensitive" FileName="TestSources/namespace-sensitive.xml" schema="namespace-sensitive-schema" Creator="Oliver Hallam">
-<description last-mod="2007-02-26">Document containing namespace-sensitive constructs.</description>
-</source>
-<source ID="dm-e005" FileName="TestSources/dm-e005.xml" schema="dm-e005-schema" Creator="Norm Walsh">
-<description last-mod="2010-03-10">Document to test erratum DM.E05.</description>
-</source>
-<source ID="extendedTypes" FileName="TestSources/extendedTypes.xml" schema="extendedTypes-schema" Creator="Oliver Hallam">
-<description last-mod="2010-03-17">Document containing elements with various restricted and extended types.</description>
-</source>
-<source ID="mixed" FileName="TestSources/mixed.xml" schema="mixedcontent" Creator="Oliver Hallam">
-<description last-mod="2010-03-17">Document containing an element with mixed content but statically could have element only content.</description>
-</source>
-<schema ID="XQTSCatalogxsd" uri="http://www.w3.org/2005/02/query-test-XQTSCatalog" FileName="XQTSCatalog.xsd">
-<description last-mod="2005-04-14">Schema for XQTSCatalog</description>
-</schema>
-<schema ID="atomicxsd" uri="http://www.w3.org/XQueryTest" FileName="TestSources/atomic.xsd">
-<description last-mod="2005-03-08">A Schema for atomic.xml</description>
-</schema>
-<schema ID="orderDataxsd" uri="http://www.w3.org/XQueryTestOrderBy" FileName="TestSources/orderData.xsd">
-<description last-mod="2005-06-01">A Schema for orderData.xml</description>
-</schema>
-<schema ID="SpecialTypesXSD" uri="http://www.example.com/typedecl" FileName="TestSources/SpecialTypes.xsd">
-<description last-mod="2005-06-01">A Schema containing certain special types e.g. interleave types, union types, anySimpleType</description>
-</schema>
-<schema ID="QNameSourceXSD" uri="http://www.example.com/QNameXSD" FileName="TestSources/QName-schema.xsd">
-<description last-mod="2005-09-28">A schema containing QName and QName derived types</description>
-</schema>
-<schema ID="notationschema" uri="http://www.example.com/notation" FileName="TestSources/notationschema.xsd">
-<description last-mod="2005-10-10">A Schema for NOTATION data</description>
-</schema>
-<schema ID="idxsd" uri="http://www.w3.org/XQueryTest/ididrefs" FileName="TestSources/id.xsd">
-<description last-mod="2009-03-06">A schema for the id/idref functions tests</description>
-</schema>
-<schema ID="simplexsd" uri="http://www.w3.org/XQueryTest/simple" FileName="TestSources/simple.xsd">
-<description last-mod="2005-12-07">A schema for simple context tests</description>
-</schema>
-<schema ID="examplesxsd" uri="http://www.w3.org/XQueryTest/someExamples" FileName="TestSources/examples.xsd">
-<description last-mod="2006-05-19">A schema for examples.xml.</description>
-</schema>
-<schema ID="userdefined" uri="http://www.w3.org/XQueryTest/userDefinedTypes" FileName="TestSources/userdefined.xsd">
-<description last-mod="2006-04-03">A schema user defined types and constructor tests</description>
-</schema>
-<schema ID="listunion" uri="http://www.w3.org/XQueryTest/ListUnionTypes" FileName="TestSources/listunion.xsd">
-<description last-mod="2006-06-07">A schema defining a list of unions.</description>
-</schema>
-<schema ID="examples2xsd" uri="http://www.w3.org/XQueryTest/someExamples2" FileName="TestSources/examples2.xsd">
-<description last-mod="2009-10-01">Test schema for Errata XQ.E6.</description>
-</schema>
-<schema ID="attribute" uri="http://www.w3.org/XQueryTest/sample" FileName="TestSources/attribute.xsd">
-<description last-mod="2009-04-01">Test schema that contains an attribute declaration.</description>
-</schema>
-<schema ID="mixedcontent" uri="http://www.w3.org/XQueryTest/mixedcontent" FileName="TestSources/mixedcontent.xsd">
-<description last-mod="2009-04-01">Test schema that contains two complex types, one of them with a mixed content.</description>
-</schema>
-<schema ID="simpleContent" uri="http://www.w3.org/query-test/complexSimple" FileName="TestSources/simpleContent.xsd">
-<description last-mod="2009-11-20">Schema for complex types with
-         simple content</description>
-</schema>
-<schema ID="namespace-sensitive-schema" uri="http://www.example.com/test/namespace-sensitive" FileName="TestSources/namespace-sensitive.xsd">
-<description last-mod="2007-02-26">Schema illustrating various namespace-sensitive constructs.</description>
-</schema>
-<schema ID="dm-e005-schema" uri="http://www.example.com/ns/test" FileName="TestSources/dm-e005.xsd">
-<description last-mod="2010-03-10">Schema to test erratum DM.E05.</description>
-</schema>
-<schema ID="xq-e18-schema" uri="http://www.example.com/ns/test/xq-e18" FileName="TestSources/xq-e18.xsd">
-<description last-mod="2010-03-11">Schema to test erratum XQ.E18.</description>
-</schema>
-<schema ID="extendedTypes-schema" uri="http://www.example.com/XQueryTest/extendedTypes" FileName="TestSources/extendedTypes.xsd">
-<description last-mod="2010-03-17">Schema containing extended and restricted types.</description>
-</schema>
-<schema ID="constraints" uri="http://www.w3.org/constraints" FileName="TestSources/constraints.xsd">
-<description last-mod="2010-06-10">Schema with unique/id/idref constraints.</description>
-</schema>
-<collection ID="collection1" Creator="Andrew Eisenberg">
-<description last-mod="2006-06-07">A simple collection of documents.</description>
-<input-document>bib</input-document>
-<input-document>reviews</input-document>
-</collection>
-<collection ID="collection2" Creator="Andrew Eisenberg">
-<description last-mod="2006-06-07">A simple collection of documents.</description>
-<input-document>bib</input-document>
-<input-document>reviews</input-document>
-<input-document>books</input-document>
-</collection>
-<module ID="module1-lib" FileName="TestSources/module1-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-07-13">Library module for "modules-18" query</description>
-</module>
-<module ID="module2-lib" FileName="TestSources/module2-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-07-13">Library module for "modules-18" query</description>
-</module>
-<module ID="empty-lib" FileName="TestSources/empty-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module for "modules-none" query</description>
-</module>
-<module ID="emptyns-lib" FileName="TestSources/emptyns-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with empty namespace</description>
-</module>
-<module ID="test1-lib" FileName="TestSources/test1-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Simple library module</description>
-</module>
-<module ID="test2-lib" FileName="TestSources/test2-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-01-19">Library module with namespace URI set to empty string.</description>
-</module>
-<module ID="test1a-lib" FileName="TestSources/test1a-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Simple library module</description>
-</module>
-<module ID="test1collide1-lib" FileName="TestSources/test1collide1-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with colliding definitions</description>
-</module>
-<module ID="test1collide2-lib" FileName="TestSources/test1collide2-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with colliding definitions</description>
-</module>
-<module ID="test1c1-lib" FileName="TestSources/test1c1-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with circular includes</description>
-</module>
-<module ID="test2c1-lib" FileName="TestSources/test2c1-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with circular includes</description>
-</module>
-<module ID="context-lib" FileName="TestSources/context-lib" Creator="Mary Holstege">
-<description last-mod="2005-12-05">Library module with interesting context</description>
-</module>
-<module ID="module-defs" FileName="TestSources/moduleDefs-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-01-06">Library module with definitions for various NIST tests.</description>
-</module>
-<module ID="modulewrongprefix-lib" FileName="TestSources/moduleDefs-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-03-21">Library module with invalid namespace prefix ("xml")</description>
-</module>
-<module ID="modulesdiffns" FileName="TestSources/modulesdiffns-lib" Creator="Carmelo Montanez">
-<description last-mod="2006-04-11">Library module with variable on different namespace than target.</description>
-</module>
-<module ID="errata6-module1" FileName="TestSources/errata6-module1" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata6-module2" FileName="TestSources/errata6-module2" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata6-module4" FileName="TestSources/errata6-module4" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata6-module5" FileName="TestSources/errata6-module5" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata6-module6" FileName="TestSources/errata6-module6" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata6-module7" FileName="TestSources/errata6-module7" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports a schema and uses types from it.</description>
-</module>
-<module ID="errata8-module1a" FileName="TestSources/errata8-module1a" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a variable from it, testing circular dependencies.</description>
-</module>
-<module ID="errata8-module1b" FileName="TestSources/errata8-module1b" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a function from it, testing circular dependencies.</description>
-</module>
-<module ID="errata8-module2a" FileName="TestSources/errata8-module2a" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a variable from it, testing circular dependencies.</description>
-</module>
-<module ID="errata8-module2b" FileName="TestSources/errata8-module2b" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a function from it, testing circular dependencies.</description>
-</module>
-<module ID="errata8-module3a" FileName="TestSources/errata8-module3a" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a variable from it, testing circular dependencies pass case.</description>
-</module>
-<module ID="errata8-module3b" FileName="TestSources/errata8-module3b" Creator="John Snelson">
-<description last-mod="2009-10-01">Module that imports another module and uses a function from it, testing circular dependencies pass case.</description>
-</module>
-<module ID="module3-lib" FileName="TestSources/module3-lib" Creator="Nicolae Brinza">
-<description last-mod="2009-04-01">Module with simple and schema-element() types, used for functions'parameters and return results.</description>
-</module>
-<module ID="module4-lib" FileName="TestSources/module4-lib" Creator="Nicolae Brinza">
-<description last-mod="2009-04-01">Module with schema-attribute() types, used for functions' parameters and return results.</description>
-</module>
-<module ID="modules-recursive1" FileName="TestSources/modules-recursive1" Creator="Nicolae Brinza">
-<description last-mod="2009-04-01">Module with cyclic recursive imports.</description>
-</module>
-<module ID="modules-recursive2" FileName="TestSources/modules-recursive2" Creator="Nicolae Brinza">
-<description last-mod="2009-04-01">Module with cyclic recursive imports.</description>
-</module>
-<module ID="module-pub-priv" FileName="TestSources/module-pub-priv" Creator="Michael Kay">
-<description last-mod="2009-10-01">Module that contains both private and public function declarations (XQuery 1.1).</description>
-</module>
-</sources>
-<implementation-defined-items>
-<implementation-defined-item name="expressionUnicode" spec="XQuery">
-<description last-mod="2005-04-04">The version of Unicode that is used to construct expressions.</description>
-</implementation-defined-item>
-<implementation-defined-item name="collations" spec="XQuery">
-<description last-mod="2005-04-04">The statically-known collations.</description>
-</implementation-defined-item>
-<implementation-defined-item name="implicitTimezone" spec="XQuery">
-<description last-mod="2005-04-04">The implicit timezone.</description>
-</implementation-defined-item>
-<implementation-defined-item name="warningsMethod" spec="XQuery">
-<description last-mod="2005-04-04">The circumstances in which warnings are raised, and the ways in which warnings are handled.</description>
-</implementation-defined-item>
-<implementation-defined-item name="errorsMethod" spec="XQuery">
-<description last-mod="2005-04-04">The method by which errors are reported to the external processing environment.</description>
-</implementation-defined-item>
-<implementation-defined-item name="XMLVersion" spec="XQuery">
-<description last-mod="2005-10-10">Whether the implementation is based on the rules of [XML 1.0] and [XML Names] or the rules of [XML 1.1] and [XML Names 1.1]. One of these sets of rules must be applied consistently by all aspects of the implementation.</description>
-</implementation-defined-item>
-<implementation-defined-item name="overwrittenContextComponents" spec="XQuery">
-<description last-mod="2005-04-04">Any components of the static context or dynamic context that are overwritten or augmented by the implementation.</description>
-</implementation-defined-item>
-<implementation-defined-item name="axes" spec="XQuery">
-<description last-mod="2005-04-04">Which of the optional axes are supported by the implementation, if the Full-Axis Feature is not supported.</description>
-</implementation-defined-item>
-<implementation-defined-item name="defaultOrderEmpty" spec="XQuery">
-<description last-mod="2005-04-04">The default handling of empty sequences returned by an ordering key (sortspec) in an order by clause (empty least or empty greatest).</description>
-</implementation-defined-item>
-<implementation-defined-item name="pragmas" spec="XQuery">
-<description last-mod="2005-04-04">The names and semantics of any extension expressions (pragmas) recognized by the implementation.</description>
-</implementation-defined-item>
-<implementation-defined-item name="optionDeclarations" spec="XQuery">
-<description last-mod="2005-04-04">The names and semantics of any option declarations recognized by the implementation.</description>
-</implementation-defined-item>
-<implementation-defined-item name="externalFunctionProtocols" spec="XQuery">
-<description last-mod="2005-04-04">Protocols (if any) by which parameters can be passed to an external function, and the result of the function can returned to the invoking query.</description>
-</implementation-defined-item>
-<implementation-defined-item name="moduleLocationHints" spec="XQuery">
-<description last-mod="2005-11-01">The process by which the specific modules to be imported by a module import are identified, if the Module Feature is supported (includes processing of location hints, if any.)</description>
-</implementation-defined-item>
-<implementation-defined-item name="staticTypingExtensions" spec="XQuery">
-<description last-mod="2005-04-04">Any static typing extensions supported by the implementation, if the Static Typing Feature is supported.</description>
-</implementation-defined-item>
-<implementation-defined-item name="serializationInvocation" spec="XQuery">
-<description last-mod="2005-04-04">The means by which serialization is invoked, if the Serialization Feature is supported.</description>
-</implementation-defined-item>
-<implementation-defined-item name="serializationDefaults" spec="XQuery">
-<description last-mod="2005-10-10">The default values for the byte-order-mark, encoding, media-type, normalization-form, omit-xml-declaration, standalone, and version parameters, if the Serialization Feature is supported.</description>
-</implementation-defined-item>
-<implementation-defined-item name="externalFunctionCall" spec="XQuery">
-<description last-mod="2006-08-09">The result of an unsuccessful call to an external function (for example, if the function implementation cannot be found or does not return a value of the declared type).</description>
-</implementation-defined-item>
-<implementation-defined-item name="limits" spec="XQuery">
-<description last-mod="2005-11-01">Limits on ranges of values for various data types, as enumerated in 5.3 Data Model Conformance.</description>
-</implementation-defined-item>
-<implementation-defined-item name="traceDestination" spec="FuncOps">
-<description last-mod="2005-10-10">The destination of the trace output is implementation-defined. See 4 The Trace Function.</description>
-</implementation-defined-item>
-<implementation-defined-item name="integerOperations" spec="FuncOps">
-<description last-mod="2005-10-10">For xs:integer operations, implementations that support limited-precision integer operations must either raise an error [err:FOAR0002] or provide an implementation-defined mechanism that allows users to choose between raising an error and returning a result that is modulo the largest representable integer value. See 6.2 Operators on Numeric Values.</description>
-</implementation-defined-item>
-<implementation-defined-item name="decimalDigits" spec="FuncOps">
-<description last-mod="2005-11-01">For xs:decimal values the number of digits of precision returned by the numeric operators is implementation-defined. See 6.2 Operators on Numeric Values. See also 17.1.3.3 Casting to xs:decimal and 17.1.3.4 Casting to xs:integer.</description>
-</implementation-defined-item>
-<implementation-defined-item name="roundOrTruncate" spec="FuncOps">
-<description last-mod="2005-10-10">If the number of digits in the result exceeds the number of digits that the implementation supports, the result is truncated or rounded in an implementation-defined manner. See 6.2 Operators on Numeric Values. See also 17.1.3.3 Casting to xs:decimal and 17.1.3.4 Casting to xs:integer.</description>
-</implementation-defined-item>
-<implementation-defined-item name="Unicode" spec="FuncOps">
-<description last-mod="2005-11-01">It is implementation-defined which version of Unicode is supported by the features defined in this specification, but it is recommended that the most recent version of Unicode be used. See 7.1 String Types.</description>
-</implementation-defined-item>
-<implementation-defined-item name="normalizationForms" spec="FuncOps">
-<description last-mod="2005-10-10">For 7.4.6 fn:normalize-unicode, conforming implementations must support normalization form "NFC" and may support normalization forms "NFD", "NFKC", "NFKD", "FULLY-NORMALIZED". They may also support other normalization forms with implementation-defined semantics.</description>
-</implementation-defined-item>
-<implementation-defined-item name="collationUnits" spec="FuncOps">
-<description last-mod="2005-10-10">The ability to decompose strings into collation units suitable for substring matching is an implementation-defined property of a collation. See 7.5 Functions Based on Substring Matching.</description>
-</implementation-defined-item>
-<implementation-defined-item name="secondsDigits" spec="FuncOps">
-<description last-mod="2005-10-10">All minimally conforming processors must support year values with a minimum of 4 digits (i.e., YYYY) and a minimum fractional second precision of 1 millisecond or three digits (i.e., s.sss). However, conforming processors may set larger implementation-defined limits on the maximum number of digits they support in these two situations. See 10.1.1 Limits and Precision.</description>
-</implementation-defined-item>
-<implementation-defined-item name="stringToDecimal" spec="FuncOps">
-<description last-mod="2006-08-09">The result of casting a string to xs:decimal, when the resulting value is not too large or too small but nevertheless has too many decimal digits to be accurately represented, is implementation-defined. See 17.1.1 Casting from xs:string and xs:untypedAtomic.</description>
-</implementation-defined-item>
-<implementation-defined-item name="docProcessing" spec="FuncOps">
-<description last-mod="2005-10-10">Various aspects of the processing provided by 15.5.4 fn:doc are implementation-defined. Implementations may provide external configuration options that allow any aspect of the processing to be controlled by the user.</description>
-</implementation-defined-item>
-<implementation-defined-item name="weakenStable" spec="FuncOps">
-<description last-mod="2006-08-09">The manner in which implementations provide options to weaken the stable characteristic of 15.5.6 fn:collection and 15.5.4 fn:doc are implementation-defined.</description>
-</implementation-defined-item>
-<implementation-defined-item name="additionalTypes" spec="DataModel">
-<description last-mod="2005-04-04">Support for additional user-defined or implementation-defined types is implementation-defined. (See 2.6.1 Representation of Types)</description>
-</implementation-defined-item>
-<implementation-defined-item name="undefinedProperties" spec="DataModel">
-<description last-mod="2005-04-04">Some typed values in the data model are undefined. Attempting to access an undefined property is always an error. Behavior in these cases is implementation-defined and the host language is responsible for determining the result. (See 5 Accessors)</description>
-</implementation-defined-item>
-<implementation-defined-item name="sequenceNormalization" spec="Serialization">
-<description last-mod="2005-04-04">For any implementation-defined output method, it is implementation-defined whether sequence normalization process takes place. (See 2 Sequence Normalization)</description>
-</implementation-defined-item>
-<implementation-defined-item name="outputMethods" spec="Serialization">
-<description last-mod="2005-04-04">If the namespace URI is non-null for the method serialization parameter, then the parameter specifies an implementation-defined output method. (See 3 Serialization Parameters)</description>
-</implementation-defined-item>
-<implementation-defined-item name="normalizationFormBehavior" spec="Serialization">
-<description last-mod="2005-04-04">If the value of the normalization-form form parameter is not NFC, NFD, NFKC, NFKD, fully-normalized, or none then the meaning of the value and it's effect is implementation-defined. (See 4 Phases of Serialization)</description>
-</implementation-defined-item>
-<implementation-defined-item name="additionalParams" spec="Serialization">
-<description last-mod="2005-11-01">The effect of additional serialization parameters on the output of the serializer, where the name of such a parameter must be namespace-qualified, is implementation-defined or implementation-dependent. The extent of this effect on the output must not override the provisions of this specification. (See 3 Serialization Parameters)</description>
-</implementation-defined-item>
-<implementation-defined-item name="encodingPhase" spec="Serialization">
-<description last-mod="2005-04-04">The effect of providing an option that allows the encoding phase to be skipped, so that the result of serialization is a stream of Unicode characters, is implementation-defined. The serializer is not required to support such an option. (See 4 Phases of Serialization)</description>
-</implementation-defined-item>
-<implementation-defined-item name="CDATASerialization" spec="Serialization">
-<description last-mod="2005-04-04">An serializer may provide an implementation-defined mechanism to place CDATA sections in the result tree. (See 5.1.4 XML Output Method: the cdata-section-elements Parameter)</description>
-</implementation-defined-item>
-</implementation-defined-items>
-<features>
-<feature name="Minimal Conformance"/>
-<feature name="Schema Import"/>
-<feature name="Schema Validation"/>
-<feature name="Static Typing"/>
-<feature name="Static Typing Extensions"/>
-<feature name="Full Axis"/>
-<feature name="Module"/>
-<feature name="Serialization"/>
-</features>
-<context-properties>
-<context-property name="Statically known namespaces" context-type="static"/>
-<context-property name="Default element/type namespace" context-type="static"/>
-<context-property name="Default function namespace" context-type="static"/>
-<context-property name="In-scope schema types" context-type="static"/>
-<context-property name="In-scope element declarations" context-type="static"/>
-<context-property name="In-scope attribute declarations" context-type="static"/>
-<context-property name="In-scope variables" context-type="static"/>
-<context-property name="Context item static type" context-type="static"/>
-<context-property name="Function signatures" context-type="static"/>
-<context-property name="Statically known collations" context-type="static"/>
-<context-property name="Default collation" context-type="static"/>
-<context-property name="Construction mode" context-type="static"/>
-<context-property name="Ordering mode" context-type="static"/>
-<context-property name="Default order for empty sequences" context-type="static"/>
-<context-property name="Boundary-space policy" context-type="static"/>
-<context-property name="Copy-namespaces mode" context-type="static"/>
-<context-property name="Base URI" context-type="static"/>
-<context-property name="Statically known documents" context-type="static"/>
-<context-property name="Statically known collections" context-type="static"/>
-<context-property name="Statically known default collection type" context-type="static"/>
-<context-property name="Context item" context-type="dynamic"/>
-<context-property name="Context position" context-type="dynamic"/>
-<context-property name="Context size" context-type="dynamic"/>
-<context-property name="Variable values" context-type="dynamic"/>
-<context-property name="Function implementations" context-type="dynamic"/>
-<context-property name="Current dateTime" context-type="dynamic"/>
-<context-property name="Implicit timezone" context-type="dynamic"/>
-<context-property name="Available documents" context-type="dynamic"/>
-<context-property name="Available collections" context-type="dynamic"/>
-<context-property name="Default collection" context-type="dynamic"/>
-</context-properties>
-<test-group name="MinimalConformance" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Minimal Conformance</title>
-<description/>
-</GroupInfo>
-<test-group name="OptionalFeatureErrors" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Optional Feature Errors</title>
-<description/>
-</GroupInfo>
-<test-group name="CombinedErrorCodes" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Single error code for extra features</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="Basics">
-<GroupInfo>
-<title>XQuery Basics</title>
-<description/>
-</GroupInfo>
-<test-group name="StaticContext">
-<GroupInfo>
-<title>Static Context Evaluation</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="Types">
-<GroupInfo>
-<title>Query Types</title>
-<description/>
-</GroupInfo>
-<test-group name="SequenceTypeSyntax" featureOwner="NIST">
-<GroupInfo>
-<title>XQuery Sequence Type Syntax</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-</test-group>
-<test-group name="Expressions" featureOwner="Frans Englich">
-<GroupInfo>
-<title>XQuery Expressions</title>
-<description/>
-</GroupInfo>
-<test-group name="PrimaryExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Primary Expressions</title>
-<description/>
-</GroupInfo>
-<test-group name="Literals" featureOwner="Microsoft and Frans Englich">
-<GroupInfo>
-<title>Literals</title>
-<description>
-                     Test string and numeric literals in XQuery.
-                  </description>
-</GroupInfo>
-</test-group>
-<test-group name="ParenExpr" featureOwner="IBM and Frans Englich">
-<GroupInfo>
-<title>Parenthesized Expressions</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="ContextExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Context Item Expressions</title>
-<description/>
-</GroupInfo>
-<test-group name="ExternalContextExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>External Context Item Expressions</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="InternalContextExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Internal Context Item Expressions</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="FunctionCallExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Function Calls</title>
-<description>Contains tests verifying the function calling mechanism; not a particular function implementation.</description>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="PathExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Path Expressions</title>
-<description/>
-</GroupInfo>
-<test-group name="PathExpressions">
-<GroupInfo>
-<title>General Path Expression Tests</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="Steps" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Steps</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="Axes" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Axes</title>
-<description>Tests in this group focus on the axes named in XQuery 3.2.1.1 and the / and // step operators of 3.2.1. Abbreviated versions (@ vs. attribute::) are included. NodeTests are typically *, node(), or a name.</description>
-</GroupInfo>
-</test-group>
-<test-group name="NodeTestSection" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Node Tests</title>
-<description>Tests in this group take the axes as a given and focus on the NodeTest syntax in XQuery 3.2.1.2. Includes explicit names, *, and the various kind tests that look like functions.</description>
-</GroupInfo>
-<test-group name="NodeTest" featureOwner="Frans Englich">
-<GroupInfo>
-<title>NodeTest</title>
-<description>Tests in this group take the axes as a given and focus on the NodeTest syntax in XQuery 3.2.1.2. Includes explicit names, *, and the various kind tests that look like functions.</description>
-</GroupInfo>
-</test-group>
-<test-group name="NameTest" featureOwner="Frans Englich">
-<GroupInfo>
-<title>NameTest</title>
-<description>Tests in this group take the axes as a given and focus on the NodeTest syntax in XQuery 3.2.1.2. Includes explicit names, *, and the various kind tests that look like functions.</description>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="Predicates" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Predicates</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="UnabbrAxes" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Unabbreviated Syntax</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="AbbrAxes" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Abbreviated Syntax</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="SeqExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Sequence Expressions</title>
-<description/>
-</GroupInfo>
-<test-group name="ConstructSeq" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Constructing Sequences</title>
-<description>Tests that construct sequences</description>
-</GroupInfo>
-<test-group name="commaOp" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Comma Operator</title>
-<description>Tests that construct sequences using the comma operator</description>
-</GroupInfo>
-</test-group>
-<test-group name="RangeExpr" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Range Expression</title>
-<description>Tests that construct sequences using the RangeExpr</description>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="FilterExpr" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Filter Expressions</title>
-<description>Simple tests to evaluate filter sequence expressions.</description>
-</GroupInfo>
-</test-group>
-<test-group name="CombNodeSeq" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Combining Node Sequences</title>
-<description>Tests for combining Sequences</description>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="Operators" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Operators</title>
-<description/>
-</GroupInfo>
-<test-group name="ArithExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Arithmetic Operators</title>
-<description/>
-</GroupInfo>
-<test-group name="NumericOpr" featureOwner="Oracle and Frans Englich">
-<GroupInfo>
-<title>Arithmetic Operators on Numeric Values</title>
-<description/>
-</GroupInfo>
-<test-group name="NumericAdd" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:numeric-add</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="NumericSubtract" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:numeric-subtract</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="NumericMultiply" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:numeric-multiply</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="NumericDivide" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:numeric-divide</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="NumericIntegerDivide" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:numeric-integer-divide</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="NumericMod" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:numeric-mod</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="NumericUnaryPlus" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:numeric-unary-plus</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="NumericUnaryMinus" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:numeric-unary-minus</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="DurationArith" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Arithmetic Operators on Duration Values</title>
-<description/>
-</GroupInfo>
-<test-group name="YearMonthDurationAdd" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:add-yearMonthDurations</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="YearMonthDurationSubtract" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:subtract-yearMonthDurations</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="YearMonthDurationMultiply" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:multiply-yearMonthDuration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="YearMonthDurationDivide" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:divide-yearMonthDuration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="YearMonthDurationDivideYMD" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:divide-yearMonthDuration-by-yearMonthDuration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DayTimeDurationAdd" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:add-dayTimeDurations</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DayTimeDurationSubtract" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:subtract-dayTimeDurations</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DayTimeDurationMultiply" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:multiply-dayTimeDuration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DayTimeDurationDivide" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:divide-dayTimeDuration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DayTimeDurationDivideDTD" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:divide-dayTimeDuration-by-dayTimeDuration</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="DurationDateTimeArith" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Arithmetic Operators on Duration and Date Time Values</title>
-<description/>
-</GroupInfo>
-<test-group name="dateTimesSubtract" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:subtract-dateTimes-yielding-dayTimeDuration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DatesSubtract" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:subtract-dates-yielding-dayTimeDuration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="TimeSubtract" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:subtract-times</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="YearMonthDurationAddDT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:add-yearMonthDuration-to-dateTime</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateTimeAddDTD" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:add-dayTimeDuration-to-dateTime</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateTimeSubtractYMD" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:subtract-yearMonthDuration-from-dateTime</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateTimeSubtractDTD" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:subtract-dayTimeDuration-from-dateTime</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateAddYMD" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:add-yearMonthDuration-to-date</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateAddDTD" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:add-dayTimeDuration-to-date</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateSubtractYMD" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:subtract-yearMonthDuration-from-date</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateSubtractDTD" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:subtract-dayTimeDuration-from-date</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="TimeAddDTD" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:add-dayTimeDuration-to-time</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="TimeSubtractDTD" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:subtract-dayTimeDuration-from-time</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-</test-group>
-<test-group name="CompExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Comparison Operators</title>
-<description/>
-</GroupInfo>
-<test-group name="ValComp" featureOwner="IBM and Frans Englich">
-<GroupInfo>
-<title>Value Comparison</title>
-<description/>
-</GroupInfo>
-<test-group name="NumericComp" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Comparison of Numeric Values</title>
-<description/>
-</GroupInfo>
-<test-group name="NumericEqual" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:numeric-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="NumericLT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:numeric-less-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="NumericGT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:numeric-greater-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="BooleanOp" featureOwner="Oracle and Frans Englich">
-<GroupInfo>
-<title>Comparison Operators on Boolean Values</title>
-<description/>
-</GroupInfo>
-<test-group name="BooleanEqual" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:boolean-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="BooleanLT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:boolean-less-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="BooleanGT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:boolean-greater-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="DurationDateTimeOp" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Comparisons of Duration, Date Time Values</title>
-<description/>
-</GroupInfo>
-<test-group name="YearMonthDurationLT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:yearMonthDuration-less-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="YearMonthDurationGT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:yearMonthDuration-greater-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DayTimeDurationLT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:dayTimeDuration-less-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DayTimeDurationGT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:dayTimeDuration-greater-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DurationEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:duration equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateTimeEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:dateTime-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateTimeLT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:dateTime-less-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateTimeGT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:dateTime-greater-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:date-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateLT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:date-less-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DateGT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:date-greater-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="TimeEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:time-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="TimeLT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:time-less-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="TimeGT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:time-greater-than</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="gYearMonthEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:gYearMonth-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="gYearEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:gYear-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="gMonthDayEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:gMonthDay-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="gMonthEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:gMonth-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="gDayEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:gDay-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="YearMonthDurationEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:yearMonthDuration-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="DayTimeDurationEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:dayTimeDuration-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="QNameOp" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Comparison Operators on QName Values</title>
-<description/>
-</GroupInfo>
-<test-group name="QNameEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:QName-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="PrefixFromQName" featureOwner="Frans Englich">
-<GroupInfo>
-<title>fn:prefix-from-QName</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="BinaryOp" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Comparison Operators on base64Binary and hexBinary Types</title>
-<description/>
-</GroupInfo>
-<test-group name="HexBinaryEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:hexBinary-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="Base64BinaryEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:base64Binary-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="NotationOp" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Comparison Operators on NOTATION Types</title>
-<description/>
-</GroupInfo>
-<test-group name="NotationEQ" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:NOTATION-equal</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="ValCompTypeChecking" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Type Checking and Error Handling</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="StringComp" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Comparison of String Values</title>
-<description/>
-</GroupInfo>
-<test-group name="StringEqual" featureOwner="Frans Englich">
-<GroupInfo>
-<title>xs:string eq/ne xs:string</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="StringGT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>xs:string gt/ge xs:string</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="StringLT" featureOwner="Frans Englich">
-<GroupInfo>
-<title>xs:string lt/le xs:string</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="AnyURIComp" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Comparison of AnyURI Values</title>
-<description/>
-</GroupInfo>
-<test-group name="AnyURIEqual" featureOwner="Frans Englich">
-<GroupInfo>
-<title>xs:anyURI eq/ne xs:anyURI</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="AnyURILtGt">
-<GroupInfo>
-<title>xs:anyURI lt/gt xs:anyURI</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="AnyURILeGe">
-<GroupInfo>
-<title>xs:anyURI le/ge xs:anyURI</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-</test-group>
-<test-group name="GenComprsn" featureOwner="Frans Englich">
-<GroupInfo>
-<title>General Comparisons</title>
-<description/>
-</GroupInfo>
-<test-group name="GenCompEq" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>The "=" operator for general comparisons</title>
-<description>The general comparison operator"="</description>
-</GroupInfo>
-</test-group>
-<test-group name="GenCompNE" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>The "!=" operator for general comparisons</title>
-<description>The general comparison operator"!="</description>
-</GroupInfo>
-</test-group>
-<test-group name="GenCompLT" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>The "&lt; (less than)" operator for general comparisons</title>
-<description>The general comparison operator "less than (&lt;)"</description>
-</GroupInfo>
-</test-group>
-<test-group name="GenCompLTEQ" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>The "&lt;= (less than or equal)" operator for general comparisons</title>
-<description>The general comparison operator "less than or equal (&lt;=)"</description>
-</GroupInfo>
-</test-group>
-<test-group name="GenCompGT" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>The "&gt; (greater than)" operator for general comparisons</title>
-<description>The general comparison operator "greater than (&gt;)"</description>
-</GroupInfo>
-</test-group>
-<test-group name="GenCompGTEQ" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>The "&gt;= (greater than or equal)" operator for general comparisons</title>
-<description>The general comparison operator "greater than or equal (&gt;=)"</description>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="NodeComp" featureOwner="IBM and Frans Englich">
-<GroupInfo>
-<title>Node Comparisons</title>
-<description/>
-</GroupInfo>
-<test-group name="NodeSame" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:is-same-node</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="NodeBefore" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:node-before</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="NodeAfter" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:node-after</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-</test-group>
-<test-group name="SeqOp" featureOwner="Oracle and Frans Englich">
-<GroupInfo>
-<title>Operators on Sequences</title>
-<description/>
-</GroupInfo>
-<test-group name="SeqUnion" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:union</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="SeqIntersect" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:intersect</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="SeqExcept" featureOwner="Frans Englich">
-<GroupInfo>
-<title>op:except</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-</test-group>
-<test-group name="LogicExpr" featureOwner="Oracle and Frans Englich">
-<GroupInfo>
-<title>Logical Expressions</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="Construct" featureOwner="IBM and Frans Englich">
-<GroupInfo>
-<title>Constructors</title>
-<description/>
-</GroupInfo>
-<test-group is-XPath2="false" name="DirectConElem" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Direct Element Constructors</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="DirectConElemAttr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Attributes</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="DirectConElemNamespace" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Namespace Declaration Attributes</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="DirectConElemContent" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Content</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="DirectConElemWhitespace" featureOwner="Frans Englich">
-<GroupInfo>
-<title>White Space Element Content</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="DirectConOther" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Other Direct Constructors</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="XMLEdition" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Conformance to the XML 1.0 3-5th edition and XML 1.1</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="ComputeCon" featureOwner="IBM and Frans Englich">
-<GroupInfo>
-<title>Computed Constructors</title>
-<description/>
-</GroupInfo>
-<test-group is-XPath2="false" name="ComputeConElem" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Computed Element Constructors</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="ComputeConAttr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Computed Attribute Constructors</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="ConDocNode" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Document Node Constructors</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="ConText" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Text Node Constructors</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="ComputeConPI" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Computed Processing-instruction Constructors</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="ComputeConComment" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Computed Comment Constructors</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group is-XPath2="false" name="ConInScopeNamespace" featureOwner="Frans Englich">
-<GroupInfo>
-<title>In-scope Namespaces of a Constructed Element</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="FLWORExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Tests of For-Let-Where-OrderBy-Return Expressions</title>
-<description>Tests in this group focus on the FLWOR expressions in XQuery 3.8.</description>
-</GroupInfo>
-<test-group name="ForExpr" featureOwner="Microsoft and Frans Englich">
-<GroupInfo>
-<title>FOR Clause</title>
-<description>Tests for the FOR part of the FLWOR expression syntax</description>
-</GroupInfo>
-<test-group name="ForExprWithout" featureOwner="Frans Englich">
-<GroupInfo>
-<title>FOR Clause without TypeDeclaration</title>
-<description>Tests for the FOR part of the FLWOR expression syntax</description>
-</GroupInfo>
-</test-group>
-<test-group name="ForExprWith" featureOwner="Frans Englich">
-<GroupInfo>
-<title>FOR Clause with TypeDeclaration</title>
-<description>Tests for the FOR part of the FLWOR expression syntax</description>
-</GroupInfo>
-</test-group>
-<test-group name="ForExprPositionalVar" featureOwner="Frans Englich">
-<GroupInfo>
-<title>FOR Clause with a Positional Variable</title>
-<description>Tests for the 'at' variable in FLWOR expression.</description>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group is-XPath2="false" name="LetExpr" featureOwner="Oracle and Frans Englich">
-<GroupInfo>
-<title>LET Clause</title>
-<description>Tests for the LET part of the FLWOR expression syntax</description>
-</GroupInfo>
-<test-group is-XPath2="false" name="LetExprWithout" featureOwner="Frans Englich">
-<GroupInfo>
-<title>LET Clause without TypeDeclaration</title>
-<description>Tests for the LET part of the FLWOR expression syntax</description>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="LetExprWith" featureOwner="Frans Englich">
-<GroupInfo>
-<title>LET Clause with TypeDeclaration</title>
-<description>Tests for the LET part of the FLWOR expression syntax</description>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group is-XPath2="false" name="WhereExpr" featureOwner="Microsoft and Frans Englich">
-<GroupInfo>
-<title>WHERE Clause</title>
-<description>Tests for the WHERE part of the FLWOR expression syntax</description>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="OrderbyExpr" featureOwner="Microsoft and Frans Englich">
-<GroupInfo>
-<title>ORDER BY Clause</title>
-<description>Tests for the ORDER BY part of the FLWOR expression syntax</description>
-</GroupInfo>
-<test-group is-XPath2="false" name="OrderbyExprWith" featureOwner="Frans Englich">
-<GroupInfo>
-<title>ORDER BY Clause with OrderModifier</title>
-<description>Tests for the ORDER BY part of the FLWOR expression syntax</description>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="OrderbyExprWithout" featureOwner="Frans Englich">
-<GroupInfo>
-<title>ORDER BY Clause without OrderModifier</title>
-<description>Tests for the ORDER BY part of the FLWOR expression syntax</description>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="ReturnExpr" featureOwner="Microsoft and Frans Englich">
-<GroupInfo>
-<title>RETURN Clause</title>
-<description>Tests for the RETURN part of the FLWOR expression syntax</description>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group is-XPath2="false" name="OrderExpr" featureOwner="IBM and Frans Englich">
-<GroupInfo>
-<title>Ordered and Unordered Expressions</title>
-<description>Tests involving "Ordered" and/or "unordered"</description>
-</GroupInfo>
-</test-group>
-<test-group name="CondExpr" featureOwner="Microsoft and Frans Englich">
-<GroupInfo>
-<title>Conditional Expressions</title>
-<description>Tests in this group focus on the conditional expressions in XQuery 3.10.</description>
-</GroupInfo>
-</test-group>
-<test-group name="QuantExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Quantified Expressions</title>
-<description/>
-</GroupInfo>
-<test-group name="QuantExprWithout" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Quantified Expressions Without TypeDeclaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="QuantExprWith" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Quantified Expressions With TypeDeclaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="exprSeqTypes" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Expressions on Sequence Types</title>
-<description/>
-</GroupInfo>
-<test-group name="SeqExprInstanceOf" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Instance Of</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="sequenceExprTypeswitch" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Typeswitch</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="SeqExprCastToDerived" featureOwner="NIST">
-<GroupInfo>
-<title>Cast from Derived types</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="SeqExprCastToDerivedParents" featureOwner="NIST">
-<GroupInfo>
-<title>Cast from Derived types To Parents</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="SeqExprCastWithinBranch" featureOwner="NIST">
-<GroupInfo>
-<title>Casting within a branch of the type hierarchy</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="SeqExprCast" featureOwner="IBM/XSLT and Frans Englich">
-<GroupInfo>
-<title>Cast</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="SeqExprCastable" featureOwner="IBM/XSLT and Frans Englich">
-<GroupInfo>
-<title>Castable</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group name="SeqExprTreat" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Treat</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group is-XPath2="false" name="PrologExpr" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Modules and Prologs</title>
-<description/>
-</GroupInfo>
-<test-group is-XPath2="false" name="VersionProlog" featureOwner="Oracle and Frans Englich">
-<GroupInfo>
-<title>Version Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="BoundarySpaceProlog" featureOwner="Oracle and Frans Englich">
-<GroupInfo>
-<title>Boundary-space Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="CollationProlog" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Default Collation Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="CopyNamespacesProlog" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Copy Namespaces Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="BaseURIProlog" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Base URI Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="ConstructionProlog" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Construction Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="DefaultNamespaceProlog" featureOwner="Oracle and Frans Englich">
-<GroupInfo>
-<title>Default Namespace Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="DefaultOrderingProlog" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Ordering Mode Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="EmptyOrderProlog" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Empty Order Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="NamespaceProlog" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Namespace Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="VariableProlog" featureOwner="Oracle and Frans Englich">
-<GroupInfo>
-<title>Variable Declaration</title>
-<description/>
-</GroupInfo>
-<test-group is-XPath2="false" name="ExternalVariablesWithout" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>External Variable References without TypeDeclaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="ExternalVariablesWith" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>External Variable References with TypeDeclatation</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="InternalVariablesWithout" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Internal Variable References without TypeDeclaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="InternalVariablesWith" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Internal Variable References with TypeDeclatation</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group is-XPath2="false" name="FunctionProlog" featureOwner="Oracle and Frans Englich">
-<GroupInfo>
-<title>Function Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="OptionDeclarationProlog" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Option Declaration Declaration</title>
-<description/>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="XQueryComment" featureOwner="Microsoft and Frans Englich">
-<GroupInfo>
-<title>XQuery Comments</title>
-<description>Tests for the XQuery comment syntax</description>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="ExtensionExpression" featureOwner="NIST and Frans Englich">
-<GroupInfo>
-<title>Extension Expression</title>
-<description/>
-</GroupInfo>
-</test-group>
-<test-group is-XPath2="false" name="ImplicitContext" featureOwner="Frans Englich">
-<GroupInfo>
-<title>Implicit Context</title>
-<description>
-                  Implementations are allowed to define an implicit context for their queries. What this means
-                  is that an XQuery expression can use the '.' or '/' axes without specifying any explicit
-                  context to bind these to. The binding of the implicit context to some input document is an
-                  implementation specific detail and should be handled by the individual test harness.
-               </description>
-</GroupInfo>
-</test-group>
-</test-group>
-<test-group name="Functions" 

<TRUNCATED>

[50/51] [abbrv] git commit: fix indentation

Posted by vi...@apache.org.
fix indentation


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/0df78c50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/0df78c50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/0df78c50

Branch: refs/heads/vxquery_0_3_staging
Commit: 0df78c506a771083e8a3a2a0acd75fdb67503b6a
Parents: c041dc6
Author: Till Westmann <we...@gmail.com>
Authored: Tue Apr 8 20:32:38 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Tue Apr 8 20:32:38 2014 -0700

----------------------------------------------------------------------
 src/site/apt/user_query.apt | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0df78c50/src/site/apt/user_query.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_query.apt b/src/site/apt/user_query.apt
index 4388aaf..44621e1 100644
--- a/src/site/apt/user_query.apt
+++ b/src/site/apt/user_query.apt
@@ -25,22 +25,22 @@ sh ./apache-vxquery-X.Y-incubating/vxquery-cli/target/appassembler/bin/vxq
 * Command Line Options
 
 ----------------------------------------
- -O N                       : Optimization Level. Default: Full Optimization
- -available-processors N    : Number of available processors. (default java's available processors)
- -client-net-ip-address VAL : IP Address of the ClusterController
- -client-net-port N         : Port of the ClusterController (default 1098)
- -compileonly               : Compile the query and stop
- -frame-size N              : Frame size in bytes. (default 65536)
- -local-node-controllers N  : Number of local node controllers (default 1)
- -repeatexec N              : Number of times to repeat execution
- -showast                   : Show abstract syntax tree
- -showoet                   : Show optimized expression tree
- -showquery                 : Show query string
- -showrp                    : Show Runtime plan
- -showtet                   : Show translated expression tree
- -timing                    : Produce timing information
- ----------------------------------------
- 
+-O N                       : Optimization Level. Default: Full Optimization
+-available-processors N    : Number of available processors. (default java's available processors)
+-client-net-ip-address VAL : IP Address of the ClusterController
+-client-net-port N         : Port of the ClusterController (default 1098)
+-compileonly               : Compile the query and stop
+-frame-size N              : Frame size in bytes. (default 65536)
+-local-node-controllers N  : Number of local node controllers (default 1)
+-repeatexec N              : Number of times to repeat execution
+-showast                   : Show abstract syntax tree
+-showoet                   : Show optimized expression tree
+-showquery                 : Show query string
+-showrp                    : Show Runtime plan
+-showtet                   : Show translated expression tree
+-timing                    : Produce timing information
+----------------------------------------
+
 * Java Options
 
 ----------------------------------------


[26/51] [abbrv] updated XQTS results

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9ab4c6d9/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index ea1a37c..b8eba23 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -15,6 +15,19 @@ Appendices/Appendix-A4//appendix-A4-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Appendices/Appendix-A4//appendix-A4-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Appendices/Appendix-A4//appendix-A4-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Appendices/Appendix-A4//appendix-A4-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/EQNames//eqname-001, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-002, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-003, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-004, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-005, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-006, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-007, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-008, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-009, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-010, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-901, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+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-10, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -37,6 +50,9 @@ 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//Catalog002, EXPECTED_RESULT_GOT_FAILURE
+Catalog//Catalog003, EXPECTED_RESULT_GOT_FAILURE
 CondExpr//K2-CondExpr-1, EXPECTED_ERROR_GOT_FAILURE
 CondExpr//K2-CondExpr-2, EXPECTED_RESULT_GOT_FAILURE
 CondExpr//K2-CondExpr-3, EXPECTED_RESULT_GOT_ERROR
@@ -121,7 +137,7 @@ Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-1, EXPECTED_ERROR_GOT_SAM
 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_DIFFERENT_RESULT
+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
@@ -159,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_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-19, EXPECTED_RESULT_GOT_FAILURE
 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
+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-23, EXPECTED_RESULT_GOT_ERROR
-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-24, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-25, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-30, EXPECTED_RESULT_GOT_FAILURE
 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
@@ -217,18 +233,18 @@ 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_DIFFERENT_RESULT
+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_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_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_FAILURE
 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_DIFFERENT_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
@@ -238,9 +254,9 @@ Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_FAILURE
 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-47, EXPECTED_ERROR_GOT_FAILURE
 Construct/DirectConElem//K2-DirectConElem-48, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_DIFFERENT_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
@@ -324,7 +340,7 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-70, EXPECTED_RES
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-71, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-72, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-73, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-74, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-74, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-75, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-76, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -371,7 +387,7 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-44, EXPECT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-45, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-46, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-47, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-48, EXPECTED_RESULT_GOT_FAILURE
+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
@@ -413,7 +429,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-35, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-36, EXPECTED_ERROR_GOT_RESULT
 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_FAILURE
+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
@@ -424,19 +440,19 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-45, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-46, EXPECTED_RESULT_GOT_FAILURE
 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_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-5, EXPECTED_RESULT_GOT_FAILURE
+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
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-53, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-54, EXPECTED_RESULT_GOT_ERROR
+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-55, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-56, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 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_FAILURE
+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
@@ -470,15 +486,15 @@ Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-17,
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-21, 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_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_FAILURE
@@ -537,10 +553,10 @@ Construct/DirectConOther//K2-DirectConOther-54, EXPECTED_RESULT_GOT_DIFFERENT_RE
 Construct/DirectConOther//K2-DirectConOther-55, EXPECTED_ERROR_GOT_SAME_ERROR
 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_DIFFERENT_RESULT
+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_DIFFERENT_RESULT
+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
 Construct/DirectConOther//K2-DirectConOther-63, EXPECTED_ERROR_GOT_RESULT
@@ -596,9 +612,9 @@ Expressions/CondExpr//K-CondExpr-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/CondExpr//K-CondExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/CondExpr//K-CondExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-1, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-12, EXPECTED_RESULT_GOT_DIFFERENT_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
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-14, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-15, EXPECTED_RESULT_GOT_FAILURE
@@ -613,16 +629,16 @@ Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-5, EXP
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-6, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-2, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-2, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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
@@ -684,7 +700,7 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-7, EX
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-8, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-data-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-doc-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-3, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -692,11 +708,11 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-name-1, EXPECTE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-name-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-name-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nested-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nested-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-4, 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-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_FAILURE
@@ -749,21 +765,21 @@ Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-attr-2, EXPECTED_ERR
 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_DIFFERENT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+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-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_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-3, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-4, 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-5, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-parent-1, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-string-1, EXPECTED_RESULT_GOT_ERROR
@@ -791,10 +807,10 @@ Expressions/Construct/ConInScopeNamespace//Constr-inscope-1, EXPECTED_RESULT_GOT
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-10, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-11, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-12, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-13, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-15, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-16, EXPECTED_RESULT_GOT_SAME_RESULT
 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
@@ -813,15 +829,15 @@ Expressions/Construct/DirectConElem//Constr-elem-curlybr-3, EXPECTED_RESULT_GOT_
 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_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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-5, EXPECTED_RESULT_GOT_DIFFERENT_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_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-4, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -834,13 +850,13 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-1, E
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-2, EXPECTED_RESULT_GOT_FAILURE
 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-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-6, 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-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-1, 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_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-1, EXPECTED_RESULT_GOT_DIFFERENT_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
@@ -848,17 +864,17 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-1, EXPE
 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_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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-3, EXPECTED_RESULT_GOT_DIFFERENT_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_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-9, EXPECTED_RESULT_GOT_DIFFERENT_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
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -893,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_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-2, EXPECTED_RESULT_GOT_ERROR
+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-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-document-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-5, 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
@@ -916,15 +932,15 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-1,
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-2, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-4, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-4, 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-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
@@ -951,19 +967,19 @@ Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-14,
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-15, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-16, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-18, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-19, 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_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-22, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-23, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-24, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-25, EXPECTED_ERROR_GOT_RESULT
 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_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
@@ -990,9 +1006,9 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-
 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_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-23, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-24, EXPECTED_RESULT_GOT_DIFFERENT_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
@@ -1241,7 +1257,7 @@ Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-55, EXPECTED_RESU
 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-8, EXPECTED_RESULT_GOT_DIFFERENT_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
@@ -1576,6 +1592,72 @@ Expressions/FunctionCallExpr//K2-FunctionCallExpr-6, EXPECTED_ERROR_GOT_SAME_ERR
 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
@@ -5469,12 +5551,12 @@ Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeCheckin
 Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-8, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-9, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodecomparisonerr-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodeexpression33, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodeexpression34, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeAfter//nodecomparisonerr-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeAfter//nodeexpression33, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeAfter//nodeexpression34, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression35, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression36, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodeexpression37, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeAfter//nodeexpression37, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression38, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression39, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression40, EXPECTED_RESULT_GOT_FAILURE
@@ -5491,12 +5573,12 @@ Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc12, EXPECTED_RESULT_GOT_
 Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc13, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc14, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodecomparisonerr-2, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodeexpression17, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodeexpression18, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeBefore//nodecomparisonerr-2, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeBefore//nodeexpression17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeBefore//nodeexpression18, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression19, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression20, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodeexpression21, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeBefore//nodeexpression21, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression22, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression23, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression24, EXPECTED_RESULT_GOT_FAILURE
@@ -5513,8 +5595,8 @@ Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc6, EXPECTED_RESULT_GOT_
 Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc8, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodecomparisonerr-1, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression1, EXPECTED_ERROR_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
@@ -5522,10 +5604,10 @@ Expressions/Operators/NodeOp/NodeSame//nodeexpression13, EXPECTED_ERROR_GOT_FAIL
 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//nodeexpression2, EXPECTED_ERROR_GOT_FAILURE
+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//nodeexpression5, EXPECTED_ERROR_GOT_FAILURE
+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
@@ -5559,9 +5641,9 @@ Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-001, EXPECTED_RESULT_
 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-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-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-009, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-010, EXPECTED_RESULT_GOT_ERROR
@@ -5582,9 +5664,9 @@ Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-001, EXPECTED_R
 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-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-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-009, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-010, EXPECTED_RESULT_GOT_ERROR
@@ -5671,19 +5753,19 @@ Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-6, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-8, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-10, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-11, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-12, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-13, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/PathExpressions//PathExpr-14, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-16, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-14, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/PathExpressions//PathExpr-15, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/PathExpressions//PathExpr-16, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/PathExpressions//PathExpr-2, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/PathExpressions//PathExpr-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/PathExpressions//PathExpr-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-6, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-8, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-9, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -5771,8 +5853,8 @@ 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//Axes015, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes016, EXPECTED_RESULT_GOT_FAILURE
+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
@@ -5913,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_ERROR
-Expressions/PathExpr/Steps/Axes//Axes087, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes086, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes087, EXPECTED_RESULT_GOT_FAILURE
 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
@@ -5969,7 +6051,7 @@ 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-10, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/NodeTest//nametest-11, EXPECTED_RESULT_GOT_FAILURE
+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-13, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//nametest-14, EXPECTED_RESULT_GOT_FAILURE
@@ -6214,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_ERROR
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-16, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-18, 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-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_ERROR
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-20, EXPECTED_RESULT_GOT_FAILURE
 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
@@ -6232,7 +6314,7 @@ Expressions/PrologExpr/BaseURIProlog//K-BaseURIProlog-1, EXPECTED_RESULT_GOT_ERR
 Expressions/PrologExpr/BaseURIProlog//K-BaseURIProlog-2, EXPECTED_ERROR_GOT_RESULT
 Expressions/PrologExpr/BaseURIProlog//K-BaseURIProlog-3, EXPECTED_ERROR_GOT_RESULT
 Expressions/PrologExpr/BaseURIProlog//base-URI-1, EXPECTED_ERROR_GOT_RESULT
-Expressions/PrologExpr/BaseURIProlog//base-URI-10, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/BaseURIProlog//base-URI-10, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/BaseURIProlog//base-URI-11, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/BaseURIProlog//base-URI-12, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PrologExpr/BaseURIProlog//base-URI-13, EXPECTED_RESULT_GOT_ERROR
@@ -6337,10 +6419,10 @@ Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-2, EXPECTED_RESULT_GO
 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_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-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-7, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-8, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-9, EXPECTED_RESULT_GOT_ERROR
@@ -6730,7 +6812,7 @@ Expressions/PrologExpr/VersionProlog//prolog-version-12, EXPECTED_ERROR_GOT_SAME
 Expressions/PrologExpr/VersionProlog//prolog-version-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PrologExpr/VersionProlog//prolog-version-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/PrologExpr/VersionProlog//prolog-version-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/PrologExpr/VersionProlog//prolog-version-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/PrologExpr/VersionProlog//prolog-version-5, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrologExpr/VersionProlog//prolog-version-6, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrologExpr/VersionProlog//prolog-version-7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrologExpr/VersionProlog//prolog-version-9, EXPECTED_ERROR_GOT_RESULT
@@ -6933,9 +7015,9 @@ Expressions/QuantExpr/QuantExprWithout//quantexpr-58, EXPECTED_RESULT_GOT_SAME_R
 Expressions/QuantExpr/QuantExprWithout//quantexpr-59, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc1, EXPECTED_RESULT_GOT_ERROR
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc2, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc4, EXPECTED_RESULT_GOT_ERROR
+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
@@ -6947,8 +7029,8 @@ 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//combiningnodeseqintersecthc1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc2, EXPECTED_ERROR_GOT_FAILURE
+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//combiningnodeseqintersecthc4, EXPECTED_RESULT_GOT_ERROR
 Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-1, EXPECTED_ERROR_GOT_RESULT
@@ -7164,6 +7246,28 @@ Expressions/SeqExpr/RangeExpr//rangeExpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/SeqExpr/RangeExpr//rangeExpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/SeqExpr/RangeExpr//rangeExpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/SeqExpr/RangeExpr//rangeExpr-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SwitchExpr//switch-001, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-002, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-003, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-004, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-005, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-006, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-007, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-008, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-009, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-010, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-011, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-012, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-013, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-901, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-902, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-903, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-904, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-905, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-906, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-907, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-908, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-909, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//K-XQueryComment-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -7184,14 +7288,14 @@ Expressions/XQueryComment//K-XQueryComment-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-8, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//K-XQueryComment-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/XQueryComment//XQueryComment001, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/XQueryComment//XQueryComment001, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//XQueryComment002, EXPECTED_RESULT_GOT_FAILURE
-Expressions/XQueryComment//XQueryComment003, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment004, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment005, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment006, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment007, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment008, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/XQueryComment//XQueryComment003, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment004, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment005, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment006, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment007, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment008, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//XQueryComment009, EXPECTED_RESULT_GOT_FAILURE
 Expressions/XQueryComment//XQueryComment010, EXPECTED_RESULT_GOT_FAILURE
 Expressions/XQueryComment//XQueryComment011, EXPECTED_RESULT_GOT_FAILURE
@@ -7203,7 +7307,7 @@ Expressions/XQueryComment//XQueryComment016, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//XQueryComment017, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//XQueryComment018, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//XQueryComment019, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/XQueryComment//XQueryComment020, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/XQueryComment//XQueryComment020, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//CastAs001, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//CastAs002, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//CastAs003, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -9083,7 +9187,7 @@ Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-74, EXPECTED_RESULT_GOT_SAME
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-740, EXPECTED_ERROR_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-741, EXPECTED_ERROR_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-742, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-743, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-743, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-744, EXPECTED_RESULT_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-745, EXPECTED_ERROR_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-746, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10421,8 +10525,8 @@ FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-1, EXPECTED_ERROR_GOT_SAME_E
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-10, EXPECTED_ERROR_GOT_FAILURE
 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_DIFFERENT_RESULT
-FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-13, EXPECTED_RESULT_GOT_FAILURE
+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
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-17, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10475,8 +10579,8 @@ FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-18, EXPECTED_RESULT_GOT_ERRO
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-19, EXPECTED_ERROR_GOT_RESULT
 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_DIFFERENT_RESULT
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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_FAILURE
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-24, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-25, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10540,7 +10644,7 @@ 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_DIFFERENT_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-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10553,7 +10657,7 @@ FullAxis/ancestor-or-selfAxis//ancestorself-18, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-19, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-2, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-20, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-21, EXPECTED_RESULT_GOT_ERROR
+FullAxis/ancestor-or-selfAxis//ancestorself-21, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-3, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-4, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-5, EXPECTED_RESULT_GOT_FAILURE
@@ -10562,7 +10666,7 @@ FullAxis/ancestor-or-selfAxis//ancestorself-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//unabbreviatedSyntax-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestorAxis//ancestor-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/ancestorAxis//ancestor-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10584,7 +10688,7 @@ FullAxis/ancestorAxis//ancestor-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//unabbreviatedSyntax-10, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/following-siblingAxis//followingsibling-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/following-siblingAxis//followingsibling-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10606,7 +10710,7 @@ FullAxis/following-siblingAxis//followingsibling-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//unabbreviatedSyntax-24, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/followingAxis//following-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/followingAxis//following-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/followingAxis//following-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10627,7 +10731,7 @@ FullAxis/followingAxis//following-6, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-9, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/preceding-siblingAxis//preceding-sibling-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/preceding-siblingAxis//preceding-sibling-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10649,7 +10753,7 @@ FullAxis/preceding-siblingAxis//preceding-sibling-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//unabbreviatedSyntax-25, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/precedingAxis//preceding-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/precedingAxis//preceding-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/precedingAxis//preceding-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/precedingAxis//preceding-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/precedingAxis//preceding-12, EXPECTED_RESULT_GOT_FAILURE
@@ -11302,7 +11406,7 @@ 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_FAILURE
 FunctX/functx-functx-distinct-element-paths//functx-functx-distinct-element-paths-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-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-duration-from-timezone//functx-functx-duration-from-timezone-1, EXPECTED_RESULT_GOT_ERROR
@@ -11514,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_ERROR
+FunctX/functx-functx-max-string//functx-functx-max-string-1, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+FunctX/functx-functx-max-string//functx-functx-max-string-all, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+FunctX/functx-functx-min-string//functx-functx-min-string-1, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+FunctX/functx-functx-min-string//functx-functx-min-string-all, EXPECTED_RESULT_GOT_FAILURE
 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
@@ -11550,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_ERROR
-FunctX/functx-functx-node-kind//functx-functx-node-kind-4, 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-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_ERROR
+FunctX/functx-functx-node-kind//functx-functx-node-kind-all, EXPECTED_RESULT_GOT_FAILURE
 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
@@ -11641,29 +11745,29 @@ 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_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-2, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-3, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
+FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-3, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-all, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-11, 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-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_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-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-siblings-same-name//functx-functx-siblings-same-name-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-siblings-same-name//functx-functx-siblings-same-name-2, EXPECTED_RESULT_GOT_FAILURE
@@ -11672,15 +11776,15 @@ FunctX/functx-functx-siblings//functx-functx-siblings-1, EXPECTED_RESULT_GOT_FAI
 FunctX/functx-functx-siblings//functx-functx-siblings-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-siblings//functx-functx-siblings-all, EXPECTED_RESULT_GOT_FAILURE
 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_ERROR
-FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-all, 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-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_ERROR
-FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-all, 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-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_ERROR
-FunctX/functx-functx-sort//functx-functx-sort-all, 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-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-funct

<TRUNCATED>

[16/51] [abbrv] git commit: Removed test queries now that we have a test suite.

Posted by vi...@apache.org.
Removed test queries now that we have a test suite.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/c8f9462f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/c8f9462f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/c8f9462f

Branch: refs/heads/vxquery_0_3_staging
Commit: c8f9462f522671001c65b2992e2f91af73e235f4
Parents: 94cf5de
Author: Preston Carman <pr...@apache.org>
Authored: Thu Apr 3 10:09:37 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Apr 3 10:09:37 2014 -0700

----------------------------------------------------------------------
 .../src/main/resources/noaa-ghcn-daily/queries/q_test_00.xq    | 5 -----
 .../src/main/resources/noaa-ghcn-daily/queries/q_test_01.xq    | 6 ------
 .../src/main/resources/noaa-ghcn-daily/queries/q_test_02.xq    | 6 ------
 3 files changed, 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c8f9462f/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_00.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_00.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_00.xq
deleted file mode 100644
index e55dced..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_00.xq
+++ /dev/null
@@ -1,5 +0,0 @@
-(: XQuery Test Query :)
-for $r in (1 to 5)
-for $s in (3 to 7)
-where $r eq $s
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c8f9462f/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_01.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_01.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_01.xq
deleted file mode 100644
index e96f0a4..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_01.xq
+++ /dev/null
@@ -1,6 +0,0 @@
-(: XQuery Test Query :)
-(: Find a specific record GHCND:BB000078954 on 1944-02-29 for TMIN. :)
-let $collection := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-for $r in collection($collection)/dataCollection/data
-where data($r/station) eq "GHCND:ASN00008113" and data($r/date) eq "1944-02-29T00:00:00.000" and data($r/dataType) eq "PRCP"
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c8f9462f/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_02.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_02.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_02.xq
deleted file mode 100644
index a5621b9..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_02.xq
+++ /dev/null
@@ -1,6 +0,0 @@
-(: XQuery Test Query :)
-(: Count all the XML documents. :)
-count( 
-    let $collection := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-    return collection($collection) 
-)


[08/51] [abbrv] Updated the testing resources.

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
new file mode 100644
index 0000000..18f5929
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
@@ -0,0 +1,8 @@
+(: XQuery Join Query :)
+(: Find all the weather readings for Washington state for a specific day    :)
+(: 2002-2-2.                                                                  :)
+let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+for $r in collection($sensor_collection)/dataCollection/data
+    
+where xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
+return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
new file mode 100644
index 0000000..d7630f0
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
@@ -0,0 +1,8 @@
+(: XQuery Join Query :)
+(: Find all the weather readings for Washington state for a specific day    :)
+(: 2002-2-2.                                                                  :)
+let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+for $s in collection($station_collection)/stationCollection/station
+
+where (some $x in $s/locationLabels satisfies ($x/type eq "ST" and fn:upper-case(fn:data($x/displayName)) eq "STATE 1"))
+return $s
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
new file mode 100644
index 0000000..df822a1
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:min(
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
new file mode 100644
index 0000000..ed9bdb0
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find the highest recorded temperature (TMAX) for each station for each     :)
+(: day over the year 2002.                                                    :)
+let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+for $r in collection($sensor_collection)/dataCollection/data
+
+where $s/id eq $r/station
+    and $r/dataType eq "TMAX" 
+    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+return ($s/displayName, $r/date, $r/value)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
new file mode 100644
index 0000000..d0e8c48
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:avg(
+    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r_max in collection($sensor_collection_max)/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/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
new file mode 100644
index 0000000..64636bc
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
@@ -0,0 +1,11 @@
+(: XQuery Filter Query :)
+(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
+(: the weather readings for December 25 over the last 10 years.               :)
+let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+for $r in collection($collection)/dataCollection/data
+let $datetime := xs:dateTime(fn:data($r/date))
+where $r/station eq "GHCND:AS000000003" 
+    and fn:year-from-dateTime($datetime) ge 2000
+    and fn:month-from-dateTime($datetime) eq 3 
+    and fn:day-from-dateTime($datetime) eq 3
+return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
new file mode 100644
index 0000000..4e1edc5
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
@@ -0,0 +1,8 @@
+(: 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 := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+for $r in collection($collection)/dataCollection/data
+where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
+return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
new file mode 100644
index 0000000..fac6bf0
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:sum(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
new file mode 100644
index 0000000..ce3d0d3
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:max(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
new file mode 100644
index 0000000..5d6d1d1
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find all the weather readings for Washington state for a specific day    :)
+(: 2002-2-2.                                                                  :)
+let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+for $r in collection($sensor_collection)/dataCollection/data
+    
+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 "STATE 1"))
+    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
+return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
new file mode 100644
index 0000000..15b98c1
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:min(
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
new file mode 100644
index 0000000..df17713
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find the highest recorded temperature (TMAX) for each station for each     :)
+(: day over the year 2002.                                                    :)
+let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+for $r in collection($sensor_collection)/dataCollection/data
+
+where $s/id eq $r/station
+    and $r/dataType eq "TMAX" 
+    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+return ($s/displayName, $r/date, $r/value)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
new file mode 100644
index 0000000..2debae0
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:avg(
+    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r_max in collection($sensor_collection_max)/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/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
new file mode 100644
index 0000000..e130e2a
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
@@ -0,0 +1,11 @@
+(: XQuery Filter Query :)
+(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
+(: the weather readings for December 25 over the last 10 years.               :)
+let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+for $r in collection($collection)/dataCollection/data
+let $datetime := xs:dateTime(fn:data($r/date))
+where $r/station eq "GHCND:AS000000003" 
+    and fn:year-from-dateTime($datetime) ge 2000
+    and fn:month-from-dateTime($datetime) eq 3 
+    and fn:day-from-dateTime($datetime) eq 3
+return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
new file mode 100644
index 0000000..bad94e4
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
@@ -0,0 +1,8 @@
+(: 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 := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+for $r in collection($collection)/dataCollection/data
+where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
+return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
new file mode 100644
index 0000000..f4c2722
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:sum(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
new file mode 100644
index 0000000..7199c97
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:max(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
new file mode 100644
index 0000000..cdf85dd
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find all the weather readings for Washington state for a specific day    :)
+(: 2002-2-2.                                                                  :)
+let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+for $r in collection($sensor_collection)/dataCollection/data
+    
+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 "STATE 1"))
+    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
+return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
new file mode 100644
index 0000000..5036305
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:min(
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
new file mode 100644
index 0000000..51c474d
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find the highest recorded temperature (TMAX) for each station for each     :)
+(: day over the year 2002.                                                    :)
+let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+for $r in collection($sensor_collection)/dataCollection/data
+
+where $s/id eq $r/station
+    and $r/dataType eq "TMAX" 
+    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+return ($s/displayName, $r/date, $r/value)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
new file mode 100644
index 0000000..a508e52
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:avg(
+    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r_max in collection($sensor_collection_max)/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/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
new file mode 100644
index 0000000..73e8aea
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:count(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
new file mode 100644
index 0000000..0d327d1
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:count(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
new file mode 100644
index 0000000..9f2ac93
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:count(
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
new file mode 100644
index 0000000..917b7c6
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:count(
+    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r_max in collection($sensor_collection_max)/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
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
new file mode 100644
index 0000000..52e7790
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:count(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
new file mode 100644
index 0000000..619c6d1
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:count(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
new file mode 100644
index 0000000..c32bcd1
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:count(
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
new file mode 100644
index 0000000..fd3431f
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:count(
+    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r_max in collection($sensor_collection_max)/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
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
new file mode 100644
index 0000000..2940380
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:count(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
new file mode 100644
index 0000000..eb6ff10
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:count(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
new file mode 100644
index 0000000..768e35d
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:count(
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
new file mode 100644
index 0000000..8ea026b
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+fn:count(
+    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r_max in collection($sensor_collection_max)/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
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
new file mode 100644
index 0000000..68b87b5
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
@@ -0,0 +1,9 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
new file mode 100644
index 0000000..8a22c5e
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
@@ -0,0 +1,6 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
new file mode 100644
index 0000000..0cd735d
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
new file mode 100644
index 0000000..793fbba
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
new file mode 100644
index 0000000..4b14f55
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
@@ -0,0 +1,9 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
new file mode 100644
index 0000000..581644a
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
@@ -0,0 +1,6 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
new file mode 100644
index 0000000..83b4683
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
new file mode 100644
index 0000000..1948ba0
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
new file mode 100644
index 0000000..8fb560b
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
@@ -0,0 +1,9 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
new file mode 100644
index 0000000..835e3b2
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
@@ -0,0 +1,6 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
new file mode 100644
index 0000000..664e91b
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
new file mode 100644
index 0000000..6f8c165
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
new file mode 100644
index 0000000..cc2fd33
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2001-01-01T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000001</station><value>11.25</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000001</station><value>31</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
new file mode 100644
index 0000000..213f748
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><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/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
new file mode 100644
index 0000000..c095726
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
new file mode 100644
index 0000000..3bcec27
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000004</id><displayName>Station 4</displayName><latitude>40.000</latitude><longitude>-40.000</longitude><elevation>4000.0</elevation><locationLabels><type>ST</type><id>FIPS:1</id><displayName>State 4</displayName></locationLabels><locationLabels><type>CNTY</type><id>FIPS:-9999</id><displayName>County 4</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/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
new file mode 100644
index 0000000..3a540d3
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
new file mode 100644
index 0000000..e9dc6e9
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000002</id><displayName>Station 2</displayName><latitude>20.000</latitude><longitude>-20.000</longitude><elevation>2000.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 2</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/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
new file mode 100644
index 0000000..2dbe586
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2004-04-04T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000004</station><value>40</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2004-04-04T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000004</station><value>4</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
new file mode 100644
index 0000000..4919c20
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:AS000000003</id><displayName>Station 3</displayName><latitude>-30.000</latitude><longitude>30.000</longitude><locationLabels><type>CNTRY</type><id>FIPS:AS</id><displayName>AUSTRALIA</displayName></locationLabels></station></stationCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/VXQueryCatalog.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/VXQueryCatalog.xml b/vxquery-xtest/src/tests/resources/VXQueryCatalog.xml
new file mode 100644
index 0000000..f396f98
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/VXQueryCatalog.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE test-suite [
+
+<!ENTITY AggregatePartition1Queries SYSTEM "cat/AggregatePartition1Queries.xml">
+<!ENTITY AggregatePartition2Queries SYSTEM "cat/AggregatePartition2Queries.xml">
+<!ENTITY AggregatePartition4Queries SYSTEM "cat/AggregatePartition4Queries.xml">
+
+<!ENTITY GhcndPartition1Queries SYSTEM "cat/GhcndPartition1Queries.xml">
+<!ENTITY GhcndPartition2Queries SYSTEM "cat/GhcndPartition2Queries.xml">
+<!ENTITY GhcndPartition4Queries SYSTEM "cat/GhcndPartition4Queries.xml">
+
+<!ENTITY GhcndRecordsPartition1Queries SYSTEM "cat/GhcndRecordsPartition1Queries.xml">
+<!ENTITY GhcndRecordsPartition2Queries SYSTEM "cat/GhcndRecordsPartition2Queries.xml">
+<!ENTITY GhcndRecordsPartition4Queries SYSTEM "cat/GhcndRecordsPartition4Queries.xml">
+
+<!ENTITY GhcndCountPartition1Queries SYSTEM "cat/GhcndCountPartition1Queries.xml">
+<!ENTITY GhcndCountPartition2Queries SYSTEM "cat/GhcndCountPartition2Queries.xml">
+<!ENTITY GhcndCountPartition4Queries SYSTEM "cat/GhcndCountPartition4Queries.xml">
+
+]>
+<test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            CatalogDesignDate="2014-04-01"
+            version="0.0.1"
+            SourceOffsetPath="./"
+            ResultOffsetPath="ExpectedTestResults/"
+            XQueryQueryOffsetPath="Queries/XQuery/"
+            XQueryXQueryOffsetPath="Queries/XQueryX/"
+            XQueryFileExtension=".xq"
+            XQueryXFileExtension=".xqx"
+            xsi:schemaLocation="http://www.w3.org/2005/02/query-test-XQTSCatalog XQTSCatalog.xsd">
+   <test-suite-info>
+      <title>VXQuery Test Suite</title>
+      <description> 
+         Test Suite for VXQuery. 
+      </description>
+   </test-suite-info>
+   <test-group name="AggregatePartitionQueries" featureOwner="Preston Carman">
+      <GroupInfo>
+         <title>Aggregate Partition Queries</title>
+         <description/>
+      </GroupInfo>
+      <test-group name="AggregateParallelExecutionTests" featureOwner="Preston Carman">
+         <GroupInfo>
+            <title>Aggregate Parallel Execution Tests</title>
+            <description/>
+         </GroupInfo>
+         &AggregatePartition1Queries;
+         &AggregatePartition2Queries;
+         &AggregatePartition4Queries;
+      </test-group>
+   </test-group>
+   <test-group name="GhcndPartitionQueries" featureOwner="Preston Carman">
+      <GroupInfo>
+         <title>GHCND Partition Queries</title>
+         <description/>
+      </GroupInfo>
+      <test-group name="ParallelExecutionTests" featureOwner="Preston Carman">
+         <GroupInfo>
+            <title>Parallel Execution Tests</title>
+            <description/>
+         </GroupInfo>
+         &GhcndPartition1Queries;
+         &GhcndPartition2Queries;
+         &GhcndPartition4Queries;
+      </test-group>
+   </test-group>
+   <test-group name="GhcndCountPartitionQueries" featureOwner="Preston Carman">
+      <GroupInfo>
+         <title>GHCND Count Partition Queries</title>
+         <description/>
+      </GroupInfo>
+      <test-group name="CountParallelExecutionTests" featureOwner="Preston Carman">
+         <GroupInfo>
+            <title>Parallel Execution Tests</title>
+            <description/>
+         </GroupInfo>
+         &GhcndCountPartition1Queries;
+         &GhcndCountPartition2Queries;
+         &GhcndCountPartition4Queries;
+      </test-group>
+   </test-group>
+   <test-group name="GhcndRecordsPartitionQueries" featureOwner="Preston Carman">
+      <GroupInfo>
+         <title>GHCND Records Partition Queries</title>
+         <description/>
+      </GroupInfo>
+      <test-group name="RecordsParallelExecutionTests" featureOwner="Preston Carman">
+         <GroupInfo>
+            <title>Records Parallel Execution Tests</title>
+            <description/>
+         </GroupInfo>
+         &GhcndRecordsPartition1Queries;
+         &GhcndRecordsPartition2Queries;
+         &GhcndRecordsPartition4Queries;
+      </test-group>
+   </test-group>
+</test-suite>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml
new file mode 100644
index 0000000..c901468
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml
@@ -0,0 +1,31 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>Aggregate Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="aggregate-partition-1-avg" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="avg" date="2014-04-01"/>
+      <output-file compare="Text">avg.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="count" date="2014-04-01"/>
+      <output-file compare="Text">count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+      <query name="min" date="2014-04-01"/>
+      <output-file compare="Text">min.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+      <query name="max" date="2014-04-01"/>
+      <output-file compare="Text">max.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+      <query name="sum" date="2014-04-01"/>
+      <output-file compare="Text">sum.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml
new file mode 100644
index 0000000..a4ac807
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml
@@ -0,0 +1,36 @@
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition2Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>Aggregate Partition 2</title>
+      <description/>
+   </GroupInfo>
+   <test-case is-XPath2="true" name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
+      <query name="avg" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">avg.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
+      <query name="count" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">count.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 2 partition.</description>
+      <query name="min" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">min.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 2 partition.</description>
+      <query name="max" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">max.txt</output-file>
+   </test-case>
+   <test-case is-XPath2="true" name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 2 partition.</description>
+      <query name="sum" date="2014-04-01"/>
+      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
+      <output-file role="principal" compare="Text">sum.txt</output-file>
+   </test-case>
+</test-group>
\ No newline at end of file


[14/51] [abbrv] git commit: make tests location-independent - use source elements in the catalog to identify partitions for collections - more test resources from src/tests/resources to src/test/resources

Posted by vi...@apache.org.
make tests location-independent
- use source elements in the catalog to identify partitions for collections
- more test resources from src/tests/resources to src/test/resources


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/fc9c5bf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/fc9c5bf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/fc9c5bf1

Branch: refs/heads/vxquery_0_3_staging
Commit: fc9c5bf12943eefe72c6c778edc529b77e1be440
Parents: 16f26a6
Author: Till Westmann <we...@gmail.com>
Authored: Wed Apr 2 22:42:07 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Wed Apr 2 22:42:07 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/vxquery/cli/VXQuery.java    |   2 +-
 .../vxquery/compiler/CompilerControlBlock.java  |  14 ++-
 .../rewriter/rules/IntroduceCollectionRule.java |  10 +-
 .../rules/SetCollectionDataSourceRule.java      |  10 +-
 .../metadata/VXQueryCollectionDataSource.java   |  12 +-
 .../metadata/VXQueryMetadataProvider.java       |  20 ++-
 .../xmlquery/query/XMLQueryCompiler.java        |   9 +-
 .../xmlquery/query/SimpleXQueryTest.java        |   2 +-
 .../java/org/apache/vxquery/xtest/TestCase.java |   5 +
 .../apache/vxquery/xtest/TestCaseFactory.java   |  10 +-
 .../apache/vxquery/xtest/TestConfiguration.java |   6 +-
 .../apache/vxquery/xtest/TestRunnerFactory.java |   5 +-
 .../Aggregate/Partition-1/avg.txt               |   1 +
 .../Aggregate/Partition-1/count.txt             |   1 +
 .../Aggregate/Partition-1/max.txt               |   1 +
 .../Aggregate/Partition-1/min.txt               |   1 +
 .../Aggregate/Partition-1/sum.txt               |   1 +
 .../Aggregate/Partition-2/avg.txt               |   1 +
 .../Aggregate/Partition-2/count.txt             |   1 +
 .../Aggregate/Partition-2/max.txt               |   1 +
 .../Aggregate/Partition-2/min.txt               |   1 +
 .../Aggregate/Partition-2/sum.txt               |   1 +
 .../Aggregate/Partition-4/avg.txt               |   1 +
 .../Aggregate/Partition-4/count.txt             |   1 +
 .../Aggregate/Partition-4/max.txt               |   1 +
 .../Aggregate/Partition-4/min.txt               |   1 +
 .../Aggregate/Partition-4/sum.txt               |   1 +
 .../Ghcnd/Partition-1/q00.txt                   |   2 +
 .../Ghcnd/Partition-1/q01.txt                   |   1 +
 .../Ghcnd/Partition-1/q02.txt                   |   1 +
 .../Ghcnd/Partition-1/q03.txt                   |   1 +
 .../Ghcnd/Partition-1/q04.txt                   |   3 +
 .../Ghcnd/Partition-1/q05.txt                   |   1 +
 .../Ghcnd/Partition-1/q06.txt                   |   3 +
 .../Ghcnd/Partition-1/q07.txt                   |   1 +
 .../Ghcnd/Partition-2/q00.txt                   |   2 +
 .../Ghcnd/Partition-2/q01.txt                   |   1 +
 .../Ghcnd/Partition-2/q02.txt                   |   1 +
 .../Ghcnd/Partition-2/q03.txt                   |   1 +
 .../Ghcnd/Partition-2/q04.txt                   |   3 +
 .../Ghcnd/Partition-2/q05.txt                   |   1 +
 .../Ghcnd/Partition-2/q06.txt                   |   3 +
 .../Ghcnd/Partition-2/q07.txt                   |   1 +
 .../Ghcnd/Partition-4/q00.txt                   |   2 +
 .../Ghcnd/Partition-4/q01.txt                   |   1 +
 .../Ghcnd/Partition-4/q02.txt                   |   1 +
 .../Ghcnd/Partition-4/q03.txt                   |   1 +
 .../Ghcnd/Partition-4/q04.txt                   |   3 +
 .../Ghcnd/Partition-4/q05.txt                   |   1 +
 .../Ghcnd/Partition-4/q06.txt                   |   3 +
 .../Ghcnd/Partition-4/q07.txt                   |   1 +
 .../GhcndCount/Partition-1/q02_count.txt        |   1 +
 .../GhcndCount/Partition-1/q03_count.txt        |   1 +
 .../GhcndCount/Partition-1/q05_count.txt        |   1 +
 .../GhcndCount/Partition-1/q07_count.txt        |   1 +
 .../GhcndCount/Partition-2/q02_count.txt        |   1 +
 .../GhcndCount/Partition-2/q03_count.txt        |   1 +
 .../GhcndCount/Partition-2/q05_count.txt        |   1 +
 .../GhcndCount/Partition-2/q07_count.txt        |   1 +
 .../GhcndCount/Partition-4/q02_count.txt        |   1 +
 .../GhcndCount/Partition-4/q03_count.txt        |   1 +
 .../GhcndCount/Partition-4/q05_count.txt        |   1 +
 .../GhcndCount/Partition-4/q07_count.txt        |   1 +
 .../GhcndRecords/Partition-1/q02_records.txt    |   1 +
 .../GhcndRecords/Partition-1/q03_records.txt    |   3 +
 .../GhcndRecords/Partition-1/q05_records.txt    |   1 +
 .../GhcndRecords/Partition-1/q07_records.txt    |   3 +
 .../GhcndRecords/Partition-2/q02_records.txt    |   1 +
 .../GhcndRecords/Partition-2/q03_records.txt    |   3 +
 .../GhcndRecords/Partition-2/q05_records.txt    |   1 +
 .../GhcndRecords/Partition-2/q07_records.txt    |   3 +
 .../GhcndRecords/Partition-4/q02_records.txt    |   1 +
 .../GhcndRecords/Partition-4/q03_records.txt    |   3 +
 .../GhcndRecords/Partition-4/q05_records.txt    |   1 +
 .../GhcndRecords/Partition-4/q07_records.txt    |   3 +
 .../Queries/XQuery/Aggregate/Partition-1/avg.xq |   8 ++
 .../XQuery/Aggregate/Partition-1/count.xq       |   8 ++
 .../Queries/XQuery/Aggregate/Partition-1/max.xq |   8 ++
 .../Queries/XQuery/Aggregate/Partition-1/min.xq |   8 ++
 .../Queries/XQuery/Aggregate/Partition-1/sum.xq |   8 ++
 .../Queries/XQuery/Aggregate/Partition-2/avg.xq |   8 ++
 .../XQuery/Aggregate/Partition-2/count.xq       |   8 ++
 .../Queries/XQuery/Aggregate/Partition-2/max.xq |   8 ++
 .../Queries/XQuery/Aggregate/Partition-2/min.xq |   8 ++
 .../Queries/XQuery/Aggregate/Partition-2/sum.xq |   8 ++
 .../Queries/XQuery/Aggregate/Partition-4/avg.xq |   8 ++
 .../XQuery/Aggregate/Partition-4/count.xq       |   8 ++
 .../Queries/XQuery/Aggregate/Partition-4/max.xq |   8 ++
 .../Queries/XQuery/Aggregate/Partition-4/min.xq |   8 ++
 .../Queries/XQuery/Aggregate/Partition-4/sum.xq |   8 ++
 .../Queries/XQuery/Ghcnd/Partition-1/q00.xq     |  11 ++
 .../Queries/XQuery/Ghcnd/Partition-1/q01.xq     |   8 ++
 .../Queries/XQuery/Ghcnd/Partition-1/q02.xq     |  11 ++
 .../Queries/XQuery/Ghcnd/Partition-1/q03.xq     |   8 ++
 .../Queries/XQuery/Ghcnd/Partition-1/q04.xq     |  13 ++
 .../XQuery/Ghcnd/Partition-1/q04_sensors.xq     |   8 ++
 .../XQuery/Ghcnd/Partition-1/q04_stations.xq    |   8 ++
 .../Queries/XQuery/Ghcnd/Partition-1/q05.xq     |  16 +++
 .../Queries/XQuery/Ghcnd/Partition-1/q06.xq     |  13 ++
 .../Queries/XQuery/Ghcnd/Partition-1/q07.xq     |  16 +++
 .../Queries/XQuery/Ghcnd/Partition-2/q00.xq     |  11 ++
 .../Queries/XQuery/Ghcnd/Partition-2/q01.xq     |   8 ++
 .../Queries/XQuery/Ghcnd/Partition-2/q02.xq     |  11 ++
 .../Queries/XQuery/Ghcnd/Partition-2/q03.xq     |   8 ++
 .../Queries/XQuery/Ghcnd/Partition-2/q04.xq     |  13 ++
 .../Queries/XQuery/Ghcnd/Partition-2/q05.xq     |  16 +++
 .../Queries/XQuery/Ghcnd/Partition-2/q06.xq     |  13 ++
 .../Queries/XQuery/Ghcnd/Partition-2/q07.xq     |  16 +++
 .../Queries/XQuery/Ghcnd/Partition-4/q00.xq     |  11 ++
 .../Queries/XQuery/Ghcnd/Partition-4/q01.xq     |   8 ++
 .../Queries/XQuery/Ghcnd/Partition-4/q02.xq     |  11 ++
 .../Queries/XQuery/Ghcnd/Partition-4/q03.xq     |   8 ++
 .../Queries/XQuery/Ghcnd/Partition-4/q04.xq     |  13 ++
 .../Queries/XQuery/Ghcnd/Partition-4/q05.xq     |  16 +++
 .../Queries/XQuery/Ghcnd/Partition-4/q06.xq     |  13 ++
 .../Queries/XQuery/Ghcnd/Partition-4/q07.xq     |  16 +++
 .../XQuery/GhcndCount/Partition-1/q02_count.xq  |  11 ++
 .../XQuery/GhcndCount/Partition-1/q03_count.xq  |   8 ++
 .../XQuery/GhcndCount/Partition-1/q05_count.xq  |  16 +++
 .../XQuery/GhcndCount/Partition-1/q07_count.xq  |  16 +++
 .../XQuery/GhcndCount/Partition-2/q02_count.xq  |  11 ++
 .../XQuery/GhcndCount/Partition-2/q03_count.xq  |   8 ++
 .../XQuery/GhcndCount/Partition-2/q05_count.xq  |  16 +++
 .../XQuery/GhcndCount/Partition-2/q07_count.xq  |  16 +++
 .../XQuery/GhcndCount/Partition-4/q02_count.xq  |  11 ++
 .../XQuery/GhcndCount/Partition-4/q03_count.xq  |   8 ++
 .../XQuery/GhcndCount/Partition-4/q05_count.xq  |  16 +++
 .../XQuery/GhcndCount/Partition-4/q07_count.xq  |  16 +++
 .../GhcndRecords/Partition-1/q02_records.xq     |   9 ++
 .../GhcndRecords/Partition-1/q03_records.xq     |   6 +
 .../GhcndRecords/Partition-1/q05_records.xq     |  14 +++
 .../GhcndRecords/Partition-1/q07_records.xq     |  14 +++
 .../GhcndRecords/Partition-2/q02_records.xq     |   9 ++
 .../GhcndRecords/Partition-2/q03_records.xq     |   6 +
 .../GhcndRecords/Partition-2/q05_records.xq     |  14 +++
 .../GhcndRecords/Partition-2/q07_records.xq     |  14 +++
 .../GhcndRecords/Partition-4/q02_records.xq     |   9 ++
 .../GhcndRecords/Partition-4/q03_records.xq     |   6 +
 .../GhcndRecords/Partition-4/q05_records.xq     |  14 +++
 .../GhcndRecords/Partition-4/q07_records.xq     |  14 +++
 .../quarter_1/sesnors/US000000001_200101_0.xml  |   1 +
 .../half_1/quarter_1/stations/US000000001.xml   |   1 +
 .../quarter_2/sesnors/US000000002_200202_0.xml  |   1 +
 .../half_1/quarter_2/stations/US000000004.xml   |   1 +
 .../quarter_3/sesnors/AS000000003_200303_0.xml  |   1 +
 .../half_2/quarter_3/stations/US000000002.xml   |   1 +
 .../quarter_4/sesnors/US000000004_200404_0.xml  |   1 +
 .../half_2/quarter_4/stations/AS000000003.xml   |   1 +
 .../src/test/resources/VXQueryCatalog.xml       | 124 +++++++++++++++++++
 .../cat/AggregatePartition1Queries.xml          |  31 +++++
 .../cat/AggregatePartition2Queries.xml          |  36 ++++++
 .../cat/AggregatePartition4Queries.xml          |  36 ++++++
 .../cat/GhcndCountPartition1Queries.xml         |  30 +++++
 .../cat/GhcndCountPartition2Queries.xml         |  30 +++++
 .../cat/GhcndCountPartition4Queries.xml         |  30 +++++
 .../resources/cat/GhcndPartition1Queries.xml    |  54 ++++++++
 .../resources/cat/GhcndPartition2Queries.xml    |  54 ++++++++
 .../resources/cat/GhcndPartition4Queries.xml    |  54 ++++++++
 .../cat/GhcndRecordsPartition1Queries.xml       |  30 +++++
 .../cat/GhcndRecordsPartition2Queries.xml       |  30 +++++
 .../cat/GhcndRecordsPartition4Queries.xml       |  30 +++++
 .../Aggregate/Partition-1/avg.txt               |   1 -
 .../Aggregate/Partition-1/count.txt             |   1 -
 .../Aggregate/Partition-1/max.txt               |   1 -
 .../Aggregate/Partition-1/min.txt               |   1 -
 .../Aggregate/Partition-1/sum.txt               |   1 -
 .../Aggregate/Partition-2/avg.txt               |   1 -
 .../Aggregate/Partition-2/count.txt             |   1 -
 .../Aggregate/Partition-2/max.txt               |   1 -
 .../Aggregate/Partition-2/min.txt               |   1 -
 .../Aggregate/Partition-2/sum.txt               |   1 -
 .../Aggregate/Partition-4/avg.txt               |   1 -
 .../Aggregate/Partition-4/count.txt             |   1 -
 .../Aggregate/Partition-4/max.txt               |   1 -
 .../Aggregate/Partition-4/min.txt               |   1 -
 .../Aggregate/Partition-4/sum.txt               |   1 -
 .../Ghcnd/Partition-1/q00.txt                   |   2 -
 .../Ghcnd/Partition-1/q01.txt                   |   1 -
 .../Ghcnd/Partition-1/q02.txt                   |   1 -
 .../Ghcnd/Partition-1/q03.txt                   |   1 -
 .../Ghcnd/Partition-1/q04.txt                   |   3 -
 .../Ghcnd/Partition-1/q05.txt                   |   1 -
 .../Ghcnd/Partition-1/q06.txt                   |   3 -
 .../Ghcnd/Partition-1/q07.txt                   |   1 -
 .../Ghcnd/Partition-2/q00.txt                   |   2 -
 .../Ghcnd/Partition-2/q01.txt                   |   1 -
 .../Ghcnd/Partition-2/q02.txt                   |   1 -
 .../Ghcnd/Partition-2/q03.txt                   |   1 -
 .../Ghcnd/Partition-2/q04.txt                   |   3 -
 .../Ghcnd/Partition-2/q05.txt                   |   1 -
 .../Ghcnd/Partition-2/q06.txt                   |   3 -
 .../Ghcnd/Partition-2/q07.txt                   |   1 -
 .../Ghcnd/Partition-4/q00.txt                   |   2 -
 .../Ghcnd/Partition-4/q01.txt                   |   1 -
 .../Ghcnd/Partition-4/q02.txt                   |   1 -
 .../Ghcnd/Partition-4/q03.txt                   |   1 -
 .../Ghcnd/Partition-4/q04.txt                   |   3 -
 .../Ghcnd/Partition-4/q05.txt                   |   1 -
 .../Ghcnd/Partition-4/q06.txt                   |   3 -
 .../Ghcnd/Partition-4/q07.txt                   |   1 -
 .../GhcndCount/Partition-1/q02_count.txt        |   1 -
 .../GhcndCount/Partition-1/q03_count.txt        |   1 -
 .../GhcndCount/Partition-1/q05_count.txt        |   1 -
 .../GhcndCount/Partition-1/q07_count.txt        |   1 -
 .../GhcndCount/Partition-2/q02_count.txt        |   1 -
 .../GhcndCount/Partition-2/q03_count.txt        |   1 -
 .../GhcndCount/Partition-2/q05_count.txt        |   1 -
 .../GhcndCount/Partition-2/q07_count.txt        |   1 -
 .../GhcndCount/Partition-4/q02_count.txt        |   1 -
 .../GhcndCount/Partition-4/q03_count.txt        |   1 -
 .../GhcndCount/Partition-4/q05_count.txt        |   1 -
 .../GhcndCount/Partition-4/q07_count.txt        |   1 -
 .../GhcndRecords/Partition-1/q02_records.txt    |   1 -
 .../GhcndRecords/Partition-1/q03_records.txt    |   3 -
 .../GhcndRecords/Partition-1/q05_records.txt    |   1 -
 .../GhcndRecords/Partition-1/q07_records.txt    |   3 -
 .../GhcndRecords/Partition-2/q02_records.txt    |   1 -
 .../GhcndRecords/Partition-2/q03_records.txt    |   3 -
 .../GhcndRecords/Partition-2/q05_records.txt    |   1 -
 .../GhcndRecords/Partition-2/q07_records.txt    |   3 -
 .../GhcndRecords/Partition-4/q02_records.txt    |   1 -
 .../GhcndRecords/Partition-4/q03_records.txt    |   3 -
 .../GhcndRecords/Partition-4/q05_records.txt    |   1 -
 .../GhcndRecords/Partition-4/q07_records.txt    |   3 -
 .../Queries/XQuery/Aggregate/Partition-1/avg.xq |   8 --
 .../XQuery/Aggregate/Partition-1/count.xq       |   8 --
 .../Queries/XQuery/Aggregate/Partition-1/max.xq |   8 --
 .../Queries/XQuery/Aggregate/Partition-1/min.xq |   8 --
 .../Queries/XQuery/Aggregate/Partition-1/sum.xq |   8 --
 .../Queries/XQuery/Aggregate/Partition-2/avg.xq |   8 --
 .../XQuery/Aggregate/Partition-2/count.xq       |   8 --
 .../Queries/XQuery/Aggregate/Partition-2/max.xq |   8 --
 .../Queries/XQuery/Aggregate/Partition-2/min.xq |   8 --
 .../Queries/XQuery/Aggregate/Partition-2/sum.xq |   8 --
 .../Queries/XQuery/Aggregate/Partition-4/avg.xq |   8 --
 .../XQuery/Aggregate/Partition-4/count.xq       |   8 --
 .../Queries/XQuery/Aggregate/Partition-4/max.xq |   8 --
 .../Queries/XQuery/Aggregate/Partition-4/min.xq |   8 --
 .../Queries/XQuery/Aggregate/Partition-4/sum.xq |   8 --
 .../Queries/XQuery/Ghcnd/Partition-1/q00.xq     |  11 --
 .../Queries/XQuery/Ghcnd/Partition-1/q01.xq     |   8 --
 .../Queries/XQuery/Ghcnd/Partition-1/q02.xq     |  11 --
 .../Queries/XQuery/Ghcnd/Partition-1/q03.xq     |   8 --
 .../Queries/XQuery/Ghcnd/Partition-1/q04.xq     |  13 --
 .../XQuery/Ghcnd/Partition-1/q04_sensors.xq     |   8 --
 .../XQuery/Ghcnd/Partition-1/q04_stations.xq    |   8 --
 .../Queries/XQuery/Ghcnd/Partition-1/q05.xq     |  16 ---
 .../Queries/XQuery/Ghcnd/Partition-1/q06.xq     |  13 --
 .../Queries/XQuery/Ghcnd/Partition-1/q07.xq     |  16 ---
 .../Queries/XQuery/Ghcnd/Partition-2/q00.xq     |  11 --
 .../Queries/XQuery/Ghcnd/Partition-2/q01.xq     |   8 --
 .../Queries/XQuery/Ghcnd/Partition-2/q02.xq     |  11 --
 .../Queries/XQuery/Ghcnd/Partition-2/q03.xq     |   8 --
 .../Queries/XQuery/Ghcnd/Partition-2/q04.xq     |  13 --
 .../Queries/XQuery/Ghcnd/Partition-2/q05.xq     |  16 ---
 .../Queries/XQuery/Ghcnd/Partition-2/q06.xq     |  13 --
 .../Queries/XQuery/Ghcnd/Partition-2/q07.xq     |  16 ---
 .../Queries/XQuery/Ghcnd/Partition-4/q00.xq     |  11 --
 .../Queries/XQuery/Ghcnd/Partition-4/q01.xq     |   8 --
 .../Queries/XQuery/Ghcnd/Partition-4/q02.xq     |  11 --
 .../Queries/XQuery/Ghcnd/Partition-4/q03.xq     |   8 --
 .../Queries/XQuery/Ghcnd/Partition-4/q04.xq     |  13 --
 .../Queries/XQuery/Ghcnd/Partition-4/q05.xq     |  16 ---
 .../Queries/XQuery/Ghcnd/Partition-4/q06.xq     |  13 --
 .../Queries/XQuery/Ghcnd/Partition-4/q07.xq     |  16 ---
 .../XQuery/GhcndCount/Partition-1/q02_count.xq  |  11 --
 .../XQuery/GhcndCount/Partition-1/q03_count.xq  |   8 --
 .../XQuery/GhcndCount/Partition-1/q05_count.xq  |  16 ---
 .../XQuery/GhcndCount/Partition-1/q07_count.xq  |  16 ---
 .../XQuery/GhcndCount/Partition-2/q02_count.xq  |  11 --
 .../XQuery/GhcndCount/Partition-2/q03_count.xq  |   8 --
 .../XQuery/GhcndCount/Partition-2/q05_count.xq  |  16 ---
 .../XQuery/GhcndCount/Partition-2/q07_count.xq  |  16 ---
 .../XQuery/GhcndCount/Partition-4/q02_count.xq  |  11 --
 .../XQuery/GhcndCount/Partition-4/q03_count.xq  |   8 --
 .../XQuery/GhcndCount/Partition-4/q05_count.xq  |  16 ---
 .../XQuery/GhcndCount/Partition-4/q07_count.xq  |  16 ---
 .../GhcndRecords/Partition-1/q02_records.xq     |   9 --
 .../GhcndRecords/Partition-1/q03_records.xq     |   6 -
 .../GhcndRecords/Partition-1/q05_records.xq     |  14 ---
 .../GhcndRecords/Partition-1/q07_records.xq     |  14 ---
 .../GhcndRecords/Partition-2/q02_records.xq     |   9 --
 .../GhcndRecords/Partition-2/q03_records.xq     |   6 -
 .../GhcndRecords/Partition-2/q05_records.xq     |  14 ---
 .../GhcndRecords/Partition-2/q07_records.xq     |  14 ---
 .../GhcndRecords/Partition-4/q02_records.xq     |   9 --
 .../GhcndRecords/Partition-4/q03_records.xq     |   6 -
 .../GhcndRecords/Partition-4/q05_records.xq     |  14 ---
 .../GhcndRecords/Partition-4/q07_records.xq     |  14 ---
 .../quarter_1/sesnors/US000000001_200101_0.xml  |   1 -
 .../half_1/quarter_1/stations/US000000001.xml   |   1 -
 .../quarter_2/sesnors/US000000002_200202_0.xml  |   1 -
 .../half_1/quarter_2/stations/US000000004.xml   |   1 -
 .../quarter_3/sesnors/AS000000003_200303_0.xml  |   1 -
 .../half_2/quarter_3/stations/US000000002.xml   |   1 -
 .../quarter_4/sesnors/US000000004_200404_0.xml  |   1 -
 .../half_2/quarter_4/stations/AS000000003.xml   |   1 -
 .../src/tests/resources/VXQueryCatalog.xml      |  98 ---------------
 .../cat/AggregatePartition1Queries.xml          |  31 -----
 .../cat/AggregatePartition2Queries.xml          |  36 ------
 .../cat/AggregatePartition4Queries.xml          |  36 ------
 .../cat/GhcndCountPartition1Queries.xml         |  30 -----
 .../cat/GhcndCountPartition2Queries.xml         |  30 -----
 .../cat/GhcndCountPartition4Queries.xml         |  30 -----
 .../resources/cat/GhcndPartition1Queries.xml    |  54 --------
 .../resources/cat/GhcndPartition2Queries.xml    |  54 --------
 .../resources/cat/GhcndPartition4Queries.xml    |  54 --------
 .../cat/GhcndRecordsPartition1Queries.xml       |  30 -----
 .../cat/GhcndRecordsPartition2Queries.xml       |  30 -----
 .../cat/GhcndRecordsPartition4Queries.xml       |  30 -----
 310 files changed, 1441 insertions(+), 1384 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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 ada055d..13853f7 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
@@ -256,7 +256,7 @@ public class VXQuery {
             XMLQueryCompiler compiler = new XMLQueryCompiler(listener, getNodeList(), opts.frameSize);
             resultSetId = createResultSetId();
             CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl(RootStaticContextImpl.INSTANCE),
-                    resultSetId);
+                    resultSetId, null);
             compiler.compile(query, new StringReader(qStr), ccb, opts.optimizationLevel);
             // if -timing argument passed, show the starting and ending times
             if (opts.timing) {

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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 a737a92..ab58442 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
@@ -16,6 +16,9 @@
  */
 package org.apache.vxquery.compiler;
 
+import java.io.File;
+import java.util.Map;
+
 import org.apache.vxquery.context.StaticContext;
 
 import edu.uci.ics.hyracks.api.dataset.ResultSetId;
@@ -25,9 +28,12 @@ public class CompilerControlBlock {
  
     private ResultSetId resultSetId;
 
-    public CompilerControlBlock(StaticContext ctx, ResultSetId resultSetId) {
+    private Map<String, File> sourceFileMap;
+
+    public CompilerControlBlock(StaticContext ctx, ResultSetId resultSetId, Map<String, File> sourceFileMap) {
         this.ctx = ctx;
         this.resultSetId = resultSetId;
+        this.sourceFileMap = sourceFileMap;
     }
 
     public StaticContext getStaticContext() {
@@ -37,4 +43,8 @@ public class CompilerControlBlock {
     public ResultSetId getResultSetId() {
         return resultSetId;
     }
-}
\ No newline at end of file
+
+    public Map<String, File> getSourceFileMap() {
+        return sourceFileMap;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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 bc8d58a..a5cdfe7 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
@@ -16,9 +16,6 @@
  */
 package org.apache.vxquery.compiler.rewriter.rules;
 
-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.metadata.VXQueryCollectionDataSource;
@@ -76,11 +73,8 @@ public class IntroduceCollectionRule extends AbstractCollectionRule {
         if (collectionName != null) {
             // Build the new operator and update the query plan.
             int collectionId = vxqueryContext.newCollectionId();
-            List<Object> types = new ArrayList<Object>();
-            types.add(SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_STAR));
-
-            VXQueryCollectionDataSource ds = new VXQueryCollectionDataSource(collectionId, collectionName,
-                    types.toArray());
+            VXQueryCollectionDataSource ds = VXQueryCollectionDataSource.create(collectionId, collectionName,
+                    SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_STAR));
             if (ds != null) {
                 ds.setTotalDataSources(vxqueryContext.getTotalDataSources());
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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 1d81a8c..2ddee4d 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
@@ -16,9 +16,6 @@
  */
 package org.apache.vxquery.compiler.rewriter.rules;
 
-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.metadata.VXQueryCollectionDataSource;
@@ -46,11 +43,8 @@ public class SetCollectionDataSourceRule extends AbstractCollectionRule {
         // Build the new collection.
         if (collectionName != null && vxqueryContext.getCollectionDataSourceMap(collectionName) == null) {
             int collectionId = vxqueryContext.getCollectionDataSourceMapSize() + 1;
-            List<Object> types = new ArrayList<Object>();
-            types.add(SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_STAR));
-
-            VXQueryCollectionDataSource ds = new VXQueryCollectionDataSource(collectionId, collectionName,
-                    types.toArray());
+            VXQueryCollectionDataSource ds = VXQueryCollectionDataSource.create(collectionId, collectionName,
+                    SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_STAR));
             vxqueryContext.putCollectionDataSourceMap(collectionName, ds);
             
             context.addToDontApplySet(this, opRef.getValue());

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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 e48d4ab..5c2867f 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
@@ -34,7 +34,7 @@ public class VXQueryCollectionDataSource implements IDataSource<String> {
     private static final String DELIMITER = "\\|";
     private final int dataSourceId;
     private final String collectionName;
-    private final String[] collectionPartitions;
+    private String[] collectionPartitions;
     private final List<Integer> childSeq;
     private int totalDataSources;
 
@@ -42,7 +42,11 @@ public class VXQueryCollectionDataSource implements IDataSource<String> {
 
     private IDataSourcePropertiesProvider propProvider;
 
-    public VXQueryCollectionDataSource(int id, String file, Object[] types) {
+    public static VXQueryCollectionDataSource create(int id, String file, Object type) {
+        return new VXQueryCollectionDataSource(id, file, new Object[] { type });
+    }
+
+    private VXQueryCollectionDataSource(int id, String file, Object[] types) {
         this.dataSourceId = id;
         this.collectionName = file;
         collectionPartitions = collectionName.split(DELIMITER);
@@ -74,6 +78,10 @@ public class VXQueryCollectionDataSource implements IDataSource<String> {
         return collectionPartitions;
     }
     
+    public void setPartitions(String[] collectionPartitions) {
+        this.collectionPartitions = collectionPartitions;
+    }
+
     public int getPartitionCount() {
         return collectionPartitions.length;
     }

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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 0aaac5c..678b74a 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
@@ -16,9 +16,13 @@
  */
 package org.apache.vxquery.metadata;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
 
 import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
 import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
@@ -51,9 +55,11 @@ import edu.uci.ics.hyracks.dataflow.std.result.ResultWriterOperatorDescriptor;
 
 public class VXQueryMetadataProvider implements IMetadataProvider<String, String> {
     String[] nodeList;
+    Map<String, File> sourceFileMap;
 
-    public VXQueryMetadataProvider(String[] nodeList) {
+    public VXQueryMetadataProvider(String[] nodeList, Map<String, File> sourceFileMap) {
         this.nodeList = nodeList;
+        this.sourceFileMap = sourceFileMap;
     }
 
     @Override
@@ -67,6 +73,16 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
             IOperatorSchema opSchema, IVariableTypeEnvironment typeEnv, JobGenContext context,
             JobSpecification jobSpec, Object implConfig) throws AlgebricksException {
         VXQueryCollectionDataSource ds = (VXQueryCollectionDataSource) dataSource;
+        if (sourceFileMap != null) {
+            final int len = ds.getPartitions().length;
+            String[] collectionPartitions = new String[len];
+            for (int i = 0; i < len; ++i) {
+                String partition = ds.getPartitions()[i];
+                File mapped = sourceFileMap.get(partition);
+                collectionPartitions[i] = mapped != null ? mapped.toString() : partition;
+            }
+            ds.setPartitions(collectionPartitions);
+        }
         RecordDescriptor rDesc = new RecordDescriptor(new ISerializerDeserializer[opSchema.getSize()]);
         IOperatorDescriptor scanner = new VXQueryCollectionOperatorDescriptor(jobSpec, ds, rDesc);
 
@@ -74,7 +90,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
         return new Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>(scanner, constraint);
     }
 
-    public AlgebricksPartitionConstraint getClusterLocations() {
+    public static AlgebricksPartitionConstraint getClusterLocations(String[] nodeList) {
         int availableProcessors = Runtime.getRuntime().availableProcessors();
         if (availableProcessors < 1) {
             availableProcessors = 1;

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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 d07de9a..0c8ff90 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
@@ -79,8 +79,6 @@ public class XMLQueryCompiler {
 
     private final ICompilerFactory cFactory;
 
-    private final VXQueryMetadataProvider mdProvider;
-
     private LogicalOperatorPrettyPrintVisitor pprinter;
 
     private ModuleNode moduleNode;
@@ -91,9 +89,12 @@ public class XMLQueryCompiler {
 
     private int frameSize;
 
+    private String[] nodeList;
+
     public XMLQueryCompiler(XQueryCompilationListener listener, String[] nodeList, int frameSize) {
         this.listener = listener == null ? NoopXQueryCompilationListener.INSTANCE : listener;
         this.frameSize = frameSize;
+        this.nodeList = nodeList;
         HeuristicCompilerFactoryBuilder builder = new HeuristicCompilerFactoryBuilder(
                 new IOptimizationContextFactory() {
                     @Override
@@ -147,8 +148,7 @@ public class XMLQueryCompiler {
             }
         });
         builder.setNullWriterFactory(new VXQueryNullWriterFactory());
-        mdProvider = new VXQueryMetadataProvider(nodeList);
-        builder.setClusterLocations(mdProvider.getClusterLocations());
+        builder.setClusterLocations(VXQueryMetadataProvider.getClusterLocations(nodeList));
         cFactory = builder.create();
     }
 
@@ -159,6 +159,7 @@ public class XMLQueryCompiler {
         module = new XMLQueryTranslator(ccb).translateModule(moduleNode);
         pprinter = new LogicalOperatorPrettyPrintVisitor(new VXQueryLogicalExpressionPrettyPrintVisitor(module
                 .getModuleContext()));
+        VXQueryMetadataProvider mdProvider = new VXQueryMetadataProvider(nodeList, ccb.getSourceFileMap());
         compiler = cFactory.createCompiler(module.getBody(), mdProvider, 0);
         listener.notifyTranslationResult(module);
         XMLQueryTypeChecker.typeCheckModule(module);

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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 82d9635..37b529b 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
@@ -135,7 +135,7 @@ public class SimpleXQueryTest {
     private static void runTestInternal(String testName, String query) throws Exception {
         XMLQueryCompiler compiler = new XMLQueryCompiler(null, new String[] { "nc1" }, 65536);
         CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl(RootStaticContextImpl.INSTANCE),
-                new ResultSetId(System.nanoTime()));
+                new ResultSetId(System.nanoTime()), null);
         compiler.compile(testName, new StringReader(query), ccb, Integer.MAX_VALUE);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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 63d330c..fbfc566 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
@@ -19,6 +19,7 @@ package org.apache.vxquery.xtest;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -75,6 +76,10 @@ public class TestCase {
         return extVars.get(varName);
     }
 
+    public Map<String, File> getSourceFileMap() {
+        return Collections.unmodifiableMap(tConfig.sourceFileMap);
+    }
+
     public void setExpectedError(String error) {
         this.expectedError = error;
     }

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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 c39f0d2..cadd5a7 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
@@ -18,8 +18,6 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.regex.Pattern;
 
@@ -36,7 +34,6 @@ import org.xml.sax.helpers.XMLReaderFactory;
 
 public class TestCaseFactory {
     private TestConfiguration tConfig;
-    private Map<String, File> srcMap;
     private File catalog;
     private String baseDirectory;
     private TestRunnerFactory trf;
@@ -66,7 +63,6 @@ public class TestCaseFactory {
         if (opts.exclude != null) {
             this.exclude = Pattern.compile(opts.exclude);
         }
-        srcMap = new HashMap<String, File>();
         try {
             currPathLen = new File(".").getCanonicalPath().length();
         } catch (IOException e) {
@@ -121,11 +117,11 @@ public class TestCaseFactory {
             String str = buffer.toString();
             buffer = null;
             if (nextVariable != null) {
-                if (srcMap.get(str) == null) {
+                if (tConfig.sourceFileMap.get(str) == null) {
                     System.err.println(tc.getXQueryFile());
                     System.err.println(str);
                 }
-                tc.addExternalVariableBinding(new QName(nextVariable), srcMap.get(str));
+                tc.addExternalVariableBinding(new QName(nextVariable), tConfig.sourceFileMap.get(str));
             } else if (expectedError) {
                 tc.setExpectedError(str);
             } else if (outputFile) {
@@ -208,7 +204,7 @@ public class TestCaseFactory {
                 } else if ("source".equals(localName)) {
                     String id = atts.getValue("", "ID");
                     File srcFile = new File(tConfig.testRoot, atts.getValue("", "FileName"));
-                    srcMap.put(id, srcFile);
+                    tConfig.sourceFileMap.put(id, srcFile);
                 } else if ("test-suite".equals(localName)) {
                     tConfig.testRoot = new File(new File(baseDirectory).getCanonicalFile(), atts.getValue("",
                             "SourceOffsetPath"));

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestConfiguration.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestConfiguration.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestConfiguration.java
index d4279b1..80ebe4d 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestConfiguration.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestConfiguration.java
@@ -17,6 +17,8 @@
 package org.apache.vxquery.xtest;
 
 import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 
 public class TestConfiguration {
     XTestOptions options;
@@ -30,4 +32,6 @@ public class TestConfiguration {
     String xqueryFileExtension;
 
     String xqueryxFileExtension;
-}
\ No newline at end of file
+
+    Map<String, File> sourceFileMap = new HashMap<String, File>();
+}

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/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 7900921..b9f1d70 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
@@ -23,9 +23,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.xml.namespace.QName;
+
 import org.apache.vxquery.compiler.CompilerControlBlock;
 import org.apache.vxquery.compiler.algebricks.VXQueryGlobalDataFactory;
 import org.apache.vxquery.context.DynamicContext;
@@ -116,7 +119,7 @@ public class TestRunnerFactory {
                         Reader in = new InputStreamReader(new FileInputStream(testCase.getXQueryFile()), "UTF-8");
                         CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl(
                                 RootStaticContextImpl.INSTANCE), new ResultSetId(testCase.getXQueryDisplayName()
-                                .hashCode()));
+                                .hashCode()), testCase.getSourceFileMap());
                         compiler.compile(testCase.getXQueryDisplayName(), in, ccb, opts.optimizationLevel);
                         JobSpecification spec = compiler.getModule().getHyracksJobSpecification();
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt
new file mode 100644
index 0000000..7ef6ffe
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt
@@ -0,0 +1 @@
+12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt
new file mode 100644
index 0000000..dc7b54a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt
@@ -0,0 +1 @@
+33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt
new file mode 100644
index 0000000..ea1acb6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt
@@ -0,0 +1 @@
+11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt
new file mode 100644
index 0000000..2b82dfe
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt
@@ -0,0 +1 @@
+60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt
new file mode 100644
index 0000000..7ef6ffe
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt
@@ -0,0 +1 @@
+12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt
new file mode 100644
index 0000000..dc7b54a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt
@@ -0,0 +1 @@
+33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt
new file mode 100644
index 0000000..ea1acb6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt
@@ -0,0 +1 @@
+11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt
new file mode 100644
index 0000000..2b82dfe
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt
@@ -0,0 +1 @@
+60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt
new file mode 100644
index 0000000..7ef6ffe
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt
@@ -0,0 +1 @@
+12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt
new file mode 100644
index 0000000..dc7b54a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt
@@ -0,0 +1 @@
+33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt
new file mode 100644
index 0000000..ea1acb6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt
@@ -0,0 +1 @@
+11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt
new file mode 100644
index 0000000..2b82dfe
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt
@@ -0,0 +1 @@
+60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
new file mode 100644
index 0000000..e6116d0
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
@@ -0,0 +1,2 @@
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
new file mode 100644
index 0000000..ff4bc9b
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
@@ -0,0 +1 @@
+<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
new file mode 100644
index 0000000..f30101c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
@@ -0,0 +1 @@
+3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
new file mode 100644
index 0000000..c5b9925
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
@@ -0,0 +1,3 @@
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
new file mode 100644
index 0000000..9f5aceb
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
@@ -0,0 +1 @@
+1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
new file mode 100644
index 0000000..ca942fc
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
@@ -0,0 +1,3 @@
+<displayName>Station 2</displayName>
+<date>2002-02-02T00:00:00.000</date>
+<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
new file mode 100644
index 0000000..bfda7af
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
@@ -0,0 +1 @@
+1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
new file mode 100644
index 0000000..e6116d0
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
@@ -0,0 +1,2 @@
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
new file mode 100644
index 0000000..ff4bc9b
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
@@ -0,0 +1 @@
+<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
new file mode 100644
index 0000000..f30101c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
@@ -0,0 +1 @@
+3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
new file mode 100644
index 0000000..c5b9925
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
@@ -0,0 +1,3 @@
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
new file mode 100644
index 0000000..9f5aceb
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
@@ -0,0 +1 @@
+1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
new file mode 100644
index 0000000..ca942fc
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
@@ -0,0 +1,3 @@
+<displayName>Station 2</displayName>
+<date>2002-02-02T00:00:00.000</date>
+<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
new file mode 100644
index 0000000..bfda7af
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
@@ -0,0 +1 @@
+1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
new file mode 100644
index 0000000..e6116d0
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
@@ -0,0 +1,2 @@
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
new file mode 100644
index 0000000..ff4bc9b
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
@@ -0,0 +1 @@
+<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
new file mode 100644
index 0000000..f30101c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
@@ -0,0 +1 @@
+3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
new file mode 100644
index 0000000..c5b9925
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
@@ -0,0 +1,3 @@
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
new file mode 100644
index 0000000..9f5aceb
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
@@ -0,0 +1 @@
+1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
new file mode 100644
index 0000000..ca942fc
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
@@ -0,0 +1,3 @@
+<displayName>Station 2</displayName>
+<date>2002-02-02T00:00:00.000</date>
+<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
new file mode 100644
index 0000000..bfda7af
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
@@ -0,0 +1 @@
+1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
new file mode 100644
index 0000000..a533a86
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
@@ -0,0 +1 @@
+<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
new file mode 100644
index 0000000..8d77b4d
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
@@ -0,0 +1,3 @@
+<value>31</value>
+<value>32</value>
+<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
new file mode 100644
index 0000000..802ab3c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
@@ -0,0 +1 @@
+<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
new file mode 100644
index 0000000..fdd1637
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
@@ -0,0 +1,3 @@
+19.75
+19.5
+19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
new file mode 100644
index 0000000..a533a86
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
@@ -0,0 +1 @@
+<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
new file mode 100644
index 0000000..8d77b4d
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
@@ -0,0 +1,3 @@
+<value>31</value>
+<value>32</value>
+<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
new file mode 100644
index 0000000..802ab3c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
@@ -0,0 +1 @@
+<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
new file mode 100644
index 0000000..fdd1637
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
@@ -0,0 +1,3 @@
+19.75
+19.5
+19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
new file mode 100644
index 0000000..a533a86
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
@@ -0,0 +1 @@
+<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
new file mode 100644
index 0000000..8d77b4d
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
@@ -0,0 +1,3 @@
+<value>31</value>
+<value>32</value>
+<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
new file mode 100644
index 0000000..802ab3c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
@@ -0,0 +1 @@
+<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
new file mode 100644
index 0000000..fdd1637
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
@@ -0,0 +1,3 @@
+19.75
+19.5
+19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
new file mode 100644
index 0000000..c781bf1
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the average minimum temperature.                                            :)
+fn:avg(
+    let $collection := "ghcnd"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
new file mode 100644
index 0000000..673ce08
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the number of wind sensor readings.                                            :)
+fn:count(
+    let $collection := "ghcnd"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "AWND" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/max.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
new file mode 100644
index 0000000..37c44ad
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest max temperature.                                            :)
+fn:max(
+    let $collection := "ghcnd"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/min.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
new file mode 100644
index 0000000..a0ae3ff
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the lowest min temperature.                                            :)
+fn:min(
+    let $collection := "ghcnd"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
new file mode 100644
index 0000000..8837123
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the total precipitation.                                            :)
+fn:sum(
+    let $collection := "ghcnd"
+    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/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
new file mode 100644
index 0000000..09fe30c
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the average minimum temperature.                                            :)
+fn:avg(
+    let $collection := "ghcnd_half_1|ghcnd_half_2"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)


[09/51] [abbrv] git commit: Updated the testing resources.

Posted by vi...@apache.org.
Updated the testing resources.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/16f26a65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/16f26a65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/16f26a65

Branch: refs/heads/vxquery_0_3_staging
Commit: 16f26a6510ffc2780ec5a01dd85d16da4223b4be
Parents: c813b09
Author: Preston Carman <pr...@apache.org>
Authored: Wed Apr 2 15:23:10 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Wed Apr 2 15:23:10 2014 -0700

----------------------------------------------------------------------
 .../apache/vxquery/xtest/TestCaseFactory.java   |   14 +-
 .../java/org/apache/vxquery/xtest/XTest.java    |    2 +-
 .../org/apache/vxquery/xtest/XTestOptions.java  |    4 +-
 .../Aggregate/Partition-1/avg.txt               |    1 +
 .../Aggregate/Partition-1/count.txt             |    1 +
 .../Aggregate/Partition-1/max.txt               |    1 +
 .../Aggregate/Partition-1/min.txt               |    1 +
 .../Aggregate/Partition-1/sum.txt               |    1 +
 .../Aggregate/Partition-2/avg.txt               |    1 +
 .../Aggregate/Partition-2/count.txt             |    1 +
 .../Aggregate/Partition-2/max.txt               |    1 +
 .../Aggregate/Partition-2/min.txt               |    1 +
 .../Aggregate/Partition-2/sum.txt               |    1 +
 .../Aggregate/Partition-4/avg.txt               |    1 +
 .../Aggregate/Partition-4/count.txt             |    1 +
 .../Aggregate/Partition-4/max.txt               |    1 +
 .../Aggregate/Partition-4/min.txt               |    1 +
 .../Aggregate/Partition-4/sum.txt               |    1 +
 .../Ghcnd/Partition-1/q00.txt                   |    2 +
 .../Ghcnd/Partition-1/q01.txt                   |    1 +
 .../Ghcnd/Partition-1/q02.txt                   |    1 +
 .../Ghcnd/Partition-1/q03.txt                   |    1 +
 .../Ghcnd/Partition-1/q04.txt                   |    3 +
 .../Ghcnd/Partition-1/q05.txt                   |    1 +
 .../Ghcnd/Partition-1/q06.txt                   |    3 +
 .../Ghcnd/Partition-1/q07.txt                   |    1 +
 .../Ghcnd/Partition-2/q00.txt                   |    2 +
 .../Ghcnd/Partition-2/q01.txt                   |    1 +
 .../Ghcnd/Partition-2/q02.txt                   |    1 +
 .../Ghcnd/Partition-2/q03.txt                   |    1 +
 .../Ghcnd/Partition-2/q04.txt                   |    3 +
 .../Ghcnd/Partition-2/q05.txt                   |    1 +
 .../Ghcnd/Partition-2/q06.txt                   |    3 +
 .../Ghcnd/Partition-2/q07.txt                   |    1 +
 .../Ghcnd/Partition-4/q00.txt                   |    2 +
 .../Ghcnd/Partition-4/q01.txt                   |    1 +
 .../Ghcnd/Partition-4/q02.txt                   |    1 +
 .../Ghcnd/Partition-4/q03.txt                   |    1 +
 .../Ghcnd/Partition-4/q04.txt                   |    3 +
 .../Ghcnd/Partition-4/q05.txt                   |    1 +
 .../Ghcnd/Partition-4/q06.txt                   |    3 +
 .../Ghcnd/Partition-4/q07.txt                   |    1 +
 .../GhcndCount/Partition-1/q02_count.txt        |    1 +
 .../GhcndCount/Partition-1/q03_count.txt        |    1 +
 .../GhcndCount/Partition-1/q05_count.txt        |    1 +
 .../GhcndCount/Partition-1/q07_count.txt        |    1 +
 .../GhcndCount/Partition-2/q02_count.txt        |    1 +
 .../GhcndCount/Partition-2/q03_count.txt        |    1 +
 .../GhcndCount/Partition-2/q05_count.txt        |    1 +
 .../GhcndCount/Partition-2/q07_count.txt        |    1 +
 .../GhcndCount/Partition-4/q02_count.txt        |    1 +
 .../GhcndCount/Partition-4/q03_count.txt        |    1 +
 .../GhcndCount/Partition-4/q05_count.txt        |    1 +
 .../GhcndCount/Partition-4/q07_count.txt        |    1 +
 .../GhcndRecords/Partition-1/q02_records.txt    |    1 +
 .../GhcndRecords/Partition-1/q03_records.txt    |    3 +
 .../GhcndRecords/Partition-1/q05_records.txt    |    1 +
 .../GhcndRecords/Partition-1/q07_records.txt    |    3 +
 .../GhcndRecords/Partition-2/q02_records.txt    |    1 +
 .../GhcndRecords/Partition-2/q03_records.txt    |    3 +
 .../GhcndRecords/Partition-2/q05_records.txt    |    1 +
 .../GhcndRecords/Partition-2/q07_records.txt    |    3 +
 .../GhcndRecords/Partition-4/q02_records.txt    |    1 +
 .../GhcndRecords/Partition-4/q03_records.txt    |    3 +
 .../GhcndRecords/Partition-4/q05_records.txt    |    1 +
 .../GhcndRecords/Partition-4/q07_records.txt    |    3 +
 .../Queries/XQuery/Aggregate/Partition-1/avg.xq |    8 +
 .../XQuery/Aggregate/Partition-1/count.xq       |    8 +
 .../Queries/XQuery/Aggregate/Partition-1/max.xq |    8 +
 .../Queries/XQuery/Aggregate/Partition-1/min.xq |    8 +
 .../Queries/XQuery/Aggregate/Partition-1/sum.xq |    8 +
 .../Queries/XQuery/Aggregate/Partition-2/avg.xq |    8 +
 .../XQuery/Aggregate/Partition-2/count.xq       |    8 +
 .../Queries/XQuery/Aggregate/Partition-2/max.xq |    8 +
 .../Queries/XQuery/Aggregate/Partition-2/min.xq |    8 +
 .../Queries/XQuery/Aggregate/Partition-2/sum.xq |    8 +
 .../Queries/XQuery/Aggregate/Partition-4/avg.xq |    8 +
 .../XQuery/Aggregate/Partition-4/count.xq       |    8 +
 .../Queries/XQuery/Aggregate/Partition-4/max.xq |    8 +
 .../Queries/XQuery/Aggregate/Partition-4/min.xq |    8 +
 .../Queries/XQuery/Aggregate/Partition-4/sum.xq |    8 +
 .../Queries/XQuery/Ghcnd/Partition-1/q00.xq     |   11 +
 .../Queries/XQuery/Ghcnd/Partition-1/q01.xq     |    8 +
 .../Queries/XQuery/Ghcnd/Partition-1/q02.xq     |   11 +
 .../Queries/XQuery/Ghcnd/Partition-1/q03.xq     |    8 +
 .../Queries/XQuery/Ghcnd/Partition-1/q04.xq     |   13 +
 .../XQuery/Ghcnd/Partition-1/q04_sensors.xq     |    8 +
 .../XQuery/Ghcnd/Partition-1/q04_stations.xq    |    8 +
 .../Queries/XQuery/Ghcnd/Partition-1/q05.xq     |   16 +
 .../Queries/XQuery/Ghcnd/Partition-1/q06.xq     |   13 +
 .../Queries/XQuery/Ghcnd/Partition-1/q07.xq     |   16 +
 .../Queries/XQuery/Ghcnd/Partition-2/q00.xq     |   11 +
 .../Queries/XQuery/Ghcnd/Partition-2/q01.xq     |    8 +
 .../Queries/XQuery/Ghcnd/Partition-2/q02.xq     |   11 +
 .../Queries/XQuery/Ghcnd/Partition-2/q03.xq     |    8 +
 .../Queries/XQuery/Ghcnd/Partition-2/q04.xq     |   13 +
 .../Queries/XQuery/Ghcnd/Partition-2/q05.xq     |   16 +
 .../Queries/XQuery/Ghcnd/Partition-2/q06.xq     |   13 +
 .../Queries/XQuery/Ghcnd/Partition-2/q07.xq     |   16 +
 .../Queries/XQuery/Ghcnd/Partition-4/q00.xq     |   11 +
 .../Queries/XQuery/Ghcnd/Partition-4/q01.xq     |    8 +
 .../Queries/XQuery/Ghcnd/Partition-4/q02.xq     |   11 +
 .../Queries/XQuery/Ghcnd/Partition-4/q03.xq     |    8 +
 .../Queries/XQuery/Ghcnd/Partition-4/q04.xq     |   13 +
 .../Queries/XQuery/Ghcnd/Partition-4/q05.xq     |   16 +
 .../Queries/XQuery/Ghcnd/Partition-4/q06.xq     |   13 +
 .../Queries/XQuery/Ghcnd/Partition-4/q07.xq     |   16 +
 .../XQuery/GhcndCount/Partition-1/q02_count.xq  |   11 +
 .../XQuery/GhcndCount/Partition-1/q03_count.xq  |    8 +
 .../XQuery/GhcndCount/Partition-1/q05_count.xq  |   16 +
 .../XQuery/GhcndCount/Partition-1/q07_count.xq  |   16 +
 .../XQuery/GhcndCount/Partition-2/q02_count.xq  |   11 +
 .../XQuery/GhcndCount/Partition-2/q03_count.xq  |    8 +
 .../XQuery/GhcndCount/Partition-2/q05_count.xq  |   16 +
 .../XQuery/GhcndCount/Partition-2/q07_count.xq  |   16 +
 .../XQuery/GhcndCount/Partition-4/q02_count.xq  |   11 +
 .../XQuery/GhcndCount/Partition-4/q03_count.xq  |    8 +
 .../XQuery/GhcndCount/Partition-4/q05_count.xq  |   16 +
 .../XQuery/GhcndCount/Partition-4/q07_count.xq  |   16 +
 .../GhcndRecords/Partition-1/q02_records.xq     |    9 +
 .../GhcndRecords/Partition-1/q03_records.xq     |    6 +
 .../GhcndRecords/Partition-1/q05_records.xq     |   14 +
 .../GhcndRecords/Partition-1/q07_records.xq     |   14 +
 .../GhcndRecords/Partition-2/q02_records.xq     |    9 +
 .../GhcndRecords/Partition-2/q03_records.xq     |    6 +
 .../GhcndRecords/Partition-2/q05_records.xq     |   14 +
 .../GhcndRecords/Partition-2/q07_records.xq     |   14 +
 .../GhcndRecords/Partition-4/q02_records.xq     |    9 +
 .../GhcndRecords/Partition-4/q03_records.xq     |    6 +
 .../GhcndRecords/Partition-4/q05_records.xq     |   14 +
 .../GhcndRecords/Partition-4/q07_records.xq     |   14 +
 .../quarter_1/sesnors/US000000001_200101_0.xml  |    1 +
 .../half_1/quarter_1/stations/US000000001.xml   |    1 +
 .../quarter_2/sesnors/US000000002_200202_0.xml  |    1 +
 .../half_1/quarter_2/stations/US000000004.xml   |    1 +
 .../quarter_3/sesnors/AS000000003_200303_0.xml  |    1 +
 .../half_2/quarter_3/stations/US000000002.xml   |    1 +
 .../quarter_4/sesnors/US000000004_200404_0.xml  |    1 +
 .../half_2/quarter_4/stations/AS000000003.xml   |    1 +
 .../src/tests/resources/VXQueryCatalog.xml      |   98 +
 .../cat/AggregatePartition1Queries.xml          |   31 +
 .../cat/AggregatePartition2Queries.xml          |   36 +
 .../cat/AggregatePartition4Queries.xml          |   36 +
 .../cat/GhcndCountPartition1Queries.xml         |   30 +
 .../cat/GhcndCountPartition2Queries.xml         |   30 +
 .../cat/GhcndCountPartition4Queries.xml         |   30 +
 .../resources/cat/GhcndPartition1Queries.xml    |   54 +
 .../resources/cat/GhcndPartition2Queries.xml    |   54 +
 .../resources/cat/GhcndPartition4Queries.xml    |   54 +
 .../cat/GhcndRecordsPartition1Queries.xml       |   30 +
 .../cat/GhcndRecordsPartition2Queries.xml       |   30 +
 .../cat/GhcndRecordsPartition4Queries.xml       |   30 +
 .../Aggregate/Partition-1/avg.txt               |    1 -
 .../Aggregate/Partition-1/count.txt             |    1 -
 .../Aggregate/Partition-1/max.txt               |    1 -
 .../Aggregate/Partition-1/min.txt               |    1 -
 .../Aggregate/Partition-1/sum.txt               |    1 -
 .../Aggregate/Partition-2/avg.txt               |    1 -
 .../Aggregate/Partition-2/count.txt             |    1 -
 .../Aggregate/Partition-2/max.txt               |    1 -
 .../Aggregate/Partition-2/min.txt               |    1 -
 .../Aggregate/Partition-2/sum.txt               |    1 -
 .../Aggregate/Partition-4/avg.txt               |    1 -
 .../Aggregate/Partition-4/count.txt             |    1 -
 .../Aggregate/Partition-4/max.txt               |    1 -
 .../Aggregate/Partition-4/min.txt               |    1 -
 .../Aggregate/Partition-4/sum.txt               |    1 -
 .../Ghcnd/Partition-1/q00.txt                   |    2 -
 .../Ghcnd/Partition-1/q01.txt                   |    1 -
 .../Ghcnd/Partition-1/q02.txt                   |    1 -
 .../Ghcnd/Partition-1/q03.txt                   |    1 -
 .../Ghcnd/Partition-1/q04.txt                   |    3 -
 .../Ghcnd/Partition-1/q05.txt                   |    1 -
 .../Ghcnd/Partition-1/q06.txt                   |    3 -
 .../Ghcnd/Partition-1/q07.txt                   |    1 -
 .../Ghcnd/Partition-2/q00.txt                   |    2 -
 .../Ghcnd/Partition-2/q01.txt                   |    1 -
 .../Ghcnd/Partition-2/q02.txt                   |    1 -
 .../Ghcnd/Partition-2/q03.txt                   |    1 -
 .../Ghcnd/Partition-2/q04.txt                   |    3 -
 .../Ghcnd/Partition-2/q05.txt                   |    1 -
 .../Ghcnd/Partition-2/q06.txt                   |    3 -
 .../Ghcnd/Partition-2/q07.txt                   |    1 -
 .../Ghcnd/Partition-4/q00.txt                   |    2 -
 .../Ghcnd/Partition-4/q01.txt                   |    1 -
 .../Ghcnd/Partition-4/q02.txt                   |    1 -
 .../Ghcnd/Partition-4/q03.txt                   |    1 -
 .../Ghcnd/Partition-4/q04.txt                   |    3 -
 .../Ghcnd/Partition-4/q05.txt                   |    1 -
 .../Ghcnd/Partition-4/q06.txt                   |    3 -
 .../Ghcnd/Partition-4/q07.txt                   |    1 -
 .../GhcndCount/Partition-1/q02_count.txt        |    1 -
 .../GhcndCount/Partition-1/q03_count.txt        |    1 -
 .../GhcndCount/Partition-1/q05_count.txt        |    1 -
 .../GhcndCount/Partition-1/q07_count.txt        |    1 -
 .../GhcndCount/Partition-2/q02_count.txt        |    1 -
 .../GhcndCount/Partition-2/q03_count.txt        |    1 -
 .../GhcndCount/Partition-2/q05_count.txt        |    1 -
 .../GhcndCount/Partition-2/q07_count.txt        |    1 -
 .../GhcndCount/Partition-4/q02_count.txt        |    1 -
 .../GhcndCount/Partition-4/q03_count.txt        |    1 -
 .../GhcndCount/Partition-4/q05_count.txt        |    1 -
 .../GhcndCount/Partition-4/q07_count.txt        |    1 -
 .../GhcndRecords/Partition-1/q02_records.txt    |    1 -
 .../GhcndRecords/Partition-1/q03_records.txt    |    3 -
 .../GhcndRecords/Partition-1/q05_records.txt    |    1 -
 .../GhcndRecords/Partition-1/q07_records.txt    |    3 -
 .../GhcndRecords/Partition-2/q02_records.txt    |    1 -
 .../GhcndRecords/Partition-2/q03_records.txt    |    3 -
 .../GhcndRecords/Partition-2/q05_records.txt    |    1 -
 .../GhcndRecords/Partition-2/q07_records.txt    |    3 -
 .../GhcndRecords/Partition-4/q02_records.txt    |    1 -
 .../GhcndRecords/Partition-4/q03_records.txt    |    3 -
 .../GhcndRecords/Partition-4/q05_records.txt    |    1 -
 .../GhcndRecords/Partition-4/q07_records.txt    |    3 -
 .../Queries/XQuery/Aggregate/Partition-1/avg.xq |    8 -
 .../XQuery/Aggregate/Partition-1/count.xq       |    8 -
 .../Queries/XQuery/Aggregate/Partition-1/max.xq |    8 -
 .../Queries/XQuery/Aggregate/Partition-1/min.xq |    8 -
 .../Queries/XQuery/Aggregate/Partition-1/sum.xq |    8 -
 .../Queries/XQuery/Aggregate/Partition-2/avg.xq |    8 -
 .../XQuery/Aggregate/Partition-2/count.xq       |    8 -
 .../Queries/XQuery/Aggregate/Partition-2/max.xq |    8 -
 .../Queries/XQuery/Aggregate/Partition-2/min.xq |    8 -
 .../Queries/XQuery/Aggregate/Partition-2/sum.xq |    8 -
 .../Queries/XQuery/Aggregate/Partition-4/avg.xq |    8 -
 .../XQuery/Aggregate/Partition-4/count.xq       |    8 -
 .../Queries/XQuery/Aggregate/Partition-4/max.xq |    8 -
 .../Queries/XQuery/Aggregate/Partition-4/min.xq |    8 -
 .../Queries/XQuery/Aggregate/Partition-4/sum.xq |    8 -
 .../Queries/XQuery/Ghcnd/Partition-1/q00.xq     |   11 -
 .../Queries/XQuery/Ghcnd/Partition-1/q01.xq     |    8 -
 .../Queries/XQuery/Ghcnd/Partition-1/q02.xq     |   11 -
 .../Queries/XQuery/Ghcnd/Partition-1/q03.xq     |    8 -
 .../Queries/XQuery/Ghcnd/Partition-1/q04.xq     |   13 -
 .../XQuery/Ghcnd/Partition-1/q04_sensors.xq     |    8 -
 .../XQuery/Ghcnd/Partition-1/q04_stations.xq    |    8 -
 .../Queries/XQuery/Ghcnd/Partition-1/q05.xq     |   16 -
 .../Queries/XQuery/Ghcnd/Partition-1/q06.xq     |   13 -
 .../Queries/XQuery/Ghcnd/Partition-1/q07.xq     |   16 -
 .../Queries/XQuery/Ghcnd/Partition-2/q00.xq     |   11 -
 .../Queries/XQuery/Ghcnd/Partition-2/q01.xq     |    8 -
 .../Queries/XQuery/Ghcnd/Partition-2/q02.xq     |   11 -
 .../Queries/XQuery/Ghcnd/Partition-2/q03.xq     |    8 -
 .../Queries/XQuery/Ghcnd/Partition-2/q04.xq     |   13 -
 .../Queries/XQuery/Ghcnd/Partition-2/q05.xq     |   16 -
 .../Queries/XQuery/Ghcnd/Partition-2/q06.xq     |   13 -
 .../Queries/XQuery/Ghcnd/Partition-2/q07.xq     |   16 -
 .../Queries/XQuery/Ghcnd/Partition-4/q00.xq     |   11 -
 .../Queries/XQuery/Ghcnd/Partition-4/q01.xq     |    8 -
 .../Queries/XQuery/Ghcnd/Partition-4/q02.xq     |   11 -
 .../Queries/XQuery/Ghcnd/Partition-4/q03.xq     |    8 -
 .../Queries/XQuery/Ghcnd/Partition-4/q04.xq     |   13 -
 .../Queries/XQuery/Ghcnd/Partition-4/q05.xq     |   16 -
 .../Queries/XQuery/Ghcnd/Partition-4/q06.xq     |   13 -
 .../Queries/XQuery/Ghcnd/Partition-4/q07.xq     |   16 -
 .../XQuery/GhcndCount/Partition-1/q02_count.xq  |   11 -
 .../XQuery/GhcndCount/Partition-1/q03_count.xq  |    8 -
 .../XQuery/GhcndCount/Partition-1/q05_count.xq  |   16 -
 .../XQuery/GhcndCount/Partition-1/q07_count.xq  |   16 -
 .../XQuery/GhcndCount/Partition-2/q02_count.xq  |   11 -
 .../XQuery/GhcndCount/Partition-2/q03_count.xq  |    8 -
 .../XQuery/GhcndCount/Partition-2/q05_count.xq  |   16 -
 .../XQuery/GhcndCount/Partition-2/q07_count.xq  |   16 -
 .../XQuery/GhcndCount/Partition-4/q02_count.xq  |   11 -
 .../XQuery/GhcndCount/Partition-4/q03_count.xq  |    8 -
 .../XQuery/GhcndCount/Partition-4/q05_count.xq  |   16 -
 .../XQuery/GhcndCount/Partition-4/q07_count.xq  |   16 -
 .../GhcndRecords/Partition-1/q02_records.xq     |    9 -
 .../GhcndRecords/Partition-1/q03_records.xq     |    6 -
 .../GhcndRecords/Partition-1/q05_records.xq     |   14 -
 .../GhcndRecords/Partition-1/q07_records.xq     |   14 -
 .../GhcndRecords/Partition-2/q02_records.xq     |    9 -
 .../GhcndRecords/Partition-2/q03_records.xq     |    6 -
 .../GhcndRecords/Partition-2/q05_records.xq     |   14 -
 .../GhcndRecords/Partition-2/q07_records.xq     |   14 -
 .../GhcndRecords/Partition-4/q02_records.xq     |    9 -
 .../GhcndRecords/Partition-4/q03_records.xq     |    6 -
 .../GhcndRecords/Partition-4/q05_records.xq     |   14 -
 .../GhcndRecords/Partition-4/q07_records.xq     |   14 -
 .../quarter_1/sesnors/US000000001_200101_0.xml  |    1 -
 .../half_1/quarter_1/stations/US000000001.xml   |    1 -
 .../quarter_2/sesnors/US000000002_200202_0.xml  |    1 -
 .../half_1/quarter_2/stations/US000000004.xml   |    1 -
 .../quarter_3/sesnors/AS000000003_200303_0.xml  |    1 -
 .../half_2/quarter_3/stations/US000000002.xml   |    1 -
 .../quarter_4/sesnors/US000000004_200404_0.xml  |    1 -
 .../half_2/quarter_4/stations/AS000000003.xml   |    1 -
 vxquery-xtest/tests/XQTSCatalog.xml             | 1013 ----
 vxquery-xtest/tests/XQTSCatalog.xsd             | 1136 -----
 vxquery-xtest/tests/XQTSCatalog.xsl             |  745 ---
 .../tests/XQTSCatalogSecondEdition.xml          | 3816 --------------
 vxquery-xtest/tests/XQTSCatalogSubmission.xml   | 4774 ------------------
 .../tests/cat/AggregatePartition1Queries.xml    |   36 -
 .../tests/cat/AggregatePartition2Queries.xml    |   36 -
 .../tests/cat/AggregatePartition4Queries.xml    |   36 -
 .../tests/cat/GhcndCountPartition1Queries.xml   |   30 -
 .../tests/cat/GhcndCountPartition2Queries.xml   |   30 -
 .../tests/cat/GhcndCountPartition4Queries.xml   |   30 -
 .../tests/cat/GhcndPartition1Queries.xml        |   54 -
 .../tests/cat/GhcndPartition2Queries.xml        |   54 -
 .../tests/cat/GhcndPartition4Queries.xml        |   54 -
 .../tests/cat/GhcndRecordsPartition1Queries.xml |   30 -
 .../tests/cat/GhcndRecordsPartition2Queries.xml |   30 -
 .../tests/cat/GhcndRecordsPartition4Queries.xml |   30 -
 305 files changed, 1358 insertions(+), 12747 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/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 02f35bc..c39f0d2 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,7 +37,8 @@ import org.xml.sax.helpers.XMLReaderFactory;
 public class TestCaseFactory {
     private TestConfiguration tConfig;
     private Map<String, File> srcMap;
-    private String xqtsBase;
+    private File catalog;
+    private String baseDirectory;
     private TestRunnerFactory trf;
     private ExecutorService eSvc;
     private TestCase tc;
@@ -51,8 +52,9 @@ public class TestCaseFactory {
     private int currPathLen;
     int count;
 
-    public TestCaseFactory(String xqtsBase, TestRunnerFactory trf, ExecutorService eSvc, XTestOptions opts) {
-        this.xqtsBase = xqtsBase;
+    public TestCaseFactory(String catalog, TestRunnerFactory trf, ExecutorService eSvc, XTestOptions opts) {
+        this.catalog = new File(catalog);
+        this.baseDirectory = this.catalog.getParent();
         this.trf = trf;
         tConfig = new TestConfiguration();
         tConfig.options = opts;
@@ -82,10 +84,10 @@ public class TestCaseFactory {
             @Override
             public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
                 URL url = new URL(systemId);
-                return new InputSource(xqtsBase + new File(url.getFile()).getCanonicalPath().substring(currPathLen));
+                return new InputSource(baseDirectory + new File(url.getFile()).getCanonicalPath().substring(currPathLen));
             }
         });
-        parser.parse(new InputSource(new FileReader(new File(xqtsBase, "XQTSCatalog.xml"))));
+        parser.parse(new InputSource(new FileReader(catalog)));
         return count;
     }
 
@@ -208,7 +210,7 @@ public class TestCaseFactory {
                     File srcFile = new File(tConfig.testRoot, atts.getValue("", "FileName"));
                     srcMap.put(id, srcFile);
                 } else if ("test-suite".equals(localName)) {
-                    tConfig.testRoot = new File(new File(xqtsBase).getCanonicalFile(), atts.getValue("",
+                    tConfig.testRoot = new File(new File(baseDirectory).getCanonicalFile(), atts.getValue("",
                             "SourceOffsetPath"));
                     tConfig.xqueryQueryOffsetPath = new File(tConfig.testRoot, atts.getValue("",
                             "XQueryQueryOffsetPath"));

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/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 491b01d..41040f4 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
@@ -78,7 +78,7 @@ public class XTest {
         });
         trf = new TestRunnerFactory(opts);
         trf.registerReporters(reporters);
-        TestCaseFactory tcf = new TestCaseFactory(opts.xqtsBase, trf, eSvc, opts);
+        TestCaseFactory tcf = new TestCaseFactory(opts.catalog, trf, eSvc, opts);
         count = tcf.process();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/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 af40d67..4788b6e 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
@@ -23,8 +23,8 @@ public class XTestOptions {
     @Option(name = "-port", required = false, usage = "Port for web server to listen on")
     int port;
 
-    @Option(name = "-xqtsbase", required = true, usage = "XQTS Base Directory")
-    String xqtsBase;
+    @Option(name = "-catalog", required = true, usage = "Test Catalog XML")
+    String catalog;
 
     @Option(name = "-threads", required = false, usage = "Number of threads")
     int threads;

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt
new file mode 100644
index 0000000..7ef6ffe
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/avg.txt
@@ -0,0 +1 @@
+12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/count.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt
new file mode 100644
index 0000000..dc7b54a
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/max.txt
@@ -0,0 +1 @@
+33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt
new file mode 100644
index 0000000..ea1acb6
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/min.txt
@@ -0,0 +1 @@
+11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt
new file mode 100644
index 0000000..2b82dfe
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-1/sum.txt
@@ -0,0 +1 @@
+60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt
new file mode 100644
index 0000000..7ef6ffe
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/avg.txt
@@ -0,0 +1 @@
+12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/count.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt
new file mode 100644
index 0000000..dc7b54a
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/max.txt
@@ -0,0 +1 @@
+33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt
new file mode 100644
index 0000000..ea1acb6
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/min.txt
@@ -0,0 +1 @@
+11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt
new file mode 100644
index 0000000..2b82dfe
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-2/sum.txt
@@ -0,0 +1 @@
+60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt
new file mode 100644
index 0000000..7ef6ffe
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/avg.txt
@@ -0,0 +1 @@
+12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/count.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt
new file mode 100644
index 0000000..dc7b54a
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/max.txt
@@ -0,0 +1 @@
+33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt
new file mode 100644
index 0000000..ea1acb6
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/min.txt
@@ -0,0 +1 @@
+11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt
new file mode 100644
index 0000000..2b82dfe
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Aggregate/Partition-4/sum.txt
@@ -0,0 +1 @@
+60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
new file mode 100644
index 0000000..e6116d0
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
@@ -0,0 +1,2 @@
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
new file mode 100644
index 0000000..ff4bc9b
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt
@@ -0,0 +1 @@
+<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q02.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
new file mode 100644
index 0000000..f30101c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q03.txt
@@ -0,0 +1 @@
+3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
new file mode 100644
index 0000000..c5b9925
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
@@ -0,0 +1,3 @@
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
new file mode 100644
index 0000000..9f5aceb
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
@@ -0,0 +1 @@
+1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
new file mode 100644
index 0000000..ca942fc
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q06.txt
@@ -0,0 +1,3 @@
+<displayName>Station 2</displayName>
+<date>2002-02-02T00:00:00.000</date>
+<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
new file mode 100644
index 0000000..bfda7af
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
@@ -0,0 +1 @@
+1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
new file mode 100644
index 0000000..e6116d0
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
@@ -0,0 +1,2 @@
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
new file mode 100644
index 0000000..ff4bc9b
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt
@@ -0,0 +1 @@
+<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q02.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
new file mode 100644
index 0000000..f30101c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q03.txt
@@ -0,0 +1 @@
+3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
new file mode 100644
index 0000000..c5b9925
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
@@ -0,0 +1,3 @@
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
new file mode 100644
index 0000000..9f5aceb
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
@@ -0,0 +1 @@
+1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
new file mode 100644
index 0000000..ca942fc
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q06.txt
@@ -0,0 +1,3 @@
+<displayName>Station 2</displayName>
+<date>2002-02-02T00:00:00.000</date>
+<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
new file mode 100644
index 0000000..bfda7af
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
@@ -0,0 +1 @@
+1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
new file mode 100644
index 0000000..e6116d0
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
@@ -0,0 +1,2 @@
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
new file mode 100644
index 0000000..ff4bc9b
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt
@@ -0,0 +1 @@
+<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q02.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
new file mode 100644
index 0000000..f30101c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q03.txt
@@ -0,0 +1 @@
+3.3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
new file mode 100644
index 0000000..c5b9925
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
@@ -0,0 +1,3 @@
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
new file mode 100644
index 0000000..9f5aceb
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
@@ -0,0 +1 @@
+1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
new file mode 100644
index 0000000..ca942fc
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q06.txt
@@ -0,0 +1,3 @@
+<displayName>Station 2</displayName>
+<date>2002-02-02T00:00:00.000</date>
+<value>32</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
new file mode 100644
index 0000000..bfda7af
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
@@ -0,0 +1 @@
+1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
@@ -0,0 +1 @@
+3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
new file mode 100644
index 0000000..a533a86
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
@@ -0,0 +1 @@
+<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
new file mode 100644
index 0000000..8d77b4d
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
@@ -0,0 +1,3 @@
+<value>31</value>
+<value>32</value>
+<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
new file mode 100644
index 0000000..802ab3c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
@@ -0,0 +1 @@
+<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
new file mode 100644
index 0000000..fdd1637
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
@@ -0,0 +1,3 @@
+19.75
+19.5
+19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
new file mode 100644
index 0000000..a533a86
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
@@ -0,0 +1 @@
+<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
new file mode 100644
index 0000000..8d77b4d
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
@@ -0,0 +1,3 @@
+<value>31</value>
+<value>32</value>
+<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
new file mode 100644
index 0000000..802ab3c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
@@ -0,0 +1 @@
+<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
new file mode 100644
index 0000000..fdd1637
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
@@ -0,0 +1,3 @@
+19.75
+19.5
+19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
new file mode 100644
index 0000000..a533a86
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
@@ -0,0 +1 @@
+<value>20</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
new file mode 100644
index 0000000..8d77b4d
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
@@ -0,0 +1,3 @@
+<value>31</value>
+<value>32</value>
+<value>33</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
new file mode 100644
index 0000000..802ab3c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
@@ -0,0 +1 @@
+<value>11.25</value>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
new file mode 100644
index 0000000..fdd1637
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
@@ -0,0 +1,3 @@
+19.75
+19.5
+19.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
new file mode 100644
index 0000000..498baaf
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the average minimum temperature.                                            :)
+fn:avg(
+    let $collection := "TestSources/ghcnd/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
new file mode 100644
index 0000000..3a2609b
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the number of wind sensor readings.                                            :)
+fn:count(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "AWND" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/max.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
new file mode 100644
index 0000000..161b409
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest max temperature.                                            :)
+fn:max(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/min.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
new file mode 100644
index 0000000..0a135d1
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the lowest min temperature.                                            :)
+fn:min(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
new file mode 100644
index 0000000..91a2c4c
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the total precipitation.                                            :)
+fn:sum(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    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/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
new file mode 100644
index 0000000..864fdb9
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the average minimum temperature.                                            :)
+fn:avg(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
new file mode 100644
index 0000000..3ad16b6
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the number of wind sensor readings.                                            :)
+fn:count(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "AWND" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/max.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
new file mode 100644
index 0000000..82b1061
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest max temperature.                                            :)
+fn:max(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/min.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
new file mode 100644
index 0000000..d990aff
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the lowest min temperature.                                            :)
+fn:min(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
new file mode 100644
index 0000000..8c9bea9
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the total precipitation.                                            :)
+fn:sum(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    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/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
new file mode 100644
index 0000000..d50166d
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the average minimum temperature.                                            :)
+fn:avg(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/count.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
new file mode 100644
index 0000000..cebf3e6
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the number of wind sensor readings.                                            :)
+fn:count(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "AWND" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/max.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
new file mode 100644
index 0000000..ba4f771
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest max temperature.                                            :)
+fn:max(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/min.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
new file mode 100644
index 0000000..b37f462
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the lowest min temperature.                                            :)
+fn:min(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMIN" 
+    return $r/value
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
new file mode 100644
index 0000000..c41c7b6
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the total precipitation.                                            :)
+fn:sum(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    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/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
new file mode 100644
index 0000000..86241cd
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
@@ -0,0 +1,11 @@
+(: XQuery Filter Query :)
+(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
+(: the weather readings for December 25 over the last 10 years.               :)
+let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+for $r in collection($collection)/dataCollection/data
+let $datetime := xs:dateTime(fn:data($r/date))
+where $r/station eq "GHCND:AS000000003" 
+    and fn:year-from-dateTime($datetime) ge 2000
+    and fn:month-from-dateTime($datetime) eq 3 
+    and fn:day-from-dateTime($datetime) eq 3
+return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
new file mode 100644
index 0000000..1572994
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
@@ -0,0 +1,8 @@
+(: 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 := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+for $r in collection($collection)/dataCollection/data
+where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
+return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
new file mode 100644
index 0000000..d363fbf
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:sum(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
new file mode 100644
index 0000000..75a8935
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
@@ -0,0 +1,8 @@
+(: XQuery Aggregate Query :)
+(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
+fn:max(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "TMAX"
+    return $r/value
+) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
new file mode 100644
index 0000000..61452fb
--- /dev/null
+++ b/vxquery-xtest/src/tests/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
@@ -0,0 +1,13 @@
+(: XQuery Join Query :)
+(: Find all the weather readings for Washington state for a specific day    :)
+(: 2002-2-2.                                                                  :)
+let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+for $s in collection($station_collection)/stationCollection/station
+
+let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+for $r in collection($sensor_collection)/dataCollection/data
+    
+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 "STATE 1"))
+    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
+return $r
\ No newline at end of file


[25/51] [abbrv] git commit: fix serialization of empty elements

Posted by vi...@apache.org.
fix serialization of empty elements


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/80436f85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/80436f85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/80436f85

Branch: refs/heads/vxquery_0_3_staging
Commit: 80436f854d4378ddf8b17714b37d95c048109390
Parents: 3b603b8 71c7108
Author: Till Westmann <we...@gmail.com>
Authored: Fri Apr 4 12:21:45 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Fri Apr 4 12:21:45 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/vxquery/serializer/XMLSerializer.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------



[34/51] [abbrv] git commit: updated XQTS results

Posted by vi...@apache.org.
updated XQTS results


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/6512b009
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/6512b009
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/6512b009

Branch: refs/heads/vxquery_0_3_staging
Commit: 6512b00954b794ce63b757ed604cf6b31fff07cc
Parents: bd1160a
Author: Till Westmann <we...@gmail.com>
Authored: Fri Apr 4 14:23:40 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:50:43 2014 -0700

----------------------------------------------------------------------
 vxquery-xtest/results/xqts.txt | 987 ++++++++++++++++++++++--------------
 1 file changed, 596 insertions(+), 391 deletions(-)
----------------------------------------------------------------------



[43/51] [abbrv] add license headers

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/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 cb20a4d..014005a 100644
--- a/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
+++ b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+
 <!DOCTYPE test-suite [
 
 <!ENTITY AggregatePartition1Queries SYSTEM "cat/AggregatePartition1Queries.xml">

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
index 9d4901a..809f54d 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition1Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>Aggregate Partition 1</title>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
index 483dea9..34de90e 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition2Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>Aggregate Partition 2</title>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
index 91b45bb..9795c8e 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition4Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>Aggregate Partition 4</title>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
index c6323d9..e39f376 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition1Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>GHCND Count Partition 1</title>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
index 0c60a64..953158a 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition2Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>GHCND Count Partition 2</title>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
index b974b1f..d53cbe7 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition4Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>GHCND Count Partition 4</title>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
index 2a01e8e..874fcfc 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>GHCND Partition 1</title>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
index fedeff9..73c01e1 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>GHCND Partition 1</title>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
index 0d8c74c..79f194e 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition4Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>GHCND Partition 4</title>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
index 5f11060..65ca953 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition1Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>GHCND Records Partition 1</title>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
index f8a4040..17d6819 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition2Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>GHCND Records Partition 2</title>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
index ccbd1db..3789c51 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
@@ -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.
+-->
+
 <test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition4Queries" featureOwner="VXQuery">
    <GroupInfo>
       <title>GHCND Records Partition 4</title>


[04/51] [abbrv] Updated the testing resources.

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/XQTSCatalog.xsd
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/XQTSCatalog.xsd b/vxquery-xtest/tests/XQTSCatalog.xsd
deleted file mode 100644
index 9ccbcec..0000000
--- a/vxquery-xtest/tests/XQTSCatalog.xsd
+++ /dev/null
@@ -1,1136 +0,0 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-   xmlns:test="http://www.w3.org/2005/02/query-test-XQTSCatalog"
-   targetNamespace="http://www.w3.org/2005/02/query-test-XQTSCatalog" elementFormDefault="qualified">
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- History:                                                             -->
-   <!--                                                                      -->
-   <!-- 2008-07-29 - reflects-resolution                                     -->
-   <!--                                                                      -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- test-suite - top level element                                       -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:element name="test-suite">
-      <xs:annotation>
-         <xs:documentation>
-            This is the top level element for documents that use this schema.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:complexType>
-         <xs:sequence>
-            <xs:element ref="test:test-suite-info"/>
-            <xs:element ref="test:citations"/>
-            <xs:element ref="test:comparisons"/>
-            <xs:element ref="test:roles"/>
-            <xs:element ref="test:scenarios"/>
-            <xs:element ref="test:sources"/>
-            <xs:element ref="test:implementation-defined-items"/>
-            <xs:element ref="test:features"/>
-            <xs:element ref="test:context-properties"/>
-            <xs:element ref="test:test-group" maxOccurs="unbounded"/>
-         </xs:sequence>
-
-         <xs:attribute name="CatalogDesignDate" type="xs:date" use="required"/>
-
-         <!-- XQTS version -->
-         <xs:attribute name="version" type="xs:string" use="required">
-            <xs:annotation>
-               <xs:documentation>
-                  XQTS version
-               </xs:documentation>
-            </xs:annotation>
-         </xs:attribute>
-
-         <!-- not used -->
-         <xs:attribute name="targetLanguage" type="test:targetLanguage" use="optional">
-            <xs:annotation>
-               <xs:documentation>
-                  not used
-               </xs:documentation>
-            </xs:annotation>
-         </xs:attribute>
-
-         <!-- offset from XQTS root to source documents and schemas -->
-         <xs:attribute name="SourceOffsetPath" type="test:SimplifiedRelativeFilePath" use="required">
-            <xs:annotation>
-               <xs:documentation>
-                  offset from XQTS root to source documents and schemas
-               </xs:documentation>
-            </xs:annotation>
-         </xs:attribute>
-
-
-         <!-- offset from XQTS root to result documents -->
-         <xs:attribute name="ResultOffsetPath" type="test:SimplifiedRelativeFilePath" use="required">
-            <xs:annotation>
-               <xs:documentation>
-                  offset from XQTS root to result documents
-               </xs:documentation>
-            </xs:annotation>
-         </xs:attribute>
-
-
-         <!-- offset from XQTS root to XQuery expression files -->
-         <xs:attribute name="XQueryQueryOffsetPath" type="test:SimplifiedRelativeFilePath"
-            use="required">
-            <xs:annotation>
-               <xs:documentation>
-                  offset from XQTS root to XQuery expression files
-               </xs:documentation>
-            </xs:annotation>
-         </xs:attribute>
-
-
-         <!-- offset from XQTS root to XQueryX documents -->
-         <xs:attribute name="XQueryXQueryOffsetPath" type="test:SimplifiedRelativeFilePath"
-            use="required">
-            <xs:annotation>
-               <xs:documentation>
-                  offset from XQTS root to XQueryX documents
-               </xs:documentation>
-            </xs:annotation>
-         </xs:attribute>
-
-
-         <!-- file extension for XQuery expression files -->
-         <xs:attribute name="XQueryFileExtension" type="xs:string" use="required">
-            <xs:annotation>
-               <xs:documentation>
-                  file extension for XQuery expression files
-               </xs:documentation>
-            </xs:annotation>
-         </xs:attribute>
-
-
-         <!-- file extension for XQueryX documents -->
-         <xs:attribute name="XQueryXFileExtension" type="xs:string" use="required">
-            <xs:annotation>
-               <xs:documentation>
-                  file extension for XQueryX documents
-               </xs:documentation>
-            </xs:annotation>
-         </xs:attribute>
-
-      </xs:complexType>
-
-      <xs:unique name="unique-test-group">
-         <xs:selector xpath=".//test:test-group"/>
-         <xs:field xpath="@name"/>
-      </xs:unique>
-
-      <xs:unique name="unique-test-case">
-         <xs:selector xpath=".//test:test-case"/>
-         <xs:field xpath="@name"/>
-      </xs:unique>
-
-
-   </xs:element>
-
-
-   <!-- targetLanguage type                                                  -->
-
-   <xs:simpleType name="targetLanguage">
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="XQuery"/>
-         <xs:enumeration value="XQueryX"/>
-      </xs:restriction>
-   </xs:simpleType>
-
-
-   <!-- SimplifiedRelativeFilePath type                                      -->
-
-   <xs:simpleType name="SimplifiedRelativeFilePath">
-      <xs:restriction base="xs:anyURI">
-         <xs:pattern value="([a-zA-Z0-9\-\.]+/)+"/>
-      </xs:restriction>
-   </xs:simpleType>
-
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- test-suite-info                                                      -->
-   <!--                                                                      -->
-   <!-- Identify the test suite.                                             -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:element name="test-suite-info">
-      <xs:annotation>
-         <xs:documentation>
-            Identify the test suite.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:complexType>
-         <xs:sequence>
-            <xs:element name="title" type="xs:string"/>
-            <xs:element name="description" type="xs:string" minOccurs="0"/>
-         </xs:sequence>
-      </xs:complexType>
-   </xs:element>
-
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- citations                                                            -->
-   <!--                                                                      -->
-   <!-- Identify each of the XQuery documents.                               -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:element name="citations">
-      <xs:annotation>
-         <xs:documentation>
-            Identify each of the XQuery documents.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:complexType>
-         <xs:choice maxOccurs="unbounded">
-            <xs:element name="citation-spec" maxOccurs="unbounded">
-               <xs:complexType>
-                  <xs:complexContent>
-                     <xs:extension base="test:infoBase">
-                        <xs:sequence>
-                           <xs:element name="spec-URI" type="xs:anyURI"/>
-                        </xs:sequence>
-                        <xs:attribute name="name" type="test:citation-spec-enum" use="required"/>
-                     </xs:extension>
-                  </xs:complexContent>
-               </xs:complexType>
-            </xs:element>
-         </xs:choice>
-      </xs:complexType>
-
-      <xs:unique name="unique-citation-specs">
-         <xs:selector xpath=".//test:citation-spec"/>
-         <xs:field xpath="@name"/>
-      </xs:unique>
-
-   </xs:element>
-
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- comparisons                                                          -->
-   <!--                                                                      -->
-   <!-- Identify each of the comparisons that will be used in test cases.    -->
-   <!--                                                                      -->
-   <!-- This is provided for the purpose of documentation and is not needed  -->
-   <!-- by implementors.                                                     -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:element name="comparisons">
-      <xs:annotation>
-         <xs:documentation>
-            Identify each of the comparisons that will be used in test cases.            
-            This is provided for the purpose of documentation and is not needed by implementors.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:complexType>
-         <xs:sequence maxOccurs="unbounded">
-            <xs:element name="comparison" maxOccurs="unbounded">
-               <xs:complexType>
-                  <xs:complexContent>
-                     <xs:extension base="test:infoBase">
-                        <xs:attribute name="name" type="test:comparison-enum" use="required"/>
-                     </xs:extension>
-                  </xs:complexContent>
-               </xs:complexType>
-            </xs:element>
-         </xs:sequence>
-      </xs:complexType>
-
-      <xs:unique name="unique-comparisons">
-         <xs:selector xpath=".//test:comparison"/>
-         <xs:field xpath="@name"/>
-      </xs:unique>
-
-   </xs:element>
-
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- roles                                                                -->
-   <!--                                                                      -->
-   <!-- Identify each of the roles that will be used in test cases.          -->
-   <!--                                                                      -->
-   <!-- This is provided for the purpose of documentation and is not needed  -->
-   <!-- by implementors.                                                     -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:element name="roles">
-      <xs:annotation>
-         <xs:documentation>
-            Identify each of the roles that will be used in test cases.
-            This is provided for the purpose of documentation and is not needed by implementors.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:complexType>
-         <xs:sequence maxOccurs="unbounded">
-            <xs:element name="role">
-               <xs:complexType>
-                  <xs:complexContent>
-                     <xs:extension base="test:infoBase">
-                        <xs:attribute name="name" type="test:role-enum" use="required"/>
-                     </xs:extension>
-                  </xs:complexContent>
-               </xs:complexType>
-            </xs:element>
-         </xs:sequence>
-      </xs:complexType>
-
-      <xs:unique name="unique-roles">
-         <xs:selector xpath=".//test:role"/>
-         <xs:field xpath="@name"/>
-      </xs:unique>
-
-   </xs:element>
-
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- scenarios                                                            -->
-   <!--                                                                      -->
-   <!-- Identify each of the scenarios that will be used in test cases.      -->
-   <!--                                                                      -->
-   <!-- This is provided for the purpose of documentation and is not needed  -->
-   <!-- by implementors.                                                     -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:element name="scenarios">
-      <xs:annotation>
-         <xs:documentation>
-            Identify each of the scenarios that will be used in test cases.
-            This is provided for the purpose of documentation and is not needed by implementors.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:complexType>
-         <xs:sequence maxOccurs="unbounded">
-            <xs:element name="scenario">
-               <xs:complexType>
-                  <xs:complexContent>
-                     <xs:extension base="test:infoBase">
-                        <xs:attribute name="name" type="test:scenarios-enum" use="required"/>
-                     </xs:extension>
-                  </xs:complexContent>
-               </xs:complexType>
-            </xs:element>
-         </xs:sequence>
-      </xs:complexType>
-
-      <xs:unique name="unique-scenarios">
-         <xs:selector xpath=".//test:scenario"/>
-         <xs:field xpath="@name"/>
-      </xs:unique>
-
-   </xs:element>
-
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- sources                                                              -->
-   <!--                                                                      -->
-   <!-- Identify each of the sources that will be used in test cases.        -->
-   <!--                                                                      -->
-   <!-- Test cases will use these ID's to identify their source documents,   -->
-   <!-- collections, schemas, and modules.                                   -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:element name="sources">
-      <xs:complexType>
-         <xs:annotation>
-            <xs:documentation>
-               Identify each of the sources that will be used in test cases.
-               Test cases will use these ID's to identify their source documents, collections, schemas, and modules.
-            </xs:documentation>
-         </xs:annotation>
-
-         <xs:sequence maxOccurs="unbounded">
-            <xs:element name="source" maxOccurs="unbounded">
-               <xs:complexType>
-                  <xs:complexContent>
-                     <xs:extension base="test:infoBase">
-                        <xs:attribute name="ID" type="xs:ID" use="required"/>
-                        <xs:attribute name="FileName" type="xs:anyURI" use="required"/>
-                        <xs:attribute name="Creator" type="xs:string" use="required"/>
-                        <xs:attribute name="schema" type="xs:IDREF" use="optional"/>
-                     </xs:extension>
-                  </xs:complexContent>
-               </xs:complexType>
-            </xs:element>
-
-            <xs:element name="schema" minOccurs="0" maxOccurs="unbounded">
-               <xs:complexType>
-                  <xs:complexContent>
-                     <xs:extension base="test:infoBase">
-                        <xs:attribute name="ID" type="xs:ID" use="required"/>
-                        <xs:attribute name="uri" type="xs:anyURI" use="required"/>
-                        <xs:attribute name="FileName" type="xs:anyURI" use="required"/>
-                     </xs:extension>
-                  </xs:complexContent>
-               </xs:complexType>
-            </xs:element>
-
-            <xs:element name="collection" minOccurs="0" maxOccurs="unbounded">
-               <xs:complexType>
-                  <xs:complexContent>
-                     <xs:extension base="test:infoBase">
-                        <xs:sequence>
-                           <xs:element name="input-document" maxOccurs="unbounded">
-                              <xs:annotation>
-                                 <xs:documentation>
-                                    One or more input files that will be used by this query.
-                                 </xs:documentation>
-                              </xs:annotation>
-                              <xs:complexType>
-                                 <xs:simpleContent>
-                                    <xs:extension base="xs:IDREF">
-                                       <!-- this attribute contains only principal-data -->
-                                    </xs:extension>
-                                 </xs:simpleContent>
-                              </xs:complexType>
-                           </xs:element>
-                        </xs:sequence>
-                        <xs:attribute name="ID" type="xs:ID" use="required"/>
-                        <xs:attribute name="Creator" type="xs:string" use="required"/>
-
-                     </xs:extension>
-                  </xs:complexContent>
-               </xs:complexType>
-            </xs:element>
-
-            <xs:element name="module" minOccurs="0" maxOccurs="unbounded">
-               <xs:complexType>
-                  <xs:complexContent>
-                     <xs:extension base="test:infoBase">
-                        <xs:attribute name="ID" type="xs:ID" use="required"/>
-                        <xs:attribute name="FileName" type="xs:anyURI" use="required"/>
-                        <xs:attribute name="Creator" type="xs:string" use="required"/>
-                     </xs:extension>
-                  </xs:complexContent>
-               </xs:complexType>
-            </xs:element>
-         </xs:sequence>
-      </xs:complexType>
-   </xs:element>
-
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- implementation-defined-items                                         -->
-   <!--                                                                      -->
-   <!-- Identify each of the implementation-defined-items that occur in the  -->
-   <!-- XQuery specifications.                                               -->
-   <!--                                                                      -->
-   <!-- These item names will be used when an implementor submits his test   -->
-   <!-- results.                                                             -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:element name="implementation-defined-items">
-      <xs:annotation>
-         <xs:documentation>
-            Identify each of the implementation-defined-items that occur in the XQuery specifications.
-            These item names will be used when an implementor submits his test results.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:complexType>
-         <xs:sequence maxOccurs="unbounded">
-            <xs:element name="implementation-defined-item" maxOccurs="unbounded">
-               <xs:complexType>
-                  <xs:complexContent>
-                     <xs:extension base="test:infoBase">
-                        <xs:attribute name="name" type="xs:string" use="required"/>
-                        <xs:attribute name="spec" type="test:citation-spec-enum" use="required"/>
-                        <xs:attribute name="spec-version" type="test:spec-version-list-type" use="optional">
-                           <xs:annotation>
-                              <xs:documentation>
-                                 Identifies the versions of the specification to which this item
-                                 applies. If the attribute is absent or empty, the item apply to all
-                                 versions of the specification.
-                              </xs:documentation>
-                           </xs:annotation>
-                        </xs:attribute>
-                     </xs:extension>
-                  </xs:complexContent>
-               </xs:complexType>
-            </xs:element>
-         </xs:sequence>
-      </xs:complexType>
-
-      <xs:unique name="unique-implementation-defined-item">
-         <xs:selector xpath=".//test:implementation-defined-item"/>
-         <xs:field xpath="@name"/>
-      </xs:unique>
-
-   </xs:element>
-
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- features                                                             -->
-   <!--                                                                      -->
-   <!-- Identify each of the features that occur in the XQuery               -->
-   <!-- specification.                                                       -->
-   <!--                                                                      -->
-   <!-- These feature names will be used when an implementor submits his     -->
-   <!-- test results.                                                        -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:element name="features">
-      <xs:annotation>
-         <xs:documentation>
-            Identify each of the features that occur in the XQuery specification.
-            These feature names will be used when an implementor submits his test results.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:complexType>
-         <xs:sequence maxOccurs="unbounded">
-            <xs:element name="feature" maxOccurs="unbounded">
-               <xs:complexType>
-                  <xs:attribute name="name" type="xs:string" use="required"/>
-                  <xs:attribute name="spec-version" type="test:spec-version-list-type" use="optional">
-                     <xs:annotation>
-                        <xs:documentation>
-                           Identifies the versions of the specification to which this featire
-                           applies. If the attribute is absent or empty, the item applies to all
-                           versions of the specification.
-                        </xs:documentation>
-                     </xs:annotation>
-                  </xs:attribute>
-               </xs:complexType>
-            </xs:element>
-         </xs:sequence>
-      </xs:complexType>
-
-      <xs:unique name="unique-feature">
-         <xs:selector xpath=".//test:feature"/>
-         <xs:field xpath="@name"/>
-      </xs:unique>
-
-   </xs:element>
-
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- context-properties                                                   -->
-   <!--                                                                      -->
-   <!-- Identify each of the properties that occur in the XQuery             -->
-   <!-- specification.                                                       -->
-   <!--                                                                      -->
-   <!-- These feature names will be used when an implementor submits his     -->
-   <!-- test results.                                                        -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:element name="context-properties">
-      <xs:annotation>
-         <xs:documentation>
-            Identify each of the properties that occur in the XQuery specification.
-            These feature names will be used when an implementor submits his test results.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:complexType>
-         <xs:sequence maxOccurs="unbounded">
-            <xs:element name="context-property" maxOccurs="unbounded">
-               <xs:complexType>
-                  <xs:attribute name="name" type="xs:string" use="required"/>
-                  <xs:attribute name="context-type" use="required">
-                     <xs:simpleType>
-                        <xs:restriction base="xs:string">
-                           <xs:enumeration value="static"/>
-                           <xs:enumeration value="dynamic"/>
-                        </xs:restriction>
-                     </xs:simpleType>
-                  </xs:attribute>
-                  <xs:attribute name="spec-version" type="test:spec-version-list-type" use="optional">
-                     <xs:annotation>
-                        <xs:documentation>
-                           Identifies the versions of the specification to which this context property
-                           applies. If the attribute is absent or empty, the property applies to all
-                           versions of the specification.
-                        </xs:documentation>
-                     </xs:annotation>
-                  </xs:attribute>
-               </xs:complexType>
-            </xs:element>
-         </xs:sequence>
-      </xs:complexType>
-
-      <xs:unique name="unique-context-property">
-         <xs:selector xpath=".//test:context-property"/>
-         <xs:field xpath="@name"/>
-      </xs:unique>
-
-   </xs:element>
-
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- test-group                                                           -->
-   <!--                                                                      -->
-   <!-- Group of test cases and test groups.                                 -->
-   <!--                                                                      -->
-   <!-- The grouping of the tests helps the XML Query WG organize its work   -->
-   <!-- and is used when reporting our results. Implementors need only       -->
-   <!-- execute the test contained in these groups.                          -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:element name="test-group">
-      <xs:annotation>
-         <xs:documentation>
-            Group of test cases and test groups.
-            The grouping of the tests helps the XML Query WG organize its work 
-            and is used when reporting our results. Implementors need only 
-            execute the test contained in these groups.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:complexType>
-         <xs:sequence>
-            <xs:element name="GroupInfo" type="test:GroupInfo"/>
-            <xs:element name="test-case" type="test:test-case" minOccurs="0" maxOccurs="unbounded">
-               <xs:unique name="unique-expected-error">
-                  <xs:selector xpath=".//test:expected-error"/>
-                  <xs:field xpath="."/>
-               </xs:unique>
-            </xs:element>
-
-            <xs:element ref="test:test-group" minOccurs="0" maxOccurs="unbounded"/>
-         </xs:sequence>
-         <xs:attribute name="name" type="xs:string" use="required"/>
-         <xs:attribute name="featureOwner" type="xs:string" use="optional"/>
-         <xs:attribute name="is-XPath2" type="xs:boolean" use="optional"/>
-      </xs:complexType>
-   </xs:element>
-
-
-   <!-- GroupInfo type                                                       -->
-
-   <xs:complexType name="GroupInfo">
-      <xs:sequence>
-         <xs:element name="title" type="xs:string"/>
-         <xs:element name="description" type="test:description"/>
-         <xs:element name="note" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-   </xs:complexType>
-
-
-
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-   <!-- test-case                                                            -->
-   <!--                                                                      -->
-   <!-- A test case to be run.                                               -->
-   <!--                                                                      -->
-   <!-- All test cases that are not parse-error's are provided in both       -->
-   <!-- XQuery and XQueryX formats. An implementor should use the            -->
-   <!-- appropriate path offsets and file extensions to locate each version. -->
-   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-   <xs:complexType name="test-case">
-      <xs:annotation>
-         <xs:documentation>
-            A test case to be run.
-            All test cases that are not parse-error's are provided in both
-            XQuery and XQueryX formats. An implementor should use the
-            appropriate path offsets and file extensions to locate each version.
-         </xs:documentation>
-
-         <xs:documentation>
-            The filename for this query can be constructed from:
-            the XQueryQueryOffsetPath or XQueryXQueryOffsetPath, the FilePath,
-            the name, the XQueryFileExtension or XQueryXFileExtension
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:sequence>
-         <xs:element name="description" type="test:description"/>
-         <xs:element name="note" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-
-         <!-- Identify the parts of the XQuery specifications that are       -->
-         <!-- being tested                                                   -->
-
-         <xs:element name="spec-citation" minOccurs="0" maxOccurs="unbounded">
-            <xs:annotation>
-               <xs:documentation>
-                  Identify the parts of the XQuery specifications that are being tested.
-               </xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:simpleContent>
-                  <xs:extension base="xs:string">
-                     <xs:attribute name="section-number" type="xs:string" use="required"/>
-                     <xs:attribute name="spec" type="test:citation-spec-enum" use="required"/>
-                     <xs:attribute name="section-title" type="xs:string" use="required"/>
-                     <xs:attribute name="section-pointer" type="xs:string" use="required"/>
-                  </xs:extension>
-               </xs:simpleContent>
-            </xs:complexType>
-         </xs:element>
-
-         <!-- Allow references to resolved Bugzilla Bugs -->
-
-         <xs:element name="reflects-resolution" minOccurs="0" maxOccurs="unbounded" type="xs:anyURI">
-            <xs:annotation>
-               <xs:documentation>
-                  Identify Bugzilla Bugs whose resolution is reflected in this test case.
-               </xs:documentation>
-            </xs:annotation>
-         </xs:element>
-
-         <!-- Description of the query -->
-
-         <xs:element name="query">
-            <xs:annotation>
-               <xs:documentation>
-                  Description of the query.
-               </xs:documentation>
-            </xs:annotation>
-
-            <xs:complexType>
-               <xs:sequence>
-                  <xs:element name="description" type="test:description" minOccurs="0"/>
-                  <xs:element name="note" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-               </xs:sequence>
-
-               <!-- This name is always equal to the name of the test case -->
-               <xs:attribute name="name" type="xs:string" use="required">
-                  <xs:annotation>
-                     <xs:documentation>
-                        This name is always equal to the name of the test case.
-                     </xs:documentation>
-                  </xs:annotation>
-               </xs:attribute>
-               <xs:attribute name="static-name" type="xs:string" use="optional">
-                  <xs:annotation>
-                     <xs:documentation>
-                        If present, specifies the name of the query file that should be used for an implementation running with the Static Typing Feature enabled.
-                     </xs:documentation>
-                  </xs:annotation>
-               </xs:attribute>
-               <xs:attribute name="date" type="xs:date" use="required"/>
-            </xs:complexType>
-         </xs:element>
-
-         <!-- Zero or more modules that will be used by this query -->
-
-         <xs:element name="module" minOccurs="0" maxOccurs="unbounded">
-            <xs:annotation>
-               <xs:documentation>
-                  Zero or more modules that will be used by this query.
-               </xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:simpleContent>
-                  <xs:extension base="xs:IDREF">
-                     <xs:attribute name="namespace" type="xs:anyURI" use="required"/>
-                  </xs:extension>
-               </xs:simpleContent>
-            </xs:complexType>
-         </xs:element>
-
-         <!-- Zero or more input files that will be used by this query -->
-
-         <xs:element name="input-file" minOccurs="0" maxOccurs="unbounded">
-            <xs:annotation>
-               <xs:documentation>
-                  One or more input files that will be used by this query.
-               </xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:simpleContent>
-                  <xs:extension base="xs:IDREF">
-                     <!-- this attribute contains only principal-data -->
-                     <xs:attribute name="role" type="test:role-enum" use="required">
-                        <xs:annotation>
-                           <xs:documentation>
-                              this attribute contains only principal-data
-                           </xs:documentation>
-                        </xs:annotation>
-                     </xs:attribute>
-                     <xs:attribute name="variable" type="xs:string" use="required"/>
-                  </xs:extension>
-               </xs:simpleContent>
-            </xs:complexType>
-         </xs:element>
-
-         <!-- Zero or more input URIs that will be used by this query -->
-
-         <xs:element name="input-URI" minOccurs="0" maxOccurs="unbounded">
-            <xs:annotation>
-               <xs:documentation>
-                  One or more input URIs that will be used by this query.
-               </xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:simpleContent>
-                  <xs:extension base="xs:IDREF">
-                     <!-- this attribute contains only principal-data -->
-                     <xs:attribute name="role" type="test:role-enum" use="required">
-                        <xs:annotation>
-                           <xs:documentation>
-                              this attribute contains only principal-data
-                           </xs:documentation>
-                        </xs:annotation>
-                     </xs:attribute>
-                     <xs:attribute name="variable" type="xs:string" use="required"/>
-                  </xs:extension>
-               </xs:simpleContent>
-            </xs:complexType>
-         </xs:element>
-
-         <!-- Zero or one default collections that will be used by this query -->
-
-         <xs:element name="defaultCollection" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation>
-                  Zero or one default collection that will be used by this query.
-               </xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:simpleContent>
-                  <xs:extension base="xs:IDREF">
-                     <!-- this attribute contains only principal-data -->
-                     <xs:attribute name="role" type="test:role-enum" use="required">
-                        <xs:annotation>
-                           <xs:documentation>
-                              this attribute contains only principal-data
-                           </xs:documentation>
-                        </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
-            </xs:complexType>
-         </xs:element>
-
-         <!-- Zero or one context nodes that will be used by this query -->
-
-         <xs:element name="contextItem" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:documentation>
-                  Zero or one context item that will be used by this query.
-               </xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:simpleContent>
-                  <xs:extension base="xs:IDREF">
-                     <!-- this attribute contains only principal-data -->
-                     <xs:attribute name="role" type="test:role-enum" use="required">
-                        <xs:annotation>
-                           <xs:documentation>
-                              this attribute contains only principal-data
-                           </xs:documentation>
-                        </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
-            </xs:complexType>
-         </xs:element>
-
-         <!-- Zero or more input queries that will be used to bind values to -->
-         <!-- external variables                                             -->
-
-         <xs:element name="input-query" minOccurs="0" maxOccurs="unbounded">
-            <xs:annotation>
-               <xs:documentation>
-                  Zero or more input queries that will be used to bind values to 
-                  external variables.
-               </xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:sequence>
-                  <xs:element name="description" type="test:description" minOccurs="0"/>
-                  <xs:element name="note" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-               </xs:sequence>
-               <xs:attribute name="variable" type="xs:string" use="required"/>
-               <xs:attribute name="name" type="xs:string" use="required"/>
-               <xs:attribute name="date" type="xs:date" use="required"/>
-            </xs:complexType>
-         </xs:element>
-
-         <!-- Zero or more files containing expected results for this query -->
-
-         <xs:element name="output-file" minOccurs="0" maxOccurs="unbounded">
-            <xs:annotation>
-               <xs:documentation>
-                  Zero or more files containing expected results for this query.
-               </xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:simpleContent>
-                  <xs:extension base="xs:string">
-                     <xs:attribute name="role" type="test:role-enum" use="required"/>
-                     <xs:attribute name="compare" type="test:comparison-enum" use="required"/>
-
-                     <!-- can identify a results as being specific to typed or untyped  -->
-                     <!-- documents                                                     -->
-
-                     <xs:attribute name="input-document" type="test:input-document-enum"
-                        use="optional">
-                        <xs:annotation>
-                           <xs:documentation>
-                              can identify a results as being specific to typed or untyped documents
-                           </xs:documentation>
-                        </xs:annotation>
-                     </xs:attribute>
-
-                     <xs:attribute name="spec-version" type="test:spec-version-list-type" use="optional">
-                        <xs:annotation>
-                           <xs:documentation>
-                              identifies the versions of the specification to which these test results
-                              apply. If the attribute is absent or empty, the test results apply to all
-                              versions of the specification.
-                           </xs:documentation>
-                        </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
-            </xs:complexType>
-         </xs:element>
-
-
-         <!-- Zero or more expected errors for this query -->
-
-         <xs:element name="expected-error" minOccurs="0" maxOccurs="unbounded">
-            <xs:annotation>
-               <xs:documentation>
-                  Zero or more expected errors for this query.
-               </xs:documentation>
-            </xs:annotation>
-
-            <xs:complexType>
-               <xs:simpleContent>
-                  <xs:extension base="test:XQueryErrorCode">
-
-                     <!-- can identify an error as being specific to typed or untyped  -->
-                     <!-- documents                                                    -->
-
-                     <xs:attribute name="input-document" type="test:input-document-enum"
-                        use="optional">
-                        <xs:annotation>
-                           <xs:documentation>
-                              can identify an error as being specific to typed or untyped documents
-                           </xs:documentation>
-                        </xs:annotation>
-                     </xs:attribute>
-
-                     <xs:attribute name="spec-version" type="test:spec-version-list-type" use="optional">
-                        <xs:annotation>
-                           <xs:documentation>
-                              identifies the versions of the specification to which this error response
-                              applies. If the attribute is absent or empty, the error response applies to all
-                              versions of the specification.
-                           </xs:documentation>
-                        </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
-            </xs:complexType>
-         </xs:element>
-
-      </xs:sequence>
-
-      <!-- The filename for this query can be constructed from:              -->
-      <!--    the XQueryQueryOffsetPath or XQueryXQueryOffsetPath            -->
-      <!--    the FilePath                                                   -->
-      <!--    the name                                                       -->
-      <!--    the XQueryFileExtension or XQueryXFileExtension                -->
-
-      <xs:attribute name="name" type="xs:string" use="required"/>
-      <xs:attribute name="FilePath" type="test:SimplifiedRelativeFilePath" use="required"/>
-      <xs:attribute name="scenario" type="test:scenarios-enum" use="required"/>
-      <xs:attribute name="Creator" type="xs:string" use="required"/>
-      <xs:attribute name="version-drop" type="xs:date">
-         <xs:annotation>
-            <xs:documentation>
-               not being used
-            </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <!-- identify tests that are applicable to XPath 2.0 -->
-      <xs:attribute name="is-XPath2" type="xs:boolean" use="optional">
-         <xs:annotation>
-            <xs:documentation>
-               identify tests that are applicable to XPath 2.0
-            </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-
-
-
-   <!-- citation-spec-enum type                                              -->
-   <!--    Identify the document being cited                                 -->
-
-   <xs:simpleType name="citation-spec-enum">
-      <xs:annotation>
-         <xs:documentation>
-            Identify the document being cited.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="XQuery"/>
-         <xs:enumeration value="FuncOps"/>
-         <xs:enumeration value="DataModel"/>
-         <xs:enumeration value="FormalSemantics"/>
-         <xs:enumeration value="SchemaPart2"/>
-         <xs:enumeration value="Schema-Errata"/>
-         <xs:enumeration value="UseCases"/>
-         <xs:enumeration value="Serialization"/>
-         <xs:enumeration value="XQueryX"/>
-      </xs:restriction>
-   </xs:simpleType>
-
-
-   <!-- comparison-enum type                                                 -->
-   <!--    Identify the type of comparison used to determine whether an      -->
-   <!--    expected result and an actual result match.                       -->
-
-   <xs:simpleType name="comparison-enum">
-      <xs:annotation>
-         <xs:documentation>
-            Identify the type of comparison used to determine whether an
-            expected result and an actual result match.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="XML"/>
-         <xs:enumeration value="Fragment"/>
-         <xs:enumeration value="Text"/>
-         <xs:enumeration value="Inspect"/>
-         <xs:enumeration value="Ignore"/>
-      </xs:restriction>
-   </xs:simpleType>
-
-
-   <!-- role-enum type                                                       -->
-   <!--    Identify how a document is being used.                            -->
-
-   <xs:simpleType name="role-enum">
-      <xs:annotation>
-         <xs:documentation>
-            Identify how a document is being used.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="principal-data"/>
-         <xs:enumeration value="supplemental-data"/>
-         <xs:enumeration value="schema"/>
-         <xs:enumeration value="principal"/>
-         <xs:enumeration value="console-log"/>
-         <xs:enumeration value="dtd"/>
-      </xs:restriction>
-   </xs:simpleType>
-
-
-   <!-- scenarios-enum type                                                  -->
-   <!--     Identify whether a test should execute normally, cause a parse   -->
-   <!--     error, or cause a runtime error.                                 -->
-
-   <xs:simpleType name="scenarios-enum">
-      <xs:annotation>
-         <xs:documentation>
-            Identify whether a test should execute normally, cause a parse 
-            error, or cause a runtime error.
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="standard"/>
-         <xs:enumeration value="parse-error"/>
-         <xs:enumeration value="runtime-error"/>
-         <xs:enumeration value="trivial"/>
-      </xs:restriction>
-   </xs:simpleType>
-
-
-   <!-- input-document-enum type                                             -->
-   <!--    Identify expected results that are specific to either typed or    -->
-   <!--    untyped input documents.                                          -->
-
-   <xs:simpleType name="input-document-enum">
-      <xs:annotation>
-         <xs:documentation>
-            Identify expected results that are specific to either typed or
-            untyped input documents.                  
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="typed"/>
-         <xs:enumeration value="untyped"/>
-      </xs:restriction>
-   </xs:simpleType>
-
-
-   <!-- description type                                                     -->
-
-   <xs:complexType name="description">
-      <xs:simpleContent>
-         <xs:extension base="xs:string">
-            <xs:attribute name="last-mod" type="xs:date"/>
-         </xs:extension>
-      </xs:simpleContent>
-   </xs:complexType>
-
-
-   <!-- XQueryErrorCode type                                                 -->
-   <!--   * is used to mean that any error code is acceptable                -->
-
-   <xs:simpleType name="XQueryErrorCode">
-      <xs:annotation>
-         <xs:documentation>
-            * is used to mean that any error code is acceptable
-         </xs:documentation>
-      </xs:annotation>
-
-      <xs:restriction base="xs:string">
-         <xs:pattern value="\*|([A-Z]{4}[0-9]{4})"/>
-      </xs:restriction>
-   </xs:simpleType>
-   
-   <xs:simpleType name="spec-version-list-type">
-      <xs:annotation>
-         <xs:documentation>
-            A list of specification versions to which expected results (actual results or error outcome) apply
-         </xs:documentation>
-      </xs:annotation>
-      <xs:list itemType="test:spec-version-type"/>
-   </xs:simpleType>
-   
-   <xs:simpleType name="spec-version-type">
-      <xs:annotation>
-         <xs:documentation>
-            A specification version. Currently "1.0" or "1.1". Could be extended to allow for example
-            "1.1+ST" to imply "XQuery 1.1 with Static Typing Feature".
-         </xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="xs:string">
-         <xs:enumeration value="1.0"/>
-         <xs:enumeration value="1.1"/>
-      </xs:restriction>
-   </xs:simpleType>
-
-
-   <!-- infoBase type                                                        -->
-
-   <xs:complexType name="infoBase">
-      <xs:sequence>
-         <xs:element name="description" type="test:description"/>
-         <xs:element name="note" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-   </xs:complexType>
-
-
-</xs:schema>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/XQTSCatalog.xsl
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/XQTSCatalog.xsl b/vxquery-xtest/tests/XQTSCatalog.xsl
deleted file mode 100644
index bc96a6d..0000000
--- a/vxquery-xtest/tests/XQTSCatalog.xsl
+++ /dev/null
@@ -1,745 +0,0 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:test="http://www.w3.org/2005/02/query-test-XQTSCatalog">
-   <xsl:key name="citation-spec" match="/test-suite/citations/citation-spec" use="@name"/>
-
-      <xsl:variable name="TargetLanguage" select="/test:test-suite/@targetLanguage" />
-      <xsl:variable name="XQueryQueryOffsetPath" select="/test:test-suite/@XQueryQueryOffsetPath" />
-      <xsl:variable name="XQueryXQueryOffsetPath" select="/test:test-suite/@XQueryXQueryOffsetPath" />
-      <xsl:variable name="ResultOffsetPath" select="/test:test-suite/@ResultOffsetPath" />
-      <xsl:variable name="XQueryFileExtension" select="/test:test-suite/@XQueryFileExtension" />
-      <xsl:variable name="XQueryXFileExtension" select="/test:test-suite/@XQueryXFileExtension" />
-      <xsl:variable name="SourceOffsetPath" select="/test:test-suite/@SourceOffsetPath" />
-
-   <xsl:template match="/">
-      <html>
-         <head>
-            <title>XQuery Interoperability Test Suite</title>
-         </head>
-         <body>
-            <xsl:if test="test:test-suite/@targetLanguage">
-               <h1><xsl:value-of select="test:test-suite/@targetLanguage" /> Interoperability Test Suite</h1>
-            </xsl:if>
-            <xsl:if test="not( test:test-suite/@targetLanguage )">
-               <h1>XQuery/XQueryX Interoperability Test Suite</h1>
-            </xsl:if>
-            <h6>[Version: <xsl:value-of select="test:test-suite/@version" /> Catalog Design Date: <xsl:value-of select="test:test-suite/@CatalogDesignDate" />]</h6>
-            <h2>Introduction</h2>
-            <P>
-               The following document is an XSLT transform of the XQuery Testing Task Force (XQTTF) test catalog. The test 
-               catalog is an XML file containing meta-data about the XQuery interoperability 
-               tests published by the XQTTF. The meta-data serves to link test queries with 
-               their required input sources and results as well as providing further 
-               information about the tests (e.g. who the author was, what the purpose of the 
-               test is) and categorizing the various tests into their relevant sections. For 
-               further information and details about this catalog file, please visit the XQTTF 
-               homepage at <A HREF="http://www.w3.org/XML/Query/test-suite/">http://www.w3.org/XML/Query/test-suite/</A>.
-            </P>
-            <h2>Citations</h2>
-            <table>
-               <tr>
-                  <th>Name</th>
-                  <th>Description</th>
-                  <th>Note</th>
-               </tr>
-               <xsl:apply-templates select="test:test-suite/test:citations/test:citation-spec" />
-            </table>
-            <h2>Comparators</h2>
-            <table>
-               <tr>
-                  <th>Name</th>
-                  <th>Description</th>
-               </tr>
-               <xsl:for-each select="test:test-suite/test:comparisons/test:comparison">
-                  <tr>
-                     <td>
-                        <A>
-                           <xsl:attribute name="name">
-                              <xsl:value-of select="@name"/>
-                           </xsl:attribute>
-                           <b>
-                              <xsl:value-of select="@name"/>
-                           </b>
-                        </A>
-                     </td>
-                     <td>
-                        <xsl:value-of select="test:description"/>
-                     </td>
-                  </tr>
-               </xsl:for-each>
-            </table>
-            <h2>Scenarios</h2>
-            <table>
-               <tr>
-                  <th>Name</th>
-                  <th>Description</th>
-               </tr>
-               <xsl:for-each select="test:test-suite/test:scenarios/test:scenario">
-                  <tr>
-                     <td>
-                        <A>
-                           <xsl:attribute name="name">
-                              <xsl:value-of select="@name"/>
-                           </xsl:attribute>
-                           <b>
-                              <xsl:value-of select="@name"/>
-                           </b>
-                        </A>
-                     </td>
-                     <td>
-                        <xsl:value-of select="test:description"/>
-                     </td>
-                  </tr>
-               </xsl:for-each>
-            </table>
-            <h2>Roles</h2>
-            <table>
-               <tr>
-                  <th>Name</th>
-                  <th>Description</th>
-               </tr>
-               <xsl:for-each select="test:test-suite/test:roles/test:role">
-                  <tr>
-                     <td>
-                        <A>
-                           <xsl:attribute name="name">
-                              <xsl:value-of select="@name"/>
-                           </xsl:attribute>
-                           <b>
-                              <xsl:value-of select="@name"/>
-                           </b>
-                        </A>
-                     </td>
-                     <td>
-                        <xsl:value-of select="test:description"/>
-                     </td>
-                  </tr>
-               </xsl:for-each>
-            </table>
-            <h2>Sources</h2>
-            <table>
-               <tr>
-                  <th>ID</th>
-                  <th>Creator</th>
-                  <th>Schema</th>
-                  <th>File</th>
-                  <th>Description</th>
-               </tr>
-               <xsl:for-each select="test:test-suite/test:sources/test:source">
-                  <tr>
-                     <td>
-                        <A>
-                           <xsl:attribute name="name">
-                              <xsl:value-of select="@ID"/>
-                           </xsl:attribute>
-                           <b>
-                              <xsl:value-of select="@ID"/>
-                           </b>
-                        </A>
-                     </td>
-                     <td>
-                        <xsl:value-of select="@Creator"/>
-                     </td>
-                     <td>
-                        <A>
-                           <xsl:attribute name="href">#<xsl:value-of select="@schema"/></xsl:attribute>
-                           <xsl:value-of select="@schema"/>								
-                        </A>
-                     </td>
-                     <td>
-                        <A>
-                           <xsl:attribute name="href">
-                              <xsl:value-of select="$SourceOffsetPath"/><xsl:value-of select="@FileName"/></xsl:attribute>
-                           <xsl:value-of select="@FileName"/>
-                        </A>
-                     </td>
-                     <td>
-                        <xsl:value-of select="test:description"/>
-                     </td>
-                  </tr>
-               </xsl:for-each>
-            </table>
-            <h2>Schemas</h2>
-            <table>
-               <tr>
-                  <th>ID</th>
-                  <th>URI</th>
-                  <th>File Name</th>
-                  <th>Description</th>
-               </tr>
-               <xsl:for-each select="test:test-suite/test:sources/test:schema">
-                  <tr>
-                     <td>
-                        <A>
-                           <xsl:attribute name="name">
-                              <xsl:value-of select="@ID"/>
-                           </xsl:attribute>
-                           <b>
-                              <xsl:value-of select="@ID"/>
-                           </b>
-                        </A>
-                     </td>
-                     <td>
-                        <xsl:value-of select="@uri"/>
-                     </td>
-                     <td>
-                        <A>
-                           <xsl:attribute name="href"><xsl:value-of select="$SourceOffsetPath"/><xsl:value-of select="@FileName"/></xsl:attribute>
-                           <xsl:value-of select="@FileName"/>
-                        </A>
-                     </td>
-                     <td>
-                        <xsl:value-of select="test:description"/>
-                     </td>
-                  </tr>
-               </xsl:for-each>
-            </table>
-            <h2>Collections</h2>
-            <table>
-               <tr>
-                  <th>ID</th>
-                  <th>Creator</th>
-                  <th>Contents</th>
-                  <th>Description</th>
-               </tr>
-               <xsl:for-each select="test:test-suite/test:sources/test:collection">
-                  <tr>
-                     <td>
-                        <A>
-                           <xsl:attribute name="name">
-                              <xsl:value-of select="@ID"/>
-                           </xsl:attribute>
-                           <b>
-                              <xsl:value-of select="@ID"/>
-                           </b>
-                        </A>
-                     </td>
-                     <td>
-                        <xsl:value-of select="@Creator"/>
-                     </td>
-                     <td>
-                        <xsl:for-each select="test:input-document">
-                           <A>
-                              <xsl:attribute name="href">#<xsl:value-of select="."/></xsl:attribute>
-                              <xsl:value-of select="."/>
-                           </A>
-			   <xsl:if test="position() != last()">
-			      <xsl:text>, </xsl:text>
-			   </xsl:if>
-                        </xsl:for-each>
-                     </td>
-                     <td>
-                        <xsl:value-of select="test:description"/>
-                     </td>
-                  </tr>
-               </xsl:for-each>
-            </table>
-            <h2>Modules</h2>
-            <table>
-               <tr>
-                  <th>ID</th>
-                  <th>Creator</th>
-                  <th>File</th>
-                  <th>Description</th>
-               </tr>
-               <xsl:for-each select="test:test-suite/test:sources/test:module">
-                  <tr>
-                     <td>
-                        <A>
-                           <xsl:attribute name="name">
-                              <xsl:value-of select="@ID"/>
-                           </xsl:attribute>
-                           <b>
-                              <xsl:value-of select="@ID"/>
-                           </b>
-                        </A>
-                     </td>
-                     <td>
-                        <xsl:value-of select="@Creator"/>
-                     </td>
-                     <td>
-                        <A>
-                           <xsl:attribute name="href">
-                              <xsl:value-of select="$SourceOffsetPath"/><xsl:value-of select="@FileName"/><xsl:value-of select="$XQueryFileExtension"/>
-                           </xsl:attribute>
-                           <xsl:value-of select="@FileName"/>
-                        </A>
-                     </td>
-                     <td>
-                        <xsl:value-of select="test:description"/>
-                     </td>
-                  </tr>
-               </xsl:for-each>
-            </table>
-            <h2>Test Groups</h2>
-            <ul>
-               <xsl:for-each select="test:test-suite/test:test-group">
-                  <li>
-                     <A>
-                        <xsl:attribute name="href">#<xsl:value-of select="@name"/></xsl:attribute>
-                        <xsl:number level="multiple" format="1.1" count="test:test-group"/>&#x20;<xsl:value-of select="test:GroupInfo/test:title"/></A>
-                     <xsl:if test="@featureOwner">
-                        &#x20;[<xsl:value-of select="@featureOwner" />]
-                     </xsl:if>
-                     <xsl:if test="test:test-group">
-                        <ul>
-                           <xsl:for-each select="test:test-group">
-                              <li>
-                                 <A>
-                                    <xsl:attribute name="href">#<xsl:value-of select="@name"/></xsl:attribute>
-                                    <xsl:number level="multiple" format="1.1" count="test:test-group"/>&#x20;<xsl:value-of select="test:GroupInfo/test:title"/></A>
-                                 <xsl:if test="@featureOwner">
-                                    &#x20;[<xsl:value-of select="@featureOwner" />]
-                                 </xsl:if>
-                              </li>
-                           </xsl:for-each>
-                        </ul>
-                     </xsl:if>
-                  </li>
-               </xsl:for-each>
-            </ul>
-            <xsl:apply-templates select="test:test-suite/test:test-group" />
-            <h2>Appendices</h2>
-            <h3>Implementation Defined Items</h3>
-            <blockquote>
-               <table border="1">
-                  <xsl:apply-templates select="test:test-suite/test:implementation-defined-items/test:implementation-defined-item" />
-               </table>
-            </blockquote>
-            <h3>Context Properties</h3>
-            <xsl:apply-templates select="test:test-suite/test:context-properties" />
-            <h3>Features</h3>
-            <table>
-               <xsl:apply-templates select="test:test-suite/test:features/test:feature" />
-            </table>
-         </body>
-      </html>
-   </xsl:template>
-   <xsl:template match="test:test-group">
-      <A>
-         <xsl:attribute name="name">
-            <xsl:value-of select="@name"/>
-         </xsl:attribute>
-      </A>
-      <h3>
-         <xsl:number level="multiple" format="1.1" count="test:test-group"/>&#x20;<xsl:value-of select="test:GroupInfo/test:title" />
-         <xsl:if test="@featureOwner">
-            &#x20;[<xsl:value-of select="@featureOwner" />]
-         </xsl:if>
-      </h3>
-      <p/>
-      <xsl:value-of select="test:GroupInfo/test:description" />
-      <p/>
-      <ul>
-         <xsl:for-each select="test:test-group">
-            <li>
-               <A>
-                  <xsl:attribute name="href">#<xsl:value-of select="@name"/></xsl:attribute>
-                  <xsl:number level="multiple" format="1.1" count="test:test-group"/>&#x20;<xsl:value-of select="test:GroupInfo/test:title"/></A>
-               <xsl:if test="@featureOwner">
-                  &#x20;[<xsl:value-of select="@featureOwner" />]
-               </xsl:if>
-               <xsl:if test="test:test-group">
-                  <ul>
-                     <xsl:for-each select="test:test-group">
-                        <li>
-                           <A>
-                              <xsl:attribute name="href">#<xsl:value-of select="@name"/></xsl:attribute>
-                              <xsl:number level="multiple" format="1.1" count="test:test-group"/>&#x20;<xsl:value-of select="test:GroupInfo/test:title"/></A>
-                           <xsl:if test="@featureOwner">
-                              &#x20;[<xsl:value-of select="@featureOwner" />]
-                           </xsl:if>
-                        </li>
-                     </xsl:for-each>
-                  </ul>
-               </xsl:if>
-            </li>
-         </xsl:for-each>
-      </ul>
-      <xsl:apply-templates select="test:test-case" />
-      <xsl:apply-templates select="test:test-group" />
-   </xsl:template>
-
-   <xsl:template match="test:test-case">
-      <xsl:variable name="FilePath" select="@FilePath" />
-      <table width="80%" bgcolor="tan">
-         <a name="{@name}"/>
-         <tr>
-            <td>
-               <b>
-                  <xsl:value-of select="@name"/>
-               </b>
-            </td>
-            <td>
-               Scenario:
-               <A>
-                  <xsl:attribute name="href">#<xsl:value-of select="@scenario"/></xsl:attribute>
-                  <xsl:value-of select="@scenario"/>
-               </A>
-            </td>
-            <td>
-               Creator:
-               <xsl:value-of select="@Creator"/>
-            </td>
-         </tr>
-         <tr>
-            <td colspan="3">
-               <B>Description:</B>
-            </td>
-         </tr>
-         <tr>
-            <td colspan="3">
-               <xsl:value-of select="test:description"/>
-            </td>
-         </tr>
-         <tr>
-            <td colspan="3">
-               <xsl:value-of select="test:query/test:description"/>
-            </td>
-         </tr>
-         <tr>
-            <td colspan="3">
-               <B>Spec Citations:</B>
-            </td>
-         </tr>
-         <xsl:for-each select="test:spec-citation">
-            <xsl:variable name="spec-URI" select="key( 'citation-spec', @spec )/test:spec-URI" />
-            <tr>
-               <td colspan="3">
-                  <A>
-                     <xsl:attribute name="href">
-                        <xsl:value-of select="$spec-URI"/>#<xsl:value-of select="@section-pointer"/>
-                     </xsl:attribute>
-                     <xsl:value-of select="$spec-URI"/>#<xsl:value-of select="@section-pointer"/>
-                  </A>
-               </td>
-            </tr>
-         </xsl:for-each>
-         
-         <tr>
-            <td colspan="3">
-               <B>Reflects Resolution:</B>
-            </td>
-         </tr>
-         <xsl:for-each select="test:reflects-resolution">
-            <tr>
-               <td colspan="3">
-                  <A>
-                     <xsl:attribute name="href">
-                        <xsl:value-of select="."/>
-                     </xsl:attribute>
-                     <xsl:value-of select="substring-after(., '?id=')"/>
-                  </A>
-               </td>
-            </tr>
-         </xsl:for-each>
-         
-         <xsl:if test="test:input-query">
-            <tr>
-               <td colspan="3">
-                  <B>External Variables:</B>
-               </td>
-            </tr>
-            <xsl:for-each select="test:input-query">
-               <tr>
-                  <td>
-                     <xsl:text>Variable: </xsl:text>
-                     <xsl:value-of select="@variable"/>
-                  </td>
-                  <td colspan="2">
-                     <A>
-                        <xsl:choose>
-                           <xsl:when test="$TargetLanguage='XQuery'">
-                              <xsl:attribute name="href">
-                                 <xsl:value-of select="$XQueryQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="@name"/><xsl:value-of select="$XQueryFileExtension"/>
-                              </xsl:attribute>
-                              <xsl:value-of select="$XQueryQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="@name"/><xsl:value-of select="$XQueryFileExtension"/>
-                           </xsl:when>
-                           <xsl:when test="$TargetLanguage='XQueryX'">
-                              <xsl:attribute name="href">
-                                 <xsl:value-of select="$XQueryXQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="@name"/><xsl:value-of select="$XQueryXFileExtension"/>
-                              </xsl:attribute>
-                              <xsl:value-of select="$XQueryXQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="@name"/><xsl:value-of select="$XQueryXFileExtension"/>
-                           </xsl:when>
-                           <xsl:otherwise>
-                              <xsl:attribute name="href">
-                                 <xsl:value-of select="$XQueryQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="@name"/><xsl:value-of select="$XQueryFileExtension"/>
-                              </xsl:attribute>
-                              <xsl:value-of select="$XQueryQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="@name"/><xsl:value-of select="$XQueryFileExtension"/>
-                           </xsl:otherwise>
-                        </xsl:choose>
-                     </A>
-                  </td>
-               </tr>
-            </xsl:for-each>
-         </xsl:if>
-         
-         <tr>
-            <td colspan="2">
-               <B>Query:</B>
-            </td>
-            <td>
-               <xsl:if test="@is-XPath2='true'">
-                  (XPath 2.0)
-               </xsl:if>
-            </td>
-         </tr>
-         <tr>
-            <td colspan="3">
-               <A>
-                  <xsl:choose>
-                     <xsl:when test="$TargetLanguage='XQuery'">
-                        <xsl:attribute name="href">
-                           <xsl:value-of select="$XQueryQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="test:query/@name"/><xsl:value-of select="$XQueryFileExtension"/>
-                        </xsl:attribute>
-                        <xsl:value-of select="$XQueryQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="test:query/@name"/><xsl:value-of select="$XQueryFileExtension"/>
-                     </xsl:when>
-                     <xsl:when test="$TargetLanguage='XQueryX'">
-                        <xsl:attribute name="href">
-                           <xsl:value-of select="$XQueryXQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="test:query/@name"/><xsl:value-of select="$XQueryXFileExtension"/>
-                        </xsl:attribute>
-                        <xsl:value-of select="$XQueryXQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="test:query/@name"/><xsl:value-of select="$XQueryXFileExtension"/>
-                     </xsl:when>
-                     <xsl:otherwise>
-                        <xsl:attribute name="href">
-                           <xsl:value-of select="$XQueryQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="test:query/@name"/><xsl:value-of select="$XQueryFileExtension"/>
-                        </xsl:attribute>
-                        <xsl:value-of select="$XQueryQueryOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="test:query/@name"/><xsl:value-of select="$XQueryFileExtension"/>
-                     </xsl:otherwise>
-                  </xsl:choose>
-               </A>
-            </td>
-         </tr>
-         <xsl:if test="test:module">
-            <tr>
-               <td colspan="3">
-                  <B>Modules:</B>
-               </td>
-            </tr>
-            <xsl:for-each select="test:module">
-               <tr>
-                  <td colspan="2">
-                     Module ID:
-                     <A>
-                        <xsl:attribute name="href">#<xsl:value-of select="."/></xsl:attribute>
-                        <xsl:value-of select="."/>
-                     </A>
-                  </td>
-                  <td>
-                     Namespace:
-                     <A>
-                        <xsl:attribute name="href">#<xsl:value-of select="@namespace"/></xsl:attribute>
-                        <xsl:value-of select="@namespace"/>
-                     </A>
-                  </td>
-               </tr>
-            </xsl:for-each>
-         </xsl:if>
-         <tr>
-            <td colspan="3">
-               <B>Inputs:</B>
-            </td>
-         </tr>
-         <xsl:for-each select="test:input-file">
-            <tr>
-               <td>
-                  Name:
-                  <xsl:value-of select="@variable"/>
-               </td>
-               <td>
-                  Role:
-                  <A>
-                     <xsl:attribute name="href">#<xsl:value-of select="@role"/></xsl:attribute>
-                     <xsl:value-of select="@role"/>
-                  </A>
-               </td>
-               <td>
-                  Source ID:
-                  <A>
-                     <xsl:attribute name="href">#<xsl:value-of select="."/></xsl:attribute>
-                     <xsl:value-of select="."/>
-                  </A>
-               </td>
-            </tr>
-         </xsl:for-each>
-         <xsl:for-each select="test:input-URI">
-            <tr>
-               <td>
-                  Role:
-                  <A>
-                     <xsl:attribute name="href">#<xsl:value-of select="@role"/></xsl:attribute>
-                     <xsl:value-of select="@role"/>
-                  </A>
-               </td>
-               <td>
-                  Source ID:
-                  <A>
-                     <xsl:attribute name="href">#<xsl:value-of select="."/></xsl:attribute>
-                     <xsl:value-of select="."/>
-                  </A>
-               </td>
-               <td>
-	          <xsl:text>(as input URI)</xsl:text>
-               </td>
-            </tr>
-         </xsl:for-each>
-         <xsl:for-each select="test:defaultCollection">
-            <tr>
-               <td>
-                  Role:
-                  <A>
-                     <xsl:attribute name="href">#<xsl:value-of select="@role"/></xsl:attribute>
-                     <xsl:value-of select="@role"/>
-                  </A>
-               </td>
-               <td>
-                  Source ID:
-                  <A>
-                     <xsl:attribute name="href">#<xsl:value-of select="."/></xsl:attribute>
-                     <xsl:value-of select="."/>
-                  </A>
-               </td>
-               <td>
-	          <xsl:text>(as default collection)</xsl:text>
-               </td>
-            </tr>
-         </xsl:for-each>
-         <xsl:for-each select="test:contextItem">
-            <tr>
-               <td>
-                  Role:
-                  <A>
-                     <xsl:attribute name="href">#<xsl:value-of select="@role"/></xsl:attribute>
-                     <xsl:value-of select="@role"/>
-                  </A>
-               </td>
-               <td>
-                  Source ID:
-                  <A>
-                     <xsl:attribute name="href">#<xsl:value-of select="."/></xsl:attribute>
-                     <xsl:value-of select="."/>
-                  </A>
-               </td>
-               <td>
-	          <xsl:text>(as context item)</xsl:text>
-               </td>
-            </tr>
-         </xsl:for-each>
-         <tr>
-            <td colspan="3">
-               <B>Outputs:</B>
-            </td>
-         </tr>
-         <xsl:for-each select="test:output-file">
-            <tr>
-               <td>
-                  Role:
-                  <A>
-                     <xsl:attribute name="href">#<xsl:value-of select="@role"/></xsl:attribute>
-                     <xsl:value-of select="@role"/>
-                  </A>
-                  <xsl:if test="@spec-version">
-                     <xsl:value-of select="concat(' (Version ', @spec-version, ')')" />
-                  </xsl:if>
-               </td>
-               <td>
-                  Comparator:
-                  <A>
-                     <xsl:attribute name="href">#<xsl:value-of select="@compare"/></xsl:attribute>
-                     <xsl:value-of select="@compare"/>
-                  </A>
-               </td>
-               <td>
-                  <A>
-                     <xsl:attribute name="href">
-                        <xsl:value-of select="$ResultOffsetPath"/><xsl:value-of select="$FilePath"/><xsl:value-of select="."/></xsl:attribute>
-                     Results/<xsl:value-of select="$FilePath"/><xsl:value-of select="."/>
-                  </A>
-               </td>
-            </tr>
-         </xsl:for-each>
-         <xsl:for-each select="test:expected-error">
-            <tr>
-               <td colspan="3">
-                  Error:
-                  <A>
-                     <xsl:attribute name="href">http://www.w3.org/TR/xquery/#ERR<xsl:value-of select="."/></xsl:attribute>
-                     err:<xsl:value-of select="."/>
-                  </A>
-                  <xsl:if test="@spec-version">
-                     <xsl:value-of select="concat(' (Version ', @spec-version, ')')" />
-                  </xsl:if>
-               </td>
-            </tr>
-         </xsl:for-each>
-      </table>
-      <p/>
-   </xsl:template>
-   <xsl:template match="test:citation-spec">
-      <tr>
-         <td>
-            <A>
-               <xsl:attribute name="name">
-                  <xsl:value-of select="@name"/>
-               </xsl:attribute>
-               <xsl:attribute name="href">
-                  <xsl:value-of select="test:spec-URI"/>
-               </xsl:attribute>
-               <b>
-                  <xsl:value-of select="@name"/>
-               </b>
-            </A>
-         </td>
-         <td>
-            <xsl:value-of select="test:description"/>
-         </td>
-         <td>
-            <I>
-               <xsl:value-of select="test:note"/>
-            </I>
-         </td>
-      </tr>
-   </xsl:template>
-   <xsl:template match="test:implementation-defined-item">
-      <tr>
-         <td valign="top">
-            <xsl:text>[</xsl:text>
-            <xsl:value-of select="@spec" />
-            <xsl:text>]</xsl:text>
-            <br />
-            <xsl:value-of select="@name" />
-         </td>
-         <td valign="top">
-            <xsl:value-of select="test:description/text()" />
-         </td>
-      </tr>
-   </xsl:template>
-   <xsl:template match="test:context-properties">
-      <h4>Static Context</h4>
-      <blockquote>
-         <table>
-            <xsl:apply-templates select="test:context-property[@context-type='static']" />
-         </table>
-      </blockquote>
-      <h4>Dynamic Context</h4>
-      <blockquote>
-         <table>
-            <xsl:apply-templates select="test:context-property[@context-type='dynamic']" />
-         </table>
-      </blockquote>
-   </xsl:template>
-   <xsl:template match="test:context-property">
-      <tr>
-         <td>
-            <xsl:value-of select="@name" />
-         </td>
-         <td />
-      </tr>
-   </xsl:template>
-   <xsl:template match="test:feature">
-      <tr>
-         <td>
-            <xsl:value-of select="@name" />
-         </td>
-         <td />
-      </tr>
-   </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file


[06/51] [abbrv] Updated the testing resources.

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q00.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q00.xq
deleted file mode 100644
index 86241cd..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q00.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Filter Query :)
-(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
-(: the weather readings for December 25 over the last 10 years.               :)
-let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $r in collection($collection)/dataCollection/data
-let $datetime := xs:dateTime(fn:data($r/date))
-where $r/station eq "GHCND:AS000000003" 
-    and fn:year-from-dateTime($datetime) ge 2000
-    and fn:month-from-dateTime($datetime) eq 3 
-    and fn:day-from-dateTime($datetime) eq 3
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q01.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q01.xq
deleted file mode 100644
index 1572994..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q01.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: 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 := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $r in collection($collection)/dataCollection/data
-where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q02.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q02.xq
deleted file mode 100644
index d363fbf..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q02.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q03.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q03.xq
deleted file mode 100644
index 75a8935..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q03.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04.xq
deleted file mode 100644
index 61452fb..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find all the weather readings for Washington state for a specific day    :)
-(: 2002-2-2.                                                                  :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $r in collection($sensor_collection)/dataCollection/data
-    
-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 "STATE 1"))
-    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
deleted file mode 100644
index 18f5929..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Join Query :)
-(: Find all the weather readings for Washington state for a specific day    :)
-(: 2002-2-2.                                                                  :)
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $r in collection($sensor_collection)/dataCollection/data
-    
-where xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
deleted file mode 100644
index d7630f0..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Join Query :)
-(: Find all the weather readings for Washington state for a specific day    :)
-(: 2002-2-2.                                                                  :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $s in collection($station_collection)/stationCollection/station
-
-where (some $x in $s/locationLabels satisfies ($x/type eq "ST" and fn:upper-case(fn:data($x/displayName)) eq "STATE 1"))
-return $s
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q05.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q05.xq
deleted file mode 100644
index df822a1..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q05.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:min(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q06.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q06.xq
deleted file mode 100644
index ed9bdb0..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q06.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find the highest recorded temperature (TMAX) for each station for each     :)
-(: day over the year 2002.                                                    :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-for $r in collection($sensor_collection)/dataCollection/data
-
-where $s/id eq $r/station
-    and $r/dataType eq "TMAX" 
-    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-return ($s/displayName, $r/date, $r/value)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q07.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q07.xq
deleted file mode 100644
index d0e8c48..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-1/q07.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:avg(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_max in collection($sensor_collection_max)/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/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q00.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q00.xq
deleted file mode 100644
index 64636bc..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q00.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Filter Query :)
-(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
-(: the weather readings for December 25 over the last 10 years.               :)
-let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $r in collection($collection)/dataCollection/data
-let $datetime := xs:dateTime(fn:data($r/date))
-where $r/station eq "GHCND:AS000000003" 
-    and fn:year-from-dateTime($datetime) ge 2000
-    and fn:month-from-dateTime($datetime) eq 3 
-    and fn:day-from-dateTime($datetime) eq 3
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q01.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q01.xq
deleted file mode 100644
index 4e1edc5..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q01.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: 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 := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $r in collection($collection)/dataCollection/data
-where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q02.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q02.xq
deleted file mode 100644
index fac6bf0..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q02.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q03.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q03.xq
deleted file mode 100644
index ce3d0d3..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q03.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q04.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q04.xq
deleted file mode 100644
index 5d6d1d1..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q04.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find all the weather readings for Washington state for a specific day    :)
-(: 2002-2-2.                                                                  :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $r in collection($sensor_collection)/dataCollection/data
-    
-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 "STATE 1"))
-    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q05.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q05.xq
deleted file mode 100644
index 15b98c1..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q05.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:min(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q06.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q06.xq
deleted file mode 100644
index df17713..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q06.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find the highest recorded temperature (TMAX) for each station for each     :)
-(: day over the year 2002.                                                    :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-for $r in collection($sensor_collection)/dataCollection/data
-
-where $s/id eq $r/station
-    and $r/dataType eq "TMAX" 
-    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-return ($s/displayName, $r/date, $r/value)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q07.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q07.xq
deleted file mode 100644
index 2debae0..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-2/q07.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:avg(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_max in collection($sensor_collection_max)/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/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q00.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q00.xq
deleted file mode 100644
index e130e2a..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q00.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Filter Query :)
-(: See historical data for Riverside, CA (AS000000003) station by selecting   :)
-(: the weather readings for December 25 over the last 10 years.               :)
-let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $r in collection($collection)/dataCollection/data
-let $datetime := xs:dateTime(fn:data($r/date))
-where $r/station eq "GHCND:AS000000003" 
-    and fn:year-from-dateTime($datetime) ge 2000
-    and fn:month-from-dateTime($datetime) eq 3 
-    and fn:day-from-dateTime($datetime) eq 3
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q01.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q01.xq
deleted file mode 100644
index bad94e4..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q01.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: 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 := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $r in collection($collection)/dataCollection/data
-where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q02.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q02.xq
deleted file mode 100644
index f4c2722..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q02.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:sum(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q03.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q03.xq
deleted file mode 100644
index 7199c97..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q03.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:max(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-) div 10
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q04.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q04.xq
deleted file mode 100644
index cdf85dd..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q04.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find all the weather readings for Washington state for a specific day    :)
-(: 2002-2-2.                                                                  :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $r in collection($sensor_collection)/dataCollection/data
-    
-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 "STATE 1"))
-    and xs:dateTime(fn:data($r/date)) eq xs:dateTime("2002-02-02T00:00:00.000")
-return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q05.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q05.xq
deleted file mode 100644
index 5036305..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q05.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:min(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q06.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q06.xq
deleted file mode 100644
index 51c474d..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q06.xq
+++ /dev/null
@@ -1,13 +0,0 @@
-(: XQuery Join Query :)
-(: Find the highest recorded temperature (TMAX) for each station for each     :)
-(: day over the year 2002.                                                    :)
-let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $s in collection($station_collection)/stationCollection/station
-
-let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-for $r in collection($sensor_collection)/dataCollection/data
-
-where $s/id eq $r/station
-    and $r/dataType eq "TMAX" 
-    and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-return ($s/displayName, $r/date, $r/value)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q07.xq b/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q07.xq
deleted file mode 100644
index a508e52..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Ghcnd/Partition-4/q07.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:avg(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_max in collection($sensor_collection_max)/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/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
deleted file mode 100644
index 73e8aea..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
deleted file mode 100644
index 0d327d1..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
deleted file mode 100644
index 9f2ac93..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:count(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
deleted file mode 100644
index 917b7c6..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:count(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_max in collection($sensor_collection_max)/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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
deleted file mode 100644
index 52e7790..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
deleted file mode 100644
index 619c6d1..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
deleted file mode 100644
index c32bcd1..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:count(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
deleted file mode 100644
index fd3431f..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:count(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_max in collection($sensor_collection_max)/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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
deleted file mode 100644
index 2940380..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
+++ /dev/null
@@ -1,11 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
deleted file mode 100644
index eb6ff10..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
+++ /dev/null
@@ -1,8 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-fn:count(
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
deleted file mode 100644
index 768e35d..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-fn:count(
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
deleted file mode 100644
index 8ea026b..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
+++ /dev/null
@@ -1,16 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-fn:count(
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_max in collection($sensor_collection_max)/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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
deleted file mode 100644
index 68b87b5..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
+++ /dev/null
@@ -1,9 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
deleted file mode 100644
index 8a22c5e..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
+++ /dev/null
@@ -1,6 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
deleted file mode 100644
index 0cd735d..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
deleted file mode 100644
index 793fbba..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
-    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
deleted file mode 100644
index 4b14f55..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
+++ /dev/null
@@ -1,9 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
deleted file mode 100644
index 581644a..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
+++ /dev/null
@@ -1,6 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
deleted file mode 100644
index 83b4683..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
deleted file mode 100644
index 1948ba0..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
-    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
deleted file mode 100644
index 8fb560b..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
+++ /dev/null
@@ -1,9 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
-(: station (US000000002) for 2002.                                            :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/station eq "GHCND:US000000002" 
-        and $r/dataType eq "PRCP" 
-        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
deleted file mode 100644
index 835e3b2..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
+++ /dev/null
@@ -1,6 +0,0 @@
-(: XQuery Aggregate Query :)
-(: Find the highest recorded temperature (TMAX) in Celsius.                   :)
-    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "TMAX"
-    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
deleted file mode 100644
index 664e91b..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Join Aggregate Query :)
-(: Find the lowest recorded temperature (TMIN) in the United States for     :)
-(: 2001.                                                                      :)
-    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $s in collection($station_collection)/stationCollection/station
-    
-    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r in collection($sensor_collection)/dataCollection/data
-    
-    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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
deleted file mode 100644
index 6f8c165..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
+++ /dev/null
@@ -1,14 +0,0 @@
-(: XQuery Self Join Query :)
-(: Self join with all stations finding the difference in min and max       :)
-(: temperature and get the average.                                        :)
-    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_min in collection($sensor_collection_min)/dataCollection/data
-    
-    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
-    for $r_max in collection($sensor_collection_max)/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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml b/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
deleted file mode 100644
index cc2fd33..0000000
--- a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2001-01-01T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000001</station><value>11.25</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000001</station><value>31</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml b/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
deleted file mode 100644
index 213f748..0000000
--- a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><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/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml b/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
deleted file mode 100644
index c095726..0000000
--- a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml b/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
deleted file mode 100644
index 3bcec27..0000000
--- a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000004</id><displayName>Station 4</displayName><latitude>40.000</latitude><longitude>-40.000</longitude><elevation>4000.0</elevation><locationLabels><type>ST</type><id>FIPS:1</id><displayName>State 4</displayName></locationLabels><locationLabels><type>CNTY</type><id>FIPS:-9999</id><displayName>County 4</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/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml b/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
deleted file mode 100644
index 3a540d3..0000000
--- a/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml b/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
deleted file mode 100644
index e9dc6e9..0000000
--- a/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000002</id><displayName>Station 2</displayName><latitude>20.000</latitude><longitude>-20.000</longitude><elevation>2000.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 2</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/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml b/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
deleted file mode 100644
index 2dbe586..0000000
--- a/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2004-04-04T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000004</station><value>40</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2004-04-04T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000004</station><value>4</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/16f26a65/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml b/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
deleted file mode 100644
index 4919c20..0000000
--- a/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:AS000000003</id><displayName>Station 3</displayName><latitude>-30.000</latitude><longitude>30.000</longitude><locationLabels><type>CNTRY</type><id>FIPS:AS</id><displayName>AUSTRALIA</displayName></locationLabels></station></stationCollection>
\ No newline at end of file


[31/51] [abbrv] git commit: add NullableTypeComputer to avoid NPE

Posted by vi...@apache.org.
add NullableTypeComputer to avoid NPE


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/c13ad120
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/c13ad120
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/c13ad120

Branch: refs/heads/vxquery_0_3_staging
Commit: c13ad1202af4da31406b0ac2e83d833e87a4c64d
Parents: 3f4797b
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 10:47:21 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:50:42 2014 -0700

----------------------------------------------------------------------
 .../org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java   | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c13ad120/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 91c7764..2fdfbea 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
@@ -41,6 +41,7 @@ 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;
@@ -149,6 +150,12 @@ public class XMLQueryCompiler {
                 return null;
             }
         });
+        builder.setNullableTypeComputer(new INullableTypeComputer() {
+            @Override
+            public Object makeNullableType(Object type) throws AlgebricksException {
+                throw new NotImplementedException("NullableTypeComputer is not implented");
+            }
+        });
         builder.setNullWriterFactory(new VXQueryNullWriterFactory());
         if (availableProcessors < 1) {
             builder.setClusterLocations(VXQueryMetadataProvider.getClusterLocations(nodeList));


[45/51] [abbrv] git commit: add license headers

Posted by vi...@apache.org.
add license headers


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/afca3afe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/afca3afe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/afca3afe

Branch: refs/heads/vxquery_0_3_staging
Commit: afca3afe74a738a64b0d5d58108cf4e390e90624
Parents: 43e6daa
Author: Till Westmann <we...@gmail.com>
Authored: Tue Apr 8 16:31:09 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Tue Apr 8 16:31:09 2014 -0700

----------------------------------------------------------------------
 .../resources/noaa-ghcn-daily/queries/q00.xq     | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q01.xq     | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q02.xq     | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q03.xq     | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q04.xq     | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q04_sensor.xq        | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q04_station.xq       | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q05.xq     | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q05_sensor.xq        | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q05_station.xq       | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q06.xq     | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q06_sensor.xq        | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q06_station.xq       | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/queries/q07.xq     | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q07_tmax.xq          | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/q07_tmin.xq          | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/sensor_count.xq      | 17 +++++++++++++++++
 .../noaa-ghcn-daily/queries/station_count.xq     | 17 +++++++++++++++++
 .../resources/noaa-ghcn-daily/scripts/README.md  | 17 +++++++++++++++++
 .../src/main/resources/util/README.md            | 17 +++++++++++++++++
 .../src/main/resources/util/vxquery_functions.xq | 17 +++++++++++++++++
 .../src/main/resources/util/vxquery_operators.xq | 17 +++++++++++++++++
 .../src/main/resources/scripts/README.md         | 17 +++++++++++++++++
 .../src/main/resources/scripts/startcc.sh        | 17 +++++++++++++++++
 .../src/main/resources/scripts/startnc.sh        | 17 +++++++++++++++++
 .../src/main/resources/scripts/stopcc.sh         | 17 +++++++++++++++++
 .../src/main/resources/scripts/stopnc.sh         | 17 +++++++++++++++++
 vxquery-xtest/results/README.md                  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-1/avg.xq  | 17 +++++++++++++++++
 .../XQuery/Aggregate/Partition-1/count.xq        | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-1/max.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-1/min.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-1/sum.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-2/avg.xq  | 17 +++++++++++++++++
 .../XQuery/Aggregate/Partition-2/count.xq        | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-2/max.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-2/min.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-2/sum.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-4/avg.xq  | 17 +++++++++++++++++
 .../XQuery/Aggregate/Partition-4/count.xq        | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-4/max.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-4/min.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Aggregate/Partition-4/sum.xq  | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q00.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q01.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q02.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q03.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q04.xq      | 17 +++++++++++++++++
 .../XQuery/Ghcnd/Partition-1/q04_sensors.xq      | 17 +++++++++++++++++
 .../XQuery/Ghcnd/Partition-1/q04_stations.xq     | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q05.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q06.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-1/q07.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q00.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q01.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q02.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q03.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q04.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q05.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q06.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-2/q07.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q00.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q01.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q02.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q03.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q04.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q05.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q06.xq      | 17 +++++++++++++++++
 .../Queries/XQuery/Ghcnd/Partition-4/q07.xq      | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-1/q02_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-1/q03_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-1/q05_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-1/q07_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-2/q02_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-2/q03_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-2/q05_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-2/q07_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-4/q02_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-4/q03_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-4/q05_count.xq   | 17 +++++++++++++++++
 .../XQuery/GhcndCount/Partition-4/q07_count.xq   | 17 +++++++++++++++++
 .../GhcndRecords/Partition-1/q02_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-1/q03_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-1/q05_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-1/q07_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-2/q02_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-2/q03_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-2/q05_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-2/q07_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-4/q02_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-4/q03_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-4/q05_records.xq      | 17 +++++++++++++++++
 .../GhcndRecords/Partition-4/q07_records.xq      | 17 +++++++++++++++++
 .../quarter_1/sensors/US000000001_200101_0.xml   | 19 ++++++++++++++++++-
 .../half_1/quarter_1/stations/US000000001.xml    | 19 ++++++++++++++++++-
 .../quarter_2/sensors/US000000002_200202_0.xml   | 19 ++++++++++++++++++-
 .../half_1/quarter_2/stations/US000000004.xml    | 19 ++++++++++++++++++-
 .../quarter_3/sensors/AS000000003_200303_0.xml   | 19 ++++++++++++++++++-
 .../half_2/quarter_3/stations/US000000002.xml    | 19 ++++++++++++++++++-
 .../quarter_4/sensors/US000000004_200404_0.xml   | 19 ++++++++++++++++++-
 .../half_2/quarter_4/stations/AS000000003.xml    | 19 ++++++++++++++++++-
 .../src/test/resources/VXQueryCatalog.xml        | 17 +++++++++++++++++
 .../resources/cat/AggregatePartition1Queries.xml | 17 +++++++++++++++++
 .../resources/cat/AggregatePartition2Queries.xml | 17 +++++++++++++++++
 .../resources/cat/AggregatePartition4Queries.xml | 17 +++++++++++++++++
 .../cat/GhcndCountPartition1Queries.xml          | 17 +++++++++++++++++
 .../cat/GhcndCountPartition2Queries.xml          | 17 +++++++++++++++++
 .../cat/GhcndCountPartition4Queries.xml          | 17 +++++++++++++++++
 .../resources/cat/GhcndPartition1Queries.xml     | 17 +++++++++++++++++
 .../resources/cat/GhcndPartition2Queries.xml     | 17 +++++++++++++++++
 .../resources/cat/GhcndPartition4Queries.xml     | 17 +++++++++++++++++
 .../cat/GhcndRecordsPartition1Queries.xml        | 17 +++++++++++++++++
 .../cat/GhcndRecordsPartition2Queries.xml        | 17 +++++++++++++++++
 .../cat/GhcndRecordsPartition4Queries.xml        | 17 +++++++++++++++++
 114 files changed, 1946 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q00.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q00.xq
index 527fa00..743f95a 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q00.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q00.xq
@@ -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. :)
+
 (: XQuery Filter Query :)
 (: See historical data for Riverside, CA (ASN00008113) station by selecting   :)
 (: the weather readings for December 25 over the last 10 years.               :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q01.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q01.xq
index 93bfbbb..0827c45 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q01.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q01.xq
@@ -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. :)
+
 (: 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     :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q02.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q02.xq
index 88d25f3..cbe72da 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q02.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q02.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
 (: station (USW00024233) for 1999.                                            :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q03.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q03.xq
index 0b50c36..c58b0a3 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q03.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q03.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest recorded temperature (TMAX) in Celsius.                   :)
 fn:max(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04.xq
index 19d5093..5b7246d 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find all the weather readings for Washington state for a specific day    :)
 (: 1976/7/4.                                                                  :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_sensor.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_sensor.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_sensor.xq
index 7a94332..6c7810a 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_sensor.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_sensor.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Count all the weather sensor readings on 1976-07-04.                       :)
 count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_station.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_station.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_station.xq
index 100d2b3..18e627a 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_station.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q04_station.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Count all the weather stations for Washington state.                       :)
 count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05.xq
index 44db96d..c95f3f5 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Find the lowest recorded temperature (TMIN) in the United States for     :)
 (: 2001.                                                                      :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_sensor.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_sensor.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_sensor.xq
index 5f96d1b..8548742 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_sensor.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_sensor.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Count all sensor readings for TMIN in 2001.                                :)
 count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_station.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_station.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_station.xq
index ee26d88..6f3a6b8 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_station.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q05_station.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Count all stations in the United States.                                 :)
 count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06.xq
index 573a3a3..5c8ed54 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find the highest recorded temperature (TMAX) for each station for each     :)
 (: day over the year 2000.                                                    :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_sensor.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_sensor.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_sensor.xq
index e8eb64a..1938151 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_sensor.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_sensor.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Count max temperature (TMAX) readings for 2000-01-01.                          :)
 count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_station.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_station.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_station.xq
index 6212016..3c1dc98 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_station.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q06_station.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Count all the stations.                                         :)
 count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07.xq
index d8eb815..5b1f2ac 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07.xq
@@ -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. :)
+
 (: XQuery Self Join Query :)
 (: Self join with all stations finding the difference in min and max       :)
 (: temperature and get the average.                                        :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmax.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmax.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmax.xq
index 43694ea..a48cad5 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmax.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmax.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find the all the records for TMAX.                                         :)
 count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin.xq
index 51db7c3..4a72d0f 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q07_tmin.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find the all the records for TMIN.                                         :)
 count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/sensor_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/sensor_count.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/sensor_count.xq
index b671d31..6fa981b 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/sensor_count.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/sensor_count.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Count all the weather sensor readings available.                           :)
 count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/station_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/station_count.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/station_count.xq
index 4f8a666..1958ec6 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/station_count.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/station_count.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Count all the weather stations available.                                  :)
 count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/README.md
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/README.md b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/README.md
index 585f54f..58bea51 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/README.md
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/README.md
@@ -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.
+-->
+
 Weather Data Conversion To XML
 =====================
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/util/README.md
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/util/README.md b/vxquery-benchmark/src/main/resources/util/README.md
index d7f47d0..8e2a204 100644
--- a/vxquery-benchmark/src/main/resources/util/README.md
+++ b/vxquery-benchmark/src/main/resources/util/README.md
@@ -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.
+-->
+
 Utilities for Benchmark Operations
 =====================
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/util/vxquery_functions.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/util/vxquery_functions.xq b/vxquery-benchmark/src/main/resources/util/vxquery_functions.xq
index 4f3a2d5..d0621eb 100644
--- a/vxquery-benchmark/src/main/resources/util/vxquery_functions.xq
+++ b/vxquery-benchmark/src/main/resources/util/vxquery_functions.xq
@@ -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. :)
+
 (: XQuery Function List :)
 (: VXQuery function list in csv with arguments and return types :)
 let $list := "../../../../../vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml"

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-benchmark/src/main/resources/util/vxquery_operators.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/util/vxquery_operators.xq b/vxquery-benchmark/src/main/resources/util/vxquery_operators.xq
index e7f7dd0..f485807 100644
--- a/vxquery-benchmark/src/main/resources/util/vxquery_operators.xq
+++ b/vxquery-benchmark/src/main/resources/util/vxquery_operators.xq
@@ -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. :)
+
 (: XQuery Function List :)
 (: VXQuery function list in csv with arguments and return types :)
 let $list := "../../../../../vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-operators.xml"

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-server/src/main/resources/scripts/README.md
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/README.md b/vxquery-server/src/main/resources/scripts/README.md
index 921e6ee..88eb2a9 100644
--- a/vxquery-server/src/main/resources/scripts/README.md
+++ b/vxquery-server/src/main/resources/scripts/README.md
@@ -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.
+-->
+
 Utilities for Cluster Operations
 =====================
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-server/src/main/resources/scripts/startcc.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/startcc.sh b/vxquery-server/src/main/resources/scripts/startcc.sh
old mode 100644
new mode 100755
index 56a9e12..68cfe35
--- a/vxquery-server/src/main/resources/scripts/startcc.sh
+++ b/vxquery-server/src/main/resources/scripts/startcc.sh
@@ -1,4 +1,21 @@
 #!/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.
+#
 
 hostname
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-server/src/main/resources/scripts/startnc.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/startnc.sh b/vxquery-server/src/main/resources/scripts/startnc.sh
old mode 100644
new mode 100755
index 8a1e5d4..c450188
--- a/vxquery-server/src/main/resources/scripts/startnc.sh
+++ b/vxquery-server/src/main/resources/scripts/startnc.sh
@@ -1,4 +1,21 @@
 #!/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.
+#
 
 hostname
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-server/src/main/resources/scripts/stopcc.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/stopcc.sh b/vxquery-server/src/main/resources/scripts/stopcc.sh
old mode 100644
new mode 100755
index 7759540..31e0ac9
--- a/vxquery-server/src/main/resources/scripts/stopcc.sh
+++ b/vxquery-server/src/main/resources/scripts/stopcc.sh
@@ -1,4 +1,21 @@
 #!/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.
+#
 
 hostname
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-server/src/main/resources/scripts/stopnc.sh
----------------------------------------------------------------------
diff --git a/vxquery-server/src/main/resources/scripts/stopnc.sh b/vxquery-server/src/main/resources/scripts/stopnc.sh
old mode 100644
new mode 100755
index 13b93a7..56ffc66
--- a/vxquery-server/src/main/resources/scripts/stopnc.sh
+++ b/vxquery-server/src/main/resources/scripts/stopnc.sh
@@ -1,4 +1,21 @@
 #!/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.
+#
 
 hostname
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/results/README.md
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/README.md b/vxquery-xtest/results/README.md
index c620dc1..59e3a0a 100644
--- a/vxquery-xtest/results/README.md
+++ b/vxquery-xtest/results/README.md
@@ -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.
+-->
+
 = XQTS Text Results =
 
 The xqts.txt file holds the results from running the XQTS tests. The results

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
index c781bf1..1d1847c 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/avg.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the average minimum temperature.                                            :)
 fn:avg(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
index 673ce08..fbc1b2f 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/count.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the number of wind sensor readings.                                            :)
 fn:count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/max.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
index 37c44ad..8de59b4 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/max.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest max temperature.                                            :)
 fn:max(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/min.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
index a0ae3ff..a841d49 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/min.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the lowest min temperature.                                            :)
 fn:min(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
index 8837123..e769d0a 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-1/sum.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the total precipitation.                                            :)
 fn:sum(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
index 09fe30c..e78b5dc 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/avg.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the average minimum temperature.                                            :)
 fn:avg(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
index f1095fd..207c34e 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/count.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the number of wind sensor readings.                                            :)
 fn:count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/max.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
index 3f283cb..f0a695c 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/max.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest max temperature.                                            :)
 fn:max(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/min.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
index a702462..32acd1b 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/min.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the lowest min temperature.                                            :)
 fn:min(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
index ce0c562..9e05658 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-2/sum.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the total precipitation.                                            :)
 fn:sum(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
index 44a6112..c42f21c 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/avg.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the average minimum temperature.                                            :)
 fn:avg(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
index ab92c73..46709d0 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/count.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the number of wind sensor readings.                                            :)
 fn:count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/max.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
index 1dd6f64..49a685c 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/max.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest max temperature.                                            :)
 fn:max(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/min.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
index 1d90584..02f6cba 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/min.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the lowest min temperature.                                            :)
 fn:min(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
index 77efe89..c1ee9ce 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Aggregate/Partition-4/sum.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the total precipitation.                                            :)
 fn:sum(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
index 80204c1..2094562 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q00.xq
@@ -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. :)
+
 (: XQuery Filter Query :)
 (: See historical data for Riverside, CA (AS000000003) station by selecting   :)
 (: the weather readings for December 25 over the last 10 years.               :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
index 95ec33f..0fed630 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q01.xq
@@ -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. :)
+
 (: 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     :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
index c9afa04..c26d1b7 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q02.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
 (: station (US000000002) for 2002.                                            :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
index 96aea81..6b72fa4 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q03.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest recorded temperature (TMAX) in Celsius.                   :)
 fn:max(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
index 46e665f..8f5bbb8 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find all the weather readings for Washington state for a specific day    :)
 (: 2002-2-2.                                                                  :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
index 9f7b896..7805fa0 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_sensors.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find all the weather readings for Washington state for a specific day    :)
 (: 2002-2-2.                                                                  :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
index b8ae9e3..f7cd7ed 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q04_stations.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find all the weather readings for Washington state for a specific day    :)
 (: 2002-2-2.                                                                  :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
index efaa1aa..7c0487f 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q05.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Find the lowest recorded temperature (TMIN) in the United States for     :)
 (: 2001.                                                                      :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
index 930f78a..158c21b 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q06.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find the highest recorded temperature (TMAX) for each station for each     :)
 (: day over the year 2002.                                                    :)


[30/51] [abbrv] git commit: avoid a few exceptions

Posted by vi...@apache.org.
avoid a few exceptions


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/bd1160a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/bd1160a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/bd1160a4

Branch: refs/heads/vxquery_0_3_staging
Commit: bd1160a4493a9a340d1dd880d9b0587b6a0fe726
Parents: c13ad12
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 22:05:49 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:50:42 2014 -0700

----------------------------------------------------------------------
 ...ueryLogicalExpressionPrettyPrintVisitor.java | 28 ++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/bd1160a4/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 c630837..e6d8dd1 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
@@ -40,6 +40,7 @@ import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.StatefulFunctionC
 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;
 
@@ -90,7 +91,23 @@ public class VXQueryLogicalExpressionPrettyPrintVisitor implements ILogicalExpre
     @Override
     public String visitAggregateFunctionCallExpression(AggregateFunctionCallExpression expr, Integer indent)
             throws AlgebricksException {
-        return appendFunction(new StringBuilder(), expr, indent).toString();
+        if (expr.isTwoStep()) {
+            IFunctionInfo step1Agg = expr.getStepOneAggregate();
+            String step1 = (step1Agg != null ? step1Agg.getFunctionIdentifier().toString() : "null");
+            IFunctionInfo step2Agg = expr.getStepTwoAggregate();
+            String step2 = (step2Agg != null ? step2Agg.getFunctionIdentifier().toString() : "null");
+            StringBuilder sb = new StringBuilder();
+            sb.append("function-call: [" + step1 + "|" + step2 + "], Args:");
+            appendArguments(sb, expr.getArguments(), indent + 2);
+            return sb.toString();
+        } else if (expr.getFunctionInfo() == null) {
+            StringBuilder sb = new StringBuilder();
+            sb.append("function-call: [null], Args:");
+            appendArguments(sb, expr.getArguments(), indent + 2);
+            return sb.toString();
+        } else {
+            return appendFunction(new StringBuilder(), expr, indent).toString();
+        }
     }
 
     @Override
@@ -138,15 +155,16 @@ public class VXQueryLogicalExpressionPrettyPrintVisitor implements ILogicalExpre
             throws AlgebricksException {
         assert expr.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL;
         FunctionIdentifier fi = expr.getFunctionIdentifier();
-        if (identifiesTypeOperator(fi) || identifiesPathStep(fi)) {
-            final ILogicalExpression typeEx = expr.getArguments().get(1).getValue();
+        List<Mutable<ILogicalExpression>> args = expr.getArguments();
+        if ((identifiesTypeOperator(fi) || identifiesPathStep(fi)) && args.size() > 1) {
+            final ILogicalExpression typeEx = args.get(1).getValue();
             assert typeEx.getExpressionTag() == LogicalExpressionTag.CONSTANT;
             SequenceType type = getSequenceType((ConstantExpression) typeEx);
             sb.append(fi + " <" + type + ">, Args:");
-            appendArgument(sb, expr.getArguments().get(0), indent + 2);
+            appendArgument(sb, args.get(0), indent + 2);
         } else {
             sb.append("function-call: " + fi + ", Args:");
-            appendArguments(sb, expr.getArguments(), indent + 2);            
+            appendArguments(sb, args, indent + 2);
         }
         return sb;
     }


[17/51] [abbrv] git commit: fix serialization for empty elements

Posted by vi...@apache.org.
fix serialization for empty elements


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/71c71087
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/71c71087
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/71c71087

Branch: refs/heads/vxquery_0_3_staging
Commit: 71c71087db747af7195decfe2523a803f3f7ec95
Parents: a09d1f5
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 10:25:13 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Thu Apr 3 10:25:13 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/vxquery/serializer/XMLSerializer.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/71c71087/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 51670e8..189ae24 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
@@ -369,14 +369,16 @@ public class XMLSerializer implements IPrinter {
                 printSequence(ps, seqp);
             }
 
-            ps.append('>');
             enp.getChildrenSequence(ntp, seqp);
             if (seqp.getByteArray() != null) {
+                ps.append('>');
                 printSequence(ps, seqp);
+                ps.append("</");
+                printPrefixedQName(ps, cqp, utf8sp);
+                ps.append('>');
+            } else {
+                ps.append("/>");
             }
-            ps.append("</");
-            printPrefixedQName(ps, cqp, utf8sp);
-            ps.append('>');
         } finally {
             pp.giveBack(seqp);
             pp.giveBack(utf8sp);


[46/51] [abbrv] git commit: first pass on switching documentation to git from svn.

Posted by vi...@apache.org.
first pass on switching documentation to git from svn.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/7ad806fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/7ad806fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/7ad806fb

Branch: refs/heads/vxquery_0_3_staging
Commit: 7ad806fb0015f4b827b637d2572ff65265a49ef7
Parents: 43e6daa
Author: Preston Carman <pr...@apache.org>
Authored: Tue Apr 8 17:13:22 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Apr 8 17:13:22 2014 -0700

----------------------------------------------------------------------
 pom.xml                                       |  8 ++---
 src/site/apt/development_eclipse_setup.apt    | 25 +++++++-------
 src/site/apt/development_tips.apt             | 40 +++++++++++-----------
 src/site/apt/development_xml_node_details.apt | 14 ++++----
 src/site/apt/user_query.apt                   | 27 +++++++++------
 src/site/apt/user_running_tests.apt           |  4 +--
 6 files changed, 61 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index daaea8b..a09be4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,9 +47,9 @@
   </licenses>
   
   <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery/branches/vxquery_0_2_staging</developerConnection>
-    <url>https://svn.apache.org/repos/asf/incubator/vxquery</url>
+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</url>
   </scm>
 
   <issueManagement>
@@ -401,7 +401,7 @@
         <configuration>
           <linkOnly>true</linkOnly>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-          <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery</developerConnection>
+          <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</developerConnection>
         </configuration>
       </plugin>
       <plugin>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/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 4d9342a..9df9fbc 100644
--- a/src/site/apt/development_eclipse_setup.apt
+++ b/src/site/apt/development_eclipse_setup.apt
@@ -52,31 +52,30 @@ Eclipse Setup
     development.
 
 ----------------------------------------
-$ git clone https://code.google.com/p/hyracks/ hyracks_for_vxquery
-$ cd hyracks_for_vxquery
-$ git checkout -b ecarm002/vxquery_compatibility origin/ecarm002/vxquery_compatibility
-$ mvn install -DskipTests
+$ git clone https://code.google.com/p/hyracks/
+$ cd hyracks
+$ mvn install
 $ cd ..
 ----------------------------------------
 
-    Finally, from Eclipse's File menu "import" the Maven Hyracks project you have just downloaded 
-    through SVN.
+    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.
 
   [[1]] Import VXQuery Code Base
 
     The VXQuery code base must be installed so eclipse has full access. Similar to the Hyracks
-    installation, VXQuery needs to be downloaded from Apache's SVN repository.
+    installation, VXQuery needs to be downloaded from Apache's git repository.
 
 ----------------------------------------
-$ svn checkout https://svn.apache.org/repos/asf/incubator/vxquery/trunk/ apache_vxquery_incubating
+$ git clone https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git apache-vxquery
 (Accept the certificate information for *.apache.org.)
-$ cd apache_vxquery_incubating/vxquery
-$ mvn package -DskipTests
-$ cd ../..
+$ cd apache-vxquery
+$ mvn package
+$ cd ..
 ----------------------------------------
  
-    Finally, from Eclipse's File menu "import" the Maven VXQuery project you have just downloaded 
-    through SVN. 
+    Finally, from Eclipse's File menu "import" the Maven VXQuery project you have just downloaded through git. 
     
   [[1]] Additional Project Configuration
     

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/src/site/apt/development_tips.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_tips.apt b/src/site/apt/development_tips.apt
index b4e78c3..bfbf818 100644
--- a/src/site/apt/development_tips.apt
+++ b/src/site/apt/development_tips.apt
@@ -50,29 +50,29 @@ Developer Tips
 *-------------------------+----------------------+---------------:
 | xs:byte                 | BytePointable        |             1 |
 *-------------------------+----------------------+---------------:
-| xs:date                 | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:date                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:dateTime             | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java}XSDateTimePointable}}  |            12 |
+| xs:dateTime             | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java}XSDateTimePointable}}  |            12 |
 *-------------------------+----------------------+---------------:
 | xs:dayTimeDuration      | LongPointable        |             8 |
 *-------------------------+----------------------+---------------:
-| xs:decimal              | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java}XSDecimalPointable}}   |             9 |
+| xs:decimal              | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java}XSDecimalPointable}}   |             9 |
 *-------------------------+----------------------+---------------:
 | xs:double               | DoublePointable      |             8 |
 *-------------------------+----------------------+---------------:
-| xs:duration             | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java}XSDurationPointable}}  |            12 |
+| xs:duration             | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java}XSDurationPointable}}  |            12 |
 *-------------------------+----------------------+---------------:
 | xs:float                | FloatPointable       |             4 |
 *-------------------------+----------------------+---------------:
-| xs:gDay                 | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gDay                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gMonth               | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gMonth               | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gMonthDay            | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gMonthDay            | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gYear                | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gYear                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
-| xs:gYearMonth           | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
+| xs:gYearMonth           | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java}XSDatePointable}}      |             6 |
 *-------------------------+----------------------+---------------:
 | xs:int                  | IntegerPointable     |             4 |
 *-------------------------+----------------------+---------------:
@@ -88,7 +88,7 @@ Developer Tips
 *-------------------------+----------------------+---------------:
 | xs:short                | ShortPointable       |             2 |
 *-------------------------+----------------------+---------------:
-| xs:time                 | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java}XSTimePointable}}      |             8 |
+| xs:time                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java}XSTimePointable}}      |             8 |
 *-------------------------+----------------------+---------------:
 | xs:unsignedByte         | ShortPointable       |             2 |
 *-------------------------+----------------------+---------------:
@@ -119,13 +119,13 @@ Developer Tips
 *-------------------------+----------------------+---------------:
 | xs:anyURI               | UTF8StringPointable  |    2 + length |
 *-------------------------+----------------------+---------------:
-| xs:base64Binary         | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
+| xs:base64Binary         | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
 *-------------------------+----------------------+---------------:
-| xs:hexBinary            | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
+| xs:hexBinary            | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java}XSBinaryPointable}}    |    2 + length |
 *-------------------------+----------------------+---------------:
 | xs:NOTATION             | UTF8StringPointable  |    2 + length |
 *-------------------------+----------------------+---------------:
-| xs:QName                | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java}XSQNamePointable}}     |    6 + length |
+| xs:QName                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java}XSQNamePointable}}     |    6 + length |
 *-------------------------+----------------------+---------------:
 | xs:string               | UTF8StringPointable  |    2 + length |
 *-------------------------+----------------------+---------------:
@@ -139,19 +139,19 @@ Developer Tips
   an end of string value. Stacking iterators can be used to alter the string
   into a desired form.
   
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/ICharacterIterator.java}ICharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/ICharacterIterator.java}ICharacterIterator}}
    
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java}LowerCaseStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/LowerCaseCharacterIterator.java}LowerCaseStringCharacterIterator}}
    
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringAfterCharacterIterator.java}SubstringAfterStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringAfterCharacterIterator.java}SubstringAfterStringCharacterIterator}}
    
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringBeforeCharacterIterator.java}SubstringBeforeStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringBeforeCharacterIterator.java}SubstringBeforeStringCharacterIterator}}
    
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringCharacterIterator.java}SubstringStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/SubstringCharacterIterator.java}SubstringStringCharacterIterator}}
    
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java}UTF8StringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java}UTF8StringCharacterIterator}}
 
-  * {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java}UpperCaseStringCharacterIterator}}
+  * {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UpperCaseCharacterIterator.java}UpperCaseStringCharacterIterator}}
   
 * Array Backed Value Store
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/src/site/apt/development_xml_node_details.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_xml_node_details.apt b/src/site/apt/development_xml_node_details.apt
index 479572d..8cf2900 100644
--- a/src/site/apt/development_xml_node_details.apt
+++ b/src/site/apt/development_xml_node_details.apt
@@ -24,19 +24,19 @@ Data XML and Node Types
 *--------------------------------+----------------------+---------------+
 | <<Data Type>>                  | <<Pointable Name>>   | <<Data Size>> |
 *--------------------------------+----------------------+---------------:
-| Attribute Nodes                | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java}AttributeNodePointable}}      |    1 + length |
+| Attribute Nodes                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java}AttributeNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Document Nodes                 | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java}DocumentNodePointable}}      |    1 + length |
+| Document Nodes                 | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java}DocumentNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Element Nodes                  | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java}ElementNodePointable}}      |    1 + length |
+| Element Nodes                  | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java}ElementNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Node Tree Nodes                | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java}NodeTreePointable}}      |    1 + length |
+| Node Tree Nodes                | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java}NodeTreePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Processing Instruction Nodes   | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java}PINodePointable}}      |    1 + length |
+| Processing Instruction Nodes   | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java}PINodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Comment Nodes                  | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
+| Comment Nodes                  | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
-| Text Nodes                     | {{{https://svn.apache.org/repos/asf/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
+| Text Nodes                     | {{{https://git-wip-us.apache.org/repos/asf?p=incubator-vxquery.git;a=blob;f=vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java}TextOrCommentNodePointable}}      |    1 + length |
 *--------------------------------+----------------------+---------------:
 
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/src/site/apt/user_query.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_query.apt b/src/site/apt/user_query.apt
index d6ba5f6..eb9c46e 100644
--- a/src/site/apt/user_query.apt
+++ b/src/site/apt/user_query.apt
@@ -25,17 +25,22 @@ sh ./apache-vxquery-X.Y-incubating/vxquery-cli/target/appassembler/bin/vxq
 * Command Line Options
 
 ----------------------------------------
- -O N          : Optimization Level. Default: Full Optimization
- -compileonly  : Compile the query and stop
- -repeatexec N : Number of times to repeat execution
- -showast      : Show abstract syntax tree
- -showoet      : Show optimized expression tree
- -showquery    : Show query string
- -showrp       : Show Runtime plan
- -showtet      : Show translated expression tree
- -timing       : Produce timing information
- -x            : Bind an external variable
-----------------------------------------
+ -O N                       : Optimization Level. Default: Full Optimization
+ -available-processors N    : Number of available processors. (default java's available processors)
+ -client-net-ip-address VAL : IP Address of the ClusterController
+ -client-net-port N         : Port of the ClusterController (default 1098)
+ -compileonly               : Compile the query and stop
+ -frame-size N              : Frame size in bytes. (default 65536)
+ -local-node-controllers N  : Number of local node controllers (default 1)
+ -repeatexec N              : Number of times to repeat execution
+ -showast                   : Show abstract syntax tree
+ -showoet                   : Show optimized expression tree
+ -showquery                 : Show query string
+ -showrp                    : Show Runtime plan
+ -showtet                   : Show translated expression tree
+ -timing                    : Produce timing information
+ -x                         : Bind an external variable
+ ----------------------------------------
  
 * Java Options
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7ad806fb/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 503d65a..0e41ab5 100644
--- a/src/site/apt/user_running_tests.apt
+++ b/src/site/apt/user_running_tests.apt
@@ -26,6 +26,7 @@ sh ./apache-vxquery-X.Y-incubating/vxquery/vxquery-xtest/target/appassembler/bin
 
 ----------------------------------------
  -O N            : Optimization Level
+ -catalog VAL    : Test Catalog XML
  -exclude VAL    : Exclude filter regular expression
  -htmlreport VAL : HTML Report output file
  -include VAL    : Include filter regular expression
@@ -35,7 +36,6 @@ sh ./apache-vxquery-X.Y-incubating/vxquery/vxquery-xtest/target/appassembler/bin
  -threads N      : Number of threads
  -v              : Verbose
  -xmlreport VAL  : XML Report output file
- -xqtsbase VAL   : XQTS Base Directory
 ----------------------------------------
  
 * Java Options
@@ -70,7 +70,7 @@ $ cd ..
   * run the tests, and
 
 ----------------------------------------
-JAVA_OPTS="-Xmx1024m  -Djava.util.logging.config.file=/path/to/logging.properties" sh ./apache-vxquery-X.Y-incubating/vxquery-xtest/target/appassembler/bin/xtest -xqtsbase xqts -htmlreport /tmp/full_report.html
+JAVA_OPTS="-Xmx1024m  -Djava.util.logging.config.file=/path/to/logging.properties" sh ./apache-vxquery-X.Y-incubating/vxquery-xtest/target/appassembler/bin/xtest -catalog xqts/XQTSCatalog.xml -htmlreport /tmp/full_report.html
 ----------------------------------------
 
   * view the results at {{{file:///tmp/full_report.html}file:///tmp/full_report.html}}.


[36/51] [abbrv] git commit: Updated the parser exceptions to give more details.

Posted by vi...@apache.org.
Updated the parser exceptions to give more details.

* Now the VXQueryCollectionOperatorDescriptor adds the file and node to the exception message.
* Re-architected the exceptions in the XMLParser to help with new exception messages.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/98f95975
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/98f95975
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/98f95975

Branch: refs/heads/vxquery_0_3_staging
Commit: 98f95975adee9ab975a76ca15ba20fc89c6c40cf
Parents: 215d9e1
Author: Preston Carman <pr...@apache.org>
Authored: Mon Apr 7 16:11:47 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Mon Apr 7 16:11:47 2014 -0700

----------------------------------------------------------------------
 .../VXQueryFileNotFoundException.java           | 35 ++++++++++++++++++++
 .../exceptions/VXQueryParseException.java       | 35 ++++++++++++++++++++
 .../VXQueryCollectionOperatorDescriptor.java    | 24 +++++++++++---
 .../runtime/functions/util/FunctionHelper.java  | 30 +++++------------
 .../org/apache/vxquery/xmlparser/XMLParser.java | 27 +++++++++++++--
 5 files changed, 122 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/98f95975/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryFileNotFoundException.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryFileNotFoundException.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryFileNotFoundException.java
new file mode 100644
index 0000000..27a0a2e
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryFileNotFoundException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2009-2013 by The Regents of the University of California
+ * Licensed 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 from
+ * 
+ *     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.exceptions;
+
+import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
+
+public class VXQueryFileNotFoundException extends HyracksDataException {
+
+    private static final long serialVersionUID = 1L;
+
+    public VXQueryFileNotFoundException() {
+        super();
+    }
+
+    public VXQueryFileNotFoundException(Exception ex) {
+        super(ex);
+    }
+
+    public VXQueryFileNotFoundException(String msg) {
+        super(msg);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/98f95975/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryParseException.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryParseException.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryParseException.java
new file mode 100644
index 0000000..f1b4155
--- /dev/null
+++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryParseException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2009-2013 by The Regents of the University of California
+ * Licensed 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 from
+ * 
+ *     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.exceptions;
+
+import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
+
+public class VXQueryParseException extends HyracksDataException {
+
+    private static final long serialVersionUID = 1L;
+
+    public VXQueryParseException() {
+        super();
+    }
+
+    public VXQueryParseException(Exception ex) {
+        super(ex);
+    }
+
+    public VXQueryParseException(String msg) {
+        super(msg);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/98f95975/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 5cc2276..54007c8 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
@@ -27,8 +27,9 @@ import org.apache.vxquery.datamodel.accessors.PointablePool;
 import org.apache.vxquery.datamodel.accessors.PointablePoolFactory;
 import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
 import org.apache.vxquery.exceptions.SystemException;
+import org.apache.vxquery.exceptions.VXQueryFileNotFoundException;
+import org.apache.vxquery.exceptions.VXQueryParseException;
 import org.apache.vxquery.runtime.functions.step.ChildPathStepOperatorDescriptor;
-import org.apache.vxquery.runtime.functions.util.FunctionHelper;
 import org.apache.vxquery.xmlparser.ITreeNodeIdProvider;
 import org.apache.vxquery.xmlparser.TreeNodeIdProvider;
 import org.apache.vxquery.xmlparser.XMLParser;
@@ -121,9 +122,24 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO
                 // Now add new field.
                 abvsFileNode.reset();
                 try {
-                    FunctionHelper.readInDocFromString(file, in, abvsFileNode, parser);
-                } catch (Exception e) {
-                    throw new HyracksDataException(e);
+                    parser.parseFile(file, in, abvsFileNode);
+                } catch (VXQueryFileNotFoundException e) {
+                    String message = "The file (" + nodeId + ":" + file.getAbsolutePath() + ") can not be found.";
+                    HyracksDataException hde = new HyracksDataException(message, e.getCause());
+                    hde.setNodeId(nodeId);
+                    throw hde;
+                } catch (VXQueryParseException e) {
+                    String message = "The file (" + nodeId + ":" + file.getAbsolutePath()
+                            + ") throw a SAXException durring parsing.";
+                    HyracksDataException hde = new HyracksDataException(message, e.getCause());
+                    hde.setNodeId(nodeId);
+                    throw hde;
+                } catch (HyracksDataException e) {
+                    String message = "The file (" + nodeId + ":" + file.getAbsolutePath()
+                            + ") throw the following error during parsing: " + e.getMessage();
+                    HyracksDataException hde = new HyracksDataException(message, e.getCause());
+                    hde.setNodeId(nodeId);
+                    throw hde;
                 }
 
                 TaggedValuePointable tvp = ppool.takeOne(TaggedValuePointable.class);

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/98f95975/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 a7d7186..d732145 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,13 +19,9 @@ package org.apache.vxquery.runtime.functions.util;
 import java.io.DataInputStream;
 import java.io.DataOutput;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import java.util.zip.GZIPInputStream;
 
 import org.apache.vxquery.context.DynamicContext;
 import org.apache.vxquery.datamodel.accessors.SequencePointable;
@@ -60,6 +56,7 @@ import org.apache.vxquery.types.BuiltinTypeRegistry;
 import org.apache.vxquery.xmlparser.XMLParser;
 import org.xml.sax.InputSource;
 
+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.BooleanPointable;
 import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
@@ -1237,26 +1234,15 @@ public class FunctionHelper {
     }
 
     public static void readInDocFromPointable(UTF8StringPointable stringp, InputSource in, ByteBufferInputStream bbis,
-            DataInputStream di, ArrayBackedValueStorage abvs, XMLParser parser) throws SystemException {
-        String fName = getStringFromPointable(stringp, bbis, di);
-        File file = new File(fName);
-        readInDocFromString(file, in, abvs, parser);
-    }
-
-    public static void readInDocFromString(File file, InputSource in, ArrayBackedValueStorage abvs, XMLParser parser)
-            throws SystemException {
+            DataInputStream di, ArrayBackedValueStorage abvs, XMLParser parser) throws HyracksDataException {
+        String fName;
         try {
-            if (file.getName().toLowerCase().endsWith(".xml.gz")) {
-                in.setCharacterStream(new InputStreamReader(new GZIPInputStream(new FileInputStream(file))));
-            } else {
-                in.setCharacterStream(new InputStreamReader(new FileInputStream(file)));
-            }
-            parser.parseInputSource(in, abvs);
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException("The file (" + file.getName() + ") does not exist.");
-        } catch (IOException e) {
-            throw new SystemException(ErrorCode.SYSE0001, e);
+            fName = getStringFromPointable(stringp, bbis, di);
+        } catch (SystemException e) {
+            throw new HyracksDataException(e);
         }
+        File file = new File(fName);
+        parser.parseFile(file, in, abvs);
     }
 
     public static boolean transformThenCompareMinMaxTaggedValues(AbstractValueComparisonOperation aOp,

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/98f95975/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 d73dd12..125557b 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
@@ -14,7 +14,17 @@
  */
 package org.apache.vxquery.xmlparser;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.zip.GZIPInputStream;
+
+import org.apache.vxquery.exceptions.VXQueryFileNotFoundException;
+import org.apache.vxquery.exceptions.VXQueryParseException;
 import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
@@ -36,12 +46,23 @@ public class XMLParser {
         }
     }
 
-    public void parseInputSource(InputSource in, ArrayBackedValueStorage abvs) throws HyracksDataException {
+
+    public void parseFile(File file, InputSource in, ArrayBackedValueStorage abvs) throws HyracksDataException {
         try {
+            if (file.getName().toLowerCase().endsWith(".xml.gz")) {
+                in.setCharacterStream(new InputStreamReader(new GZIPInputStream(new FileInputStream(file))));
+            } else {
+                in.setCharacterStream(new InputStreamReader(new FileInputStream(file)));
+            }
             parser.parse(in);
             handler.write(abvs);
-        } catch (Exception e) {
-            throw new HyracksDataException(e.toString());
+        } catch (FileNotFoundException e) {
+            throw new VXQueryFileNotFoundException(e);
+        } catch (SAXException e) {
+            throw new VXQueryParseException(e);
+        } catch (IOException e) {
+            throw new HyracksDataException(e);
         }
     }
+
 }
\ No newline at end of file


[15/51] [abbrv] git commit: s/sesnors/sensors/

Posted by vi...@apache.org.
s/sesnors/sensors/


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/94cf5deb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/94cf5deb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/94cf5deb

Branch: refs/heads/vxquery_0_3_staging
Commit: 94cf5deb7235eb0e7056a3d1d4d91a4ef2fe9176
Parents: fc9c5bf
Author: Till Westmann <we...@gmail.com>
Authored: Wed Apr 2 22:51:37 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Wed Apr 2 22:51:37 2014 -0700

----------------------------------------------------------------------
 .../ghcnd/half_1/quarter_1/sensors/US000000001_200101_0.xml         | 1 +
 .../ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml         | 1 -
 .../ghcnd/half_1/quarter_2/sensors/US000000002_200202_0.xml         | 1 +
 .../ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml         | 1 -
 .../ghcnd/half_2/quarter_3/sensors/AS000000003_200303_0.xml         | 1 +
 .../ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml         | 1 -
 .../ghcnd/half_2/quarter_4/sensors/US000000004_200404_0.xml         | 1 +
 .../ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml         | 1 -
 8 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/94cf5deb/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sensors/US000000001_200101_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sensors/US000000001_200101_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sensors/US000000001_200101_0.xml
new file mode 100644
index 0000000..cc2fd33
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sensors/US000000001_200101_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2001-01-01T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000001</station><value>11.25</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000001</station><value>31</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/94cf5deb/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
deleted file mode 100644
index cc2fd33..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2001-01-01T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000001</station><value>11.25</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000001</station><value>31</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/94cf5deb/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sensors/US000000002_200202_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sensors/US000000002_200202_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sensors/US000000002_200202_0.xml
new file mode 100644
index 0000000..c095726
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sensors/US000000002_200202_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/94cf5deb/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
deleted file mode 100644
index c095726..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/94cf5deb/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sensors/AS000000003_200303_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sensors/AS000000003_200303_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sensors/AS000000003_200303_0.xml
new file mode 100644
index 0000000..3a540d3
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sensors/AS000000003_200303_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/94cf5deb/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
deleted file mode 100644
index 3a540d3..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/94cf5deb/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sensors/US000000004_200404_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sensors/US000000004_200404_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sensors/US000000004_200404_0.xml
new file mode 100644
index 0000000..2dbe586
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sensors/US000000004_200404_0.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2004-04-04T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000004</station><value>40</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2004-04-04T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000004</station><value>4</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/94cf5deb/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
deleted file mode 100644
index 2dbe586..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sesnors/US000000004_200404_0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2004-04-04T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000004</station><value>40</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2004-04-04T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000004</station><value>4</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file


[20/51] [abbrv] git commit: Added command line option for available processors.

Posted by vi...@apache.org.
Added command line option for available processors.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/17e4f71a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/17e4f71a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/17e4f71a

Branch: refs/heads/vxquery_0_3_staging
Commit: 17e4f71a6b873249f50a4eca891310ea675e7d9f
Parents: 0febd9c
Author: Preston Carman <pr...@apache.org>
Authored: Thu Apr 3 15:38:51 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Apr 3 15:38:51 2014 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/vxquery/cli/VXQuery.java |  5 ++++-
 .../vxquery/metadata/VXQueryMetadataProvider.java |  4 +---
 .../vxquery/xmlquery/query/XMLQueryCompiler.java  | 18 ++++++++++++------
 3 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/17e4f71a/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 13853f7..f882899 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
@@ -390,7 +390,7 @@ public class VXQuery {
     }
 
     /**
-     * Shuts down the virtual cluster, alongwith all nodes and node execution, network and queue managers.
+     * Shuts down the virtual cluster, along with all nodes and node execution, network and queue managers.
      * 
      * @throws Exception
      */
@@ -417,6 +417,9 @@ 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)")
+        public int availableProcessors = -1;
+
         @Option(name = "-client-net-ip-address", usage = "IP Address of the ClusterController")
         public String clientNetIpAddress = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/17e4f71a/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 678b74a..40a02ae 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 javax.xml.namespace.QName;
-
 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;
@@ -98,7 +96,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
         return getClusterLocations(nodeList, availableProcessors);
     }
 
-    private static AlgebricksPartitionConstraint getClusterLocations(String[] nodeList, int partitions) {
+    public static AlgebricksPartitionConstraint getClusterLocations(String[] nodeList, int partitions) {
         ArrayList<String> locs = new ArrayList<String>();
         for (String node : nodeList) {
             for (int j = 0; j < partitions; j++) {

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/17e4f71a/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 0c8ff90..91c7764 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
@@ -39,10 +39,7 @@ 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 org.omg.SendingContext.RunTime;
 
-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.compiler.api.HeuristicCompilerFactoryBuilder;
@@ -92,6 +89,11 @@ public class XMLQueryCompiler {
     private String[] nodeList;
 
     public XMLQueryCompiler(XQueryCompilationListener listener, String[] nodeList, int frameSize) {
+        this(listener, nodeList, frameSize, -1);
+    }
+
+    public XMLQueryCompiler(XQueryCompilationListener listener, String[] nodeList, int frameSize,
+            int availableProcessors) {
         this.listener = listener == null ? NoopXQueryCompilationListener.INSTANCE : listener;
         this.frameSize = frameSize;
         this.nodeList = nodeList;
@@ -148,7 +150,11 @@ public class XMLQueryCompiler {
             }
         });
         builder.setNullWriterFactory(new VXQueryNullWriterFactory());
-        builder.setClusterLocations(VXQueryMetadataProvider.getClusterLocations(nodeList));
+        if (availableProcessors < 1) {
+            builder.setClusterLocations(VXQueryMetadataProvider.getClusterLocations(nodeList));
+        } else {
+            builder.setClusterLocations(VXQueryMetadataProvider.getClusterLocations(nodeList, availableProcessors));
+        }
         cFactory = builder.create();
     }
 
@@ -157,8 +163,8 @@ public class XMLQueryCompiler {
         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());
         compiler = cFactory.createCompiler(module.getBody(), mdProvider, 0);
         listener.notifyTranslationResult(module);


[41/51] [abbrv] git commit: Changed the end of file character back to linux default for these files.

Posted by vi...@apache.org.
Changed the end of file character back to linux default for these files.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/5367a26d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/5367a26d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/5367a26d

Branch: refs/heads/vxquery_0_3_staging
Commit: 5367a26d333c614d7962385603ac6ab8b5360783
Parents: e8d3f8b
Author: Preston Carman <pr...@apache.org>
Authored: Tue Apr 8 14:51:43 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Apr 8 14:51:43 2014 -0700

----------------------------------------------------------------------
 .../scripts/run_benchmark_cluster.sh            | 44 +++++-----
 .../noaa-ghcn-daily/scripts/weather_example.xml |  2 +-
 .../scripts/weather_example_cluster.xml         |  2 +-
 .../cat/AggregatePartition1Queries.xml          | 60 ++++++-------
 .../cat/AggregatePartition2Queries.xml          | 60 ++++++-------
 .../cat/AggregatePartition4Queries.xml          | 60 ++++++-------
 .../cat/GhcndCountPartition1Queries.xml         | 50 +++++------
 .../cat/GhcndCountPartition2Queries.xml         | 50 +++++------
 .../cat/GhcndCountPartition4Queries.xml         | 50 +++++------
 .../resources/cat/GhcndPartition1Queries.xml    | 90 ++++++++++----------
 .../resources/cat/GhcndPartition2Queries.xml    | 90 ++++++++++----------
 .../resources/cat/GhcndPartition4Queries.xml    | 90 ++++++++++----------
 .../cat/GhcndRecordsPartition1Queries.xml       | 60 ++++++-------
 .../cat/GhcndRecordsPartition2Queries.xml       | 60 ++++++-------
 .../cat/GhcndRecordsPartition4Queries.xml       | 60 ++++++-------
 15 files changed, 414 insertions(+), 414 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
index 6dc9714..a77f3c2 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
@@ -37,27 +37,27 @@ fi
 # Run queries for each number of nodes.
 for (( i = 0; i < ${CLUSTER_COUNT}; i++ ))
 do 
-	echo "Starting ${i} cluster nodes"
-	python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${i}nodes.xml -a start
-	
-	for j in $(find ${1} -name '*q??.xq')
-	do
-		# Only work with i nodes.
-		if [[ "${j}" =~ "${i}nodes" ]] 
-		then
-			# Only run for specified queries.
-			if [ -z "${3}" ] || [[ "${j}" =~ "${3}" ]] 
-			then
-				echo "Running query: ${j}"
-				log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log"
-				log_base_path=$(dirname ${j/queries/query_logs})
-				mkdir -p ${log_base_path}
-				time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -showoet -showrp -frame-size 10000 -repeatexec 10 > ${log_base_path}/${log_file} 2>&1
-			fi;
-		fi;
-	done
-	
-	# Stop cluster.
-	python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${i}nodes.xml -a stop
+    echo "Starting ${i} cluster nodes"
+    python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${i}nodes.xml -a start
+    
+    for j in $(find ${1} -name '*q??.xq')
+    do
+        # Only work with i nodes.
+        if [[ "${j}" =~ "${i}nodes" ]]
+        then
+            # Only run for specified queries.
+            if [ -z "${3}" ] || [[ "${j}" =~ "${3}" ]]
+            then
+                echo "Running query: ${j}"
+                log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log"
+                log_base_path=$(dirname ${j/queries/query_logs})
+                mkdir -p ${log_base_path}
+                time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -showoet -showrp -frame-size 10000 -repeatexec 10 > ${log_base_path}/${log_file} 2>&1
+            fi;
+        fi;
+    done
+    
+    # Stop cluster.
+    python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${i}nodes.xml -a stop
 done
 

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example.xml b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example.xml
index bc9f07f..94c1440 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example.xml
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example.xml
@@ -31,4 +31,4 @@
         <partitions_per_path>4</partitions_per_path>
         <partitions_per_path>8</partitions_per_path>
     </dataset>
-</data>
+</data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
index c8d253f..6078627 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
@@ -53,4 +53,4 @@
         <save_path>/data2</save_path>
         <partitions_per_path>1</partitions_per_path>
     </dataset>
-</data>
+</data>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
index b3ed2fc..9d4901a 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="aggregate-partition-1-avg" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <output-file compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <output-file compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <output-file compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <output-file compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <output-file compare="Text">sum.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>Aggregate Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="aggregate-partition-1-avg" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="avg" date="2014-04-01"/>
+      <output-file compare="Text">avg.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="count" date="2014-04-01"/>
+      <output-file compare="Text">count.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+      <query name="min" date="2014-04-01"/>
+      <output-file compare="Text">min.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+      <query name="max" date="2014-04-01"/>
+      <output-file compare="Text">max.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+      <query name="sum" date="2014-04-01"/>
+      <output-file compare="Text">sum.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
index efa93d0..483dea9 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <output-file compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <output-file compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <output-file compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <output-file compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <output-file compare="Text">sum.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition2Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>Aggregate Partition 2</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
+      <query name="avg" date="2014-04-01"/>
+      <output-file compare="Text">avg.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
+      <query name="count" date="2014-04-01"/>
+      <output-file compare="Text">count.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 2 partition.</description>
+      <query name="min" date="2014-04-01"/>
+      <output-file compare="Text">min.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 2 partition.</description>
+      <query name="max" date="2014-04-01"/>
+      <output-file compare="Text">max.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 2 partition.</description>
+      <query name="sum" date="2014-04-01"/>
+      <output-file compare="Text">sum.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
index 800de1c..91b45bb 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <output-file compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <output-file compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <output-file compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <output-file compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <output-file compare="Text">sum.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>Aggregate Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
+      <query name="avg" date="2014-04-01"/>
+      <output-file compare="Text">avg.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
+      <query name="count" date="2014-04-01"/>
+      <output-file compare="Text">count.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 4 partition.</description>
+      <query name="min" date="2014-04-01"/>
+      <output-file compare="Text">min.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 4 partition.</description>
+      <query name="max" date="2014-04-01"/>
+      <output-file compare="Text">max.txt</output-file>
+   </test-case>
+   <test-case name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 4 partition.</description>
+      <query name="sum" date="2014-04-01"/>
+      <output-file compare="Text">sum.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
index 6a5b609..c6323d9 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
@@ -1,26 +1,26 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <output-file compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <output-file compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <output-file compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <output-file compare="Text">q07_count.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Count Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="q02_count" date="2014-04-01"/>
+      <output-file compare="Text">q02_count.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+      <query name="q03_count" date="2014-04-01"/>
+      <output-file compare="Text">q03_count.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+      <query name="q05_count" date="2014-04-01"/>
+      <output-file compare="Text">q05_count.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+      <query name="q07_count" date="2014-04-01"/>
+      <output-file compare="Text">q07_count.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
index 99fee09..0c60a64 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
@@ -1,26 +1,26 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <output-file compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <output-file compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <output-file compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <output-file compare="Text">q07_count.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition2Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Count Partition 2</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
+      <query name="q02_count" date="2014-04-01"/>
+      <output-file compare="Text">q02_count.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
+      <query name="q03_count" date="2014-04-01"/>
+      <output-file compare="Text">q03_count.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
+      <query name="q05_count" date="2014-04-01"/>
+      <output-file compare="Text">q05_count.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
+      <query name="q07_count" date="2014-04-01"/>
+      <output-file compare="Text">q07_count.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
index 8f1b3f0..b974b1f 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
@@ -1,26 +1,26 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <output-file compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <output-file compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <output-file compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <output-file compare="Text">q07_count.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Count Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
+      <query name="q02_count" date="2014-04-01"/>
+      <output-file compare="Text">q02_count.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
+      <query name="q03_count" date="2014-04-01"/>
+      <output-file compare="Text">q03_count.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
+      <query name="q05_count" date="2014-04-01"/>
+      <output-file compare="Text">q05_count.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
+      <query name="q07_count" date="2014-04-01"/>
+      <output-file compare="Text">q07_count.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
index 94c45dc..2a01e8e 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
@@ -1,46 +1,46 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 1 partition.</description>
-      <query name="q00" date="2014-04-01"/>
-      <output-file compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 1 partition.</description>
-      <query name="q01" date="2014-04-01"/>
-      <output-file compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02" date="2014-04-01"/>
-      <output-file compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03" date="2014-04-01"/>
-      <output-file compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 1 partition.</description>
-      <query name="q04" date="2014-04-01"/>
-      <output-file compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05" date="2014-04-01"/>
-      <output-file compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 1 partition.</description>
-      <query name="q06" date="2014-04-01"/>
-      <output-file compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07" date="2014-04-01"/>
-      <output-file compare="Text">q07.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+      <description>Execution of q00 from the weather benchmark with 1 partition.</description>
+      <query name="q00" date="2014-04-01"/>
+      <output-file compare="Text">q00.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+      <description>Execution of q01 from the weather benchmark with 1 partition.</description>
+      <query name="q01" date="2014-04-01"/>
+      <output-file compare="Text">q01.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+      <description>Execution of q02 from the weather benchmark with 1 partition.</description>
+      <query name="q02" date="2014-04-01"/>
+      <output-file compare="Text">q02.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+      <description>Execution of q03 from the weather benchmark with 1 partition.</description>
+      <query name="q03" date="2014-04-01"/>
+      <output-file compare="Text">q03.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+      <description>Execution of q04 from the weather benchmark with 1 partition.</description>
+      <query name="q04" date="2014-04-01"/>
+      <output-file compare="Text">q04.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+      <description>Execution of q05 from the weather benchmark with 1 partition.</description>
+      <query name="q05" date="2014-04-01"/>
+      <output-file compare="Text">q05.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+      <description>Execution of q06 from the weather benchmark with 1 partition.</description>
+      <query name="q06" date="2014-04-01"/>
+      <output-file compare="Text">q06.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+      <description>Execution of q07 from the weather benchmark with 1 partition.</description>
+      <query name="q07" date="2014-04-01"/>
+      <output-file compare="Text">q07.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
index a35c153..fedeff9 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
@@ -1,46 +1,46 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 2 partitions.</description>
-      <query name="q00" date="2014-04-01"/>
-      <output-file compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 2 partitions.</description>
-      <query name="q01" date="2014-04-01"/>
-      <output-file compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02" date="2014-04-01"/>
-      <output-file compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03" date="2014-04-01"/>
-      <output-file compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 2 partitions.</description>
-      <query name="q04" date="2014-04-01"/>
-      <output-file compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05" date="2014-04-01"/>
-      <output-file compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 2 partitions.</description>
-      <query name="q06" date="2014-04-01"/>
-      <output-file compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07" date="2014-04-01"/>
-      <output-file compare="Text">q07.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+      <description>Execution of q00 from the weather benchmark with 2 partitions.</description>
+      <query name="q00" date="2014-04-01"/>
+      <output-file compare="Text">q00.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+      <description>Execution of q01 from the weather benchmark with 2 partitions.</description>
+      <query name="q01" date="2014-04-01"/>
+      <output-file compare="Text">q01.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+      <description>Execution of q02 from the weather benchmark with 2 partitions.</description>
+      <query name="q02" date="2014-04-01"/>
+      <output-file compare="Text">q02.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+      <description>Execution of q03 from the weather benchmark with 2 partitions.</description>
+      <query name="q03" date="2014-04-01"/>
+      <output-file compare="Text">q03.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+      <description>Execution of q04 from the weather benchmark with 2 partitions.</description>
+      <query name="q04" date="2014-04-01"/>
+      <output-file compare="Text">q04.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+      <description>Execution of q05 from the weather benchmark with 2 partitions.</description>
+      <query name="q05" date="2014-04-01"/>
+      <output-file compare="Text">q05.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+      <description>Execution of q06 from the weather benchmark with 2 partitions.</description>
+      <query name="q06" date="2014-04-01"/>
+      <output-file compare="Text">q06.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+      <description>Execution of q07 from the weather benchmark with 2 partitions.</description>
+      <query name="q07" date="2014-04-01"/>
+      <output-file compare="Text">q07.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
index fcbf3d5..0d8c74c 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
@@ -1,46 +1,46 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 4 partitions.</description>
-      <query name="q00" date="2014-04-01"/>
-      <output-file compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 4 partitions.</description>
-      <query name="q01" date="2014-04-01"/>
-      <output-file compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02" date="2014-04-01"/>
-      <output-file compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03" date="2014-04-01"/>
-      <output-file compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 4 partitions.</description>
-      <query name="q04" date="2014-04-01"/>
-      <output-file compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05" date="2014-04-01"/>
-      <output-file compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 4 partitions.</description>
-      <query name="q06" date="2014-04-01"/>
-      <output-file compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07" date="2014-04-01"/>
-      <output-file compare="Text">q07.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+      <description>Execution of q00 from the weather benchmark with 4 partitions.</description>
+      <query name="q00" date="2014-04-01"/>
+      <output-file compare="Text">q00.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+      <description>Execution of q01 from the weather benchmark with 4 partitions.</description>
+      <query name="q01" date="2014-04-01"/>
+      <output-file compare="Text">q01.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+      <description>Execution of q02 from the weather benchmark with 4 partitions.</description>
+      <query name="q02" date="2014-04-01"/>
+      <output-file compare="Text">q02.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+      <description>Execution of q03 from the weather benchmark with 4 partitions.</description>
+      <query name="q03" date="2014-04-01"/>
+      <output-file compare="Text">q03.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+      <description>Execution of q04 from the weather benchmark with 4 partitions.</description>
+      <query name="q04" date="2014-04-01"/>
+      <output-file compare="Text">q04.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+      <description>Execution of q05 from the weather benchmark with 4 partitions.</description>
+      <query name="q05" date="2014-04-01"/>
+      <output-file compare="Text">q05.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+      <description>Execution of q06 from the weather benchmark with 4 partitions.</description>
+      <query name="q06" date="2014-04-01"/>
+      <output-file compare="Text">q06.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+      <description>Execution of q07 from the weather benchmark with 4 partitions.</description>
+      <query name="q07" date="2014-04-01"/>
+      <output-file compare="Text">q07.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
index 2a77991..5f11060 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <output-file compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <output-file compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <output-file compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <output-file compare="Text">q07_records.txt</output-file>
-      <output-file compare="Text">q07_records-1.txt</output-file>
-      <output-file compare="Text">q07_records-2.txt</output-file>
-      <output-file compare="Text">q07_records-3.txt</output-file>
-      <output-file compare="Text">q07_records-4.txt</output-file>
-      <output-file compare="Text">q07_records-5.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition1Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Records Partition 1</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+      <query name="q02_records" date="2014-04-01"/>
+      <output-file compare="Text">q02_records.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+      <query name="q03_records" date="2014-04-01"/>
+      <output-file compare="Text">q03_records.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+      <query name="q05_records" date="2014-04-01"/>
+      <output-file compare="Text">q05_records.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+      <query name="q07_records" date="2014-04-01"/>
+      <output-file compare="Text">q07_records.txt</output-file>
+      <output-file compare="Text">q07_records-1.txt</output-file>
+      <output-file compare="Text">q07_records-2.txt</output-file>
+      <output-file compare="Text">q07_records-3.txt</output-file>
+      <output-file compare="Text">q07_records-4.txt</output-file>
+      <output-file compare="Text">q07_records-5.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
index e3a53cf..f8a4040 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <output-file compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <output-file compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <output-file compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <output-file compare="Text">q07_records.txt</output-file>
-      <output-file compare="Text">q07_records-1.txt</output-file>
-      <output-file compare="Text">q07_records-2.txt</output-file>
-      <output-file compare="Text">q07_records-3.txt</output-file>
-      <output-file compare="Text">q07_records-4.txt</output-file>
-      <output-file compare="Text">q07_records-5.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition2Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Records Partition 2</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
+      <query name="q02_records" date="2014-04-01"/>
+      <output-file compare="Text">q02_records.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
+      <query name="q03_records" date="2014-04-01"/>
+      <output-file compare="Text">q03_records.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
+      <query name="q05_records" date="2014-04-01"/>
+      <output-file compare="Text">q05_records.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
+      <query name="q07_records" date="2014-04-01"/>
+      <output-file compare="Text">q07_records.txt</output-file>
+      <output-file compare="Text">q07_records-1.txt</output-file>
+      <output-file compare="Text">q07_records-2.txt</output-file>
+      <output-file compare="Text">q07_records-3.txt</output-file>
+      <output-file compare="Text">q07_records-4.txt</output-file>
+      <output-file compare="Text">q07_records-5.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
index f2707f3..ccbd1db 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <output-file compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <output-file compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <output-file compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <output-file compare="Text">q07_records.txt</output-file>
-      <output-file compare="Text">q07_records-1.txt</output-file>
-      <output-file compare="Text">q07_records-2.txt</output-file>
-      <output-file compare="Text">q07_records-3.txt</output-file>
-      <output-file compare="Text">q07_records-4.txt</output-file>
-      <output-file compare="Text">q07_records-5.txt</output-file>
-   </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition4Queries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>GHCND Records Partition 4</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
+      <query name="q02_records" date="2014-04-01"/>
+      <output-file compare="Text">q02_records.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
+      <query name="q03_records" date="2014-04-01"/>
+      <output-file compare="Text">q03_records.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
+      <query name="q05_records" date="2014-04-01"/>
+      <output-file compare="Text">q05_records.txt</output-file>
+   </test-case>
+   <test-case name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
+      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
+      <query name="q07_records" date="2014-04-01"/>
+      <output-file compare="Text">q07_records.txt</output-file>
+      <output-file compare="Text">q07_records-1.txt</output-file>
+      <output-file compare="Text">q07_records-2.txt</output-file>
+      <output-file compare="Text">q07_records-3.txt</output-file>
+      <output-file compare="Text">q07_records-4.txt</output-file>
+      <output-file compare="Text">q07_records-5.txt</output-file>
+   </test-case>
 </test-group>
\ No newline at end of file


[32/51] [abbrv] git commit: fix serialization for empty elements

Posted by vi...@apache.org.
fix serialization for empty elements


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/3f4797bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/3f4797bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/3f4797bb

Branch: refs/heads/vxquery_0_3_staging
Commit: 3f4797bb7b17916947c6d0a9e821eb5084e23f5f
Parents: e553544
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 10:25:13 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:50:42 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/vxquery/serializer/XMLSerializer.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/3f4797bb/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 51670e8..189ae24 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
@@ -369,14 +369,16 @@ public class XMLSerializer implements IPrinter {
                 printSequence(ps, seqp);
             }
 
-            ps.append('>');
             enp.getChildrenSequence(ntp, seqp);
             if (seqp.getByteArray() != null) {
+                ps.append('>');
                 printSequence(ps, seqp);
+                ps.append("</");
+                printPrefixedQName(ps, cqp, utf8sp);
+                ps.append('>');
+            } else {
+                ps.append("/>");
             }
-            ps.append("</");
-            printPrefixedQName(ps, cqp, utf8sp);
-            ps.append('>');
         } finally {
             pp.giveBack(seqp);
             pp.giveBack(utf8sp);


[51/51] [abbrv] git commit: Merged in master

Posted by vi...@apache.org.
Merged in master


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/a5c8adff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/a5c8adff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/a5c8adff

Branch: refs/heads/vxquery_0_3_staging
Commit: a5c8adff4e00826ff80a5e573ef9efe120624526
Parents: ad002b5 0df78c5
Author: Vinayak Borkar <vi...@gmail.com>
Authored: Wed Apr 9 15:18:30 2014 -0700
Committer: Vinayak Borkar <vi...@gmail.com>
Committed: Wed Apr 9 15:18:30 2014 -0700

----------------------------------------------------------------------
 .rat-excludes                                   |   4 +
 pom.xml                                         |  16 +-
 src/site/apt/development_eclipse_setup.apt      |  25 +-
 src/site/apt/development_tips.apt               |  40 +-
 src/site/apt/development_xml_node_details.apt   |  14 +-
 src/site/apt/user_query.apt                     |  26 +-
 src/site/apt/user_running_tests.apt             |   4 +-
 .../resources/noaa-ghcn-daily/queries/q00.xq    |  25 +-
 .../resources/noaa-ghcn-daily/queries/q01.xq    |  17 +
 .../resources/noaa-ghcn-daily/queries/q02.xq    |  20 +-
 .../resources/noaa-ghcn-daily/queries/q03.xq    |  17 +
 .../resources/noaa-ghcn-daily/queries/q04.xq    |  32 +-
 .../noaa-ghcn-daily/queries/q04_sensor.xq       |  27 +
 .../noaa-ghcn-daily/queries/q04_station.xq      |  25 +
 .../resources/noaa-ghcn-daily/queries/q05.xq    |  32 +-
 .../noaa-ghcn-daily/queries/q05_sensor.xq       |  28 +
 .../noaa-ghcn-daily/queries/q05_station.xq      |  25 +
 .../resources/noaa-ghcn-daily/queries/q06.xq    |  30 +
 .../noaa-ghcn-daily/queries/q06_sensor.xq       |  27 +
 .../noaa-ghcn-daily/queries/q06_station.xq      |  24 +
 .../resources/noaa-ghcn-daily/queries/q07.xq    |  33 +
 .../noaa-ghcn-daily/queries/q07_tmax.xq         |  26 +
 .../noaa-ghcn-daily/queries/q07_tmin.xq         |  26 +
 .../noaa-ghcn-daily/queries/q_test_00.xq        |   5 -
 .../noaa-ghcn-daily/queries/q_test_01.xq        |   6 -
 .../noaa-ghcn-daily/queries/q_test_02.xq        |   6 -
 .../noaa-ghcn-daily/queries/sensor_count.xq     |  24 +
 .../noaa-ghcn-daily/queries/station_count.xq    |  24 +
 .../resources/noaa-ghcn-daily/scripts/README.md |  17 +
 .../noaa-ghcn-daily/scripts/run_benchmark.sh    |  32 +-
 .../scripts/run_benchmark_cluster.sh            |  63 ++
 .../scripts/weather_benchmark.py                | 298 ++++++
 .../noaa-ghcn-daily/scripts/weather_cli.py      |  64 +-
 .../noaa-ghcn-daily/scripts/weather_config.py   |  27 +-
 .../scripts/weather_config_ghcnd.py             |  95 ++
 .../scripts/weather_config_mshr.py              |  78 ++
 .../scripts/weather_convert_to_xml.py           | 225 ++++-
 .../scripts/weather_data_files.py               | 127 ++-
 .../scripts/weather_dly_config.py               |  96 --
 .../scripts/weather_download_files.py           |  35 +-
 .../noaa-ghcn-daily/scripts/weather_example.xml |  17 +-
 .../scripts/weather_example_cluster.xml         |  56 ++
 .../src/main/resources/util/README.md           |  17 +
 .../main/resources/util/vxquery_functions.xq    |  17 +
 .../main/resources/util/vxquery_operators.xq    |  17 +
 .../java/org/apache/vxquery/cli/VXQuery.java    |  18 +-
 .../vxquery/compiler/CompilerControlBlock.java  |  14 +-
 .../VXQueryComparatorFactoryProvider.java       |   7 +-
 ...ueryLogicalExpressionPrettyPrintVisitor.java |  28 +-
 .../compiler/rewriter/RewriteRuleset.java       |  39 +-
 .../rewriter/VXQueryOptimizationContext.java    |  20 +-
 ...tractRemoveRedundantTypeExpressionsRule.java |   3 +-
 .../ConvertFromAlgebricksExpressionsRule.java   | 119 +++
 .../ConvertToAlgebricksExpressionsRule.java     | 124 +++
 .../rules/InlineNestedVariablesRule.java        |  97 ++
 .../rewriter/rules/IntroduceCollectionRule.java |   9 +-
 .../rules/IntroduceTwoStepAggregateRule.java    |  58 +-
 .../rules/PushFunctionsOntoEqJoinBranches.java  | 122 +++
 .../RemoveRedundantBooleanExpressionsRule.java  |  69 ++
 .../rules/SetCollectionDataSourceRule.java      |  23 +-
 .../rewriter/rules/util/ExpressionToolbox.java  |  36 +-
 .../accessors/atomic/XSDecimalPointable.java    |   4 +-
 .../DefaultSystemExceptionFactory.java          |  30 +-
 .../apache/vxquery/exceptions/ErrorCode.java    |  30 +-
 .../vxquery/exceptions/ErrorMessages.java       |  30 +-
 .../vxquery/exceptions/ErrorReporter.java       |  30 +-
 .../vxquery/exceptions/SystemException.java     |  30 +-
 .../exceptions/SystemExceptionFactory.java      |  30 +-
 .../exceptions/VXQueryDataException.java        |  41 +
 .../VXQueryFileNotFoundException.java           |  29 +
 .../exceptions/VXQueryParseException.java       |  29 +
 .../vxquery/exceptions/WarningReporter.java     |  30 +-
 .../vxquery/functions/builtin-operators.xml     |  14 +
 .../metadata/VXQueryCollectionDataSource.java   |  13 +-
 .../VXQueryCollectionOperatorDescriptor.java    |   9 +-
 .../metadata/VXQueryMetadataProvider.java       |  39 +-
 .../VXQueryRawBinaryHashFunctionFactory.java    |   4 +-
 ...AbstractMaxMinAggregateEvaluatorFactory.java |  39 +-
 .../AbstractMaxMinScalarEvaluatorFactory.java   |  25 +-
 .../AvgGlobalAggregateEvaluatorFactory.java     | 117 +++
 .../AvgLocalAggregateEvaluatorFactory.java      | 106 ++
 .../FnAvgAggregateEvaluatorFactory.java         |  24 +-
 .../aggregate/FnAvgScalarEvaluatorFactory.java  |   2 +-
 .../FnCountScalarEvaluatorFactory.java          |   2 +-
 .../FnSumAggregateEvaluatorFactory.java         |  40 +-
 .../aggregate/FnSumScalarEvaluatorFactory.java  |   2 +-
 .../bool/FnBooleanScalarEvaluatorFactory.java   |   2 +-
 .../misc/FnDataScalarEvaluatorFactory.java      |   2 +-
 .../ConcatenateScalarEvaluatorFactory.java      |   2 +-
 .../sequence/FnEmptyScalarEvaluatorFactory.java |   2 +-
 .../FnExactlyOneScalarEvaluatorFactory.java     |   2 +-
 .../FnExistsScalarEvaluatorFactory.java         |   2 +-
 .../FnInsertBeforeScalarEvaluatorFactory.java   |   4 +-
 .../FnOneOrMoreScalarEvaluatorFactory.java      |   2 +-
 .../FnRemoveScalarEvaluatorFactory.java         |   2 +-
 .../FnReverseScalarEvaluatorFactory.java        |   2 +-
 .../FnSubsequenceScalarEvaluatorFactory.java    |   2 +-
 .../FnZeroOrOneScalarEvaluatorFactory.java      |   2 +-
 .../IterateUnnestingEvaluatorFactory.java       |   5 +-
 .../SequenceAggregateEvaluatorFactory.java      |   2 +-
 .../strings/FnStringJoinEvaluatorFactory.java   |   2 +-
 .../runtime/functions/util/FunctionHelper.java  |  31 +-
 ...VXQueryBinaryHashFunctionFamilyProvider.java |  36 +
 .../vxquery/serializer/XMLSerializer.java       |  10 +-
 .../org/apache/vxquery/xmlparser/XMLParser.java |  26 +-
 .../xmlquery/query/XMLQueryCompiler.java        |  37 +-
 .../xmlquery/query/SimpleXQueryTest.java        |   2 +-
 .../src/main/resources/scripts/README.md        |  17 +
 .../main/resources/scripts/cluster_actions.py   |  26 +-
 .../src/main/resources/scripts/cluster_cli.py   |   2 +-
 .../src/main/resources/scripts/startcc.sh       |  17 +
 .../src/main/resources/scripts/startnc.sh       |  17 +
 .../src/main/resources/scripts/stopcc.sh        |  17 +
 .../src/main/resources/scripts/stopnc.sh        |  17 +
 vxquery-xtest/pom.xml                           |   8 +
 vxquery-xtest/results/README.md                 |  17 +
 vxquery-xtest/results/xqts.txt                  | 987 +++++++++++--------
 .../java/org/apache/vxquery/xtest/TestCase.java |   5 +
 .../apache/vxquery/xtest/TestCaseFactory.java   |  24 +-
 .../apache/vxquery/xtest/TestConfiguration.java |   6 +-
 .../apache/vxquery/xtest/TestRunnerFactory.java |   5 +-
 .../java/org/apache/vxquery/xtest/XTest.java    |   2 +-
 .../org/apache/vxquery/xtest/XTestOptions.java  |   4 +-
 .../Aggregate/Partition-1/avg.txt               |   1 +
 .../Aggregate/Partition-1/count.txt             |   1 +
 .../Aggregate/Partition-1/max.txt               |   1 +
 .../Aggregate/Partition-1/min.txt               |   1 +
 .../Aggregate/Partition-1/sum.txt               |   1 +
 .../Aggregate/Partition-2/avg.txt               |   1 +
 .../Aggregate/Partition-2/count.txt             |   1 +
 .../Aggregate/Partition-2/max.txt               |   1 +
 .../Aggregate/Partition-2/min.txt               |   1 +
 .../Aggregate/Partition-2/sum.txt               |   1 +
 .../Aggregate/Partition-4/avg.txt               |   1 +
 .../Aggregate/Partition-4/count.txt             |   1 +
 .../Aggregate/Partition-4/max.txt               |   1 +
 .../Aggregate/Partition-4/min.txt               |   1 +
 .../Aggregate/Partition-4/sum.txt               |   1 +
 .../Ghcnd/Partition-1/q00.txt                   |   2 +
 .../Ghcnd/Partition-1/q01.txt                   |   1 +
 .../Ghcnd/Partition-1/q02.txt                   |   1 +
 .../Ghcnd/Partition-1/q03.txt                   |   1 +
 .../Ghcnd/Partition-1/q04.txt                   |   3 +
 .../Ghcnd/Partition-1/q05.txt                   |   1 +
 .../Ghcnd/Partition-1/q06.txt                   |   3 +
 .../Ghcnd/Partition-1/q07.txt                   |   1 +
 .../Ghcnd/Partition-2/q00.txt                   |   2 +
 .../Ghcnd/Partition-2/q01.txt                   |   1 +
 .../Ghcnd/Partition-2/q02.txt                   |   1 +
 .../Ghcnd/Partition-2/q03.txt                   |   1 +
 .../Ghcnd/Partition-2/q04.txt                   |   3 +
 .../Ghcnd/Partition-2/q05.txt                   |   1 +
 .../Ghcnd/Partition-2/q06.txt                   |   3 +
 .../Ghcnd/Partition-2/q07.txt                   |   1 +
 .../Ghcnd/Partition-4/q00.txt                   |   2 +
 .../Ghcnd/Partition-4/q01.txt                   |   1 +
 .../Ghcnd/Partition-4/q02.txt                   |   1 +
 .../Ghcnd/Partition-4/q03.txt                   |   1 +
 .../Ghcnd/Partition-4/q04.txt                   |   3 +
 .../Ghcnd/Partition-4/q05.txt                   |   1 +
 .../Ghcnd/Partition-4/q06.txt                   |   3 +
 .../Ghcnd/Partition-4/q07.txt                   |   1 +
 .../GhcndCount/Partition-1/q02_count.txt        |   1 +
 .../GhcndCount/Partition-1/q03_count.txt        |   1 +
 .../GhcndCount/Partition-1/q05_count.txt        |   1 +
 .../GhcndCount/Partition-1/q07_count.txt        |   1 +
 .../GhcndCount/Partition-2/q02_count.txt        |   1 +
 .../GhcndCount/Partition-2/q03_count.txt        |   1 +
 .../GhcndCount/Partition-2/q05_count.txt        |   1 +
 .../GhcndCount/Partition-2/q07_count.txt        |   1 +
 .../GhcndCount/Partition-4/q02_count.txt        |   1 +
 .../GhcndCount/Partition-4/q03_count.txt        |   1 +
 .../GhcndCount/Partition-4/q05_count.txt        |   1 +
 .../GhcndCount/Partition-4/q07_count.txt        |   1 +
 .../GhcndRecords/Partition-1/q02_records.txt    |   1 +
 .../GhcndRecords/Partition-1/q03_records.txt    |   3 +
 .../GhcndRecords/Partition-1/q05_records.txt    |   1 +
 .../GhcndRecords/Partition-1/q07_records-1.txt  |   3 +
 .../GhcndRecords/Partition-1/q07_records-2.txt  |   3 +
 .../GhcndRecords/Partition-1/q07_records-3.txt  |   3 +
 .../GhcndRecords/Partition-1/q07_records-4.txt  |   3 +
 .../GhcndRecords/Partition-1/q07_records-5.txt  |   3 +
 .../GhcndRecords/Partition-1/q07_records.txt    |   3 +
 .../GhcndRecords/Partition-2/q02_records.txt    |   1 +
 .../GhcndRecords/Partition-2/q03_records.txt    |   3 +
 .../GhcndRecords/Partition-2/q05_records.txt    |   1 +
 .../GhcndRecords/Partition-2/q07_records-1.txt  |   3 +
 .../GhcndRecords/Partition-2/q07_records-2.txt  |   3 +
 .../GhcndRecords/Partition-2/q07_records-3.txt  |   3 +
 .../GhcndRecords/Partition-2/q07_records-4.txt  |   3 +
 .../GhcndRecords/Partition-2/q07_records-5.txt  |   3 +
 .../GhcndRecords/Partition-2/q07_records.txt    |   3 +
 .../GhcndRecords/Partition-4/q02_records.txt    |   1 +
 .../GhcndRecords/Partition-4/q03_records.txt    |   3 +
 .../GhcndRecords/Partition-4/q05_records.txt    |   1 +
 .../GhcndRecords/Partition-4/q07_records-1.txt  |   3 +
 .../GhcndRecords/Partition-4/q07_records-2.txt  |   3 +
 .../GhcndRecords/Partition-4/q07_records-3.txt  |   3 +
 .../GhcndRecords/Partition-4/q07_records-4.txt  |   3 +
 .../GhcndRecords/Partition-4/q07_records-5.txt  |   3 +
 .../GhcndRecords/Partition-4/q07_records.txt    |   3 +
 .../Queries/XQuery/Aggregate/Partition-1/avg.xq |  25 +
 .../XQuery/Aggregate/Partition-1/count.xq       |  25 +
 .../Queries/XQuery/Aggregate/Partition-1/max.xq |  25 +
 .../Queries/XQuery/Aggregate/Partition-1/min.xq |  25 +
 .../Queries/XQuery/Aggregate/Partition-1/sum.xq |  25 +
 .../Queries/XQuery/Aggregate/Partition-2/avg.xq |  25 +
 .../XQuery/Aggregate/Partition-2/count.xq       |  25 +
 .../Queries/XQuery/Aggregate/Partition-2/max.xq |  25 +
 .../Queries/XQuery/Aggregate/Partition-2/min.xq |  25 +
 .../Queries/XQuery/Aggregate/Partition-2/sum.xq |  25 +
 .../Queries/XQuery/Aggregate/Partition-4/avg.xq |  25 +
 .../XQuery/Aggregate/Partition-4/count.xq       |  25 +
 .../Queries/XQuery/Aggregate/Partition-4/max.xq |  25 +
 .../Queries/XQuery/Aggregate/Partition-4/min.xq |  25 +
 .../Queries/XQuery/Aggregate/Partition-4/sum.xq |  25 +
 .../Queries/XQuery/Ghcnd/Partition-1/q00.xq     |  28 +
 .../Queries/XQuery/Ghcnd/Partition-1/q01.xq     |  25 +
 .../Queries/XQuery/Ghcnd/Partition-1/q02.xq     |  28 +
 .../Queries/XQuery/Ghcnd/Partition-1/q03.xq     |  25 +
 .../Queries/XQuery/Ghcnd/Partition-1/q04.xq     |  30 +
 .../XQuery/Ghcnd/Partition-1/q04_sensors.xq     |  25 +
 .../XQuery/Ghcnd/Partition-1/q04_stations.xq    |  25 +
 .../Queries/XQuery/Ghcnd/Partition-1/q05.xq     |  33 +
 .../Queries/XQuery/Ghcnd/Partition-1/q06.xq     |  30 +
 .../Queries/XQuery/Ghcnd/Partition-1/q07.xq     |  33 +
 .../Queries/XQuery/Ghcnd/Partition-2/q00.xq     |  28 +
 .../Queries/XQuery/Ghcnd/Partition-2/q01.xq     |  25 +
 .../Queries/XQuery/Ghcnd/Partition-2/q02.xq     |  28 +
 .../Queries/XQuery/Ghcnd/Partition-2/q03.xq     |  25 +
 .../Queries/XQuery/Ghcnd/Partition-2/q04.xq     |  30 +
 .../Queries/XQuery/Ghcnd/Partition-2/q05.xq     |  33 +
 .../Queries/XQuery/Ghcnd/Partition-2/q06.xq     |  30 +
 .../Queries/XQuery/Ghcnd/Partition-2/q07.xq     |  33 +
 .../Queries/XQuery/Ghcnd/Partition-4/q00.xq     |  28 +
 .../Queries/XQuery/Ghcnd/Partition-4/q01.xq     |  25 +
 .../Queries/XQuery/Ghcnd/Partition-4/q02.xq     |  28 +
 .../Queries/XQuery/Ghcnd/Partition-4/q03.xq     |  25 +
 .../Queries/XQuery/Ghcnd/Partition-4/q04.xq     |  30 +
 .../Queries/XQuery/Ghcnd/Partition-4/q05.xq     |  33 +
 .../Queries/XQuery/Ghcnd/Partition-4/q06.xq     |  30 +
 .../Queries/XQuery/Ghcnd/Partition-4/q07.xq     |  33 +
 .../XQuery/GhcndCount/Partition-1/q02_count.xq  |  28 +
 .../XQuery/GhcndCount/Partition-1/q03_count.xq  |  25 +
 .../XQuery/GhcndCount/Partition-1/q05_count.xq  |  33 +
 .../XQuery/GhcndCount/Partition-1/q07_count.xq  |  33 +
 .../XQuery/GhcndCount/Partition-2/q02_count.xq  |  28 +
 .../XQuery/GhcndCount/Partition-2/q03_count.xq  |  25 +
 .../XQuery/GhcndCount/Partition-2/q05_count.xq  |  33 +
 .../XQuery/GhcndCount/Partition-2/q07_count.xq  |  33 +
 .../XQuery/GhcndCount/Partition-4/q02_count.xq  |  28 +
 .../XQuery/GhcndCount/Partition-4/q03_count.xq  |  25 +
 .../XQuery/GhcndCount/Partition-4/q05_count.xq  |  33 +
 .../XQuery/GhcndCount/Partition-4/q07_count.xq  |  33 +
 .../GhcndRecords/Partition-1/q02_records.xq     |  26 +
 .../GhcndRecords/Partition-1/q03_records.xq     |  23 +
 .../GhcndRecords/Partition-1/q05_records.xq     |  31 +
 .../GhcndRecords/Partition-1/q07_records.xq     |  31 +
 .../GhcndRecords/Partition-2/q02_records.xq     |  26 +
 .../GhcndRecords/Partition-2/q03_records.xq     |  23 +
 .../GhcndRecords/Partition-2/q05_records.xq     |  31 +
 .../GhcndRecords/Partition-2/q07_records.xq     |  31 +
 .../GhcndRecords/Partition-4/q02_records.xq     |  26 +
 .../GhcndRecords/Partition-4/q03_records.xq     |  23 +
 .../GhcndRecords/Partition-4/q05_records.xq     |  31 +
 .../GhcndRecords/Partition-4/q07_records.xq     |  31 +
 .../quarter_1/sensors/US000000001_200101_0.xml  |  18 +
 .../half_1/quarter_1/stations/US000000001.xml   |  18 +
 .../quarter_2/sensors/US000000002_200202_0.xml  |  18 +
 .../half_1/quarter_2/stations/US000000004.xml   |  18 +
 .../quarter_3/sensors/AS000000003_200303_0.xml  |  18 +
 .../half_2/quarter_3/stations/US000000002.xml   |  18 +
 .../quarter_4/sensors/US000000004_200404_0.xml  |  18 +
 .../half_2/quarter_4/stations/AS000000003.xml   |  18 +
 .../src/test/resources/VXQueryCatalog.xml       | 141 +++
 .../cat/AggregatePartition1Queries.xml          |  48 +
 .../cat/AggregatePartition2Queries.xml          |  48 +
 .../cat/AggregatePartition4Queries.xml          |  48 +
 .../cat/GhcndCountPartition1Queries.xml         |  43 +
 .../cat/GhcndCountPartition2Queries.xml         |  43 +
 .../cat/GhcndCountPartition4Queries.xml         |  43 +
 .../resources/cat/GhcndPartition1Queries.xml    |  63 ++
 .../resources/cat/GhcndPartition2Queries.xml    |  63 ++
 .../resources/cat/GhcndPartition4Queries.xml    |  63 ++
 .../cat/GhcndRecordsPartition1Queries.xml       |  48 +
 .../cat/GhcndRecordsPartition2Queries.xml       |  48 +
 .../cat/GhcndRecordsPartition4Queries.xml       |  48 +
 287 files changed, 6535 insertions(+), 1074 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/a5c8adff/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0597245,6f711ec..1c0ac97
--- a/pom.xml
+++ b/pom.xml
@@@ -45,11 -45,11 +45,11 @@@
        <comments>A business-friendly OSS license</comments>
      </license>
    </licenses>
 -  
 +
    <scm>
-     <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery</connection>
-     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery/branches/vxquery_0_2_staging</developerConnection>
-     <url>https://svn.apache.org/repos/asf/incubator/vxquery</url>
+     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</connection>
+     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</developerConnection>
+     <url>https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</url>
    </scm>
  
    <issueManagement>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/a5c8adff/vxquery-xtest/pom.xml
----------------------------------------------------------------------


[44/51] [abbrv] add license headers

Posted by vi...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
index bf71241..1da441d 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-1/q07.xq
@@ -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. :)
+
 (: XQuery Self Join Query :)
 (: Self join with all stations finding the difference in min and max       :)
 (: temperature and get the average.                                        :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
index 2d068c2..05f1705 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q00.xq
@@ -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. :)
+
 (: XQuery Filter Query :)
 (: See historical data for Riverside, CA (AS000000003) station by selecting   :)
 (: the weather readings for December 25 over the last 10 years.               :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
index 44d1179..bc62d73 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q01.xq
@@ -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. :)
+
 (: 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     :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
index df63040..5907b24 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q02.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
 (: station (US000000002) for 2002.                                            :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
index 703937a..4a6d577 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q03.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest recorded temperature (TMAX) in Celsius.                   :)
 fn:max(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
index 0339b12..8316a22 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q04.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find all the weather readings for Washington state for a specific day    :)
 (: 2002-2-2.                                                                  :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
index 66c6af8..68f29b1 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q05.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Find the lowest recorded temperature (TMIN) in the United States for     :)
 (: 2001.                                                                      :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
index d618697..9e8b88a 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q06.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find the highest recorded temperature (TMAX) for each station for each     :)
 (: day over the year 2002.                                                    :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
index ac64d8b..d0cd2d2 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-2/q07.xq
@@ -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. :)
+
 (: XQuery Self Join Query :)
 (: Self join with all stations finding the difference in min and max       :)
 (: temperature and get the average.                                        :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
index 17c6021..01f474b 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q00.xq
@@ -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. :)
+
 (: XQuery Filter Query :)
 (: See historical data for Riverside, CA (AS000000003) station by selecting   :)
 (: the weather readings for December 25 over the last 10 years.               :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
index a5506e0..2de2690 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q01.xq
@@ -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. :)
+
 (: 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     :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
index 3e5c9c7..7a92e27 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q02.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
 (: station (US000000002) for 2002.                                            :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
index 1234a74..183b85f 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q03.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest recorded temperature (TMAX) in Celsius.                   :)
 fn:max(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
index 2a01c70..463afe1 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q04.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find all the weather readings for Washington state for a specific day    :)
 (: 2002-2-2.                                                                  :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
index 3bc7d8b..a238c59 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q05.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Find the lowest recorded temperature (TMIN) in the United States for     :)
 (: 2001.                                                                      :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
index e7db76a..c293717 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q06.xq
@@ -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. :)
+
 (: XQuery Join Query :)
 (: Find the highest recorded temperature (TMAX) for each station for each     :)
 (: day over the year 2002.                                                    :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
index 2e16d96..55173b8 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Ghcnd/Partition-4/q07.xq
@@ -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. :)
+
 (: XQuery Self Join Query :)
 (: Self join with all stations finding the difference in min and max       :)
 (: temperature and get the average.                                        :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
index c47b146..de639fc 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
 (: station (US000000002) for 2002.                                            :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
index d6af8d4..3865ba7 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q03_count.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest recorded temperature (TMAX) in Celsius.                   :)
 fn:count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
index 298b22a..926901e 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Find the lowest recorded temperature (TMIN) in the United States for     :)
 (: 2001.                                                                      :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
index 80c0f9d..e20b1d7 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-1/q07_count.xq
@@ -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. :)
+
 (: XQuery Self Join Query :)
 (: Self join with all stations finding the difference in min and max       :)
 (: temperature and get the average.                                        :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
index 175e8a9..aabebdd 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q02_count.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
 (: station (US000000002) for 2002.                                            :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
index 35f1f9f..dc66dd2 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q03_count.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest recorded temperature (TMAX) in Celsius.                   :)
 fn:count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
index c4c2b3e..a0c20e8 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Find the lowest recorded temperature (TMIN) in the United States for     :)
 (: 2001.                                                                      :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
index 2e96ae7..0afacb1 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-2/q07_count.xq
@@ -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. :)
+
 (: XQuery Self Join Query :)
 (: Self join with all stations finding the difference in min and max       :)
 (: temperature and get the average.                                        :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
index a4646df..43750a0 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q02_count.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
 (: station (US000000002) for 2002.                                            :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
index 50984ea..e4a20da 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q03_count.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest recorded temperature (TMAX) in Celsius.                   :)
 fn:count(

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
index 0ad6e4a..328f96c 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Find the lowest recorded temperature (TMIN) in the United States for     :)
 (: 2001.                                                                      :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
index d21ee34..de58821 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndCount/Partition-4/q07_count.xq
@@ -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. :)
+
 (: XQuery Self Join Query :)
 (: Self join with all stations finding the difference in min and max       :)
 (: temperature and get the average.                                        :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
index 9c59e82..e966e3b 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q02_records.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
 (: station (US000000002) for 2002.                                            :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
index 27f98aa..00853ec 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q03_records.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest recorded temperature (TMAX) in Celsius.                   :)
     let $collection := "ghcnd"

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
index d1e80de..994017a 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Find the lowest recorded temperature (TMIN) in the United States for     :)
 (: 2001.                                                                      :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
index 1c0a14b..4946a48 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-1/q07_records.xq
@@ -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. :)
+
 (: XQuery Self Join Query :)
 (: Self join with all stations finding the difference in min and max       :)
 (: temperature and get the average.                                        :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
index 30d68c2..68d7f08 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q02_records.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
 (: station (US000000002) for 2002.                                            :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
index 090b56a..72865e9 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q03_records.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest recorded temperature (TMAX) in Celsius.                   :)
     let $collection := "ghcnd_half_1|ghcnd_half_2"

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
index dae3b01..a80a11e 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Find the lowest recorded temperature (TMIN) in the United States for     :)
 (: 2001.                                                                      :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
index 71176b0..4133153 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-2/q07_records.xq
@@ -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. :)
+
 (: XQuery Self Join Query :)
 (: Self join with all stations finding the difference in min and max       :)
 (: temperature and get the average.                                        :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
index a4eb414..2dfbe03 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q02_records.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
 (: station (US000000002) for 2002.                                            :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
index cab55cd..825b3aa 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q03_records.xq
@@ -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. :)
+
 (: XQuery Aggregate Query :)
 (: Find the highest recorded temperature (TMAX) in Celsius.                   :)
     let $collection := "ghcnd_quarter_1|ghcnd_quarter_2|ghcnd_quarter_3|ghcnd_quarter_4"

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
index 193974d..e4b0259 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
@@ -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. :)
+
 (: XQuery Join Aggregate Query :)
 (: Find the lowest recorded temperature (TMIN) in the United States for     :)
 (: 2001.                                                                      :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
index 686ae9e..3ec308b 100644
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
@@ -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. :)
+
 (: XQuery Self Join Query :)
 (: Self join with all stations finding the difference in min and max       :)
 (: temperature and get the average.                                        :)

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sensors/US000000001_200101_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sensors/US000000001_200101_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sensors/US000000001_200101_0.xml
index cc2fd33..30f2242 100644
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sensors/US000000001_200101_0.xml
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/sensors/US000000001_200101_0.xml
@@ -1 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2001-01-01T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000001</station><value>11.25</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000001</station><value>31</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<dataCollection pageCount="1" totalCount="3"><data><date>2001-01-01T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000001</station><value>11.25</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000001</station><value>31</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
index 213f748..5479293 100644
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_1/stations/US000000001.xml
@@ -1 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><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
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<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/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sensors/US000000002_200202_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sensors/US000000002_200202_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sensors/US000000002_200202_0.xml
index c095726..9f2695f 100644
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sensors/US000000002_200202_0.xml
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/sensors/US000000002_200202_0.xml
@@ -1 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<dataCollection pageCount="1" totalCount="3"><data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
index 3bcec27..15eef88 100644
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_1/quarter_2/stations/US000000004.xml
@@ -1 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000004</id><displayName>Station 4</displayName><latitude>40.000</latitude><longitude>-40.000</longitude><elevation>4000.0</elevation><locationLabels><type>ST</type><id>FIPS:1</id><displayName>State 4</displayName></locationLabels><locationLabels><type>CNTY</type><id>FIPS:-9999</id><displayName>County 4</displayName></locationLabels><locationLabels><type>CNTRY</type><id>FIPS:US</id><displayName>UNITED STATES</displayName></locationLabels></station></stationCollection>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000004</id><displayName>Station 4</displayName><latitude>40.000</latitude><longitude>-40.000</longitude><elevation>4000.0</elevation><locationLabels><type>ST</type><id>FIPS:1</id><displayName>State 4</displayName></locationLabels><locationLabels><type>CNTY</type><id>FIPS:-9999</id><displayName>County 4</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/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sensors/AS000000003_200303_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sensors/AS000000003_200303_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sensors/AS000000003_200303_0.xml
index 3a540d3..ec44bcd 100644
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sensors/AS000000003_200303_0.xml
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/sensors/AS000000003_200303_0.xml
@@ -1 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<dataCollection pageCount="1" totalCount="2"><data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
index e9dc6e9..52b0797 100644
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_3/stations/US000000002.xml
@@ -1 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000002</id><displayName>Station 2</displayName><latitude>20.000</latitude><longitude>-20.000</longitude><elevation>2000.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 2</displayName></locationLabels><locationLabels><type>CNTRY</type><id>FIPS:US</id><displayName>UNITED STATES</displayName></locationLabels></station></stationCollection>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000002</id><displayName>Station 2</displayName><latitude>20.000</latitude><longitude>-20.000</longitude><elevation>2000.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 2</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/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sensors/US000000004_200404_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sensors/US000000004_200404_0.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sensors/US000000004_200404_0.xml
index 2dbe586..d24fdf6 100644
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sensors/US000000004_200404_0.xml
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/sensors/US000000004_200404_0.xml
@@ -1 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2004-04-04T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000004</station><value>40</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2004-04-04T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000004</station><value>4</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<dataCollection pageCount="1" totalCount="2"><data><date>2004-04-04T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000004</station><value>40</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2004-04-04T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000004</station><value>4</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/afca3afe/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
index 4919c20..0f754c2 100644
--- a/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
+++ b/vxquery-xtest/src/test/resources/TestSources/ghcnd/half_2/quarter_4/stations/AS000000003.xml
@@ -1 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:AS000000003</id><displayName>Station 3</displayName><latitude>-30.000</latitude><longitude>30.000</longitude><locationLabels><type>CNTRY</type><id>FIPS:AS</id><displayName>AUSTRALIA</displayName></locationLabels></station></stationCollection>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:AS000000003</id><displayName>Station 3</displayName><latitude>-30.000</latitude><longitude>30.000</longitude><locationLabels><type>CNTRY</type><id>FIPS:AS</id><displayName>AUSTRALIA</displayName></locationLabels></station></stationCollection>
\ No newline at end of file


[49/51] [abbrv] git commit: add includes for Apache Rat

Posted by vi...@apache.org.
add includes for Apache Rat


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/c041dc60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/c041dc60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/c041dc60

Branch: refs/heads/vxquery_0_3_staging
Commit: c041dc60eb3112c53d74c6d4a6614daaaf77a607
Parents: 551ded5
Author: Till Westmann <we...@gmail.com>
Authored: Tue Apr 8 18:43:45 2014 -0700
Committer: Till Westmann <we...@gmail.com>
Committed: Tue Apr 8 18:43:45 2014 -0700

----------------------------------------------------------------------
 .rat-excludes         | 4 ++++
 pom.xml               | 8 ++++++++
 vxquery-xtest/pom.xml | 8 ++++++++
 3 files changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c041dc60/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
new file mode 100644
index 0000000..c9667aa
--- /dev/null
+++ b/.rat-excludes
@@ -0,0 +1,4 @@
+.gitignore
+.rat-excludes
+ExpectedTestResults
+xqts.txt

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c041dc60/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a09be4c..6f711ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -408,6 +408,14 @@
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <version>0.7</version>
+        <configuration>
+          <excludes>
+            <exclude>.gitignore</exclude>
+            <exclude>.git/**/*</exclude>
+          </excludes>
+          <numUnapprovedLicenses>0</numUnapprovedLicenses>
+          <maxmemory>2g</maxmemory>
+        </configuration>
       </plugin>
       <plugin>
         <inherited>true</inherited>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c041dc60/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 04e06ff..5397b69 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -132,6 +132,14 @@
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <version>0.7</version>
+        <configuration>
+          <excludes>
+            <exclude>**/ExpectedTestResults/**/*</exclude>
+            <exclude>**/xqts.txt</exclude>
+          </excludes>
+          <numUnapprovedLicenses>0</numUnapprovedLicenses>
+          <maxmemory>2g</maxmemory>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>


[48/51] [abbrv] git commit: Removed unimplemented option from the documentation.

Posted by vi...@apache.org.
Removed unimplemented option from the documentation.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/551ded54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/551ded54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/551ded54

Branch: refs/heads/vxquery_0_3_staging
Commit: 551ded54abb03bf1e135e89cef75ea11c63c70b0
Parents: 45ab836
Author: Preston Carman <pr...@apache.org>
Authored: Tue Apr 8 17:52:40 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Apr 8 17:52:40 2014 -0700

----------------------------------------------------------------------
 src/site/apt/user_query.apt | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/551ded54/src/site/apt/user_query.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_query.apt b/src/site/apt/user_query.apt
index eb9c46e..4388aaf 100644
--- a/src/site/apt/user_query.apt
+++ b/src/site/apt/user_query.apt
@@ -39,7 +39,6 @@ sh ./apache-vxquery-X.Y-incubating/vxquery-cli/target/appassembler/bin/vxq
  -showrp                    : Show Runtime plan
  -showtet                   : Show translated expression tree
  -timing                    : Produce timing information
- -x                         : Bind an external variable
  ----------------------------------------
  
 * Java Options


[29/51] [abbrv] git commit: Removed extra collection context variables.

Posted by vi...@apache.org.
Removed extra collection context variables.

Set collection only counts the number of collections instead of adding each one to the context.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/e5535440
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/e5535440
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/e5535440

Branch: refs/heads/vxquery_0_3_staging
Commit: e55354408f5732d0d1dafb6f26661a480d0076f2
Parents: e229502
Author: Preston Carman <pr...@apache.org>
Authored: Sun Apr 6 09:09:01 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:09:08 2014 -0700

----------------------------------------------------------------------
 .../rewriter/VXQueryOptimizationContext.java      | 18 ------------------
 .../rules/SetCollectionDataSourceRule.java        | 17 ++---------------
 2 files changed, 2 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e5535440/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 f86b9d6..b2a6f1a 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
@@ -20,7 +20,6 @@ import java.util.Map;
 import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.cardinality.Cardinality;
 import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.documentorder.DocumentOrder;
 import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.uniquenodes.UniqueNodes;
-import org.apache.vxquery.metadata.VXQueryCollectionDataSource;
 
 import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
 import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer;
@@ -37,7 +36,6 @@ public class VXQueryOptimizationContext extends AlgebricksOptimizationContext {
     private final Map<ILogicalOperator, HashMap<Integer, UniqueNodes>> uniqueNodesOperatorVariableMap = new HashMap<ILogicalOperator, HashMap<Integer, UniqueNodes>>();
     private final Map<ILogicalOperator, Cardinality> cardinalityOperatorMap = new HashMap<ILogicalOperator, Cardinality>();
 
-    private final Map<String, VXQueryCollectionDataSource> dataSourceScanMap = new HashMap<String, VXQueryCollectionDataSource>();
     private int totalDataSources = 0;
     private int collectionId = 0;
 
@@ -49,22 +47,6 @@ public class VXQueryOptimizationContext extends AlgebricksOptimizationContext {
                 nullableTypeComputer, physicalOptimizationConfig, prettyPrintVisitor);
     }
 
-    public VXQueryCollectionDataSource getCollectionDataSourceMap(String collectionName) {
-        if (dataSourceScanMap.containsKey(collectionName)) {
-            return dataSourceScanMap.get(collectionName);
-        } else {
-            return null;
-        }
-    }
-
-    public int getCollectionDataSourceMapSize() {
-        return dataSourceScanMap.size();
-    }
-
-    public void putCollectionDataSourceMap(String collectionName, VXQueryCollectionDataSource ds) {
-        this.dataSourceScanMap.put(collectionName, ds);
-    }
-
     public void incrementTotalDataSources() {
         totalDataSources++;
     }

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/e5535440/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 2ddee4d..496a99c 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
@@ -18,10 +18,6 @@ package org.apache.vxquery.compiler.rewriter.rules;
 
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext;
-import org.apache.vxquery.metadata.VXQueryCollectionDataSource;
-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;
@@ -38,17 +34,8 @@ public class SetCollectionDataSourceRule extends AbstractCollectionRule {
             return false;
         }
         VXQueryOptimizationContext vxqueryContext = (VXQueryOptimizationContext) context;
-        String collectionName = getCollectionName(opRef);
-
-        // Build the new collection.
-        if (collectionName != null && vxqueryContext.getCollectionDataSourceMap(collectionName) == null) {
-            int collectionId = vxqueryContext.getCollectionDataSourceMapSize() + 1;
-            VXQueryCollectionDataSource ds = VXQueryCollectionDataSource.create(collectionId, collectionName,
-                    SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_STAR));
-            vxqueryContext.putCollectionDataSourceMap(collectionName, ds);
-            
-            context.addToDontApplySet(this, opRef.getValue());
-        }
+        vxqueryContext.incrementTotalDataSources();
+        context.addToDontApplySet(this, opRef.getValue());
         return false;
     }
 }


[21/51] [abbrv] git commit: Updated to the latest Hyracks snapshot.

Posted by vi...@apache.org.
Updated to the latest Hyracks snapshot.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/52724588
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/52724588
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/52724588

Branch: refs/heads/vxquery_0_3_staging
Commit: 527245881a92d69020796b29296e1157b72c1815
Parents: 17e4f71
Author: Preston Carman <pr...@apache.org>
Authored: Thu Apr 3 15:39:13 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Apr 3 15:39:13 2014 -0700

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/52724588/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index db91760..daaea8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -424,7 +424,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <hyracks.version>0.2.11-SNAPSHOT</hyracks.version>
+    <hyracks.version>0.2.12-SNAPSHOT</hyracks.version>
   </properties>
 
   <modules>