GH-455 Disable delete bitmap when not required

the-qa-company · Mar 1, 2024 · c760e93 · c760e93
1 parent e42e7f6
commit c760e93
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/...t-store/src/main/java/com/the_qa_company/qendpoint/store/EndpointStoreTripleIterator.java b/...t-store/src/main/java/com/the_qa_company/qendpoint/store/EndpointStoreTripleIterator.java
@@ -1,7 +1,9 @@
 package com.the_qa_company.qendpoint.store;
 
+import com.the_qa_company.qendpoint.core.compact.bitmap.MultiLayerBitmapWrapper;
 import com.the_qa_company.qendpoint.core.enums.TripleComponentOrder;
 import com.the_qa_company.qendpoint.store.exception.EndpointTimeoutException;
+import com.the_qa_company.qendpoint.utils.BitArrayDisk;
 import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 import org.eclipse.rdf4j.common.iteration.IndexReportingIterator;
 import org.eclipse.rdf4j.model.IRI;
@@ -52,16 +54,11 @@ public boolean hasNext() {
 		// iterate over the result of hdt
 		while (iterator.hasNext()) {
 			TripleID tripleID = iterator.next();
-			long index;
-			if (endpoint.isDeleteDisabled()) {
-				index = -1;
-			} else {
-				index = iterator.getLastTriplePosition();
-			}
 			TripleComponentOrder order = iterator.isLastTriplePositionBoundToOrder() ? iterator.getOrder()
 					: TripleComponentOrder.SPO;
-			if (endpoint.isDeleteDisabled() || !endpoint.getDeleteBitMap(order)
-					.access(tripleID.isQuad() ? tripleID.getGraph() - 1 : 0, index)) {
+			MultiLayerBitmapWrapper.MultiLayerModBitmapWrapper dbm = endpoint.getDeleteBitMap(order);
+			if (endpoint.isDeleteDisabled() || dbm.<BitArrayDisk>getHandle().getMaxNumBits() == 0
+					|| !dbm.access(tripleID.isQuad() ? tripleID.getGraph() - 1 : 0, iterator.getLastTriplePosition())) {
 				Resource subject = endpoint.getHdtConverter().idToSubjectHDTResource(tripleID.getSubject());
 				IRI predicate = endpoint.getHdtConverter().idToPredicateHDTResource(tripleID.getPredicate());
 				Value object = endpoint.getHdtConverter().idToObjectHDTResource(tripleID.getObject());

diff --git a/qendpoint-store/src/main/java/com/the_qa_company/qendpoint/utils/BitArrayDisk.java b/qendpoint-store/src/main/java/com/the_qa_company/qendpoint/utils/BitArrayDisk.java
@@ -404,4 +404,11 @@ public String printInfo() {
 				+ (inMemory ? ", inMemory: true" : "\nfile: " + output.getFile().getAbsolutePath())
 				+ (allBits <= 20 ? "\nbits: " + toString(true) : "");
 	}
+
+	/**
+	 * @return the maximum bit of this bitmap
+	 */
+	public long getMaxNumBits() {
+		return numbits;
+	}
 }