You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by vi...@apache.org on 2014/04/10 00:21:36 UTC
[41/51] [abbrv] git commit: Changed the end of file character back to
linux default for these files.
Changed the end of file character back to linux default for these files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/5367a26d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/5367a26d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/5367a26d
Branch: refs/heads/vxquery_0_3_staging
Commit: 5367a26d333c614d7962385603ac6ab8b5360783
Parents: e8d3f8b
Author: Preston Carman <pr...@apache.org>
Authored: Tue Apr 8 14:51:43 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Tue Apr 8 14:51:43 2014 -0700
----------------------------------------------------------------------
.../scripts/run_benchmark_cluster.sh | 44 +++++-----
.../noaa-ghcn-daily/scripts/weather_example.xml | 2 +-
.../scripts/weather_example_cluster.xml | 2 +-
.../cat/AggregatePartition1Queries.xml | 60 ++++++-------
.../cat/AggregatePartition2Queries.xml | 60 ++++++-------
.../cat/AggregatePartition4Queries.xml | 60 ++++++-------
.../cat/GhcndCountPartition1Queries.xml | 50 +++++------
.../cat/GhcndCountPartition2Queries.xml | 50 +++++------
.../cat/GhcndCountPartition4Queries.xml | 50 +++++------
.../resources/cat/GhcndPartition1Queries.xml | 90 ++++++++++----------
.../resources/cat/GhcndPartition2Queries.xml | 90 ++++++++++----------
.../resources/cat/GhcndPartition4Queries.xml | 90 ++++++++++----------
.../cat/GhcndRecordsPartition1Queries.xml | 60 ++++++-------
.../cat/GhcndRecordsPartition2Queries.xml | 60 ++++++-------
.../cat/GhcndRecordsPartition4Queries.xml | 60 ++++++-------
15 files changed, 414 insertions(+), 414 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
index 6dc9714..a77f3c2 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh
@@ -37,27 +37,27 @@ fi
# Run queries for each number of nodes.
for (( i = 0; i < ${CLUSTER_COUNT}; i++ ))
do
- echo "Starting ${i} cluster nodes"
- python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${i}nodes.xml -a start
-
- for j in $(find ${1} -name '*q??.xq')
- do
- # Only work with i nodes.
- if [[ "${j}" =~ "${i}nodes" ]]
- then
- # Only run for specified queries.
- if [ -z "${3}" ] || [[ "${j}" =~ "${3}" ]]
- then
- echo "Running query: ${j}"
- log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log"
- log_base_path=$(dirname ${j/queries/query_logs})
- mkdir -p ${log_base_path}
- time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -showoet -showrp -frame-size 10000 -repeatexec 10 > ${log_base_path}/${log_file} 2>&1
- fi;
- fi;
- done
-
- # Stop cluster.
- python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${i}nodes.xml -a stop
+ echo "Starting ${i} cluster nodes"
+ python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${i}nodes.xml -a start
+
+ for j in $(find ${1} -name '*q??.xq')
+ do
+ # Only work with i nodes.
+ if [[ "${j}" =~ "${i}nodes" ]]
+ then
+ # Only run for specified queries.
+ if [ -z "${3}" ] || [[ "${j}" =~ "${3}" ]]
+ then
+ echo "Running query: ${j}"
+ log_file="$(basename ${j}).$(date +%Y%m%d%H%M).log"
+ log_base_path=$(dirname ${j/queries/query_logs})
+ mkdir -p ${log_base_path}
+ time sh ./vxquery-cli/target/appassembler/bin/vxq ${j} ${2} -timing -showquery -showoet -showrp -frame-size 10000 -repeatexec 10 > ${log_base_path}/${log_file} 2>&1
+ fi;
+ fi;
+ done
+
+ # Stop cluster.
+ python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${i}nodes.xml -a stop
done
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example.xml b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example.xml
index bc9f07f..94c1440 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example.xml
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example.xml
@@ -31,4 +31,4 @@
<partitions_per_path>4</partitions_per_path>
<partitions_per_path>8</partitions_per_path>
</dataset>
-</data>
+</data>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
index c8d253f..6078627 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_example_cluster.xml
@@ -53,4 +53,4 @@
<save_path>/data2</save_path>
<partitions_per_path>1</partitions_per_path>
</dataset>
-</data>
+</data>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
index b3ed2fc..9d4901a 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition1Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>Aggregate Partition 1</title>
- <description/>
- </GroupInfo>
- <test-case name="aggregate-partition-1-avg" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
- <query name="avg" date="2014-04-01"/>
- <output-file compare="Text">avg.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
- <query name="count" date="2014-04-01"/>
- <output-file compare="Text">count.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
- <query name="min" date="2014-04-01"/>
- <output-file compare="Text">min.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
- <query name="max" date="2014-04-01"/>
- <output-file compare="Text">max.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
- <query name="sum" date="2014-04-01"/>
- <output-file compare="Text">sum.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition1Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>Aggregate Partition 1</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="aggregate-partition-1-avg" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+ <query name="avg" date="2014-04-01"/>
+ <output-file compare="Text">avg.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+ <query name="count" date="2014-04-01"/>
+ <output-file compare="Text">count.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+ <query name="min" date="2014-04-01"/>
+ <output-file compare="Text">min.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+ <query name="max" date="2014-04-01"/>
+ <output-file compare="Text">max.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+ <query name="sum" date="2014-04-01"/>
+ <output-file compare="Text">sum.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
index efa93d0..483dea9 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition2Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>Aggregate Partition 2</title>
- <description/>
- </GroupInfo>
- <test-case name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
- <query name="avg" date="2014-04-01"/>
- <output-file compare="Text">avg.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
- <query name="count" date="2014-04-01"/>
- <output-file compare="Text">count.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q05 from the weather benchmark with 2 partition.</description>
- <query name="min" date="2014-04-01"/>
- <output-file compare="Text">min.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q07 from the weather benchmark with 2 partition.</description>
- <query name="max" date="2014-04-01"/>
- <output-file compare="Text">max.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q03 from the weather benchmark with 2 partition.</description>
- <query name="sum" date="2014-04-01"/>
- <output-file compare="Text">sum.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition2Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>Aggregate Partition 2</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
+ <query name="avg" date="2014-04-01"/>
+ <output-file compare="Text">avg.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
+ <query name="count" date="2014-04-01"/>
+ <output-file compare="Text">count.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q05 from the weather benchmark with 2 partition.</description>
+ <query name="min" date="2014-04-01"/>
+ <output-file compare="Text">min.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q07 from the weather benchmark with 2 partition.</description>
+ <query name="max" date="2014-04-01"/>
+ <output-file compare="Text">max.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q03 from the weather benchmark with 2 partition.</description>
+ <query name="sum" date="2014-04-01"/>
+ <output-file compare="Text">sum.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
index 800de1c..91b45bb 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition4Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>Aggregate Partition 4</title>
- <description/>
- </GroupInfo>
- <test-case name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
- <query name="avg" date="2014-04-01"/>
- <output-file compare="Text">avg.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
- <query name="count" date="2014-04-01"/>
- <output-file compare="Text">count.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q05 from the weather benchmark with 4 partition.</description>
- <query name="min" date="2014-04-01"/>
- <output-file compare="Text">min.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q07 from the weather benchmark with 4 partition.</description>
- <query name="max" date="2014-04-01"/>
- <output-file compare="Text">max.txt</output-file>
- </test-case>
- <test-case name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q03 from the weather benchmark with 4 partition.</description>
- <query name="sum" date="2014-04-01"/>
- <output-file compare="Text">sum.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition4Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>Aggregate Partition 4</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
+ <query name="avg" date="2014-04-01"/>
+ <output-file compare="Text">avg.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
+ <query name="count" date="2014-04-01"/>
+ <output-file compare="Text">count.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q05 from the weather benchmark with 4 partition.</description>
+ <query name="min" date="2014-04-01"/>
+ <output-file compare="Text">min.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q07 from the weather benchmark with 4 partition.</description>
+ <query name="max" date="2014-04-01"/>
+ <output-file compare="Text">max.txt</output-file>
+ </test-case>
+ <test-case name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q03 from the weather benchmark with 4 partition.</description>
+ <query name="sum" date="2014-04-01"/>
+ <output-file compare="Text">sum.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
index 6a5b609..c6323d9 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
@@ -1,26 +1,26 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition1Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>GHCND Count Partition 1</title>
- <description/>
- </GroupInfo>
- <test-case name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
- <query name="q02_count" date="2014-04-01"/>
- <output-file compare="Text">q02_count.txt</output-file>
- </test-case>
- <test-case name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
- <query name="q03_count" date="2014-04-01"/>
- <output-file compare="Text">q03_count.txt</output-file>
- </test-case>
- <test-case name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
- <query name="q05_count" date="2014-04-01"/>
- <output-file compare="Text">q05_count.txt</output-file>
- </test-case>
- <test-case name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
- <query name="q07_count" date="2014-04-01"/>
- <output-file compare="Text">q07_count.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition1Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>GHCND Count Partition 1</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+ <query name="q02_count" date="2014-04-01"/>
+ <output-file compare="Text">q02_count.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+ <query name="q03_count" date="2014-04-01"/>
+ <output-file compare="Text">q03_count.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+ <query name="q05_count" date="2014-04-01"/>
+ <output-file compare="Text">q05_count.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+ <query name="q07_count" date="2014-04-01"/>
+ <output-file compare="Text">q07_count.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
index 99fee09..0c60a64 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
@@ -1,26 +1,26 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition2Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>GHCND Count Partition 2</title>
- <description/>
- </GroupInfo>
- <test-case name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
- <query name="q02_count" date="2014-04-01"/>
- <output-file compare="Text">q02_count.txt</output-file>
- </test-case>
- <test-case name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
- <query name="q03_count" date="2014-04-01"/>
- <output-file compare="Text">q03_count.txt</output-file>
- </test-case>
- <test-case name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
- <query name="q05_count" date="2014-04-01"/>
- <output-file compare="Text">q05_count.txt</output-file>
- </test-case>
- <test-case name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
- <query name="q07_count" date="2014-04-01"/>
- <output-file compare="Text">q07_count.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition2Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>GHCND Count Partition 2</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
+ <query name="q02_count" date="2014-04-01"/>
+ <output-file compare="Text">q02_count.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
+ <query name="q03_count" date="2014-04-01"/>
+ <output-file compare="Text">q03_count.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
+ <query name="q05_count" date="2014-04-01"/>
+ <output-file compare="Text">q05_count.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
+ <query name="q07_count" date="2014-04-01"/>
+ <output-file compare="Text">q07_count.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
index 8f1b3f0..b974b1f 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
@@ -1,26 +1,26 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition4Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>GHCND Count Partition 4</title>
- <description/>
- </GroupInfo>
- <test-case name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
- <query name="q02_count" date="2014-04-01"/>
- <output-file compare="Text">q02_count.txt</output-file>
- </test-case>
- <test-case name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
- <query name="q03_count" date="2014-04-01"/>
- <output-file compare="Text">q03_count.txt</output-file>
- </test-case>
- <test-case name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
- <query name="q05_count" date="2014-04-01"/>
- <output-file compare="Text">q05_count.txt</output-file>
- </test-case>
- <test-case name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
- <query name="q07_count" date="2014-04-01"/>
- <output-file compare="Text">q07_count.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition4Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>GHCND Count Partition 4</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
+ <query name="q02_count" date="2014-04-01"/>
+ <output-file compare="Text">q02_count.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
+ <query name="q03_count" date="2014-04-01"/>
+ <output-file compare="Text">q03_count.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
+ <query name="q05_count" date="2014-04-01"/>
+ <output-file compare="Text">q05_count.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
+ <query name="q07_count" date="2014-04-01"/>
+ <output-file compare="Text">q07_count.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
index 94c45dc..2a01e8e 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
@@ -1,46 +1,46 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>GHCND Partition 1</title>
- <description/>
- </GroupInfo>
- <test-case name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
- <description>Execution of q00 from the weather benchmark with 1 partition.</description>
- <query name="q00" date="2014-04-01"/>
- <output-file compare="Text">q00.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
- <description>Execution of q01 from the weather benchmark with 1 partition.</description>
- <query name="q01" date="2014-04-01"/>
- <output-file compare="Text">q01.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
- <description>Execution of q02 from the weather benchmark with 1 partition.</description>
- <query name="q02" date="2014-04-01"/>
- <output-file compare="Text">q02.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
- <description>Execution of q03 from the weather benchmark with 1 partition.</description>
- <query name="q03" date="2014-04-01"/>
- <output-file compare="Text">q03.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
- <description>Execution of q04 from the weather benchmark with 1 partition.</description>
- <query name="q04" date="2014-04-01"/>
- <output-file compare="Text">q04.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
- <description>Execution of q05 from the weather benchmark with 1 partition.</description>
- <query name="q05" date="2014-04-01"/>
- <output-file compare="Text">q05.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
- <description>Execution of q06 from the weather benchmark with 1 partition.</description>
- <query name="q06" date="2014-04-01"/>
- <output-file compare="Text">q06.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
- <description>Execution of q07 from the weather benchmark with 1 partition.</description>
- <query name="q07" date="2014-04-01"/>
- <output-file compare="Text">q07.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>GHCND Partition 1</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+ <description>Execution of q00 from the weather benchmark with 1 partition.</description>
+ <query name="q00" date="2014-04-01"/>
+ <output-file compare="Text">q00.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+ <description>Execution of q01 from the weather benchmark with 1 partition.</description>
+ <query name="q01" date="2014-04-01"/>
+ <output-file compare="Text">q01.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+ <description>Execution of q02 from the weather benchmark with 1 partition.</description>
+ <query name="q02" date="2014-04-01"/>
+ <output-file compare="Text">q02.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+ <description>Execution of q03 from the weather benchmark with 1 partition.</description>
+ <query name="q03" date="2014-04-01"/>
+ <output-file compare="Text">q03.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+ <description>Execution of q04 from the weather benchmark with 1 partition.</description>
+ <query name="q04" date="2014-04-01"/>
+ <output-file compare="Text">q04.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+ <description>Execution of q05 from the weather benchmark with 1 partition.</description>
+ <query name="q05" date="2014-04-01"/>
+ <output-file compare="Text">q05.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+ <description>Execution of q06 from the weather benchmark with 1 partition.</description>
+ <query name="q06" date="2014-04-01"/>
+ <output-file compare="Text">q06.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
+ <description>Execution of q07 from the weather benchmark with 1 partition.</description>
+ <query name="q07" date="2014-04-01"/>
+ <output-file compare="Text">q07.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
index a35c153..fedeff9 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
@@ -1,46 +1,46 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>GHCND Partition 1</title>
- <description/>
- </GroupInfo>
- <test-case name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
- <description>Execution of q00 from the weather benchmark with 2 partitions.</description>
- <query name="q00" date="2014-04-01"/>
- <output-file compare="Text">q00.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
- <description>Execution of q01 from the weather benchmark with 2 partitions.</description>
- <query name="q01" date="2014-04-01"/>
- <output-file compare="Text">q01.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
- <description>Execution of q02 from the weather benchmark with 2 partitions.</description>
- <query name="q02" date="2014-04-01"/>
- <output-file compare="Text">q02.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
- <description>Execution of q03 from the weather benchmark with 2 partitions.</description>
- <query name="q03" date="2014-04-01"/>
- <output-file compare="Text">q03.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
- <description>Execution of q04 from the weather benchmark with 2 partitions.</description>
- <query name="q04" date="2014-04-01"/>
- <output-file compare="Text">q04.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
- <description>Execution of q05 from the weather benchmark with 2 partitions.</description>
- <query name="q05" date="2014-04-01"/>
- <output-file compare="Text">q05.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
- <description>Execution of q06 from the weather benchmark with 2 partitions.</description>
- <query name="q06" date="2014-04-01"/>
- <output-file compare="Text">q06.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
- <description>Execution of q07 from the weather benchmark with 2 partitions.</description>
- <query name="q07" date="2014-04-01"/>
- <output-file compare="Text">q07.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>GHCND Partition 1</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+ <description>Execution of q00 from the weather benchmark with 2 partitions.</description>
+ <query name="q00" date="2014-04-01"/>
+ <output-file compare="Text">q00.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+ <description>Execution of q01 from the weather benchmark with 2 partitions.</description>
+ <query name="q01" date="2014-04-01"/>
+ <output-file compare="Text">q01.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+ <description>Execution of q02 from the weather benchmark with 2 partitions.</description>
+ <query name="q02" date="2014-04-01"/>
+ <output-file compare="Text">q02.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+ <description>Execution of q03 from the weather benchmark with 2 partitions.</description>
+ <query name="q03" date="2014-04-01"/>
+ <output-file compare="Text">q03.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+ <description>Execution of q04 from the weather benchmark with 2 partitions.</description>
+ <query name="q04" date="2014-04-01"/>
+ <output-file compare="Text">q04.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+ <description>Execution of q05 from the weather benchmark with 2 partitions.</description>
+ <query name="q05" date="2014-04-01"/>
+ <output-file compare="Text">q05.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+ <description>Execution of q06 from the weather benchmark with 2 partitions.</description>
+ <query name="q06" date="2014-04-01"/>
+ <output-file compare="Text">q06.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
+ <description>Execution of q07 from the weather benchmark with 2 partitions.</description>
+ <query name="q07" date="2014-04-01"/>
+ <output-file compare="Text">q07.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
index fcbf3d5..0d8c74c 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
@@ -1,46 +1,46 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition4Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>GHCND Partition 4</title>
- <description/>
- </GroupInfo>
- <test-case name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
- <description>Execution of q00 from the weather benchmark with 4 partitions.</description>
- <query name="q00" date="2014-04-01"/>
- <output-file compare="Text">q00.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
- <description>Execution of q01 from the weather benchmark with 4 partitions.</description>
- <query name="q01" date="2014-04-01"/>
- <output-file compare="Text">q01.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
- <description>Execution of q02 from the weather benchmark with 4 partitions.</description>
- <query name="q02" date="2014-04-01"/>
- <output-file compare="Text">q02.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
- <description>Execution of q03 from the weather benchmark with 4 partitions.</description>
- <query name="q03" date="2014-04-01"/>
- <output-file compare="Text">q03.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
- <description>Execution of q04 from the weather benchmark with 4 partitions.</description>
- <query name="q04" date="2014-04-01"/>
- <output-file compare="Text">q04.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
- <description>Execution of q05 from the weather benchmark with 4 partitions.</description>
- <query name="q05" date="2014-04-01"/>
- <output-file compare="Text">q05.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
- <description>Execution of q06 from the weather benchmark with 4 partitions.</description>
- <query name="q06" date="2014-04-01"/>
- <output-file compare="Text">q06.txt</output-file>
- </test-case>
- <test-case name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
- <description>Execution of q07 from the weather benchmark with 4 partitions.</description>
- <query name="q07" date="2014-04-01"/>
- <output-file compare="Text">q07.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition4Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>GHCND Partition 4</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+ <description>Execution of q00 from the weather benchmark with 4 partitions.</description>
+ <query name="q00" date="2014-04-01"/>
+ <output-file compare="Text">q00.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+ <description>Execution of q01 from the weather benchmark with 4 partitions.</description>
+ <query name="q01" date="2014-04-01"/>
+ <output-file compare="Text">q01.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+ <description>Execution of q02 from the weather benchmark with 4 partitions.</description>
+ <query name="q02" date="2014-04-01"/>
+ <output-file compare="Text">q02.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+ <description>Execution of q03 from the weather benchmark with 4 partitions.</description>
+ <query name="q03" date="2014-04-01"/>
+ <output-file compare="Text">q03.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+ <description>Execution of q04 from the weather benchmark with 4 partitions.</description>
+ <query name="q04" date="2014-04-01"/>
+ <output-file compare="Text">q04.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+ <description>Execution of q05 from the weather benchmark with 4 partitions.</description>
+ <query name="q05" date="2014-04-01"/>
+ <output-file compare="Text">q05.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+ <description>Execution of q06 from the weather benchmark with 4 partitions.</description>
+ <query name="q06" date="2014-04-01"/>
+ <output-file compare="Text">q06.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
+ <description>Execution of q07 from the weather benchmark with 4 partitions.</description>
+ <query name="q07" date="2014-04-01"/>
+ <output-file compare="Text">q07.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
index 2a77991..5f11060 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition1Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>GHCND Records Partition 1</title>
- <description/>
- </GroupInfo>
- <test-case name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
- <query name="q02_records" date="2014-04-01"/>
- <output-file compare="Text">q02_records.txt</output-file>
- </test-case>
- <test-case name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
- <query name="q03_records" date="2014-04-01"/>
- <output-file compare="Text">q03_records.txt</output-file>
- </test-case>
- <test-case name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
- <query name="q05_records" date="2014-04-01"/>
- <output-file compare="Text">q05_records.txt</output-file>
- </test-case>
- <test-case name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
- <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
- <query name="q07_records" date="2014-04-01"/>
- <output-file compare="Text">q07_records.txt</output-file>
- <output-file compare="Text">q07_records-1.txt</output-file>
- <output-file compare="Text">q07_records-2.txt</output-file>
- <output-file compare="Text">q07_records-3.txt</output-file>
- <output-file compare="Text">q07_records-4.txt</output-file>
- <output-file compare="Text">q07_records-5.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition1Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>GHCND Records Partition 1</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
+ <query name="q02_records" date="2014-04-01"/>
+ <output-file compare="Text">q02_records.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
+ <query name="q03_records" date="2014-04-01"/>
+ <output-file compare="Text">q03_records.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
+ <query name="q05_records" date="2014-04-01"/>
+ <output-file compare="Text">q05_records.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
+ <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
+ <query name="q07_records" date="2014-04-01"/>
+ <output-file compare="Text">q07_records.txt</output-file>
+ <output-file compare="Text">q07_records-1.txt</output-file>
+ <output-file compare="Text">q07_records-2.txt</output-file>
+ <output-file compare="Text">q07_records-3.txt</output-file>
+ <output-file compare="Text">q07_records-4.txt</output-file>
+ <output-file compare="Text">q07_records-5.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
index e3a53cf..f8a4040 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition2Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>GHCND Records Partition 2</title>
- <description/>
- </GroupInfo>
- <test-case name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
- <query name="q02_records" date="2014-04-01"/>
- <output-file compare="Text">q02_records.txt</output-file>
- </test-case>
- <test-case name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
- <query name="q03_records" date="2014-04-01"/>
- <output-file compare="Text">q03_records.txt</output-file>
- </test-case>
- <test-case name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
- <query name="q05_records" date="2014-04-01"/>
- <output-file compare="Text">q05_records.txt</output-file>
- </test-case>
- <test-case name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
- <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
- <query name="q07_records" date="2014-04-01"/>
- <output-file compare="Text">q07_records.txt</output-file>
- <output-file compare="Text">q07_records-1.txt</output-file>
- <output-file compare="Text">q07_records-2.txt</output-file>
- <output-file compare="Text">q07_records-3.txt</output-file>
- <output-file compare="Text">q07_records-4.txt</output-file>
- <output-file compare="Text">q07_records-5.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition2Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>GHCND Records Partition 2</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
+ <query name="q02_records" date="2014-04-01"/>
+ <output-file compare="Text">q02_records.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
+ <query name="q03_records" date="2014-04-01"/>
+ <output-file compare="Text">q03_records.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
+ <query name="q05_records" date="2014-04-01"/>
+ <output-file compare="Text">q05_records.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
+ <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
+ <query name="q07_records" date="2014-04-01"/>
+ <output-file compare="Text">q07_records.txt</output-file>
+ <output-file compare="Text">q07_records-1.txt</output-file>
+ <output-file compare="Text">q07_records-2.txt</output-file>
+ <output-file compare="Text">q07_records-3.txt</output-file>
+ <output-file compare="Text">q07_records-4.txt</output-file>
+ <output-file compare="Text">q07_records-5.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/5367a26d/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
index f2707f3..ccbd1db 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
@@ -1,31 +1,31 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition4Queries" featureOwner="VXQuery">
- <GroupInfo>
- <title>GHCND Records Partition 4</title>
- <description/>
- </GroupInfo>
- <test-case name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
- <query name="q02_records" date="2014-04-01"/>
- <output-file compare="Text">q02_records.txt</output-file>
- </test-case>
- <test-case name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
- <query name="q03_records" date="2014-04-01"/>
- <output-file compare="Text">q03_records.txt</output-file>
- </test-case>
- <test-case name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
- <query name="q05_records" date="2014-04-01"/>
- <output-file compare="Text">q05_records.txt</output-file>
- </test-case>
- <test-case name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
- <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
- <query name="q07_records" date="2014-04-01"/>
- <output-file compare="Text">q07_records.txt</output-file>
- <output-file compare="Text">q07_records-1.txt</output-file>
- <output-file compare="Text">q07_records-2.txt</output-file>
- <output-file compare="Text">q07_records-3.txt</output-file>
- <output-file compare="Text">q07_records-4.txt</output-file>
- <output-file compare="Text">q07_records-5.txt</output-file>
- </test-case>
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition4Queries" featureOwner="VXQuery">
+ <GroupInfo>
+ <title>GHCND Records Partition 4</title>
+ <description/>
+ </GroupInfo>
+ <test-case name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
+ <query name="q02_records" date="2014-04-01"/>
+ <output-file compare="Text">q02_records.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
+ <query name="q03_records" date="2014-04-01"/>
+ <output-file compare="Text">q03_records.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
+ <query name="q05_records" date="2014-04-01"/>
+ <output-file compare="Text">q05_records.txt</output-file>
+ </test-case>
+ <test-case name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
+ <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
+ <query name="q07_records" date="2014-04-01"/>
+ <output-file compare="Text">q07_records.txt</output-file>
+ <output-file compare="Text">q07_records-1.txt</output-file>
+ <output-file compare="Text">q07_records-2.txt</output-file>
+ <output-file compare="Text">q07_records-3.txt</output-file>
+ <output-file compare="Text">q07_records-4.txt</output-file>
+ <output-file compare="Text">q07_records-5.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file