This is an automated email from the ASF dual-hosted git repository.

andy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


    from abd21173a8 GH-3618: Node.sameTermAs(Node) and Node.sameValueAs(Node)
     new de4a5d668f GH-3619: Rename org.apache.jena.mem as 
org.apache.jena.memvalue
     new 9db136539b Move counting open/close into jena.ontology
     new adf2bf8880 Rename GraphMem2* as GraphMem*

The 3 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:
 .../test/java/org/apache/jena/system/GTest.java    |   6 +-
 .../spatial/index/SpatialIndexCurrent.java         |   2 +-
 .../org/apache/jena/mem/graph/TestGraphAdd.java    |  10 +-
 .../jena/mem/graph/TestGraphContainsAnything.java  |  13 +-
 .../jena/mem/graph/TestGraphContainsTriple.java    |  10 +-
 .../org/apache/jena/mem/graph/TestGraphCopy.java   |  27 ++-
 .../org/apache/jena/mem/graph/TestGraphDelete.java |  10 +-
 .../TestGraphFindAllWithForEachRemaining.java      |  10 +-
 .../graph/TestGraphFindAllWithHasNextAndNext.java  |  10 +-
 .../mem/graph/TestGraphFindByMatchAndCount.java    |  13 +-
 .../mem/graph/TestGraphFindByMatchAndGetFirst.java |  13 +-
 .../jena/mem/graph/TestGraphInitializeIndex.java   |   9 +-
 .../jena/mem/graph/TestGraphMemoryConsumption.java |  10 +-
 .../apache/jena/mem/graph/TestGraphStreamAll.java  |  21 +-
 .../mem/graph/TestGraphStreamByMatchAndCount.java  |  13 +-
 .../graph/TestGraphStreamByMatchAndFindAny.java    |  13 +-
 .../org/apache/jena/mem/graph/helper/Context.java  |  46 ++--
 .../graph/helper/GraphTripleNodeHelperCurrent.java |  40 ++--
 .../org/apache/jena/mem/graph/helper/Releases.java |   3 +-
 .../{mem2 => mem}/helper/JMHDefaultOptions.java    |   2 +-
 .../{mem2 => mem}/map/node/FastHashNodeMap.java    |   4 +-
 .../{mem2 => mem}/map/node/HashCommonNodeMap.java  |   4 +-
 .../jena/{mem2 => mem}/map/node/TestMapAdd.java    |   5 +-
 .../{mem2 => mem}/map/node/TestMapContains.java    |   5 +-
 .../set/triple/FastHashTripleSet.java              |   4 +-
 .../set/triple/HashCommonTripleSet.java            |   4 +-
 .../jena/{mem2 => mem}/set/triple/TestSetAdd.java  |   5 +-
 .../{mem2 => mem}/set/triple/TestSetContains.java  |   5 +-
 .../{mem2 => mem}/set/triple/TestSetIterate.java   |   5 +-
 .../set/triple/TestSetMemoryConsumption.java       |   2 +-
 .../{mem2 => mem}/set/triple/TestSetRemove.java    |   5 +-
 .../{mem2 => mem}/set/triple/TestSetStreamAll.java |   5 +-
 .../{mem2 => mem}/set/triple/TestSetUpdate.java    |   5 +-
 ...estSparseArraySpliteratorsForeachRemaining.java |   8 +-
 .../TestSparseArraySpliteratorsStreamParallel.java |   8 +-
 .../TestSparseArraySpliteratorsTryAdvance.java     |   8 +-
 .../jena/riot/lang/rdfxml/TestXMLParser.java       |   4 +-
 .../org/apache/jena/sparql/expr/TestCoalesce.java  |   1 -
 jena-benchmarks/pom.xml                            |   1 -
 .../org/apache/jena/graph/GraphMemFactory.java     |  26 +-
 .../org/apache/jena/graph/impl/GraphPlain.java     |   2 +-
 .../apache/jena/graph/impl/SimpleEventManager.java |   2 +-
 .../main/java/org/apache/jena/mem/ArrayBunch.java  | 199 ----------------
 .../main/java/org/apache/jena/mem/BunchMap.java    |  77 ------
 .../{mem2/GraphMem2.java => mem/GraphMem.java}     |  23 +-
 .../GraphMem2Fast.java => mem/GraphMemFast.java}   |  24 +-
 .../GraphMemLegacy.java}                           |  20 +-
 .../GraphMemRoaring.java}                          |  28 +--
 .../org/apache/jena/mem/GraphTripleStoreBase.java  | 219 -----------------
 .../org/apache/jena/mem/GraphTripleStoreMem.java   |  45 ----
 .../java/org/apache/jena/mem/HashedBunchMap.java   | 256 --------------------
 .../org/apache/jena/mem/HashedTripleBunch.java     | 111 ---------
 .../jena/{mem2 => mem}/IndexingStrategy.java       |   2 +-
 .../org/apache/jena/mem/NodeToTriplesMapBase.java  | 189 ---------------
 .../org/apache/jena/mem/NodeToTriplesMapMem.java   | 150 ------------
 .../java/org/apache/jena/mem/ObjectIterator.java   |  95 --------
 .../apache/jena/mem/TrackingTripleIterator.java    |  60 -----
 .../{mem2 => mem}/collection/FastHashBase.java     |   6 +-
 .../jena/{mem2 => mem}/collection/FastHashMap.java |   6 +-
 .../jena/{mem2 => mem}/collection/FastHashSet.java |   6 +-
 .../{mem2 => mem}/collection/HashCommonBase.java   |   6 +-
 .../{mem2 => mem}/collection/HashCommonMap.java    |   6 +-
 .../{mem2 => mem}/collection/HashCommonSet.java    |   2 +-
 .../jena/{mem2 => mem}/collection/JenaMap.java     |   2 +-
 .../{mem2 => mem}/collection/JenaMapSetCommon.java |   2 +-
 .../jena/{mem2 => mem}/collection/JenaSet.java     |   2 +-
 .../collection/JenaSetHashOptimized.java           |   2 +-
 .../{mem2 => mem}/iterator/IteratorOfJenaSets.java |   4 +-
 .../iterator/SparseArrayIndexedIterator.java       |   4 +-
 .../iterator/SparseArrayIterator.java              |   2 +-
 .../jena/{mem2 => mem}/pattern/MatchPattern.java   |   2 +-
 .../{mem2 => mem}/pattern/PatternClassifier.java   |   2 +-
 .../spliterator/ArraySpliterator.java              |   2 +-
 .../spliterator/ArraySubSpliterator.java           |   2 +-
 .../spliterator/SparseArrayIndexedSpliterator.java |   6 +-
 .../spliterator/SparseArraySpliterator.java        |   2 +-
 .../spliterator/SparseArraySubSpliterator.java     |   2 +-
 .../jena/{mem2 => mem}/store/TripleStore.java      |   2 +-
 .../{mem2 => mem}/store/fast/FastArrayBunch.java   |   4 +-
 .../store/fast/FastHashedBunchMap.java             |   4 +-
 .../store/fast/FastHashedTripleBunch.java          |   6 +-
 .../{mem2 => mem}/store/fast/FastTripleBunch.java  |   6 +-
 .../{mem2 => mem}/store/fast/FastTripleStore.java  |  14 +-
 .../{mem2 => mem}/store/legacy/ArrayBunch.java     |   4 +-
 .../{mem2 => mem}/store/legacy/FieldFilter.java    |   2 +-
 .../{mem2 => mem}/store/legacy/HashedBunchMap.java |   4 +-
 .../store/legacy/HashedTripleBunch.java            |   6 +-
 .../store/legacy/LegacyTripleStore.java            |  14 +-
 .../store/legacy/NodeToTriplesMap.java             |   4 +-
 .../store/legacy/NodeToTriplesMapMem.java          |   4 +-
 .../{mem2 => mem}/store/legacy/TripleBunch.java    |   4 +-
 .../store/roaring/NodesToBitmapsMap.java           |   4 +-
 .../store/roaring/RoaringBitmapTripleIterator.java |   4 +-
 .../store/roaring/RoaringTripleStore.java          |  10 +-
 .../{mem2 => mem}/store/roaring/TripleSet.java     |   4 +-
 .../roaring/strategies/EagerStoreStrategy.java     |  12 +-
 .../roaring/strategies/LazyStoreStrategy.java      |   4 +-
 .../roaring/strategies/ManualStoreStrategy.java    |   4 +-
 .../roaring/strategies/MinimalStoreStrategy.java   |   6 +-
 .../store/roaring/strategies/StoreStrategy.java    |   4 +-
 .../java/org/apache/jena/memvalue/ArrayBunch.java  | 201 ++++++++++++++++
 .../java/org/apache/jena/memvalue/BunchMap.java    |  75 ++++++
 .../org/apache/jena/{mem => memvalue}/ByValue.java |   5 +-
 .../apache/jena/{mem => memvalue}/FieldFilter.java |  10 +-
 .../jena/{mem => memvalue}/GraphMemValue.java      |  19 +-
 .../apache/jena/memvalue/GraphTripleStoreBase.java | 218 +++++++++++++++++
 .../apache/jena/memvalue/GraphTripleStoreMem.java} |  37 +--
 .../apache/jena/{mem => memvalue}/HashCommon.java  |   2 +-
 .../org/apache/jena/memvalue/HashedBunchMap.java   | 261 +++++++++++++++++++++
 .../apache/jena/memvalue/HashedTripleBunch.java    | 119 ++++++++++
 .../apache/jena/memvalue/NodeToTriplesMapBase.java | 196 ++++++++++++++++
 .../apache/jena/memvalue/NodeToTriplesMapMem.java  | 151 ++++++++++++
 .../org/apache/jena/memvalue/ObjectIterator.java   |  93 ++++++++
 .../{mem => memvalue}/SparseArraySpliterator.java  | 116 +++++----
 .../SparseArraySubSpliterator.java                 | 130 +++++-----
 .../{mem => memvalue}/StoreTripleIterator.java     |  55 ++---
 .../jena/memvalue/TrackingTripleIterator.java      |  62 +++++
 .../apache/jena/{mem => memvalue}/TripleBunch.java |  14 +-
 .../org/apache/jena/{mem => memvalue}/package.html |   0
 .../jena/ontology/models/BaseGraphMaker.java       |  88 +++----
 .../apache/jena/ontology/models/GraphMaker.java    | 140 +++++------
 .../models/GraphRefCount.java}                     |  27 +--
 .../jena/ontology/models/MemoryModelGetter.java    |  34 +--
 .../apache/jena/ontology/models/ModelGetter.java   |  44 ++--
 .../apache/jena/ontology/models/ModelMaker.java    | 138 ++++++-----
 .../jena/ontology/models/ModelMakerImpl.java       |  69 +++---
 .../apache/jena/ontology/models/ModelSource.java   |  94 ++++----
 .../jena/ontology/models/SimpleGraphMaker.java     |  74 +++---
 .../jena/assembler/test/TestAssemblerGroup.java    |   4 +-
 .../assembler/test/TestDefaultModelAssembler.java  |   7 +-
 .../assembler/test/TestMemoryModelAssembler.java   |   9 +-
 .../apache/jena/graph/test/AbstractTestGraph.java  |   2 +-
 .../jena/graph/test/AbstractTestGraphMaker.java    |   9 +-
 .../java/org/apache/jena/graph/test/TS3_graph.java |   2 +
 .../java/org/apache/jena/graph/test/TestGraph.java |  20 +-
 .../apache/jena/graph/test/TestGraphListener.java  |   4 +-
 .../org/apache/jena/graph/test/TestGraphPlain.java |   2 +-
 .../org/apache/jena/graph/test/TestReifier.java    |   4 +-
 .../AbstractGraphMemTest.java}                     |   8 +-
 .../GraphMemFastTest.java}                         |   8 +-
 .../GraphMemLegacyTest.java}                       |   8 +-
 .../GraphMemRoaringTest.java}                      |  19 +-
 .../GraphMem2Test.java => mem/GraphMemTest.java}   |  37 +--
 .../TS4_GraphMem2.java => mem/TS4_GraphMem.java}   |  41 ++--
 .../collection/AbstractJenaMapNodeTest.java        |   2 +-
 .../collection/AbstractJenaSetTripleTest.java      |   2 +-
 .../{mem2 => mem}/collection/FastHashMapTest.java  |   2 +-
 .../{mem2 => mem}/collection/FastHashMapTest2.java |   2 +-
 .../{mem2 => mem}/collection/FastHashSetTest.java  |   2 +-
 .../{mem2 => mem}/collection/FastHashSetTest2.java |   2 +-
 .../collection/HashCommonMapTest.java              |   2 +-
 .../collection/HashCommonSetTest.java              |   2 +-
 .../iterator/IteratorOfJenaSetsTest.java           |   6 +-
 .../iterator/SparseArrayIndexedIteratorTest.java   |   2 +-
 .../iterator/SparseArrayIteratorTest.java          |   2 +-
 .../pattern/PatternClassifierTest.java             |   2 +-
 .../spliterator/ArraySpliteratorTest.java          |   2 +-
 .../spliterator/ArraySubSpliteratorTest.java       |   2 +-
 .../SparseArrayIndexedSpliteratorTest.java         |   4 +-
 .../spliterator/SparseArraySpliteratorTest.java    |   2 +-
 .../spliterator/SparseArraySubSpliteratorTest.java |   2 +-
 .../store/AbstractTripleStoreTest.java             |   2 +-
 .../store/fast/FastArrayBunchTest.java             |   6 +-
 .../store/fast/FastHashedTripleBunchTest.java      |   6 +-
 .../store/fast/FastTripleStoreTest.java            |   6 +-
 .../{mem2 => mem}/store/legacy/ArrayBunchTest.java |   6 +-
 .../store/legacy/FieldFilterTest.java              |   2 +-
 .../store/legacy/HashedTripleBunchTest.java        |   6 +-
 .../store/legacy/LegacyTripleStoreTest.java        |   6 +-
 .../store/legacy/NodeToTriplesMapMemTest.java      |   6 +-
 .../roaring/RoaringBitmapTripleIteratorTest.java   |   4 +-
 .../store/roaring/RoaringTripleStoreTest.java      |  10 +-
 .../jena/{mem => memvalue}/FieldFilterTest.java    |   3 +-
 .../SparseArraySpliteratorTest.java                |   6 +-
 .../SparseArraySubSpliteratorTest.java             |   2 +-
 .../{mem/test => memvalue}/TS3_GraphMemValue.java  |   7 +-
 .../test => memvalue}/TestArrayTripleBunch.java    |   4 +-
 .../TestConcurrentModificationException.java       |   3 +-
 .../{mem/test => memvalue}/TestGraphMemModel.java  |   3 +-
 .../test => memvalue}/TestGraphTripleStoreMem.java |   7 +-
 .../{mem/test => memvalue}/TestHashCommon.java     |   7 +-
 .../{mem/test => memvalue}/TestHashedBunchMap.java |   3 +-
 .../test => memvalue}/TestHashedTripleBunch.java   |   3 +-
 .../test => memvalue}/TestNodeToTriplesMapMem.java |   4 +-
 .../{mem/test => memvalue}/TestTripleBunch.java    |   3 +-
 .../java/org/apache/jena/test/JenaCoreTestAll.java |   4 +-
 .../java/org/apache/jena/ontapi/utils/Graphs.java  |  63 ++---
 .../org/apache/jena/ontapi/UnionGraphTest.java     |   8 +-
 188 files changed, 2449 insertions(+), 2532 deletions(-)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/helper/JMHDefaultOptions.java (98%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/map/node/FastHashNodeMap.java (92%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/map/node/HashCommonNodeMap.java (94%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/map/node/TestMapAdd.java (97%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/map/node/TestMapContains.java (98%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/set/triple/FastHashTripleSet.java (92%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/set/triple/HashCommonTripleSet.java (92%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/set/triple/TestSetAdd.java (97%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/set/triple/TestSetContains.java (97%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/set/triple/TestSetIterate.java (97%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/set/triple/TestSetMemoryConsumption.java (99%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/set/triple/TestSetRemove.java (97%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/set/triple/TestSetStreamAll.java (97%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/set/triple/TestSetUpdate.java (98%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/spliterator/TestSparseArraySpliteratorsForeachRemaining.java (94%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/spliterator/TestSparseArraySpliteratorsStreamParallel.java (94%)
 rename jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{mem2 
=> mem}/spliterator/TestSparseArraySpliteratorsTryAdvance.java (94%)
 delete mode 100644 jena-core/src/main/java/org/apache/jena/mem/ArrayBunch.java
 delete mode 100644 jena-core/src/main/java/org/apache/jena/mem/BunchMap.java
 rename jena-core/src/main/java/org/apache/jena/{mem2/GraphMem2.java => 
mem/GraphMem.java} (88%)
 rename jena-core/src/main/java/org/apache/jena/{mem2/GraphMem2Fast.java => 
mem/GraphMemFast.java} (71%)
 rename jena-core/src/main/java/org/apache/jena/{mem2/GraphMem2Legacy.java => 
mem/GraphMemLegacy.java} (79%)
 rename jena-core/src/main/java/org/apache/jena/{mem2/GraphMem2Roaring.java => 
mem/GraphMemRoaring.java} (86%)
 delete mode 100644 
jena-core/src/main/java/org/apache/jena/mem/GraphTripleStoreBase.java
 delete mode 100644 
jena-core/src/main/java/org/apache/jena/mem/GraphTripleStoreMem.java
 delete mode 100644 
jena-core/src/main/java/org/apache/jena/mem/HashedBunchMap.java
 delete mode 100644 
jena-core/src/main/java/org/apache/jena/mem/HashedTripleBunch.java
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/IndexingStrategy.java (99%)
 delete mode 100644 
jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMapBase.java
 delete mode 100644 
jena-core/src/main/java/org/apache/jena/mem/NodeToTriplesMapMem.java
 delete mode 100644 
jena-core/src/main/java/org/apache/jena/mem/ObjectIterator.java
 delete mode 100644 
jena-core/src/main/java/org/apache/jena/mem/TrackingTripleIterator.java
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/collection/FastHashBase.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/collection/FastHashMap.java (97%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/collection/FastHashSet.java (97%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/collection/HashCommonBase.java (97%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/collection/HashCommonMap.java (97%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/collection/HashCommonSet.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/collection/JenaMap.java (99%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/collection/JenaMapSetCommon.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/collection/JenaSet.java (97%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/collection/JenaSetHashOptimized.java (96%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/iterator/IteratorOfJenaSets.java (96%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/iterator/SparseArrayIndexedIterator.java (97%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/iterator/SparseArrayIterator.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/pattern/MatchPattern.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/pattern/PatternClassifier.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/spliterator/ArraySpliterator.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/spliterator/ArraySubSpliterator.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/spliterator/SparseArrayIndexedSpliterator.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/spliterator/SparseArraySpliterator.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/spliterator/SparseArraySubSpliterator.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/TripleStore.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/fast/FastArrayBunch.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/fast/FastHashedBunchMap.java (94%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/fast/FastHashedTripleBunch.java (93%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/fast/FastTripleBunch.java (92%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/fast/FastTripleStore.java (97%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/legacy/ArrayBunch.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/legacy/FieldFilter.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/legacy/HashedBunchMap.java (95%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/legacy/HashedTripleBunch.java (92%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/legacy/LegacyTripleStore.java (92%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/legacy/NodeToTriplesMap.java (96%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/legacy/NodeToTriplesMapMem.java (98%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/legacy/TripleBunch.java (94%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/roaring/NodesToBitmapsMap.java (94%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/roaring/RoaringBitmapTripleIterator.java (97%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/roaring/RoaringTripleStore.java (97%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/roaring/TripleSet.java (93%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/roaring/strategies/EagerStoreStrategy.java (97%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/roaring/strategies/LazyStoreStrategy.java (96%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/roaring/strategies/ManualStoreStrategy.java (95%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/roaring/strategies/MinimalStoreStrategy.java (94%)
 rename jena-core/src/main/java/org/apache/jena/{mem2 => 
mem}/store/roaring/strategies/StoreStrategy.java (96%)
 create mode 100644 
jena-core/src/main/java/org/apache/jena/memvalue/ArrayBunch.java
 create mode 100644 
jena-core/src/main/java/org/apache/jena/memvalue/BunchMap.java
 rename jena-core/src/main/java/org/apache/jena/{mem => memvalue}/ByValue.java 
(97%)
 rename jena-core/src/main/java/org/apache/jena/{mem => 
memvalue}/FieldFilter.java (89%)
 rename jena-core/src/main/java/org/apache/jena/{mem => 
memvalue}/GraphMemValue.java (91%)
 create mode 100644 
jena-core/src/main/java/org/apache/jena/memvalue/GraphTripleStoreBase.java
 copy 
jena-core/src/{test/java/org/apache/jena/mem/test/TestGraphTripleStoreMem.java 
=> main/java/org/apache/jena/memvalue/GraphTripleStoreMem.java} (52%)
 rename jena-core/src/main/java/org/apache/jena/{mem => 
memvalue}/HashCommon.java (99%)
 create mode 100644 
jena-core/src/main/java/org/apache/jena/memvalue/HashedBunchMap.java
 create mode 100644 
jena-core/src/main/java/org/apache/jena/memvalue/HashedTripleBunch.java
 create mode 100644 
jena-core/src/main/java/org/apache/jena/memvalue/NodeToTriplesMapBase.java
 create mode 100644 
jena-core/src/main/java/org/apache/jena/memvalue/NodeToTriplesMapMem.java
 create mode 100644 
jena-core/src/main/java/org/apache/jena/memvalue/ObjectIterator.java
 rename jena-core/src/main/java/org/apache/jena/{mem => 
memvalue}/SparseArraySpliterator.java (68%)
 rename jena-core/src/main/java/org/apache/jena/{mem => 
memvalue}/SparseArraySubSpliterator.java (65%)
 rename jena-core/src/main/java/org/apache/jena/{mem => 
memvalue}/StoreTripleIterator.java (52%)
 create mode 100644 
jena-core/src/main/java/org/apache/jena/memvalue/TrackingTripleIterator.java
 rename jena-core/src/main/java/org/apache/jena/{mem => 
memvalue}/TripleBunch.java (87%)
 rename jena-core/src/main/java/org/apache/jena/{mem => memvalue}/package.html 
(100%)
 rename jena-core/src/main/java/org/apache/jena/{mem/GraphMemBase.java => 
ontology/models/GraphRefCount.java} (73%)
 rename 
jena-core/src/test/java/org/apache/jena/{mem2/AbstractGraphMem2Test.java => 
mem/AbstractGraphMemTest.java} (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2/GraphMem2FastTest.java => 
mem/GraphMemFastTest.java} (82%)
 rename jena-core/src/test/java/org/apache/jena/{mem2/GraphMem2LegacyTest.java 
=> mem/GraphMemLegacyTest.java} (82%)
 rename jena-core/src/test/java/org/apache/jena/{mem2/GraphMem2RoaringTest.java 
=> mem/GraphMemRoaringTest.java} (95%)
 rename jena-core/src/test/java/org/apache/jena/{mem2/GraphMem2Test.java => 
mem/GraphMemTest.java} (83%)
 rename jena-core/src/test/java/org/apache/jena/{mem2/TS4_GraphMem2.java => 
mem/TS4_GraphMem.java} (63%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/collection/AbstractJenaMapNodeTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/collection/AbstractJenaSetTripleTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/collection/FastHashMapTest.java (96%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/collection/FastHashMapTest2.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/collection/FastHashSetTest.java (96%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/collection/FastHashSetTest2.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/collection/HashCommonMapTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/collection/HashCommonSetTest.java (98%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/iterator/IteratorOfJenaSetsTest.java (96%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/iterator/SparseArrayIndexedIteratorTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/iterator/SparseArrayIteratorTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/pattern/PatternClassifierTest.java (98%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/spliterator/ArraySpliteratorTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/spliterator/ArraySubSpliteratorTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/spliterator/SparseArrayIndexedSpliteratorTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/spliterator/SparseArraySpliteratorTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/spliterator/SparseArraySubSpliteratorTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/store/AbstractTripleStoreTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/store/fast/FastArrayBunchTest.java (90%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/store/fast/FastHashedTripleBunchTest.java (93%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/store/fast/FastTripleStoreTest.java (96%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/store/legacy/ArrayBunchTest.java (86%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/store/legacy/FieldFilterTest.java (98%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/store/legacy/HashedTripleBunchTest.java (91%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/store/legacy/LegacyTripleStoreTest.java (86%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/store/legacy/NodeToTriplesMapMemTest.java (87%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/store/roaring/RoaringBitmapTripleIteratorTest.java (98%)
 rename jena-core/src/test/java/org/apache/jena/{mem2 => 
mem}/store/roaring/RoaringTripleStoreTest.java (97%)
 rename jena-core/src/test/java/org/apache/jena/{mem => 
memvalue}/FieldFilterTest.java (98%)
 rename jena-core/src/test/java/org/apache/jena/{mem => 
memvalue}/SparseArraySpliteratorTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem => 
memvalue}/SparseArraySubSpliteratorTest.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem/test => 
memvalue}/TS3_GraphMemValue.java (87%)
 rename jena-core/src/test/java/org/apache/jena/{mem/test => 
memvalue}/TestArrayTripleBunch.java (94%)
 rename jena-core/src/test/java/org/apache/jena/{mem/test => 
memvalue}/TestConcurrentModificationException.java (98%)
 rename jena-core/src/test/java/org/apache/jena/{mem/test => 
memvalue}/TestGraphMemModel.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem/test => 
memvalue}/TestGraphTripleStoreMem.java (93%)
 rename jena-core/src/test/java/org/apache/jena/{mem/test => 
memvalue}/TestHashCommon.java (98%)
 rename jena-core/src/test/java/org/apache/jena/{mem/test => 
memvalue}/TestHashedBunchMap.java (95%)
 rename jena-core/src/test/java/org/apache/jena/{mem/test => 
memvalue}/TestHashedTripleBunch.java (98%)
 rename jena-core/src/test/java/org/apache/jena/{graph/test => 
memvalue}/TestNodeToTriplesMapMem.java (99%)
 rename jena-core/src/test/java/org/apache/jena/{mem/test => 
memvalue}/TestTripleBunch.java (98%)

Reply via email to