JENA-1282: Merge commit 'refs/pull/208/head' of github.com:apache/jena This closes #208.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/44264d1c Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/44264d1c Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/44264d1c Branch: refs/heads/ThreadPerGraphDataset Commit: 44264d1c5310f7764256cbfee646a165a1e8e2dc Parents: 05e68d0 e96d356 Author: Andy Seaborne <[email protected]> Authored: Fri Jan 27 09:29:27 2017 +0000 Committer: Andy Seaborne <[email protected]> Committed: Fri Jan 27 09:29:27 2017 +0000 ---------------------------------------------------------------------- .../org/apache/jena/query/ResultSetFactory.java | 8 ++-- .../org/apache/jena/query/SortCondition.java | 2 +- .../engine/iterator/QueryIterCommonParent.java | 2 +- .../engine/iterator/QueryIterRepeatApply.java | 2 +- .../engine/iterator/QueryIteratorBase.java | 4 +- .../engine/main/StageGeneratorGeneric.java | 2 +- .../optimizer/reorder/ReorderProcIndexes.java | 2 +- .../jena/sparql/lang/ParserARQUpdate.java | 2 +- .../jena/sparql/lang/ParserSPARQL11Update.java | 2 +- .../org/apache/jena/sparql/lib/Metadata.java | 4 +- .../jena/sparql/syntax/ElementService.java | 2 +- .../apache/jena/atlas/io/IndentedWriter.java | 40 ++++++++++++++++---- .../java/org/apache/jena/atlas/logging/Log.java | 30 +++++++++++++++ .../jena/rdf/model/impl/RDFReaderFImpl.java | 4 +- .../jena/rdf/model/impl/RDFWriterFImpl.java | 4 +- .../tdb/base/objectfile/ObjectFileStorage.java | 4 +- .../org/apache/jena/tdb/base/page/PageBase.java | 2 +- .../base/recordbuffer/RecordRangeIterator.java | 2 +- .../tdb/index/bplustree/BPlusTreeParams.java | 2 +- .../java/org/apache/jena/tdb/lib/NodeLib.java | 2 +- .../org/apache/jena/tdb/solver/BindingTDB.java | 2 +- .../jena/tdb/store/nodetable/NodecLib.java | 2 +- .../java/org/apache/jena/tdb/sys/FileRef.java | 2 +- .../java/org/apache/jena/tdb/sys/SystemTDB.java | 2 +- .../jena/tdb/transaction/BlockMgrJournal.java | 6 +-- .../jena/tdb/transaction/JournalEntryType.java | 2 +- .../tdb/transaction/TransactionManager.java | 4 +- 27 files changed, 98 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
