You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/05/09 12:48:47 UTC
[08/21] jena git commit: JENA-931: Merge commit 'refs/pull/56/head'
of github.com:apache/jena
JENA-931: Merge commit 'refs/pull/56/head' of github.com:apache/jena
This closes #56
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d480bd1f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d480bd1f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d480bd1f
Branch: refs/heads/jena926-remove-graphstore
Commit: d480bd1fc36d4f7a9b286a607dbc66ea4988b64d
Parents: bc438d8 0ef8184
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 6 19:27:12 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 6 19:29:13 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/atlas/csv/CSVParser.java | 9 +-
.../org/apache/jena/atlas/json/JsonBuilder.java | 4 +-
.../org/apache/jena/atlas/web/MediaType.java | 4 +-
.../org/apache/jena/query/SortCondition.java | 5 +-
.../java/org/apache/jena/riot/RDFFormat.java | 7 +-
.../org/apache/jena/riot/RDFFormatVariant.java | 5 +-
.../org/apache/jena/riot/RDFWriterRegistry.java | 29 ++-
.../jena/riot/adapters/RDFReaderRIOT_Web.java | 4 +-
.../org/apache/jena/riot/lang/JsonLDReader.java | 4 +-
.../jena/riot/other/BatchedStreamRDF.java | 6 +-
.../java/org/apache/jena/riot/other/GLib.java | 58 +----
.../org/apache/jena/riot/out/JsonLDWriter.java | 8 +-
.../jena/riot/out/SinkQuadBracedOutput.java | 4 +-
.../process/normalize/CanonicalizeLiteral.java | 6 +-
.../apache/jena/riot/system/PrefixMapBase.java | 25 +--
.../org/apache/jena/riot/thrift/BinRDF.java | 12 +-
.../java/org/apache/jena/riot/tokens/Token.java | 10 +-
.../apache/jena/riot/writer/TurtleShell.java | 5 +-
.../riot/writer/WriterStreamRDFBatched.java | 6 +-
.../jena/riot/writer/WriterStreamRDFBlocks.java | 8 +-
.../apache/jena/sparql/algebra/op/OpAssign.java | 5 +-
.../apache/jena/sparql/algebra/op/OpExtend.java | 5 +-
.../apache/jena/sparql/algebra/op/OpGroup.java | 6 +-
.../apache/jena/sparql/algebra/op/OpLabel.java | 6 +-
.../jena/sparql/algebra/op/OpProject.java | 4 +-
.../optimize/TransformFilterPlacement.java | 3 +-
.../jena/sparql/core/DatasetChangesBatched.java | 8 +-
.../jena/sparql/core/DatasetGraphBase.java | 12 +-
.../sparql/core/DatasetGraphCollection.java | 4 +-
.../jena/sparql/core/DatasetGraphQuad.java | 13 +-
.../org/apache/jena/sparql/core/Prologue.java | 7 +-
.../java/org/apache/jena/sparql/core/Quad.java | 7 +-
.../apache/jena/sparql/core/QueryCompare.java | 4 +-
.../apache/jena/sparql/core/VarExprList.java | 4 +-
.../org/apache/jena/sparql/engine/Rename.java | 19 +-
.../jena/sparql/engine/binding/BindingBase.java | 4 +-
.../sparql/engine/iterator/QueryIterGroup.java | 22 +-
.../sparql/engine/iterator/QueryIterTopN.java | 8 +-
.../ReorderTransformationSubstitution.java | 12 +-
.../org/apache/jena/sparql/expr/E_Exists.java | 2 +-
.../apache/jena/sparql/expr/E_NotExists.java | 2 +-
.../java/org/apache/jena/sparql/expr/Expr.java | 3 +-
.../apache/jena/sparql/expr/ExprAggregator.java | 10 +-
.../apache/jena/sparql/expr/ExprFunction.java | 4 +-
.../apache/jena/sparql/expr/ExprFunction0.java | 2 +-
.../apache/jena/sparql/expr/ExprFunction1.java | 2 +-
.../apache/jena/sparql/expr/ExprFunction2.java | 2 +-
.../apache/jena/sparql/expr/ExprFunction3.java | 2 +-
.../apache/jena/sparql/expr/ExprFunctionN.java | 3 +-
.../org/apache/jena/sparql/expr/ExprList.java | 3 +-
.../org/apache/jena/sparql/expr/ExprNode.java | 3 +-
.../org/apache/jena/sparql/expr/ExprVar.java | 4 +-
.../org/apache/jena/sparql/expr/NodeValue.java | 5 +-
.../jena/sparql/expr/aggregate/AggCustom.java | 6 +-
.../sparql/expr/aggregate/AggGroupConcat.java | 5 +-
.../expr/aggregate/AggGroupConcatDistinct.java | 5 +-
.../jena/sparql/expr/aggregate/AggMax.java | 5 +-
.../sparql/expr/aggregate/AggMaxDistinct.java | 5 +-
.../jena/sparql/expr/aggregate/AggMin.java | 5 +-
.../sparql/expr/aggregate/AggMinDistinct.java | 5 +-
.../jena/sparql/expr/aggregate/AggSample.java | 5 +-
.../jena/sparql/expr/aggregate/Aggregator.java | 2 +-
.../sparql/expr/aggregate/AggregatorBase.java | 3 +-
.../apache/jena/sparql/graph/NodeTransform.java | 8 +-
.../jena/sparql/graph/NodeTransformLib.java | 27 ++-
.../jena/sparql/graph/NodeTransformOp.java | 11 +-
.../modify/NodeTransformBNodesToVariables.java | 5 +-
.../apache/jena/sparql/modify/TemplateLib.java | 31 ++-
.../jena/sparql/modify/UpdateEngineWorker.java | 5 +-
.../jena/sparql/modify/request/UpdateLoad.java | 5 +-
.../org/apache/jena/sparql/path/PathLib.java | 6 +-
.../jena/sparql/path/eval/PathEngine.java | 25 +--
.../jena/sparql/path/eval/PathEvaluator.java | 6 +-
.../jena/sparql/pfunction/library/strSplit.java | 12 +-
.../apache/jena/sparql/resultset/CSVInput.java | 6 +-
.../jena/sparql/resultset/ResultSetCompare.java | 25 +--
.../org/apache/jena/sparql/util/Context.java | 2 +-
.../org/apache/jena/sparql/util/ModelUtils.java | 19 +-
.../org/apache/jena/sparql/util/NodeUtils.java | 5 +-
.../jena/sparql/util/graph/GraphList.java | 12 +-
.../jena/riot/process/TestNormalization.java | 4 +-
.../jena/riot/thrift/TestResultSetThrift.java | 11 -
.../jena/riot/thrift/TestStreamRDFThrift.java | 13 +-
.../org/apache/jena/atlas/iterator/Action.java | 10 +-
.../apache/jena/atlas/iterator/ActionCount.java | 6 +-
.../jena/atlas/iterator/ActionNothing.java | 26 ---
.../org/apache/jena/atlas/iterator/Filter.java | 9 +-
.../atlas/iterator/FilterDistinctAdjacent.java | 11 +-
.../jena/atlas/iterator/FilterOutNulls.java | 32 ---
.../apache/jena/atlas/iterator/FilterStack.java | 16 +-
.../jena/atlas/iterator/FilterUnique.java | 12 +-
.../org/apache/jena/atlas/iterator/Iter.java | 211 +++++-------------
.../jena/atlas/iterator/IteratorArray.java | 7 +
.../apache/jena/atlas/iterator/MapUtils.java | 36 ---
.../apache/jena/atlas/iterator/Transform.java | 9 +-
.../apache/jena/atlas/lib/ActionKeyValue.java | 9 +-
.../org/apache/jena/atlas/lib/Allocator.java | 28 ---
.../java/org/apache/jena/atlas/lib/Cache.java | 3 +-
.../org/apache/jena/atlas/lib/CacheSet.java | 4 +-
.../org/apache/jena/atlas/lib/Callback.java | 5 +-
.../java/org/apache/jena/atlas/lib/Cell.java | 99 ---------
.../apache/jena/atlas/lib/CollectionUtils.java | 27 +--
.../java/org/apache/jena/atlas/lib/FileOps.java | 18 +-
.../java/org/apache/jena/atlas/lib/Lib.java | 14 +-
.../org/apache/jena/atlas/lib/ListUtils.java | 66 ++----
.../org/apache/jena/atlas/lib/MapUtils.java | 45 ----
.../org/apache/jena/atlas/lib/MultiMap.java | 146 -------------
.../apache/jena/atlas/lib/MultiMapToList.java | 43 ----
.../apache/jena/atlas/lib/MultiMapToSet.java | 47 ----
.../org/apache/jena/atlas/lib/MultiSet.java | 218 -------------------
.../java/org/apache/jena/atlas/lib/Pair.java | 4 +-
.../java/org/apache/jena/atlas/lib/Problem.java | 25 ---
.../apache/jena/atlas/lib/PropertyUtils.java | 4 +-
.../org/apache/jena/atlas/lib/SetUtils.java | 26 +--
.../org/apache/jena/atlas/lib/StrUtils.java | 41 +---
.../java/org/apache/jena/atlas/lib/Tuple.java | 28 +--
.../org/apache/jena/atlas/lib/TupleBuilder.java | 50 -----
.../org/apache/jena/atlas/lib/cache/Cache0.java | 4 +-
.../org/apache/jena/atlas/lib/cache/Cache1.java | 12 +-
.../apache/jena/atlas/lib/cache/CacheGuava.java | 9 +-
.../jena/atlas/lib/cache/CacheSetImpl.java | 16 +-
.../jena/atlas/lib/cache/CacheSetSync.java | 5 +-
.../jena/atlas/lib/cache/CacheSetWrapper.java | 5 +-
.../jena/atlas/lib/cache/CacheSimple.java | 13 +-
.../jena/atlas/lib/cache/CacheWrapper.java | 4 +-
.../org/apache/jena/atlas/lib/cache/Getter.java | 25 ---
.../java/org/apache/jena/base/Closeable.java | 27 ---
.../apache/jena/atlas/iterator/TestIter.java | 134 +-----------
.../java/org/apache/jena/atlas/lib/TS_Lib.java | 1 -
.../org/apache/jena/atlas/lib/TestMultiSet.java | 143 ------------
.../impl/PropertyTableHashMapImpl.java | 19 +-
.../java/org/apache/jena/fuseki/FusekiCmd.java | 5 +-
.../java/org/apache/jena/fuseki/FusekiLib.java | 8 +-
.../jena/fuseki/servlets/ResponseResultSet.java | 16 +-
.../jena/fuseki/servlets/SPARQL_Protocol.java | 12 +-
.../java/org/apache/jena/fuseki/FusekiLib.java | 8 +-
.../apache/jena/fuseki/server/DataService.java | 6 +-
.../apache/jena/fuseki/server/FusekiServer.java | 5 +-
.../jena/fuseki/servlets/ResponseResultSet.java | 16 +-
.../jena/fuseki/servlets/SPARQL_Protocol.java | 10 +-
.../query/rewriter/SecuredFunction.java | 3 +-
.../org/apache/jena/sdb/compiler/QuadBlock.java | 6 +-
.../org/apache/jena/sdb/compiler/SDB_QC.java | 14 +-
.../apache/jena/sdb/compiler/TransformSDB.java | 4 +-
.../org/apache/jena/sdb/core/ScopeEntry.java | 28 +--
.../org/apache/jena/sdb/core/ScopeRename.java | 21 --
.../sdb/core/sqlnode/GenerateSQLVisitor.java | 9 +-
.../org/apache/jena/sdb/print/ActionPrint.java | 7 +-
.../java/org/apache/jena/sdb/util/Pair.java | 5 +-
.../jena/sdb/test/junit/ParamAllStoreDesc.java | 11 +-
.../jena/sdb/test/junit/ParamAllStores.java | 11 +-
.../apache/jena/sdb/test/junit/StoreList.java | 21 +-
.../spatial/SpatialDocProducerTriples.java | 19 --
.../jena/tdb/base/block/BlockMgrCache.java | 6 +-
.../jena/tdb/base/block/BlockMgrTracker.java | 31 +--
.../org/apache/jena/tdb/base/file/Location.java | 4 +-
.../org/apache/jena/tdb/base/file/MetaFile.java | 5 +-
.../tdb/index/bplustree/BPlusTreeRewriter.java | 10 +-
.../java/org/apache/jena/tdb/lib/NodeLib.java | 9 +-
.../java/org/apache/jena/tdb/lib/TupleLib.java | 34 +--
.../apache/jena/tdb/solver/OpExecutorTDB1.java | 11 +-
.../java/org/apache/jena/tdb/solver/QC2.java | 9 +-
.../org/apache/jena/tdb/solver/SolverLib.java | 52 ++---
.../tdb/solver/StageGeneratorDirectTDB.java | 9 +-
.../apache/jena/tdb/solver/StageMatchTuple.java | 34 +--
.../tdb/solver/stats/StatsCollectorBase.java | 5 +-
.../apache/jena/tdb/store/DatasetGraphTDB.java | 13 +-
.../org/apache/jena/tdb/store/GraphTDB.java | 19 +-
.../org/apache/jena/tdb/store/QuadTable.java | 9 -
.../org/apache/jena/tdb/store/TripleTable.java | 9 -
.../store/bulkloader2/CmdNodeTableBuilder.java | 5 +-
.../tdb/store/nodetable/NodeTableNative.java | 35 +--
.../tdb/store/tupletable/TupleIndexRecord.java | 18 +-
.../java/org/apache/jena/tdb/sys/FileRef.java | 4 +-
.../apache/jena/tdb/base/record/RecordLib.java | 9 +-
.../apache/jena/tdb/store/TestQuadFilter.java | 20 +-
.../jena/query/text/EntityDefinition.java | 5 +-
.../assembler/EntityDefinitionAssembler.java | 19 +-
178 files changed, 665 insertions(+), 2419 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d480bd1f/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java
----------------------------------------------------------------------