Merge branch 'christina/squash_parser'
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/2f54a03c Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/2f54a03c Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/2f54a03c Branch: refs/heads/master Commit: 2f54a03ca2d328deb96476dd3985af263492537e Parents: 3d14785 9f3515e Author: Preston Carman <[email protected]> Authored: Thu Jul 7 12:14:17 2016 -0700 Committer: Preston Carman <[email protected]> Committed: Thu Jul 7 12:14:17 2016 -0700 ---------------------------------------------------------------------- pom.xml | 2 + .../rules/ReplaceSourceMapInDocExpression.java | 8 + .../vxquery/functions/builtin-functions.xml | 14 ++ .../apache/vxquery/jsonparser/JSONParser.java | 198 +++++++++++++++++++ .../functions/index/IndexConstructorUtil.java | 3 +- .../json/JnDocScalarEvaluatorFactory.java | 77 ++++++++ .../json/JnMembersScalarEvaluator.java | 101 ++++++++++ .../json/JnMembersScalarEvaluatorFactory.java | 39 ++++ .../FnDocAvailableScalarEvaluatorFactory.java | 3 +- .../node/FnDocScalarEvaluatorFactory.java | 3 +- .../runtime/functions/util/FunctionHelper.java | 11 +- .../org/apache/vxquery/xmlparser/IParser.java | 29 +++ .../org/apache/vxquery/xmlparser/XMLParser.java | 14 +- .../Json/Functions/jn_members1.txt | 7 + .../Json/Functions/jn_members2.txt | 2 + .../Json/Functions/jn_members3.txt | 1 + .../Json/Parser/q01_parser.txt | 1 + .../Json/Parser/q02_parser.txt | 1 + .../Json/Parser/q03_parser.txt | 1 + .../Json/Parser/q04_parser.txt | 1 + .../Json/Parser/q05_parser.txt | 1 + .../Json/Parser/q06_parser.txt | 1 + .../Json/Parser/q07_parser.txt | 1 + .../Json/Parser/q08_parser.txt | 1 + .../Json/Parser/q09_parser.txt | 1 + .../XQuery/Json/Functions/jn_members1.xq | 22 +++ .../XQuery/Json/Functions/jn_members2.xq | 22 +++ .../XQuery/Json/Functions/jn_members3.xq | 22 +++ .../Queries/XQuery/Json/Parser/q01_parser.xq | 20 ++ .../Queries/XQuery/Json/Parser/q02_parser.xq | 20 ++ .../Queries/XQuery/Json/Parser/q03_parser.xq | 20 ++ .../Queries/XQuery/Json/Parser/q04_parser.xq | 20 ++ .../Queries/XQuery/Json/Parser/q05_parser.xq | 20 ++ .../Queries/XQuery/Json/Parser/q06_parser.xq | 20 ++ .../Queries/XQuery/Json/Parser/q07_parser.xq | 20 ++ .../Queries/XQuery/Json/Parser/q08_parser.xq | 20 ++ .../Queries/XQuery/Json/Parser/q09_parser.xq | 20 ++ .../resources/TestSources/json/array/array.json | 1 + .../TestSources/json/array/nested_array.json | 1 + .../json/array/nested_array_object.json | 1 + .../TestSources/json/atomic_double.json | 1 + .../resources/TestSources/json/atomic_int.json | 1 + .../TestSources/json/atomic_string.json | 1 + .../TestSources/json/object/nested_object.json | 1 + .../json/object/nested_object_array.json | 1 + .../TestSources/json/object/object.json | 1 + .../src/test/resources/VXQueryCatalog.xml | 38 ++++ .../test/resources/cat/FunctionsInJSONiq.xml | 15 ++ .../test/resources/cat/JsonParserQueries.xml | 68 +++++++ .../src/test/resources/cat/SingleQuery.xml | 7 +- 50 files changed, 886 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/2f54a03c/vxquery-core/src/main/java/org/apache/vxquery/functions/builtin-functions.xml ----------------------------------------------------------------------
