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:46 UTC
[51/51] [abbrv] git commit: Merged in master
Merged in master
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/a5c8adff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/a5c8adff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/a5c8adff
Branch: refs/heads/vxquery_0_3_staging
Commit: a5c8adff4e00826ff80a5e573ef9efe120624526
Parents: ad002b5 0df78c5
Author: Vinayak Borkar <vi...@gmail.com>
Authored: Wed Apr 9 15:18:30 2014 -0700
Committer: Vinayak Borkar <vi...@gmail.com>
Committed: Wed Apr 9 15:18:30 2014 -0700
----------------------------------------------------------------------
.rat-excludes | 4 +
pom.xml | 16 +-
src/site/apt/development_eclipse_setup.apt | 25 +-
src/site/apt/development_tips.apt | 40 +-
src/site/apt/development_xml_node_details.apt | 14 +-
src/site/apt/user_query.apt | 26 +-
src/site/apt/user_running_tests.apt | 4 +-
.../resources/noaa-ghcn-daily/queries/q00.xq | 25 +-
.../resources/noaa-ghcn-daily/queries/q01.xq | 17 +
.../resources/noaa-ghcn-daily/queries/q02.xq | 20 +-
.../resources/noaa-ghcn-daily/queries/q03.xq | 17 +
.../resources/noaa-ghcn-daily/queries/q04.xq | 32 +-
.../noaa-ghcn-daily/queries/q04_sensor.xq | 27 +
.../noaa-ghcn-daily/queries/q04_station.xq | 25 +
.../resources/noaa-ghcn-daily/queries/q05.xq | 32 +-
.../noaa-ghcn-daily/queries/q05_sensor.xq | 28 +
.../noaa-ghcn-daily/queries/q05_station.xq | 25 +
.../resources/noaa-ghcn-daily/queries/q06.xq | 30 +
.../noaa-ghcn-daily/queries/q06_sensor.xq | 27 +
.../noaa-ghcn-daily/queries/q06_station.xq | 24 +
.../resources/noaa-ghcn-daily/queries/q07.xq | 33 +
.../noaa-ghcn-daily/queries/q07_tmax.xq | 26 +
.../noaa-ghcn-daily/queries/q07_tmin.xq | 26 +
.../noaa-ghcn-daily/queries/q_test_00.xq | 5 -
.../noaa-ghcn-daily/queries/q_test_01.xq | 6 -
.../noaa-ghcn-daily/queries/q_test_02.xq | 6 -
.../noaa-ghcn-daily/queries/sensor_count.xq | 24 +
.../noaa-ghcn-daily/queries/station_count.xq | 24 +
.../resources/noaa-ghcn-daily/scripts/README.md | 17 +
.../noaa-ghcn-daily/scripts/run_benchmark.sh | 32 +-
.../scripts/run_benchmark_cluster.sh | 63 ++
.../scripts/weather_benchmark.py | 298 ++++++
.../noaa-ghcn-daily/scripts/weather_cli.py | 64 +-
.../noaa-ghcn-daily/scripts/weather_config.py | 27 +-
.../scripts/weather_config_ghcnd.py | 95 ++
.../scripts/weather_config_mshr.py | 78 ++
.../scripts/weather_convert_to_xml.py | 225 ++++-
.../scripts/weather_data_files.py | 127 ++-
.../scripts/weather_dly_config.py | 96 --
.../scripts/weather_download_files.py | 35 +-
.../noaa-ghcn-daily/scripts/weather_example.xml | 17 +-
.../scripts/weather_example_cluster.xml | 56 ++
.../src/main/resources/util/README.md | 17 +
.../main/resources/util/vxquery_functions.xq | 17 +
.../main/resources/util/vxquery_operators.xq | 17 +
.../java/org/apache/vxquery/cli/VXQuery.java | 18 +-
.../vxquery/compiler/CompilerControlBlock.java | 14 +-
.../VXQueryComparatorFactoryProvider.java | 7 +-
...ueryLogicalExpressionPrettyPrintVisitor.java | 28 +-
.../compiler/rewriter/RewriteRuleset.java | 39 +-
.../rewriter/VXQueryOptimizationContext.java | 20 +-
...tractRemoveRedundantTypeExpressionsRule.java | 3 +-
.../ConvertFromAlgebricksExpressionsRule.java | 119 +++
.../ConvertToAlgebricksExpressionsRule.java | 124 +++
.../rules/InlineNestedVariablesRule.java | 97 ++
.../rewriter/rules/IntroduceCollectionRule.java | 9 +-
.../rules/IntroduceTwoStepAggregateRule.java | 58 +-
.../rules/PushFunctionsOntoEqJoinBranches.java | 122 +++
.../RemoveRedundantBooleanExpressionsRule.java | 69 ++
.../rules/SetCollectionDataSourceRule.java | 23 +-
.../rewriter/rules/util/ExpressionToolbox.java | 36 +-
.../accessors/atomic/XSDecimalPointable.java | 4 +-
.../DefaultSystemExceptionFactory.java | 30 +-
.../apache/vxquery/exceptions/ErrorCode.java | 30 +-
.../vxquery/exceptions/ErrorMessages.java | 30 +-
.../vxquery/exceptions/ErrorReporter.java | 30 +-
.../vxquery/exceptions/SystemException.java | 30 +-
.../exceptions/SystemExceptionFactory.java | 30 +-
.../exceptions/VXQueryDataException.java | 41 +
.../VXQueryFileNotFoundException.java | 29 +
.../exceptions/VXQueryParseException.java | 29 +
.../vxquery/exceptions/WarningReporter.java | 30 +-
.../vxquery/functions/builtin-operators.xml | 14 +
.../metadata/VXQueryCollectionDataSource.java | 13 +-
.../VXQueryCollectionOperatorDescriptor.java | 9 +-
.../metadata/VXQueryMetadataProvider.java | 39 +-
.../VXQueryRawBinaryHashFunctionFactory.java | 4 +-
...AbstractMaxMinAggregateEvaluatorFactory.java | 39 +-
.../AbstractMaxMinScalarEvaluatorFactory.java | 25 +-
.../AvgGlobalAggregateEvaluatorFactory.java | 117 +++
.../AvgLocalAggregateEvaluatorFactory.java | 106 ++
.../FnAvgAggregateEvaluatorFactory.java | 24 +-
.../aggregate/FnAvgScalarEvaluatorFactory.java | 2 +-
.../FnCountScalarEvaluatorFactory.java | 2 +-
.../FnSumAggregateEvaluatorFactory.java | 40 +-
.../aggregate/FnSumScalarEvaluatorFactory.java | 2 +-
.../bool/FnBooleanScalarEvaluatorFactory.java | 2 +-
.../misc/FnDataScalarEvaluatorFactory.java | 2 +-
.../ConcatenateScalarEvaluatorFactory.java | 2 +-
.../sequence/FnEmptyScalarEvaluatorFactory.java | 2 +-
.../FnExactlyOneScalarEvaluatorFactory.java | 2 +-
.../FnExistsScalarEvaluatorFactory.java | 2 +-
.../FnInsertBeforeScalarEvaluatorFactory.java | 4 +-
.../FnOneOrMoreScalarEvaluatorFactory.java | 2 +-
.../FnRemoveScalarEvaluatorFactory.java | 2 +-
.../FnReverseScalarEvaluatorFactory.java | 2 +-
.../FnSubsequenceScalarEvaluatorFactory.java | 2 +-
.../FnZeroOrOneScalarEvaluatorFactory.java | 2 +-
.../IterateUnnestingEvaluatorFactory.java | 5 +-
.../SequenceAggregateEvaluatorFactory.java | 2 +-
.../strings/FnStringJoinEvaluatorFactory.java | 2 +-
.../runtime/functions/util/FunctionHelper.java | 31 +-
...VXQueryBinaryHashFunctionFamilyProvider.java | 36 +
.../vxquery/serializer/XMLSerializer.java | 10 +-
.../org/apache/vxquery/xmlparser/XMLParser.java | 26 +-
.../xmlquery/query/XMLQueryCompiler.java | 37 +-
.../xmlquery/query/SimpleXQueryTest.java | 2 +-
.../src/main/resources/scripts/README.md | 17 +
.../main/resources/scripts/cluster_actions.py | 26 +-
.../src/main/resources/scripts/cluster_cli.py | 2 +-
.../src/main/resources/scripts/startcc.sh | 17 +
.../src/main/resources/scripts/startnc.sh | 17 +
.../src/main/resources/scripts/stopcc.sh | 17 +
.../src/main/resources/scripts/stopnc.sh | 17 +
vxquery-xtest/pom.xml | 8 +
vxquery-xtest/results/README.md | 17 +
vxquery-xtest/results/xqts.txt | 987 +++++++++++--------
.../java/org/apache/vxquery/xtest/TestCase.java | 5 +
.../apache/vxquery/xtest/TestCaseFactory.java | 24 +-
.../apache/vxquery/xtest/TestConfiguration.java | 6 +-
.../apache/vxquery/xtest/TestRunnerFactory.java | 5 +-
.../java/org/apache/vxquery/xtest/XTest.java | 2 +-
.../org/apache/vxquery/xtest/XTestOptions.java | 4 +-
.../Aggregate/Partition-1/avg.txt | 1 +
.../Aggregate/Partition-1/count.txt | 1 +
.../Aggregate/Partition-1/max.txt | 1 +
.../Aggregate/Partition-1/min.txt | 1 +
.../Aggregate/Partition-1/sum.txt | 1 +
.../Aggregate/Partition-2/avg.txt | 1 +
.../Aggregate/Partition-2/count.txt | 1 +
.../Aggregate/Partition-2/max.txt | 1 +
.../Aggregate/Partition-2/min.txt | 1 +
.../Aggregate/Partition-2/sum.txt | 1 +
.../Aggregate/Partition-4/avg.txt | 1 +
.../Aggregate/Partition-4/count.txt | 1 +
.../Aggregate/Partition-4/max.txt | 1 +
.../Aggregate/Partition-4/min.txt | 1 +
.../Aggregate/Partition-4/sum.txt | 1 +
.../Ghcnd/Partition-1/q00.txt | 2 +
.../Ghcnd/Partition-1/q01.txt | 1 +
.../Ghcnd/Partition-1/q02.txt | 1 +
.../Ghcnd/Partition-1/q03.txt | 1 +
.../Ghcnd/Partition-1/q04.txt | 3 +
.../Ghcnd/Partition-1/q05.txt | 1 +
.../Ghcnd/Partition-1/q06.txt | 3 +
.../Ghcnd/Partition-1/q07.txt | 1 +
.../Ghcnd/Partition-2/q00.txt | 2 +
.../Ghcnd/Partition-2/q01.txt | 1 +
.../Ghcnd/Partition-2/q02.txt | 1 +
.../Ghcnd/Partition-2/q03.txt | 1 +
.../Ghcnd/Partition-2/q04.txt | 3 +
.../Ghcnd/Partition-2/q05.txt | 1 +
.../Ghcnd/Partition-2/q06.txt | 3 +
.../Ghcnd/Partition-2/q07.txt | 1 +
.../Ghcnd/Partition-4/q00.txt | 2 +
.../Ghcnd/Partition-4/q01.txt | 1 +
.../Ghcnd/Partition-4/q02.txt | 1 +
.../Ghcnd/Partition-4/q03.txt | 1 +
.../Ghcnd/Partition-4/q04.txt | 3 +
.../Ghcnd/Partition-4/q05.txt | 1 +
.../Ghcnd/Partition-4/q06.txt | 3 +
.../Ghcnd/Partition-4/q07.txt | 1 +
.../GhcndCount/Partition-1/q02_count.txt | 1 +
.../GhcndCount/Partition-1/q03_count.txt | 1 +
.../GhcndCount/Partition-1/q05_count.txt | 1 +
.../GhcndCount/Partition-1/q07_count.txt | 1 +
.../GhcndCount/Partition-2/q02_count.txt | 1 +
.../GhcndCount/Partition-2/q03_count.txt | 1 +
.../GhcndCount/Partition-2/q05_count.txt | 1 +
.../GhcndCount/Partition-2/q07_count.txt | 1 +
.../GhcndCount/Partition-4/q02_count.txt | 1 +
.../GhcndCount/Partition-4/q03_count.txt | 1 +
.../GhcndCount/Partition-4/q05_count.txt | 1 +
.../GhcndCount/Partition-4/q07_count.txt | 1 +
.../GhcndRecords/Partition-1/q02_records.txt | 1 +
.../GhcndRecords/Partition-1/q03_records.txt | 3 +
.../GhcndRecords/Partition-1/q05_records.txt | 1 +
.../GhcndRecords/Partition-1/q07_records-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-1/q07_records.txt | 3 +
.../GhcndRecords/Partition-2/q02_records.txt | 1 +
.../GhcndRecords/Partition-2/q03_records.txt | 3 +
.../GhcndRecords/Partition-2/q05_records.txt | 1 +
.../GhcndRecords/Partition-2/q07_records-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-2/q07_records.txt | 3 +
.../GhcndRecords/Partition-4/q02_records.txt | 1 +
.../GhcndRecords/Partition-4/q03_records.txt | 3 +
.../GhcndRecords/Partition-4/q05_records.txt | 1 +
.../GhcndRecords/Partition-4/q07_records-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 +
.../GhcndRecords/Partition-4/q07_records.txt | 3 +
.../Queries/XQuery/Aggregate/Partition-1/avg.xq | 25 +
.../XQuery/Aggregate/Partition-1/count.xq | 25 +
.../Queries/XQuery/Aggregate/Partition-1/max.xq | 25 +
.../Queries/XQuery/Aggregate/Partition-1/min.xq | 25 +
.../Queries/XQuery/Aggregate/Partition-1/sum.xq | 25 +
.../Queries/XQuery/Aggregate/Partition-2/avg.xq | 25 +
.../XQuery/Aggregate/Partition-2/count.xq | 25 +
.../Queries/XQuery/Aggregate/Partition-2/max.xq | 25 +
.../Queries/XQuery/Aggregate/Partition-2/min.xq | 25 +
.../Queries/XQuery/Aggregate/Partition-2/sum.xq | 25 +
.../Queries/XQuery/Aggregate/Partition-4/avg.xq | 25 +
.../XQuery/Aggregate/Partition-4/count.xq | 25 +
.../Queries/XQuery/Aggregate/Partition-4/max.xq | 25 +
.../Queries/XQuery/Aggregate/Partition-4/min.xq | 25 +
.../Queries/XQuery/Aggregate/Partition-4/sum.xq | 25 +
.../Queries/XQuery/Ghcnd/Partition-1/q00.xq | 28 +
.../Queries/XQuery/Ghcnd/Partition-1/q01.xq | 25 +
.../Queries/XQuery/Ghcnd/Partition-1/q02.xq | 28 +
.../Queries/XQuery/Ghcnd/Partition-1/q03.xq | 25 +
.../Queries/XQuery/Ghcnd/Partition-1/q04.xq | 30 +
.../XQuery/Ghcnd/Partition-1/q04_sensors.xq | 25 +
.../XQuery/Ghcnd/Partition-1/q04_stations.xq | 25 +
.../Queries/XQuery/Ghcnd/Partition-1/q05.xq | 33 +
.../Queries/XQuery/Ghcnd/Partition-1/q06.xq | 30 +
.../Queries/XQuery/Ghcnd/Partition-1/q07.xq | 33 +
.../Queries/XQuery/Ghcnd/Partition-2/q00.xq | 28 +
.../Queries/XQuery/Ghcnd/Partition-2/q01.xq | 25 +
.../Queries/XQuery/Ghcnd/Partition-2/q02.xq | 28 +
.../Queries/XQuery/Ghcnd/Partition-2/q03.xq | 25 +
.../Queries/XQuery/Ghcnd/Partition-2/q04.xq | 30 +
.../Queries/XQuery/Ghcnd/Partition-2/q05.xq | 33 +
.../Queries/XQuery/Ghcnd/Partition-2/q06.xq | 30 +
.../Queries/XQuery/Ghcnd/Partition-2/q07.xq | 33 +
.../Queries/XQuery/Ghcnd/Partition-4/q00.xq | 28 +
.../Queries/XQuery/Ghcnd/Partition-4/q01.xq | 25 +
.../Queries/XQuery/Ghcnd/Partition-4/q02.xq | 28 +
.../Queries/XQuery/Ghcnd/Partition-4/q03.xq | 25 +
.../Queries/XQuery/Ghcnd/Partition-4/q04.xq | 30 +
.../Queries/XQuery/Ghcnd/Partition-4/q05.xq | 33 +
.../Queries/XQuery/Ghcnd/Partition-4/q06.xq | 30 +
.../Queries/XQuery/Ghcnd/Partition-4/q07.xq | 33 +
.../XQuery/GhcndCount/Partition-1/q02_count.xq | 28 +
.../XQuery/GhcndCount/Partition-1/q03_count.xq | 25 +
.../XQuery/GhcndCount/Partition-1/q05_count.xq | 33 +
.../XQuery/GhcndCount/Partition-1/q07_count.xq | 33 +
.../XQuery/GhcndCount/Partition-2/q02_count.xq | 28 +
.../XQuery/GhcndCount/Partition-2/q03_count.xq | 25 +
.../XQuery/GhcndCount/Partition-2/q05_count.xq | 33 +
.../XQuery/GhcndCount/Partition-2/q07_count.xq | 33 +
.../XQuery/GhcndCount/Partition-4/q02_count.xq | 28 +
.../XQuery/GhcndCount/Partition-4/q03_count.xq | 25 +
.../XQuery/GhcndCount/Partition-4/q05_count.xq | 33 +
.../XQuery/GhcndCount/Partition-4/q07_count.xq | 33 +
.../GhcndRecords/Partition-1/q02_records.xq | 26 +
.../GhcndRecords/Partition-1/q03_records.xq | 23 +
.../GhcndRecords/Partition-1/q05_records.xq | 31 +
.../GhcndRecords/Partition-1/q07_records.xq | 31 +
.../GhcndRecords/Partition-2/q02_records.xq | 26 +
.../GhcndRecords/Partition-2/q03_records.xq | 23 +
.../GhcndRecords/Partition-2/q05_records.xq | 31 +
.../GhcndRecords/Partition-2/q07_records.xq | 31 +
.../GhcndRecords/Partition-4/q02_records.xq | 26 +
.../GhcndRecords/Partition-4/q03_records.xq | 23 +
.../GhcndRecords/Partition-4/q05_records.xq | 31 +
.../GhcndRecords/Partition-4/q07_records.xq | 31 +
.../quarter_1/sensors/US000000001_200101_0.xml | 18 +
.../half_1/quarter_1/stations/US000000001.xml | 18 +
.../quarter_2/sensors/US000000002_200202_0.xml | 18 +
.../half_1/quarter_2/stations/US000000004.xml | 18 +
.../quarter_3/sensors/AS000000003_200303_0.xml | 18 +
.../half_2/quarter_3/stations/US000000002.xml | 18 +
.../quarter_4/sensors/US000000004_200404_0.xml | 18 +
.../half_2/quarter_4/stations/AS000000003.xml | 18 +
.../src/test/resources/VXQueryCatalog.xml | 141 +++
.../cat/AggregatePartition1Queries.xml | 48 +
.../cat/AggregatePartition2Queries.xml | 48 +
.../cat/AggregatePartition4Queries.xml | 48 +
.../cat/GhcndCountPartition1Queries.xml | 43 +
.../cat/GhcndCountPartition2Queries.xml | 43 +
.../cat/GhcndCountPartition4Queries.xml | 43 +
.../resources/cat/GhcndPartition1Queries.xml | 63 ++
.../resources/cat/GhcndPartition2Queries.xml | 63 ++
.../resources/cat/GhcndPartition4Queries.xml | 63 ++
.../cat/GhcndRecordsPartition1Queries.xml | 48 +
.../cat/GhcndRecordsPartition2Queries.xml | 48 +
.../cat/GhcndRecordsPartition4Queries.xml | 48 +
287 files changed, 6535 insertions(+), 1074 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/a5c8adff/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0597245,6f711ec..1c0ac97
--- a/pom.xml
+++ b/pom.xml
@@@ -45,11 -45,11 +45,11 @@@
<comments>A business-friendly OSS license</comments>
</license>
</licenses>
-
+
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery/branches/vxquery_0_2_staging</developerConnection>
- <url>https://svn.apache.org/repos/asf/incubator/vxquery</url>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</developerConnection>
+ <url>https://git-wip-us.apache.org/repos/asf/incubator-vxquery.git</url>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/a5c8adff/vxquery-xtest/pom.xml
----------------------------------------------------------------------