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/04 01:00:01 UTC
[1/4] git commit: Removed test queries now that we have a test suite.
Repository: incubator-vxquery
Updated Branches:
refs/heads/prestonc/hash_join 94cf5deb7 -> 527245881
Removed test queries now that we have a test suite.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/c8f9462f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/c8f9462f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/c8f9462f
Branch: refs/heads/prestonc/hash_join
Commit: c8f9462f522671001c65b2992e2f91af73e235f4
Parents: 94cf5de
Author: Preston Carman <pr...@apache.org>
Authored: Thu Apr 3 10:09:37 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Apr 3 10:09:37 2014 -0700
----------------------------------------------------------------------
.../src/main/resources/noaa-ghcn-daily/queries/q_test_00.xq | 5 -----
.../src/main/resources/noaa-ghcn-daily/queries/q_test_01.xq | 6 ------
.../src/main/resources/noaa-ghcn-daily/queries/q_test_02.xq | 6 ------
3 files changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c8f9462f/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_00.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_00.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_00.xq
deleted file mode 100644
index e55dced..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_00.xq
+++ /dev/null
@@ -1,5 +0,0 @@
-(: XQuery Test Query :)
-for $r in (1 to 5)
-for $s in (3 to 7)
-where $r eq $s
-return $r
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c8f9462f/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_01.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_01.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_01.xq
deleted file mode 100644
index e96f0a4..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_01.xq
+++ /dev/null
@@ -1,6 +0,0 @@
-(: XQuery Test Query :)
-(: Find a specific record GHCND:BB000078954 on 1944-02-29 for TMIN. :)
-let $collection := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
-for $r in collection($collection)/dataCollection/data
-where data($r/station) eq "GHCND:ASN00008113" and data($r/date) eq "1944-02-29T00:00:00.000" and data($r/dataType) eq "PRCP"
-return $r
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c8f9462f/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_02.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_02.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_02.xq
deleted file mode 100644
index a5621b9..0000000
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q_test_02.xq
+++ /dev/null
@@ -1,6 +0,0 @@
-(: XQuery Test Query :)
-(: Count all the XML documents. :)
-count(
- let $collection := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
- return collection($collection)
-)
[4/4] git commit: Updated to the latest Hyracks snapshot.
Posted by pr...@apache.org.
Updated to the latest Hyracks snapshot.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/52724588
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/52724588
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/52724588
Branch: refs/heads/prestonc/hash_join
Commit: 527245881a92d69020796b29296e1157b72c1815
Parents: 17e4f71
Author: Preston Carman <pr...@apache.org>
Authored: Thu Apr 3 15:39:13 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Apr 3 15:39:13 2014 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/52724588/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index db91760..daaea8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -424,7 +424,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <hyracks.version>0.2.11-SNAPSHOT</hyracks.version>
+ <hyracks.version>0.2.12-SNAPSHOT</hyracks.version>
</properties>
<modules>
[2/4] git commit: Cleaned up the XML file by removing unnecessary
information.
Posted by pr...@apache.org.
Cleaned up the XML file by removing unnecessary information.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/0febd9c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/0febd9c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/0febd9c4
Branch: refs/heads/prestonc/hash_join
Commit: 0febd9c4c0fbb15b90d974af09810d6d867f1b7c
Parents: c8f9462
Author: Preston Carman <pr...@apache.org>
Authored: Thu Apr 3 11:00:25 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Apr 3 11:00:25 2014 -0700
----------------------------------------------------------------------
.../cat/AggregatePartition1Queries.xml | 8 ++--
.../cat/AggregatePartition2Queries.xml | 25 +++++-------
.../cat/AggregatePartition4Queries.xml | 25 +++++-------
.../cat/GhcndCountPartition1Queries.xml | 20 ++++------
.../cat/GhcndCountPartition2Queries.xml | 20 ++++------
.../cat/GhcndCountPartition4Queries.xml | 20 ++++------
.../resources/cat/GhcndPartition1Queries.xml | 40 ++++++++------------
.../resources/cat/GhcndPartition2Queries.xml | 40 ++++++++------------
.../resources/cat/GhcndPartition4Queries.xml | 40 ++++++++------------
.../cat/GhcndRecordsPartition1Queries.xml | 20 ++++------
.../cat/GhcndRecordsPartition2Queries.xml | 20 ++++------
.../cat/GhcndRecordsPartition4Queries.xml | 20 ++++------
12 files changed, 120 insertions(+), 178 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
index c901468..b3ed2fc 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
@@ -8,22 +8,22 @@
<query name="avg" date="2014-04-01"/>
<output-file compare="Text">avg.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
<query name="count" date="2014-04-01"/>
<output-file compare="Text">count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
<query name="min" date="2014-04-01"/>
<output-file compare="Text">min.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
<query name="max" date="2014-04-01"/>
<output-file compare="Text">max.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
<query name="sum" date="2014-04-01"/>
<output-file compare="Text">sum.txt</output-file>
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
index a4ac807..efa93d0 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
@@ -3,34 +3,29 @@
<title>Aggregate Partition 2</title>
<description/>
</GroupInfo>
- <test-case is-XPath2="true" name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
<query name="avg" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">avg.txt</output-file>
+ <output-file compare="Text">avg.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
<query name="count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">count.txt</output-file>
+ <output-file compare="Text">count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q05 from the weather benchmark with 2 partition.</description>
<query name="min" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">min.txt</output-file>
+ <output-file compare="Text">min.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q07 from the weather benchmark with 2 partition.</description>
<query name="max" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">max.txt</output-file>
+ <output-file compare="Text">max.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q03 from the weather benchmark with 2 partition.</description>
<query name="sum" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">sum.txt</output-file>
+ <output-file compare="Text">sum.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
index d920d31..800de1c 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
@@ -3,34 +3,29 @@
<title>Aggregate Partition 4</title>
<description/>
</GroupInfo>
- <test-case is-XPath2="true" name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
<query name="avg" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">avg.txt</output-file>
+ <output-file compare="Text">avg.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
<query name="count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">count.txt</output-file>
+ <output-file compare="Text">count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q05 from the weather benchmark with 4 partition.</description>
<query name="min" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">min.txt</output-file>
+ <output-file compare="Text">min.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q07 from the weather benchmark with 4 partition.</description>
<query name="max" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">max.txt</output-file>
+ <output-file compare="Text">max.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q03 from the weather benchmark with 4 partition.</description>
<query name="sum" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">sum.txt</output-file>
+ <output-file compare="Text">sum.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
index 515738e..6a5b609 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
@@ -3,28 +3,24 @@
<title>GHCND Count Partition 1</title>
<description/>
</GroupInfo>
- <test-case is-XPath2="true" name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
<query name="q02_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q02_count.txt</output-file>
+ <output-file compare="Text">q02_count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
<query name="q03_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q03_count.txt</output-file>
+ <output-file compare="Text">q03_count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
<query name="q05_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q05_count.txt</output-file>
+ <output-file compare="Text">q05_count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
<query name="q07_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q07_count.txt</output-file>
+ <output-file compare="Text">q07_count.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
index 8bb590b..99fee09 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
@@ -3,28 +3,24 @@
<title>GHCND Count Partition 2</title>
<description/>
</GroupInfo>
- <test-case is-XPath2="true" name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
<query name="q02_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q02_count.txt</output-file>
+ <output-file compare="Text">q02_count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
<query name="q03_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q03_count.txt</output-file>
+ <output-file compare="Text">q03_count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
<query name="q05_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q05_count.txt</output-file>
+ <output-file compare="Text">q05_count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
<query name="q07_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q07_count.txt</output-file>
+ <output-file compare="Text">q07_count.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
index ff75d3a..8f1b3f0 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
@@ -3,28 +3,24 @@
<title>GHCND Count Partition 4</title>
<description/>
</GroupInfo>
- <test-case is-XPath2="true" name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
<query name="q02_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q02_count.txt</output-file>
+ <output-file compare="Text">q02_count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
<query name="q03_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q03_count.txt</output-file>
+ <output-file compare="Text">q03_count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
<query name="q05_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q05_count.txt</output-file>
+ <output-file compare="Text">q05_count.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
<query name="q07_count" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q07_count.txt</output-file>
+ <output-file compare="Text">q07_count.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
index 1237971..94c45dc 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
@@ -3,52 +3,44 @@
<title>GHCND Partition 1</title>
<description/>
</GroupInfo>
- <test-case is-XPath2="true" name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
<description>Execution of q00 from the weather benchmark with 1 partition.</description>
<query name="q00" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q00.txt</output-file>
+ <output-file compare="Text">q00.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
<description>Execution of q01 from the weather benchmark with 1 partition.</description>
<query name="q01" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q01.txt</output-file>
+ <output-file compare="Text">q01.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
<description>Execution of q02 from the weather benchmark with 1 partition.</description>
<query name="q02" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q02.txt</output-file>
+ <output-file compare="Text">q02.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
<description>Execution of q03 from the weather benchmark with 1 partition.</description>
<query name="q03" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q03.txt</output-file>
+ <output-file compare="Text">q03.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
<description>Execution of q04 from the weather benchmark with 1 partition.</description>
<query name="q04" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q04.txt</output-file>
+ <output-file compare="Text">q04.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
<description>Execution of q05 from the weather benchmark with 1 partition.</description>
<query name="q05" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q05.txt</output-file>
+ <output-file compare="Text">q05.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
<description>Execution of q06 from the weather benchmark with 1 partition.</description>
<query name="q06" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q06.txt</output-file>
+ <output-file compare="Text">q06.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" Creator="Preston Carman">
<description>Execution of q07 from the weather benchmark with 1 partition.</description>
<query name="q07" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q07.txt</output-file>
+ <output-file compare="Text">q07.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
index 86b5cf0..a35c153 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
@@ -3,52 +3,44 @@
<title>GHCND Partition 1</title>
<description/>
</GroupInfo>
- <test-case is-XPath2="true" name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
<description>Execution of q00 from the weather benchmark with 2 partitions.</description>
<query name="q00" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q00.txt</output-file>
+ <output-file compare="Text">q00.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
<description>Execution of q01 from the weather benchmark with 2 partitions.</description>
<query name="q01" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q01.txt</output-file>
+ <output-file compare="Text">q01.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
<description>Execution of q02 from the weather benchmark with 2 partitions.</description>
<query name="q02" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q02.txt</output-file>
+ <output-file compare="Text">q02.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
<description>Execution of q03 from the weather benchmark with 2 partitions.</description>
<query name="q03" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q03.txt</output-file>
+ <output-file compare="Text">q03.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
<description>Execution of q04 from the weather benchmark with 2 partitions.</description>
<query name="q04" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q04.txt</output-file>
+ <output-file compare="Text">q04.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
<description>Execution of q05 from the weather benchmark with 2 partitions.</description>
<query name="q05" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q05.txt</output-file>
+ <output-file compare="Text">q05.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
<description>Execution of q06 from the weather benchmark with 2 partitions.</description>
<query name="q06" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q06.txt</output-file>
+ <output-file compare="Text">q06.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" Creator="Preston Carman">
<description>Execution of q07 from the weather benchmark with 2 partitions.</description>
<query name="q07" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q07.txt</output-file>
+ <output-file compare="Text">q07.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
index 232a7b0..fcbf3d5 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
@@ -3,52 +3,44 @@
<title>GHCND Partition 4</title>
<description/>
</GroupInfo>
- <test-case is-XPath2="true" name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
<description>Execution of q00 from the weather benchmark with 4 partitions.</description>
<query name="q00" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q00.txt</output-file>
+ <output-file compare="Text">q00.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
<description>Execution of q01 from the weather benchmark with 4 partitions.</description>
<query name="q01" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q01.txt</output-file>
+ <output-file compare="Text">q01.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
<description>Execution of q02 from the weather benchmark with 4 partitions.</description>
<query name="q02" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q02.txt</output-file>
+ <output-file compare="Text">q02.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
<description>Execution of q03 from the weather benchmark with 4 partitions.</description>
<query name="q03" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q03.txt</output-file>
+ <output-file compare="Text">q03.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
<description>Execution of q04 from the weather benchmark with 4 partitions.</description>
<query name="q04" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q04.txt</output-file>
+ <output-file compare="Text">q04.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
<description>Execution of q05 from the weather benchmark with 4 partitions.</description>
<query name="q05" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q05.txt</output-file>
+ <output-file compare="Text">q05.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
<description>Execution of q06 from the weather benchmark with 4 partitions.</description>
<query name="q06" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q06.txt</output-file>
+ <output-file compare="Text">q06.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" Creator="Preston Carman">
<description>Execution of q07 from the weather benchmark with 4 partitions.</description>
<query name="q07" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q07.txt</output-file>
+ <output-file compare="Text">q07.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
index 0c22422..31f6a13 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
@@ -3,28 +3,24 @@
<title>GHCND Records Partition 1</title>
<description/>
</GroupInfo>
- <test-case is-XPath2="true" name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
<query name="q02_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q02_records.txt</output-file>
+ <output-file compare="Text">q02_records.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
<query name="q03_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q03_records.txt</output-file>
+ <output-file compare="Text">q03_records.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
<query name="q05_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q05_records.txt</output-file>
+ <output-file compare="Text">q05_records.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
<query name="q07_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q07_records.txt</output-file>
+ <output-file compare="Text">q07_records.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
index 929ff28..41b1966 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
@@ -3,28 +3,24 @@
<title>GHCND Records Partition 2</title>
<description/>
</GroupInfo>
- <test-case is-XPath2="true" name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
<query name="q02_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q02_records.txt</output-file>
+ <output-file compare="Text">q02_records.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
<query name="q03_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q03_records.txt</output-file>
+ <output-file compare="Text">q03_records.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
<query name="q05_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q05_records.txt</output-file>
+ <output-file compare="Text">q05_records.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" Creator="Preston Carman">
<description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
<query name="q07_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q07_records.txt</output-file>
+ <output-file compare="Text">q07_records.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
index 03eea78..f1b99ed 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
@@ -3,28 +3,24 @@
<title>GHCND Records Partition 4</title>
<description/>
</GroupInfo>
- <test-case is-XPath2="true" name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
<query name="q02_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q02_records.txt</output-file>
+ <output-file compare="Text">q02_records.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
<query name="q03_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q03_records.txt</output-file>
+ <output-file compare="Text">q03_records.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
<query name="q05_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q05_records.txt</output-file>
+ <output-file compare="Text">q05_records.txt</output-file>
</test-case>
- <test-case is-XPath2="true" name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
+ <test-case name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" Creator="Preston Carman">
<description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
<query name="q07_records" date="2014-04-01"/>
- <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
- <output-file role="principal" compare="Text">q07_records.txt</output-file>
+ <output-file compare="Text">q07_records.txt</output-file>
</test-case>
</test-group>
\ No newline at end of file
[3/4] git commit: Added command line option for available processors.
Posted by pr...@apache.org.
Added command line option for available processors.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/17e4f71a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/17e4f71a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/17e4f71a
Branch: refs/heads/prestonc/hash_join
Commit: 17e4f71a6b873249f50a4eca891310ea675e7d9f
Parents: 0febd9c
Author: Preston Carman <pr...@apache.org>
Authored: Thu Apr 3 15:38:51 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Apr 3 15:38:51 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/vxquery/cli/VXQuery.java | 5 ++++-
.../vxquery/metadata/VXQueryMetadataProvider.java | 4 +---
.../vxquery/xmlquery/query/XMLQueryCompiler.java | 18 ++++++++++++------
3 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/17e4f71a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index 13853f7..f882899 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -390,7 +390,7 @@ public class VXQuery {
}
/**
- * Shuts down the virtual cluster, alongwith all nodes and node execution, network and queue managers.
+ * Shuts down the virtual cluster, along with all nodes and node execution, network and queue managers.
*
* @throws Exception
*/
@@ -417,6 +417,9 @@ public class VXQuery {
* Helper class with fields and methods to handle all command line options
*/
private static class CmdLineOptions {
+ @Option(name = "-available-processors", usage = "Number of available processors. (default java's available processors)")
+ public int availableProcessors = -1;
+
@Option(name = "-client-net-ip-address", usage = "IP Address of the ClusterController")
public String clientNetIpAddress = null;
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/17e4f71a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
index 678b74a..40a02ae 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java
@@ -22,8 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.xml.namespace.QName;
-
import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -98,7 +96,7 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String
return getClusterLocations(nodeList, availableProcessors);
}
- private static AlgebricksPartitionConstraint getClusterLocations(String[] nodeList, int partitions) {
+ public static AlgebricksPartitionConstraint getClusterLocations(String[] nodeList, int partitions) {
ArrayList<String> locs = new ArrayList<String>();
for (String node : nodeList) {
for (int j = 0; j < partitions; j++) {
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/17e4f71a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index 0c8ff90..91c7764 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -39,10 +39,7 @@ import org.apache.vxquery.types.Quantifier;
import org.apache.vxquery.types.SequenceType;
import org.apache.vxquery.xmlquery.ast.ModuleNode;
import org.apache.vxquery.xmlquery.translator.XMLQueryTranslator;
-import org.omg.SendingContext.RunTime;
-import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
-import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
import edu.uci.ics.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder;
@@ -92,6 +89,11 @@ public class XMLQueryCompiler {
private String[] nodeList;
public XMLQueryCompiler(XQueryCompilationListener listener, String[] nodeList, int frameSize) {
+ this(listener, nodeList, frameSize, -1);
+ }
+
+ public XMLQueryCompiler(XQueryCompilationListener listener, String[] nodeList, int frameSize,
+ int availableProcessors) {
this.listener = listener == null ? NoopXQueryCompilationListener.INSTANCE : listener;
this.frameSize = frameSize;
this.nodeList = nodeList;
@@ -148,7 +150,11 @@ public class XMLQueryCompiler {
}
});
builder.setNullWriterFactory(new VXQueryNullWriterFactory());
- builder.setClusterLocations(VXQueryMetadataProvider.getClusterLocations(nodeList));
+ if (availableProcessors < 1) {
+ builder.setClusterLocations(VXQueryMetadataProvider.getClusterLocations(nodeList));
+ } else {
+ builder.setClusterLocations(VXQueryMetadataProvider.getClusterLocations(nodeList, availableProcessors));
+ }
cFactory = builder.create();
}
@@ -157,8 +163,8 @@ public class XMLQueryCompiler {
moduleNode = XMLQueryParser.parse(name, query);
listener.notifyParseResult(moduleNode);
module = new XMLQueryTranslator(ccb).translateModule(moduleNode);
- pprinter = new LogicalOperatorPrettyPrintVisitor(new VXQueryLogicalExpressionPrettyPrintVisitor(module
- .getModuleContext()));
+ pprinter = new LogicalOperatorPrettyPrintVisitor(new VXQueryLogicalExpressionPrettyPrintVisitor(
+ module.getModuleContext()));
VXQueryMetadataProvider mdProvider = new VXQueryMetadataProvider(nodeList, ccb.getSourceFileMap());
compiler = cFactory.createCompiler(module.getBody(), mdProvider, 0);
listener.notifyTranslationResult(module);