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 2019/05/02 18:40:42 UTC
[jena] branch master updated (460774e -> d1ecb43)
This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git.
from 460774e Merge pull request #561 from afs/license-notice
new 573e070 Add Iter.limit and Iter.skip
new dea173a JENA-1695: Modular storage interface and framework
new d1ecb43 Merge pull request #562 from afs/storage
The 7824 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/jena/riot/system/RiotLib.java | 41 ++--
.../org/apache/jena/sparql/core/GraphView.java | 18 +-
.../sparql/engine/iterator/QueryIterDistinct.java | 2 +-
.../jena/sparql/expr/nodevalue/NodeFunctions.java | 23 +-
...Graph2.java => AbstractTestGraphAddDelete.java} | 3 +-
...ng2.java => AbstractTestPrefixMappingView.java} | 3 +-
.../jena/web/AbstractTestDatasetGraphAccessor.java | 2 +-
.../java/org/apache/jena/atlas/iterator/Iter.java | 54 ++++-
jena-cmds/src/main/java/riotcmd/CmdLangParse.java | 7 +-
jena-cmds/src/main/java/tdb2/tdbcompact.java | 2 +-
.../base/recordbuffer/RecordRangeIterator.java | 2 -
jena-db/jena-dboe-storage/pom.xml | 81 +++++++
.../org/apache/jena/dboe/storage/DatabaseRDF.java | 39 ++++
.../apache/jena/dboe/storage/StoragePrefixes.java | 82 +++++++
.../org/apache/jena/dboe/storage/StorageRDF.java | 252 +++++++++++++++++++++
.../org/apache/jena/dboe/storage/migrate/M.java | 65 ++++++
.../jena/dboe/storage/migrate/StreamOps.java | 58 +++++
.../jena/dboe/storage/prefixes/PrefixEntry.java | 42 ++++
.../jena/dboe/storage/prefixes/PrefixLib.java | 99 ++++++++
.../jena/dboe/storage/prefixes/PrefixMapBase.java | 124 ++++++++++
.../jena/dboe/storage/prefixes/PrefixMapI.java | 104 +++++++++
.../storage/prefixes/PrefixMapOverPrefixMapI.java | 105 +++++++++
.../storage/prefixes/PrefixMapStorageSimple.java | 74 ++++++
.../prefixes/PrefixMappingOverPrefixMapI.java | 145 ++++++++++++
.../dboe/storage/prefixes/PrefixesFactory.java | 62 +++++
.../dboe/storage/prefixes/StoragePrefixMap.java | 79 +++++++
.../storage/prefixes/StoragePrefixesEmpty.java | 74 ++++++
.../dboe/storage/prefixes/StoragePrefixesView.java | 108 +++++++++
.../apache/jena/dboe/storage/simple/SimpleDB.java | 34 ++-
.../jena/dboe/storage/simple/StorageMem.java | 28 +++
.../dboe/storage/simple/StoragePrefixesMem.java | 120 ++++++++++
.../jena/dboe/storage/simple/StorageTuples.java | 116 ++++++++++
.../jena/dboe/storage/simple/StorageTuplesN.java | 86 +++++++
.../dboe/storage/system/DatasetGraphStorage.java | 182 +++++++++++++++
.../jena/dboe/storage/system/GraphViewStorage.java | 71 ++++++
.../jena/dboe/storage/system/StorageLib.java | 80 +++++++
.../org/apache/jena/dboe/storage/TC_StoreBase.java | 34 +--
.../AbstractTestDatasetPrefixesStorage.java | 85 +++++++
.../jena/dboe/storage/prefixes/TS_Prefixes.java | 37 +++
.../storage/prefixes/TestDatasetPrefixesMem.java | 38 ++++
.../jena/dboe/storage/prefixes/TestPrefixLib.java | 95 ++++++++
.../prefixes/TestPrefixMapOverPrefixMapI.java | 28 +--
.../TestPrefixMappingOverDatasetPrefixes.java | 41 ++++
.../TestPrefixMappingOverDatasetPrefixes2.java | 44 ++++
.../prefixes/TestPrefixMappingOverPrefixMap.java | 39 ++++
.../dboe/storage/storage/BaseTestStorageRDF.java | 131 +++++++++++
.../jena/dboe/storage/storage/TS_Storage.java | 30 +++
.../storage/TestDatasetGraphStorageFindTests.java | 28 +++
.../storage/TestDatasetGraphStorageTests.java | 28 +++
.../dboe/storage/storage/TestStorageSimple.java | 30 +++
.../jena/dboe/trans/bplustree/BPlusTree.java | 32 +--
.../org/apache/jena/dboe/trans/bplustree/Mode.java | 32 +--
.../jena/dboe/trans/data/TransBinaryDataFile.java | 6 +-
.../org/apache/jena/dboe/trans/data/TransBlob.java | 4 +-
.../apache/jena/dboe/transaction/TransInteger.java | 4 +-
.../dboe/transaction/txn}/IteratorTxnTracker.java | 6 +-
.../jena/dboe/transaction/txn/Transaction.java | 11 +
.../txn/TransactionalComponentLifecycle.java | 92 ++------
.../src/main/java/org/apache/jena/tdb2/TDB2.java | 2 +-
.../org/apache/jena/tdb2/setup/TDBBuilder.java | 2 +-
.../apache/jena/tdb2/store/DatasetGraphTDB.java | 41 ++--
.../jena/tdb2/store/GraphViewSwitchable.java | 4 +-
.../tdb2/store/IteratorCheckNotConcurrent.java | 93 --------
.../jena/tdb2/store/nodetable/NodeTableCache.java | 3 -
.../apache/jena/tdb2/sys/DatabaseConnection.java | 3 +-
.../jena/tdb2/graph/TestPrefixMappingTDB.java | 4 +-
.../apache/jena/tdb2/store/TestGraphNamedTDB.java | 4 +-
.../org/apache/jena/tdb2/store/TestGraphTDB.java | 4 +-
jena-db/pom.xml | 1 +
.../apache/jena/tdb/store/DatasetPrefixesTDB.java | 7 +-
.../jena/tdb/graph/TestPrefixMappingTDB.java | 4 +-
.../apache/jena/tdb/store/TestGraphNamedTDB.java | 4 +-
.../org/apache/jena/tdb/store/TestGraphTDB.java | 4 +-
73 files changed, 3153 insertions(+), 369 deletions(-)
rename jena-arq/src/test/java/org/apache/jena/sparql/graph/{AbstractTestGraph2.java => AbstractTestGraphAddDelete.java} (99%)
rename jena-arq/src/test/java/org/apache/jena/sparql/graph/{AbstractTestPrefixMapping2.java => AbstractTestPrefixMappingView.java} (95%)
create mode 100644 jena-db/jena-dboe-storage/pom.xml
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/DatabaseRDF.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/StoragePrefixes.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/StorageRDF.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/migrate/M.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/migrate/StreamOps.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixEntry.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixLib.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixMapBase.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixMapI.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixMapOverPrefixMapI.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixMapStorageSimple.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixMappingOverPrefixMapI.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/PrefixesFactory.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/StoragePrefixMap.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/StoragePrefixesEmpty.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/prefixes/StoragePrefixesView.java
copy jena-tdb/src/test/java/org/apache/jena/tdb/store/TestGraphNamedTDB.java => jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/simple/SimpleDB.java (53%)
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/simple/StorageMem.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/simple/StoragePrefixesMem.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/simple/StorageTuples.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/simple/StorageTuplesN.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/system/DatasetGraphStorage.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/system/GraphViewStorage.java
create mode 100644 jena-db/jena-dboe-storage/src/main/java/org/apache/jena/dboe/storage/system/StorageLib.java
copy jena-tdb/src/test/java/org/apache/jena/tdb/store/TestGraphNamedTDB.java => jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/TC_StoreBase.java (52%)
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/prefixes/AbstractTestDatasetPrefixesStorage.java
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/prefixes/TS_Prefixes.java
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/prefixes/TestDatasetPrefixesMem.java
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/prefixes/TestPrefixLib.java
copy jena-tdb/src/test/java/org/apache/jena/tdb/store/TestGraphNamedTDB.java => jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/prefixes/TestPrefixMapOverPrefixMapI.java (53%)
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/prefixes/TestPrefixMappingOverDatasetPrefixes.java
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/prefixes/TestPrefixMappingOverDatasetPrefixes2.java
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/prefixes/TestPrefixMappingOverPrefixMap.java
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/storage/BaseTestStorageRDF.java
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/storage/TS_Storage.java
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/storage/TestDatasetGraphStorageFindTests.java
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/storage/TestDatasetGraphStorageTests.java
create mode 100644 jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/storage/TestStorageSimple.java
rename jena-db/{jena-tdb2/src/main/java/org/apache/jena/tdb2/store => jena-dboe-transaction/src/main/java/org/apache/jena/dboe/transaction/txn}/IteratorTxnTracker.java (88%)
delete mode 100644 jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/IteratorCheckNotConcurrent.java