GH-4870 MapDB3 based collection factory is now the default instead of an MapDB1 based one

JervenBolleman · JervenBolleman · commit 0ef1d99f63e0 · 2024-01-19T13:52:51.000+01:00
Signed-off-by: Jerven Bolleman &lt;jerven.bolleman@sib.swiss&gt;
diff --git a/core/collection-factory/mapdb3/pom.xml b/core/collection-factory/mapdb3/pom.xml
@@ -28,6 +28,18 @@
 			<groupId>org.mapdb</groupId>
 			<artifactId>mapdb</artifactId>
 			<version>3.0.9</version>
+			<exclusions>
+				<exclusion>
+					<groupId>net.jpountz.lz4</groupId>
+					<artifactId>lz4</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!--Update the lz4 dependency from the earlier net.jpountz.lz4, avoids duplicate classfiles downstream-->
+		<dependency>
+			<groupId>org.lz4</groupId>
+			<artifactId>lz4-java</artifactId>
+			<version>1.8.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jmh</groupId>
diff --git a/core/sail/extensible-store/pom.xml b/core/sail/extensible-store/pom.xml
@@ -17,7 +17,7 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>rdf4j-collection-factory-mapdb</artifactId>
+			<artifactId>rdf4j-collection-factory-mapdb3</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/core/sail/extensible-store/src/main/java/org/eclipse/rdf4j/sail/extensiblestore/ExtensibleStore.java b/core/sail/extensible-store/src/main/java/org/eclipse/rdf4j/sail/extensiblestore/ExtensibleStore.java
@@ -16,7 +16,7 @@
 import java.util.function.Supplier;
 
 import org.eclipse.rdf4j.collection.factory.api.CollectionFactory;
-import org.eclipse.rdf4j.collection.factory.mapdb.MapDbCollectionFactory;
+import org.eclipse.rdf4j.collection.factory.mapdb.MapDb3CollectionFactory;
 import org.eclipse.rdf4j.common.annotation.Experimental;
 import org.eclipse.rdf4j.common.transaction.IsolationLevel;
 import org.eclipse.rdf4j.common.transaction.IsolationLevels;
@@ -178,6 +178,6 @@ public enum Cache {
 
 	@Override
 	public Supplier<CollectionFactory> getCollectionFactory() {
-		return () -> new MapDbCollectionFactory(getIterationCacheSyncThreshold());
+		return () -> new MapDb3CollectionFactory(getIterationCacheSyncThreshold());
 	}
 }
diff --git a/core/sail/lmdb/pom.xml b/core/sail/lmdb/pom.xml
@@ -126,7 +126,7 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>rdf4j-collection-factory-mapdb</artifactId>
+			<artifactId>rdf4j-collection-factory-mapdb3</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbStore.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbStore.java
@@ -22,7 +22,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.eclipse.rdf4j.collection.factory.api.CollectionFactory;
-import org.eclipse.rdf4j.collection.factory.mapdb.MapDbCollectionFactory;
+import org.eclipse.rdf4j.collection.factory.mapdb.MapDb3CollectionFactory;
 import org.eclipse.rdf4j.common.annotation.Experimental;
 import org.eclipse.rdf4j.common.concurrent.locks.Lock;
 import org.eclipse.rdf4j.common.concurrent.locks.LockManager;
@@ -404,6 +404,6 @@ private boolean upgradeStore(File dataDir, String version) throws SailException
 
 	@Override
 	public Supplier<CollectionFactory> getCollectionFactory() {
-		return () -> new MapDbCollectionFactory(getIterationCacheSyncThreshold());
+		return () -> new MapDb3CollectionFactory(getIterationCacheSyncThreshold());
 	}
 }
diff --git a/core/sail/nativerdf/pom.xml b/core/sail/nativerdf/pom.xml
@@ -32,7 +32,7 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>rdf4j-collection-factory-mapdb</artifactId>
+			<artifactId>rdf4j-collection-factory-mapdb3</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/core/sail/nativerdf/src/main/java/org/eclipse/rdf4j/sail/nativerdf/NativeStore.java b/core/sail/nativerdf/src/main/java/org/eclipse/rdf4j/sail/nativerdf/NativeStore.java
@@ -23,7 +23,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.eclipse.rdf4j.collection.factory.api.CollectionFactory;
-import org.eclipse.rdf4j.collection.factory.mapdb.MapDbCollectionFactory;
+import org.eclipse.rdf4j.collection.factory.mapdb.MapDb3CollectionFactory;
 import org.eclipse.rdf4j.common.concurrent.locks.Lock;
 import org.eclipse.rdf4j.common.concurrent.locks.LockManager;
 import org.eclipse.rdf4j.common.io.MavenUtil;
