Merge pull request #155 from ate47/fix_diff_64kp1

fix HDTDiff certain size values close to 64 or 0
rdfhdt · Mar 21, 2022 · 1275d8b · 1275d8b
2 parents d7acea2 + aa75959
commit 1275d8b
Show file tree

Hide file tree

Showing 9 changed files with 159 additions and 1 deletion.
diff --git a/hdt-java-core/src/main/java/org/rdfhdt/hdt/compact/bitmap/Bitmap64.java b/hdt-java-core/src/main/java/org/rdfhdt/hdt/compact/bitmap/Bitmap64.java
@@ -222,6 +222,9 @@ public long countOnes() {
 			return 0;
 		long acc = 0;
 		int end = wordIndex(numbits);
+		if (end >= words.length) {
+			end = words.length - 1;
+		}
 		for (int i = 0; i <= end; i++)
 			acc += Long.bitCount(words[i]);
 		return acc;

diff --git a/hdt-java-core/src/main/java/org/rdfhdt/hdt/hdt/impl/HDTImpl.java b/hdt-java-core/src/main/java/org/rdfhdt/hdt/hdt/impl/HDTImpl.java
@@ -766,7 +766,7 @@ public void diffBit(String location, HDT hdt, Bitmap deleteBitmap, ProgressListe
 		log.debug("Generating Triples...");
 		il.notifyProgress(40, "Generating Triples...");
 		// map the triples based on the new dictionary
-		BitmapTriplesIteratorMapDiff mapIter = new BitmapTriplesIteratorMapDiff(hdt, deleteBitmap, diff, iter.getCount());
+		BitmapTriplesIteratorMapDiff mapIter = new BitmapTriplesIteratorMapDiff(hdt, deleteBitmap, diff, iter.getCount() + 1);
 		BitmapTriples triples = new BitmapTriples(spec);
 		triples.load(mapIter, listener);
 		this.triples = triples;

diff --git a/hdt-java-core/src/test/java/org/rdfhdt/hdt/hdtDiff/HdtDiffStaticTest.java b/hdt-java-core/src/test/java/org/rdfhdt/hdt/hdtDiff/HdtDiffStaticTest.java
@@ -176,4 +176,22 @@ public void ntFilesDiffTest23M24() throws IOException, ParserException {
                 "hdtDiff/example23-24.nt"
         );
     }
+
+    @Test
+    public void ntFilesDiffTest25M26() throws IOException, ParserException {
+        ntFilesDiffTest(
+                "hdtDiff/example25.nt",
+                "hdtDiff/example26.nt",
+                "hdtDiff/example25-26.nt"
+        );
+    }
+
+    @Test
+    public void ntFilesDiffTest27M28() throws IOException, ParserException {
+        ntFilesDiffTest(
+                "hdtDiff/example27.nt",
+                "hdtDiff/example28.nt",
+                "hdtDiff/example27-28.nt"
+        );
+    }
 }
diff --git a/hdt-java-core/src/test/resources/hdtDiff/example25-26.nt b/hdt-java-core/src/test/resources/hdtDiff/example25-26.nt
@@ -0,0 +1,3 @@
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O00> .
+
+
diff --git a/hdt-java-core/src/test/resources/hdtDiff/example25.nt b/hdt-java-core/src/test/resources/hdtDiff/example25.nt
@@ -0,0 +1,2 @@
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O00> .
+
diff --git a/hdt-java-core/src/test/resources/hdtDiff/example26.nt b/hdt-java-core/src/test/resources/hdtDiff/example26.nt
diff --git a/hdt-java-core/src/test/resources/hdtDiff/example27-28.nt b/hdt-java-core/src/test/resources/hdtDiff/example27-28.nt
@@ -0,0 +1,66 @@
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O00> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O01> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O02> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O03> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O04> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O05> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O06> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O07> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O08> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O09> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O10> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O11> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O12> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O13> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O14> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O15> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O16> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O17> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O18> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O19> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O20> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O21> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O22> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O23> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O24> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O25> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O26> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O27> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O28> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O29> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O30> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O31> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O32> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O33> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O34> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O35> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O36> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O37> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O38> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O39> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O40> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O41> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O42> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O43> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O44> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O45> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O46> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O47> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O48> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O49> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O50> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O51> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O52> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O53> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O54> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O55> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O56> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O57> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O58> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O59> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O60> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O61> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O62> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O63> .
+
+
diff --git a/hdt-java-core/src/test/resources/hdtDiff/example27.nt b/hdt-java-core/src/test/resources/hdtDiff/example27.nt
@@ -0,0 +1,66 @@
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O00> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O01> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O02> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O03> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O04> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O05> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O06> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O07> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O08> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O09> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O10> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O11> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O12> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O13> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O14> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O15> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O16> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O17> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O18> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O19> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O20> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O21> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O22> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O23> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O24> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O25> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O26> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O27> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O28> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O29> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O30> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O31> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O32> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O33> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O34> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O35> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O36> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O37> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O38> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O39> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O40> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O41> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O42> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O43> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O44> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O45> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O46> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O47> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O48> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O49> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O50> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O51> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O52> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O53> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O54> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O55> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O56> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O57> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O58> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O59> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O60> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O61> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O62> .
+<http://example.com/S1> <http://example.com/P1> <http://example.com/O63> .
+
+
diff --git a/hdt-java-core/src/test/resources/hdtDiff/example28.nt b/hdt-java-core/src/test/resources/hdtDiff/example28.nt