merge
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/eacae134 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/eacae134 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/eacae134 Branch: refs/heads/master Commit: eacae134492b11a67a3de5aa0d4543cfd7d25831 Parents: 086542e d7fcc0e Author: Shivani Mall <[email protected]> Authored: Wed Jun 3 14:51:15 2015 -0700 Committer: Shivani Mall <[email protected]> Committed: Wed Jun 3 14:51:15 2015 -0700 ---------------------------------------------------------------------- NOTICE | 2 +- pom.xml | 7 +- src/site/apt/developer_get_started.apt | 41 + src/site/apt/development_eclipse_setup.apt | 4 + src/site/apt/development_release.apt | 217 + src/site/apt/release.apt | 187 - src/site/apt/user_get_started.apt | 35 + src/site/apt/user_running_tests.apt | 22 +- src/site/site.xml | 14 +- vxquery-benchmark/pom.xml | 7 +- .../other_systems/saxon/count_sensor.xq | 17 + .../other_systems/saxon/count_station.xq | 17 + .../noaa-ghcn-daily/other_systems/saxon/q00.xq | 17 + .../noaa-ghcn-daily/other_systems/saxon/q01.xq | 17 + .../noaa-ghcn-daily/other_systems/saxon/q02.xq | 17 + .../noaa-ghcn-daily/other_systems/saxon/q03.xq | 17 + .../other_systems/saxon/q04_count_sensor.xq | 17 + .../other_systems/saxon/q04_count_station.xq | 17 + .../other_systems/saxon/q05_count_sensor.xq | 17 + .../other_systems/saxon/q05_count_station.xq | 17 + .../other_systems/saxon/q06_count_sensor.xq | 17 + .../other_systems/saxon/q06_count_station.xq | 17 + .../noaa-ghcn-daily/other_systems/saxon/q07.xq | 17 + .../other_systems/saxon/q07_count_tmax.xq | 17 + .../other_systems/saxon/q07_count_tmin.xq | 17 + .../scripts/benchmark_logging.properties | 44 +- vxquery-cli/pom.xml | 9 +- vxquery-core/pom.xml | 47 +- .../functions/cast/CastToDecimalOperation.java | 43 +- .../functions/cast/CastToDoubleOperation.java | 171 +- .../functions/cast/CastToStringOperation.java | 1 + .../functions/numeric/FnCeilingOperation.java | 6 +- .../functions/numeric/FnFloorOperation.java | 6 +- ...FnRoundHalfToEvenScalarEvaluatorFactory.java | 25 +- .../functions/numeric/FnRoundOperation.java | 2 +- vxquery-server/pom.xml | 9 +- vxquery-xtest/pom.xml | 9 +- .../vxquery/xtest/AbstractTestCaseFactory.java | 12 +- .../org/apache/vxquery/xtest/TestRunner.java | 19 +- .../org/apache/vxquery/xtest/XTestOptions.java | 3 + .../GhcndRecords/Partition-1/q03_records-1.txt | 3 + .../GhcndRecords/Partition-1/q03_records-2.txt | 3 + .../GhcndRecords/Partition-1/q03_records-3.txt | 3 + .../GhcndRecords/Partition-1/q03_records-4.txt | 3 + .../GhcndRecords/Partition-1/q03_records-5.txt | 3 + .../ExpectedTestResults/Numerics/fn_floor.txt | 8 + .../Numerics/fn_round-half-to-even.txt | 16 + .../ExpectedTestResults/Numerics/fn_round.txt | 8 + .../ExpectedTestResults/XMark/Modified/q01.txt | 1 + .../ExpectedTestResults/XMark/Modified/q02.txt | 25 + .../ExpectedTestResults/XMark/Modified/q03.txt | 8 + .../ExpectedTestResults/XMark/Modified/q04.txt | 1 + .../ExpectedTestResults/XMark/Modified/q05.txt | 1 + .../ExpectedTestResults/XMark/Modified/q06.txt | 1 + .../ExpectedTestResults/XMark/Modified/q07.txt | 1 + .../ExpectedTestResults/XMark/Modified/q08.txt | 53 + .../ExpectedTestResults/XMark/Modified/q09.txt | 83 + .../ExpectedTestResults/XMark/Modified/q10.txt | 440 ++ .../ExpectedTestResults/XMark/Modified/q11.txt | 53 + .../ExpectedTestResults/XMark/Modified/q12.txt | 12 + .../ExpectedTestResults/XMark/Modified/q13.txt | 55 + .../ExpectedTestResults/XMark/Modified/q14.txt | 1 + .../ExpectedTestResults/XMark/Modified/q15.txt | 3 + .../ExpectedTestResults/XMark/Modified/q16.txt | 1 + .../ExpectedTestResults/XMark/Modified/q17.txt | 27 + .../ExpectedTestResults/XMark/Modified/q18.txt | 1 + .../ExpectedTestResults/XMark/Modified/q19.txt | 44 + .../ExpectedTestResults/XMark/Modified/q20.txt | 6 + .../ExpectedTestResults/XMark/Original/q01.txt | 1 + .../ExpectedTestResults/XMark/Original/q02.txt | 25 + .../ExpectedTestResults/XMark/Original/q03.txt | 8 + .../ExpectedTestResults/XMark/Original/q04.txt | 1 + .../ExpectedTestResults/XMark/Original/q05.txt | 1 + .../ExpectedTestResults/XMark/Original/q06.txt | 1 + .../ExpectedTestResults/XMark/Original/q07.txt | 1 + .../ExpectedTestResults/XMark/Original/q08.txt | 53 + .../ExpectedTestResults/XMark/Original/q09.txt | 83 + .../ExpectedTestResults/XMark/Original/q10.txt | 440 ++ .../ExpectedTestResults/XMark/Original/q11.txt | 53 + .../ExpectedTestResults/XMark/Original/q12.txt | 12 + .../ExpectedTestResults/XMark/Original/q13.txt | 55 + .../ExpectedTestResults/XMark/Original/q14.txt | 1 + .../ExpectedTestResults/XMark/Original/q15.txt | 3 + .../ExpectedTestResults/XMark/Original/q16.txt | 1 + .../ExpectedTestResults/XMark/Original/q17.txt | 27 + .../ExpectedTestResults/XMark/Original/q18.txt | 1 + .../ExpectedTestResults/XMark/Original/q19.txt | 44 + .../ExpectedTestResults/XMark/Original/q20.txt | 6 + .../XMark/Original/simple_query1.txt | 1 + .../XMark/Original/simple_query2.txt | 4 + .../Queries/XQuery/Numerics/fn_floor.xq | 22 + .../XQuery/Numerics/fn_round-half-to-even.xq | 39 + .../Queries/XQuery/Numerics/fn_round.xq | 22 + .../Queries/XQuery/XMark/Modified/q01.xq | 23 + .../Queries/XQuery/XMark/Modified/q02.xq | 22 + .../Queries/XQuery/XMark/Modified/q03.xq | 26 + .../Queries/XQuery/XMark/Modified/q04.xq | 26 + .../Queries/XQuery/XMark/Modified/q05.xq | 25 + .../Queries/XQuery/XMark/Modified/q06.xq | 22 + .../Queries/XQuery/XMark/Modified/q07.xq | 22 + .../Queries/XQuery/XMark/Modified/q08.xq | 28 + .../Queries/XQuery/XMark/Modified/q09.xq | 33 + .../Queries/XQuery/XMark/Modified/q10.xq | 46 + .../Queries/XQuery/XMark/Modified/q11.xq | 27 + .../Queries/XQuery/XMark/Modified/q12.xq | 28 + .../Queries/XQuery/XMark/Modified/q13.xq | 22 + .../Queries/XQuery/XMark/Modified/q14.xq | 23 + .../Queries/XQuery/XMark/Modified/q15.xq | 29 + .../Queries/XQuery/XMark/Modified/q16.xq | 30 + .../Queries/XQuery/XMark/Modified/q17.xq | 23 + .../Queries/XQuery/XMark/Modified/q18.xq | 28 + .../Queries/XQuery/XMark/Modified/q19.xq | 24 + .../Queries/XQuery/XMark/Modified/q20.xq | 58 + .../Queries/XQuery/XMark/Original/q01.xq | 27 + .../Queries/XQuery/XMark/Original/q02.xq | 22 + .../Queries/XQuery/XMark/Original/q03.xq | 26 + .../Queries/XQuery/XMark/Original/q04.xq | 27 + .../Queries/XQuery/XMark/Original/q05.xq | 25 + .../Queries/XQuery/XMark/Original/q06.xq | 21 + .../Queries/XQuery/XMark/Original/q07.xq | 23 + .../Queries/XQuery/XMark/Original/q08.xq | 26 + .../Queries/XQuery/XMark/Original/q09.xq | 31 + .../Queries/XQuery/XMark/Original/q10.xq | 46 + .../Queries/XQuery/XMark/Original/q11.xq | 26 + .../Queries/XQuery/XMark/Original/q12.xq | 27 + .../Queries/XQuery/XMark/Original/q13.xq | 22 + .../Queries/XQuery/XMark/Original/q14.xq | 23 + .../Queries/XQuery/XMark/Original/q15.xq | 30 + .../Queries/XQuery/XMark/Original/q16.xq | 30 + .../Queries/XQuery/XMark/Original/q17.xq | 23 + .../Queries/XQuery/XMark/Original/q18.xq | 28 + .../Queries/XQuery/XMark/Original/q19.xq | 24 + .../Queries/XQuery/XMark/Original/q20.xq | 45 + .../XQuery/XMark/Original/simple_query1.xq | 22 + .../XQuery/XMark/Original/simple_query2.xq | 22 + .../TestSources/XMark/SingleFile/auction.xml | 5760 ++++++++++++++++++ .../SplitFiles/categories/micro_categories.xml | 56 + .../SplitFiles/catgraph/micro_catgraph.xml | 23 + .../closed_auctions/micro_closed_auctions.xml | 1192 ++++ .../open_auctions/micro_open_auctions.xml | 1944 ++++++ .../XMark/SplitFiles/people/micro_people.xml | 855 +++ .../XMark/SplitFiles/regions/micro_regions.xml | 2365 +++++++ .../resources/VXQuerySingleAlternateCatalog.xml | 3 +- .../src/test/resources/VXQuerySingleCatalog.xml | 2 +- .../src/test/resources/VXQueryXMarkCatalog.xml | 77 + .../src/test/resources/XMarkCatalog.xml | 74 + .../FunctionsAndOperatorsOnNumericsQueries.xml | 15 + .../test/resources/cat/XMarkOriginalQueries.xml | 133 + .../src/test/resources/cat/XMarkQueries.xml | 123 + 149 files changed, 16263 insertions(+), 486 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/eacae134/src/site/site.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/eacae134/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java ---------------------------------------------------------------------- diff --cc vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java index 5f04a7a,facc698..d68c09c --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/TestRunner.java @@@ -25,10 -23,8 +23,9 @@@ import java.util.EnumSet import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.io.IOUtils; import org.apache.vxquery.compiler.CompilerControlBlock; import org.apache.vxquery.compiler.algebricks.VXQueryGlobalDataFactory; - import org.apache.vxquery.compiler.algebricks.prettyprint.VXQueryLogicalExpressionPrettyPrintVisitor; import org.apache.vxquery.context.DynamicContext; import org.apache.vxquery.context.DynamicContextImpl; import org.apache.vxquery.context.RootStaticContextImpl; @@@ -36,21 -32,8 +33,9 @@@ import org.apache.vxquery.context.Stati import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; import org.apache.vxquery.result.ResultUtils; - import org.apache.vxquery.xmlquery.ast.ModuleNode; - import org.apache.vxquery.xmlquery.query.Module; +import org.apache.vxquery.xmlquery.query.VXQueryCompilationListener; import org.apache.vxquery.xmlquery.query.XMLQueryCompiler; - import org.apache.vxquery.xmlquery.query.XQueryCompilationListener; - import org.apache.vxquery.xtest.XTestOptions; - import org.json.JSONException; - import com.thoughtworks.xstream.XStream; - import com.thoughtworks.xstream.io.xml.DomDriver; - - import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; - import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor; - import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.PlanPrettyPrinter; - import edu.uci.ics.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor; import edu.uci.ics.hyracks.api.client.HyracksConnection; import edu.uci.ics.hyracks.api.client.IHyracksClientConnection; import edu.uci.ics.hyracks.api.comm.IFrameTupleAccessor; @@@ -118,21 -99,10 +101,21 @@@ public class TestRunner if (opts.verbose) { System.err.println("Starting " + testCase.getXQueryDisplayName()); } + long start = System.currentTimeMillis(); + try { try { - XMLQueryCompiler compiler = new XMLQueryCompiler(null, new String[] { "nc1" }, opts.frameSize); + FileInputStream query = new FileInputStream(testCase.getXQueryFile()); + if (opts.showQuery) { + System.err.println("***Query for " + testCase.getXQueryDisplayName() + ": "); + System.err.println(IOUtils.toString(query, "UTF-8")); + //query.reset(); + } + + VXQueryCompilationListener listener = new VXQueryCompilationListener(opts.showAST, opts.showTET, + opts.showOET, opts.showRP); - XMLQueryCompiler compiler = new XMLQueryCompiler(listener, new String[] { "nc1" }, FRAME_SIZE); ++ XMLQueryCompiler compiler = new XMLQueryCompiler(listener, new String[] { "nc1" }, opts.frameSize); Reader in = new InputStreamReader(new FileInputStream(testCase.getXQueryFile()), "UTF-8"); CompilerControlBlock ccb = new CompilerControlBlock(new StaticContextImpl( RootStaticContextImpl.INSTANCE), new ResultSetId(testCase.getXQueryDisplayName().hashCode()), http://git-wip-us.apache.org/repos/asf/vxquery/blob/eacae134/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTestOptions.java ----------------------------------------------------------------------