@@ -500,6 +500,6 @@ private boolean upgradeStore(File dataDir, String version) throws IOException, S
 
 	@Override
 	public Supplier<CollectionFactory> getCollectionFactory() {
-		return () -> new MapDbCollectionFactory(getIterationCacheSyncThreshold());
+		return () -> new MapDb3CollectionFactory(getIterationCacheSyncThreshold());
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`import java.util.function.Supplier;`
`17`	`17`
`18`	`18`	`import org.eclipse.rdf4j.collection.factory.api.CollectionFactory;`
`19`		`-import org.eclipse.rdf4j.collection.factory.mapdb.MapDbCollectionFactory;`
	`19`	`+import org.eclipse.rdf4j.collection.factory.mapdb.MapDb3CollectionFactory;`
`20`	`20`	`import org.eclipse.rdf4j.common.annotation.Experimental;`
`21`	`21`	`import org.eclipse.rdf4j.common.transaction.IsolationLevel;`
`22`	`22`	`import org.eclipse.rdf4j.common.transaction.IsolationLevels;`
`@@ -178,6 +178,6 @@ public enum Cache {`
`178`	`178`
`179`	`179`	`@Override`
`180`	`180`	`public Supplier<CollectionFactory> getCollectionFactory() {`
`181`		`- return () -> new MapDbCollectionFactory(getIterationCacheSyncThreshold());`
	`181`	`+ return () -> new MapDb3CollectionFactory(getIterationCacheSyncThreshold());`
`182`	`182`	`}`
`183`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`import org.apache.commons.io.FileUtils;`
`24`	`24`	`import org.eclipse.rdf4j.collection.factory.api.CollectionFactory;`
`25`		`-import org.eclipse.rdf4j.collection.factory.mapdb.MapDbCollectionFactory;`
	`25`	`+import org.eclipse.rdf4j.collection.factory.mapdb.MapDb3CollectionFactory;`
`26`	`26`	`import org.eclipse.rdf4j.common.annotation.Experimental;`
`27`	`27`	`import org.eclipse.rdf4j.common.concurrent.locks.Lock;`
`28`	`28`	`import org.eclipse.rdf4j.common.concurrent.locks.LockManager;`
`@@ -404,6 +404,6 @@ private boolean upgradeStore(File dataDir, String version) throws SailException`
`404`	`404`
`405`	`405`	`@Override`
`406`	`406`	`public Supplier<CollectionFactory> getCollectionFactory() {`
`407`		`- return () -> new MapDbCollectionFactory(getIterationCacheSyncThreshold());`
	`407`	`+ return () -> new MapDb3CollectionFactory(getIterationCacheSyncThreshold());`
`408`	`408`	`}`
`409`	`409`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`import org.apache.commons.io.FileUtils;`
`25`	`25`	`import org.eclipse.rdf4j.collection.factory.api.CollectionFactory;`
`26`		`-import org.eclipse.rdf4j.collection.factory.mapdb.MapDbCollectionFactory;`
	`26`	`+import org.eclipse.rdf4j.collection.factory.mapdb.MapDb3CollectionFactory;`
`27`	`27`	`import org.eclipse.rdf4j.common.concurrent.locks.Lock;`
`28`	`28`	`import org.eclipse.rdf4j.common.concurrent.locks.LockManager;`
`29`	`29`	`import org.eclipse.rdf4j.common.io.MavenUtil;`
`@@ -500,6 +500,6 @@ private boolean upgradeStore(File dataDir, String version) throws IOException, S`
`500`	`500`
`501`	`501`	`@Override`
`502`	`502`	`public Supplier<CollectionFactory> getCollectionFactory() {`
`503`		`- return () -> new MapDbCollectionFactory(getIterationCacheSyncThreshold());`
	`503`	`+ return () -> new MapDb3CollectionFactory(getIterationCacheSyncThreshold());`
`504`	`504`	`}`
`505`	`505`	`}`