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

[40/50] [abbrv] git commit: Added more parallel tests to the VXQuery test suite.

Added more parallel tests to the VXQuery test suite.

* Added specific aggregate queries.
* Added supporting count and record queries to debug parallel aggregate and join queries.


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

Branch: refs/heads/prestonc/hash_join
Commit: 7cde080b00699159bb56cbea1838da70e21c838a
Parents: 65c6d1b
Author: Preston Carman <pr...@apache.org>
Authored: Tue Apr 1 16:53:19 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Apr 1 20:56:26 2014 -0700

----------------------------------------------------------------------
 .../Collection/Partition-1/q02_count.txt        |  1 -
 .../Collection/Partition-1/q03_count.txt        |  1 -
 .../Collection/Partition-1/q05_count.txt        |  1 -
 .../Collection/Partition-1/q07_count.txt        |  1 -
 .../Collection/Partition-2/q02_count.txt        |  1 -
 .../Collection/Partition-2/q03_count.txt        |  1 -
 .../Collection/Partition-2/q05_count.txt        |  1 -
 .../Collection/Partition-2/q07_count.txt        |  1 -
 .../Collection/Partition-4/q02_count.txt        |  1 -
 .../Collection/Partition-4/q03_count.txt        |  1 -
 .../Collection/Partition-4/q05_count.txt        |  1 -
 .../Collection/Partition-4/q07_count.txt        |  1 -
 .../Ghcnd/Partition-1/q00.txt                   |  2 +-
 .../Ghcnd/Partition-1/q04.txt                   |  2 +-
 .../Ghcnd/Partition-1/q05.txt                   |  2 +-
 .../Ghcnd/Partition-1/q07.txt                   |  2 +-
 .../Ghcnd/Partition-2/q00.txt                   |  2 +-
 .../Ghcnd/Partition-2/q04.txt                   |  2 +-
 .../Ghcnd/Partition-2/q05.txt                   |  2 +-
 .../Ghcnd/Partition-2/q07.txt                   |  2 +-
 .../Ghcnd/Partition-4/q00.txt                   |  2 +-
 .../Ghcnd/Partition-4/q04.txt                   |  2 +-
 .../Ghcnd/Partition-4/q05.txt                   |  2 +-
 .../Ghcnd/Partition-4/q07.txt                   |  2 +-
 .../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 ++
 .../XQuery/Collection/Partition-1/q02_count.xq  | 11 ----
 .../XQuery/Collection/Partition-1/q03_count.xq  |  8 ---
 .../XQuery/Collection/Partition-1/q05_count.xq  | 16 ------
 .../XQuery/Collection/Partition-1/q07_count.xq  | 16 ------
 .../XQuery/Collection/Partition-2/q02_count.xq  | 11 ----
 .../XQuery/Collection/Partition-2/q03_count.xq  |  8 ---
 .../XQuery/Collection/Partition-2/q05_count.xq  | 16 ------
 .../XQuery/Collection/Partition-2/q07_count.xq  | 16 ------
 .../XQuery/Collection/Partition-4/q02_count.xq  | 11 ----
 .../XQuery/Collection/Partition-4/q03_count.xq  |  8 ---
 .../XQuery/Collection/Partition-4/q05_count.xq  | 16 ------
 .../XQuery/Collection/Partition-4/q07_count.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  |  2 +-
 .../quarter_2/sesnors/US000000002_200202_0.xml  |  2 +-
 .../quarter_3/sesnors/AS000000003_200303_0.xml  |  2 +-
 vxquery-xtest/tests/XQTSCatalog.xml             | 56 ++++++++++++++++----
 .../tests/cat/AggregatePartition1Queries.xml    | 36 +++++++++++++
 .../tests/cat/AggregatePartition2Queries.xml    | 36 +++++++++++++
 .../tests/cat/AggregatePartition4Queries.xml    | 36 +++++++++++++
 .../tests/cat/CollectionPartition1Queries.xml   | 30 -----------
 .../tests/cat/CollectionPartition2Queries.xml   | 30 -----------
 .../tests/cat/CollectionPartition4Queries.xml   | 30 -----------
 .../tests/cat/GhcndCountPartition1Queries.xml   | 30 +++++++++++
 .../tests/cat/GhcndCountPartition2Queries.xml   | 30 +++++++++++
 .../tests/cat/GhcndCountPartition4Queries.xml   | 30 +++++++++++
 .../tests/cat/GhcndRecordsPartition1Queries.xml | 30 +++++++++++
 .../tests/cat/GhcndRecordsPartition2Queries.xml | 30 +++++++++++
 .../tests/cat/GhcndRecordsPartition4Queries.xml | 30 +++++++++++
 100 files changed, 668 insertions(+), 279 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q02_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q02_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q03_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q03_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q05_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q05_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q07_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-1/q07_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q02_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q02_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q03_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q03_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q05_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q05_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q07_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-2/q07_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q02_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q02_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q03_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q03_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q05_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q05_count.txt
