Fix byte mask used for index calculation

enso-org · Jun 3, 2024 · a157891 · a157891
1 parent f9a802e
commit a157891
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...ime-language-arrow/src/main/java/org/enso/interpreter/arrow/runtime/ByteBufferDirect.java b/...ime-language-arrow/src/main/java/org/enso/interpreter/arrow/runtime/ByteBufferDirect.java
@@ -184,15 +184,15 @@ public int capacity() throws UnsupportedMessageException {
   public boolean isNull(int index) {
     var bufferIndex = index >> 3;
     var slot = bitmapBuffer.get(bufferIndex);
-    var byteIndex = index & ~(1 << 3);
+    var byteIndex = index & byteMask;
     var mask = 1 << byteIndex;
     return (slot & mask) == 0;
   }
 
   public void setNull(int index) {
     var bufferIndex = index >> 3;
     var slot = bitmapBuffer.get(bufferIndex);
-    var byteIndex = index & ~(1 << 3);
+    var byteIndex = index & byteMask;
     var mask = ~(1 << byteIndex);
     bitmapBuffer.put(bufferIndex, (byte) (slot & mask));
   }
@@ -201,12 +201,17 @@ private void setValidityBitmap(int index0, int unitSize) {
     var index = index0 / unitSize;
     var bufferIndex = index >> 3;
     var slot = bitmapBuffer.get(bufferIndex);
-    var byteIndex = index & ~(1 << 3);
+
+    var byteIndex = index & byteMask;
+    var test = index & byteMask;
+
     var mask = 1 << byteIndex;
     var updated = (slot | mask);
     bitmapBuffer.put(bufferIndex, (byte) (updated));
   }
 
+  private static final int byteMask = ~(~(1 << 3) + 1); // 7
+
   @Override
   public void close() throws Exception {
     this.dataBuffer.clear();