Merge remote-tracking branch 'upstream/master' into hdfs2_read
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/c1f1ec47 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/c1f1ec47 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/c1f1ec47 Branch: refs/heads/steven/hdfs Commit: c1f1ec47b7ee21766db5e8d064aebb5b23bcc595 Parents: 63c910e ef31a81 Author: efikalti <[email protected]> Authored: Tue Sep 22 19:36:57 2015 +0300 Committer: efikalti <[email protected]> Committed: Tue Sep 22 19:36:57 2015 +0300 ---------------------------------------------------------------------- src/site/apt/development_xmark_status.apt | 76 ++++++++++++++++++++ src/site/site.xml | 27 +++---- .../java/org/apache/vxquery/cli/VXQuery.java | 17 ++++- .../rules/PushChildIntoDataScanRule.java | 49 +++++++------ .../metadata/VXQueryMetadataProvider.java | 14 +++- .../xmlquery/query/XMLQueryCompiler.java | 3 +- .../ExpectedTestResults/Simple/fn_doc.txt | 2 +- .../ExpectedTestResults/XMark/Modified/q13.txt | 34 ++++----- .../ExpectedTestResults/XMark/Modified/q14.txt | 5 +- .../ExpectedTestResults/XMark/Original/q13.txt | 34 ++++----- .../ExpectedTestResults/XMark/Original/q14.txt | 5 +- .../XMark/Original/simple_query1.txt | 1 - .../XMark/Original/simple_query2.txt | 4 -- 13 files changed, 170 insertions(+), 101 deletions(-) ----------------------------------------------------------------------
