Updated testing suite for recent changes to masters. * changed result for empty tags * added alternate results * fixed the available processors command line option
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/215d9e10 Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/215d9e10 Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/215d9e10 Branch: refs/heads/vxquery_0_3_staging Commit: 215d9e1027a11946272e6517c13fff7e7d3874ab Parents: 6512b00 Author: Preston Carman <[email protected]> Authored: Mon Apr 7 09:45:23 2014 -0700 Committer: Preston Carman <[email protected]> Committed: Mon Apr 7 09:45:23 2014 -0700 ---------------------------------------------------------------------- vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java | 2 +- .../resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt | 4 ++-- .../resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt | 2 +- .../resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt | 6 +++--- .../resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt | 4 ++-- .../resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt | 2 +- .../resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt | 6 +++--- .../resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt | 4 ++-- .../resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt | 2 +- .../resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt | 6 +++--- .../GhcndRecords/Partition-1/q07_records-1.txt | 3 +++ .../GhcndRecords/Partition-1/q07_records-2.txt | 3 +++ .../GhcndRecords/Partition-1/q07_records-3.txt | 3 +++ .../GhcndRecords/Partition-1/q07_records-4.txt | 3 +++ .../GhcndRecords/Partition-1/q07_records-5.txt | 3 +++ .../GhcndRecords/Partition-2/q07_records-1.txt | 3 +++ .../GhcndRecords/Partition-2/q07_records-2.txt | 3 +++ .../GhcndRecords/Partition-2/q07_records-3.txt | 3 +++ .../GhcndRecords/Partition-2/q07_records-4.txt | 3 +++ .../GhcndRecords/Partition-2/q07_records-5.txt | 3 +++ .../GhcndRecords/Partition-4/q07_records-1.txt | 3 +++ .../GhcndRecords/Partition-4/q07_records-2.txt | 3 +++ .../GhcndRecords/Partition-4/q07_records-3.txt | 3 +++ .../GhcndRecords/Partition-4/q07_records-4.txt | 3 +++ .../GhcndRecords/Partition-4/q07_records-5.txt | 3 +++ .../src/test/resources/cat/GhcndRecordsPartition1Queries.xml | 5 +++++ .../src/test/resources/cat/GhcndRecordsPartition2Queries.xml | 5 +++++ .../src/test/resources/cat/GhcndRecordsPartition4Queries.xml | 5 +++++ 28 files changed, 79 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java ---------------------------------------------------------------------- diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java index f882899..ec3ed68 100644 --- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java +++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java @@ -253,7 +253,7 @@ public class VXQuery { }; start = opts.timing ? new Date() : null; - XMLQueryCompiler compiler = new XMLQueryCompiler(listener, getNodeList(), opts.frameSize); + XMLQueryCompiler compiler = new XMLQueryCompiler(listener, getNodeList(), opts.frameSize, opts.availableProcessors); resultSetId = createResultSetId(); CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl(RootStaticContextImpl.INSTANCE), resultSetId, null); http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt index e6116d0..28001eb 100644 --- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q00.txt @@ -1,2 +1,2 @@ -<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> -<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> \ No newline at end of file +<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> +<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt index ff4bc9b..82de09d 100644 --- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q01.txt @@ -1 +1 @@ -<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> \ No newline at end of file +<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt index c5b9925..e6134af 100644 --- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-1/q04.txt @@ -1,3 +1,3 @@ -<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> -<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> -<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> \ No newline at end of file +<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> +<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> +<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt index e6116d0..28001eb 100644 --- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q00.txt @@ -1,2 +1,2 @@ -<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> -<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> \ No newline at end of file +<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> +<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt index ff4bc9b..82de09d 100644 --- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q01.txt @@ -1 +1 @@ -<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> \ No newline at end of file +<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt index c5b9925..e6134af 100644 --- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-2/q04.txt @@ -1,3 +1,3 @@ -<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> -<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> -<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> \ No newline at end of file +<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> +<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> +<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt index e6116d0..28001eb 100644 --- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q00.txt @@ -1,2 +1,2 @@ -<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> -<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> \ No newline at end of file +<data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> +<data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt index ff4bc9b..82de09d 100644 --- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q01.txt @@ -1 +1 @@ -<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> \ No newline at end of file +<data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt index c5b9925..e6134af 100644 --- a/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Ghcnd/Partition-4/q04.txt @@ -1,3 +1,3 @@ -<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> -<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> -<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data> \ No newline at end of file +<data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> +<data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> +<data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute/><attribute/><attribute>a</attribute><attribute/></attributes></data> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-1.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-1.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-1.txt new file mode 100644 index 0000000..f72ff5e --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-1.txt @@ -0,0 +1,3 @@ +19.75 +19.25 +19.5 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-2.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-2.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-2.txt new file mode 100644 index 0000000..b95a51e --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-2.txt @@ -0,0 +1,3 @@ +19.5 +19.75 +19.25 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-3.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-3.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-3.txt new file mode 100644 index 0000000..e5e2462 --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-3.txt @@ -0,0 +1,3 @@ +19.5 +19.25 +19.75 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-4.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-4.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-4.txt new file mode 100644 index 0000000..5225394 --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-4.txt @@ -0,0 +1,3 @@ +19.25 +19.75 +19.5 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-5.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-5.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-5.txt new file mode 100644 index 0000000..c1727b5 --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q07_records-5.txt @@ -0,0 +1,3 @@ +19.25 +19.5 +19.75 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-1.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-1.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-1.txt new file mode 100644 index 0000000..f72ff5e --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-1.txt @@ -0,0 +1,3 @@ +19.75 +19.25 +19.5 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-2.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-2.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-2.txt new file mode 100644 index 0000000..b95a51e --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-2.txt @@ -0,0 +1,3 @@ +19.5 +19.75 +19.25 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-3.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-3.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-3.txt new file mode 100644 index 0000000..e5e2462 --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-3.txt @@ -0,0 +1,3 @@ +19.5 +19.25 +19.75 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-4.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-4.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-4.txt new file mode 100644 index 0000000..5225394 --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-4.txt @@ -0,0 +1,3 @@ +19.25 +19.75 +19.5 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-5.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-5.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-5.txt new file mode 100644 index 0000000..c1727b5 --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-2/q07_records-5.txt @@ -0,0 +1,3 @@ +19.25 +19.5 +19.75 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-1.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-1.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-1.txt new file mode 100644 index 0000000..f72ff5e --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-1.txt @@ -0,0 +1,3 @@ +19.75 +19.25 +19.5 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-2.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-2.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-2.txt new file mode 100644 index 0000000..b95a51e --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-2.txt @@ -0,0 +1,3 @@ +19.5 +19.75 +19.25 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-3.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-3.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-3.txt new file mode 100644 index 0000000..e5e2462 --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-3.txt @@ -0,0 +1,3 @@ +19.5 +19.25 +19.75 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-4.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-4.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-4.txt new file mode 100644 index 0000000..5225394 --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-4.txt @@ -0,0 +1,3 @@ +19.25 +19.75 +19.5 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-5.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-5.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-5.txt new file mode 100644 index 0000000..c1727b5 --- /dev/null +++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-4/q07_records-5.txt @@ -0,0 +1,3 @@ +19.25 +19.5 +19.75 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml index 31f6a13..2a77991 100644 --- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml +++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml @@ -22,5 +22,10 @@ <description>Count records returned for q07 from the weather benchmark with 1 partition.</description> <query name="q07_records" date="2014-04-01"/> <output-file compare="Text">q07_records.txt</output-file> + <output-file compare="Text">q07_records-1.txt</output-file> + <output-file compare="Text">q07_records-2.txt</output-file> + <output-file compare="Text">q07_records-3.txt</output-file> + <output-file compare="Text">q07_records-4.txt</output-file> + <output-file compare="Text">q07_records-5.txt</output-file> </test-case> </test-group> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml index 41b1966..e3a53cf 100644 --- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml +++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml @@ -22,5 +22,10 @@ <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description> <query name="q07_records" date="2014-04-01"/> <output-file compare="Text">q07_records.txt</output-file> + <output-file compare="Text">q07_records-1.txt</output-file> + <output-file compare="Text">q07_records-2.txt</output-file> + <output-file compare="Text">q07_records-3.txt</output-file> + <output-file compare="Text">q07_records-4.txt</output-file> + <output-file compare="Text">q07_records-5.txt</output-file> </test-case> </test-group> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/215d9e10/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml index f1b99ed..f2707f3 100644 --- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml +++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml @@ -22,5 +22,10 @@ <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description> <query name="q07_records" date="2014-04-01"/> <output-file compare="Text">q07_records.txt</output-file> + <output-file compare="Text">q07_records-1.txt</output-file> + <output-file compare="Text">q07_records-2.txt</output-file> + <output-file compare="Text">q07_records-3.txt</output-file> + <output-file compare="Text">q07_records-4.txt</output-file> + <output-file compare="Text">q07_records-5.txt</output-file> </test-case> </test-group> \ No newline at end of file
