more wip

Author: mkeskells

roaringbitmap/src/main/java/org/roaringbitmap/art/Art.java

@@ -283,7 +283,7 @@ public <T> long findOrCreateByKey(long highPart, ToLongFunction<Supplier<T>> nex
               byte branchKey = parentBranch.prefix[matchLength];
               parentBranch = parentBranch.shrinkPrefixBy(matchLength + 1);
               result = new LeafNode(highPart, nextContainer.applyAsLong(ifNotFound));
-              parent = Node4.create(parentBranch, result, branchKey, LongUtils.getByte(highPart, depth + matchLength), highPart, depth, (byte) depth + matchLength);
+              parent = Node4.create(parentBranch, result, branchKey, LongUtils.getByte(highPart, depth + matchLength), highPart, depth,  matchLength);
               break;
             }
           }

roaringbitmap/src/main/java/org/roaringbitmap/longlong/HighLowContainer.java

@@ -74,7 +74,7 @@ public void put(byte[] highPart, Container container) {
   }
 
   public ContainerWithIndex findOrCreateContainer(long highPart, Supplier<Container> ifNotFound) {
-    long containerIdx = art.findOrCreateByKey(highPart, containers::addContainer, ifNotFound);
+    long containerIdx = art.findOrCreateByKey(highPart, x -> containers.addContainer(x.get()), ifNotFound);
       Container container = containers.getContainer(containerIdx);
       return new ContainerWithIndex(container, containerIdx);
   }

roaringbitmap/src/main/java/org/roaringbitmap/longlong/Roaring64Bitmap.java

@@ -70,7 +70,7 @@ public void addLong(long x) {
   public void addLongNew(long x) {
     long high = LongUtils.highPartOnly(x);
     char low = LongUtils.lowPart(x);
-    ContainerWithIndex containerWithIndex = highLowContainer.searchOrCreateContainer(high, ArrayContainer::new);
+    ContainerWithIndex containerWithIndex = highLowContainer.findOrCreateContainer(high, ArrayContainer::new);
     Container container = containerWithIndex.getContainer();
     Container freshOne = container.add(low);
     highLowContainer.replaceContainer(containerWithIndex.getContainerIdx(), freshOne);