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 2018/03/06 16:30:01 UTC
[11/12] jena git commit: JENA-1492: Merge commit 'refs/pull/369/head'
of https://github.com/apache/jena
JENA-1492: Merge commit 'refs/pull/369/head' of https://github.com/apache/jena
This closes #369.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/642a17ce
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/642a17ce
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/642a17ce
Branch: refs/heads/master
Commit: 642a17cef8e4db9b722c1782a706d91c6b35e924
Parents: 4100e44 1f14950
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Mar 6 16:16:08 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Mar 6 16:16:08 2018 +0000
----------------------------------------------------------------------
.../arq/examples/riot/ExJsonLD.java | 14 +-
.../org/apache/jena/query/DatasetFactory.java | 32 ++-
.../jena/query/QueryExecutionFactory.java | 4 +-
.../org/apache/jena/riot/system/RiotLib.java | 25 +-
.../org/apache/jena/sparql/algebra/Algebra.java | 4 +-
.../jena/sparql/core/DatasetGraphFactory.java | 21 +-
.../jena/sparql/core/DatasetGraphMapLink.java | 101 ++++----
.../jena/sparql/core/DatasetGraphOne.java | 51 ++--
.../jena/sparql/core/DatasetGraphWithLock.java | 10 +-
.../jena/sparql/core/DatasetGraphZero.java | 1 +
.../apache/jena/sparql/core/DatasetImpl.java | 6 +-
.../org/apache/jena/sparql/core/DatasetOne.java | 84 +++++++
.../jena/sparql/core/TransactionalLock.java | 12 +-
.../jena/sparql/core/TxnDataset2Graph.java | 241 +++++++++++++++++++
.../sparql/core/assembler/AssemblerUtils.java | 12 +-
.../core/assembler/DatasetAssemblerVocab.java | 8 +-
.../core/assembler/DatasetNullAssembler.java | 59 +++++
.../core/assembler/DatasetOneAssembler.java | 82 +++++++
.../org/apache/jena/sparql/graph/GraphZero.java | 9 +-
.../apache/jena/sparql/util/QueryExecUtils.java | 2 +-
.../query/TestParameterizedSparqlString.java | 2 +-
.../jena/riot/lang/ParserTestBaseLib.java | 2 +-
.../jena/riot/writer/TestJsonLDWriter.java | 4 +-
.../sparql/api/TestQueryExecutionTimeout1.java | 2 +-
.../sparql/api/TestQueryExecutionTimeout2.java | 2 +-
.../jena/sparql/resultset/TestResultSet.java | 9 +-
.../transaction/TestTransactionSupport.java | 16 +-
.../jena/dboe/trans/bplustree/BPTreeNode.java | 18 --
.../txn/TransactionalComponentByLock.java | 127 ++++++++++
.../dboe/transaction/txn/TransactionalMRSW.java | 137 -----------
.../jena/tdb2/setup/AbstractTDBBuilder.java | 2 +-
.../apache/jena/tdb2/store/DatasetGraphTDB.java | 32 ++-
.../jena/tdb2/store/DatasetPrefixesTDB.java | 8 +
.../jena/tdb2/store/GraphViewSwitchable.java | 11 +
.../org/apache/jena/tdb2/store/StorageTDB.java | 5 +-
.../jena/test/assembler/TS_Assembler.java | 31 +++
.../test/assembler/TestDatasetAssembler.java | 145 +++++++++++
.../rdfconnection/TestRDFConnectionRemote.java | 3 +-
.../jena/test/txn/TS_TranactionIntegration.java | 31 +++
.../apache/jena/test/txn/TestDataset2Graph.java | 160 ++++++++++++
.../testing/Assembler/assem_dsg1_1.ttl | 11 +
.../testing/Assembler/assem_dsg1_2.ttl | 15 ++
.../testing/Assembler/assem_dsg1_3.ttl | 15 ++
.../testing/Assembler/assem_dsg1_bad_1.ttl | 15 ++
.../testing/Assembler/assem_dsg1_inf_tdb1.ttl | 31 +++
.../testing/Assembler/assem_dsg1_inf_tdb2.ttl | 30 +++
.../testing/Assembler/assem_dsg_sink.ttl | 11 +
.../testing/Assembler/assem_dsg_zero.ttl | 9 +
.../testing/Assembler/data.ttl | 5 +
.../jena/rdfconnection/RDFConnection.java | 2 -
.../jena/rdfconnection/RDFConnectionLocal.java | 3 +-
51 files changed, 1352 insertions(+), 320 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/642a17ce/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
----------------------------------------------------------------------