You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@vxquery.apache.org by ti...@apache.org on 2014/04/03 07:44:05 UTC

[1/5] 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

Repository: incubator-vxquery
Updated Branches:
  refs/heads/prestonc/hash_join 16f26a651 -> fc9c5bf12


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

[2/5] 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 ti...@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>

[4/5] 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 ti...@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

[5/5] 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 ti...@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/prestonc/hash_join
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
+)

[3/5] 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 ti...@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