deleted file mode 100644
index 56a6051..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q07_count.txt b/vxquery-xtest/tests/ExpectedTestResults/Collection/Partition-4/q07_count.txt
deleted file mode 100644
index e440e5c..0000000
--- a/vxquery-xtest/tests/ExpectedTestResults/Collection/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q00.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
index 06502bc..e6116d0 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q00.txt
@@ -1,2 +1,2 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q04.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
index a1ca535..c5b9925 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q04.txt
@@ -1,3 +1,3 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q05.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
index b123147..9f5aceb 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q05.txt
@@ -1 +1 @@
-1.1
\ No newline at end of file
+1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q07.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
index d8263ee..bfda7af 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-1/q07.txt
@@ -1 +1 @@
-2
\ No newline at end of file
+1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q00.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
index 06502bc..e6116d0 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q00.txt
@@ -1,2 +1,2 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q04.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
index a1ca535..c5b9925 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q04.txt
@@ -1,3 +1,3 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q05.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
index b123147..9f5aceb 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q05.txt
@@ -1 +1 @@
-1.1
\ No newline at end of file
+1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q07.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
index d8263ee..bfda7af 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-2/q07.txt
@@ -1 +1 @@
-2
\ No newline at end of file
+1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q00.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
index 06502bc..e6116d0 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q00.txt
@@ -1,2 +1,2 @@
-<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q04.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
index a1ca535..c5b9925 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q04.txt
@@ -1,3 +1,3 @@
-<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data>
+<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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q05.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
index b123147..9f5aceb 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q05.txt
@@ -1 +1 @@
-1.1
\ No newline at end of file
+1.125
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q07.txt b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
index d8263ee..bfda7af 100644
--- a/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
+++ b/vxquery-xtest/tests/ExpectedTestResults/Ghcnd/Partition-4/q07.txt
@@ -1 +1 @@
-2
\ No newline at end of file
+1.95
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q02_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q03_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q05_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-1/q07_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q02_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q03_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q05_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-2/q07_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q02_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q03_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q05_count.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndCount/Partition-4/q07_count.txt
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q02_records.txt
new file mode 100644
index 0000000..a533a86
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q03_records.txt
new file mode 100644
index 0000000..8d77b4d
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q05_records.txt
new file mode 100644
index 0000000..802ab3c
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-1/q07_records.txt
new file mode 100644
index 0000000..fdd1637
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q02_records.txt
new file mode 100644
index 0000000..a533a86
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q03_records.txt
new file mode 100644
index 0000000..8d77b4d
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q05_records.txt
new file mode 100644
index 0000000..802ab3c
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-2/q07_records.txt
new file mode 100644
index 0000000..fdd1637
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q02_records.txt
new file mode 100644
index 0000000..a533a86
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q03_records.txt
new file mode 100644
index 0000000..8d77b4d
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q05_records.txt
new file mode 100644
index 0000000..802ab3c
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt b/vxquery-xtest/tests/ExpectedTestResults/GhcndRecords/Partition-4/q07_records.txt
new file mode 100644
index 0000000..fdd1637
--- /dev/null
+++ b/vxquery-xtest/tests/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q02_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q02_count.xq
deleted file mode 100644
index 73e8aea..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q03_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q03_count.xq
deleted file mode 100644
index 0d327d1..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q05_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q05_count.xq
deleted file mode 100644
index 9f2ac93..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q07_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-1/q07_count.xq
deleted file mode 100644
index 917b7c6..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q02_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q02_count.xq
deleted file mode 100644
index 52e7790..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q03_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q03_count.xq
deleted file mode 100644
index 619c6d1..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q05_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q05_count.xq
deleted file mode 100644
index c32bcd1..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q07_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-2/q07_count.xq
deleted file mode 100644
index fd3431f..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q02_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q02_count.xq
deleted file mode 100644
index 2940380..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q03_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q03_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q03_count.xq
deleted file mode 100644
index eb6ff10..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q05_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q05_count.xq
deleted file mode 100644
index 768e35d..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q07_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q07_count.xq b/vxquery-xtest/tests/Queries/XQuery/Collection/Partition-4/q07_count.xq
deleted file mode 100644
index 8ea026b..0000000
--- a/vxquery-xtest/tests/Queries/XQuery/Collection/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/7cde080b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
new file mode 100644
index 0000000..73e8aea
--- /dev/null
+++ b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q02_count.xq
@@ -0,0 +1,11 @@
+(: XQuery Aggregate Query :)
+(: Find the annual precipitation (PRCP) for a Seattle using the airport       :)
+(: station (US000000002) for 2002.                                            :)
+fn:count(
+    let $collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($collection)/dataCollection/data
+    where $r/station eq "GHCND:US000000002" 
+        and $r/dataType eq "PRCP" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2002
+    return $r/value
+)
\ No newline at end of file

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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
new file mode 100644
index 0000000..9f2ac93
--- /dev/null
+++ b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-1/q05_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:count(
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    where $s/id eq $r/station
+        and (some $x in $s/locationLabels satisfies ($x/type eq "CNTRY" and $x/id eq "FIPS:US"))
+        and $r/dataType eq "TMIN" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2001
+    return $r/value
+)
\ No newline at end of file

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
new file mode 100644
index 0000000..c32bcd1
--- /dev/null
+++ b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-2/q05_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:count(
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    where $s/id eq $r/station
+        and (some $x in $s/locationLabels satisfies ($x/type eq "CNTRY" and $x/id eq "FIPS:US"))
+        and $r/dataType eq "TMIN" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2001
+    return $r/value
+)
\ No newline at end of file

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
new file mode 100644
index 0000000..768e35d
--- /dev/null
+++ b/vxquery-xtest/tests/Queries/XQuery/GhcndCount/Partition-4/q05_count.xq
@@ -0,0 +1,16 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+fn:count(
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    where $s/id eq $r/station
+        and (some $x in $s/locationLabels satisfies ($x/type eq "CNTRY" and $x/id eq "FIPS:US"))
+        and $r/dataType eq "TMIN" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2001
+    return $r/value
+)
\ No newline at end of file

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
new file mode 100644
index 0000000..0cd735d
--- /dev/null
+++ b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-1/q05_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    where $s/id eq $r/station
+        and (some $x in $s/locationLabels satisfies ($x/type eq "CNTRY" and $x/id eq "FIPS:US"))
+        and $r/dataType eq "TMIN" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2001
+    return $r/value

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
new file mode 100644
index 0000000..83b4683
--- /dev/null
+++ b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-2/q05_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    where $s/id eq $r/station
+        and (some $x in $s/locationLabels satisfies ($x/type eq "CNTRY" and $x/id eq "FIPS:US"))
+        and $r/dataType eq "TMIN" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2001
+    return $r/value

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

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

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