Merge branch 'deephaven:main' into fix-java-coverage-enabled-in-build

Author: stanbrub

engine/query-constants/src/main/java/io/deephaven/util/BooleanUtils.java

@@ -9,17 +9,17 @@
 public class BooleanUtils {
 
     /**
-     * The byte encoding of null booleans.
+     * The byte encoding of null booleans. Do not use to compare values, use {@link #isNull(byte)} instead.
      */
     public static final byte NULL_BOOLEAN_AS_BYTE = QueryConstants.NULL_BYTE;
 
     /**
-     * The byte encoding of true booleans.
+     * The byte encoding of true booleans. Do not use to compare values, use {@link #byteAsBoolean(byte)} instead.
      */
     public static final byte TRUE_BOOLEAN_AS_BYTE = (byte) 1;
 
     /**
-     * The byte encoding of false booleans.
+     * The byte encoding of false booleans. This is the only safe value to use when comparing byte representations.
      */
     public static final byte FALSE_BOOLEAN_AS_BYTE = (byte) 0;
 
@@ -36,7 +36,17 @@ public class BooleanUtils {
      * @return the boxed boolean represented by byteValue
      */
     public static Boolean byteAsBoolean(final byte byteValue) {
-        return byteValue == FALSE_BOOLEAN_AS_BYTE ? Boolean.FALSE : byteValue > 0 ? Boolean.TRUE : null;
+        return isNull(byteValue) ? null : byteValue > FALSE_BOOLEAN_AS_BYTE;
+    }
+
+    /**
+     * Check if a byte represents a null boolean.
+     *
+     * @param byteValue the byte to check if it represents a null boolean
+     * @return true if byteValue represents a null boolean
+     */
+    public static boolean isNull(final byte byteValue) {
+        return byteValue < 0;
     }
 
     /**

engine/table/src/main/java/io/deephaven/engine/table/impl/BothIncrementalNaturalJoinStateManager.java

@@ -21,11 +21,11 @@ public interface BothIncrementalNaturalJoinStateManager extends IncrementalNatur
 
     void compactAll();
 
-    WritableRowRedirection buildIndexedRowRedirection(QueryTable leftTable, boolean exactMatch, InitialBuildContext ibc,
+    WritableRowRedirection buildIndexedRowRedirection(QueryTable leftTable, InitialBuildContext ibc,
             ColumnSource<RowSet> indexRowSets, JoinControl.RedirectionType redirectionType);
 
-    WritableRowRedirection buildRowRedirectionFromRedirections(QueryTable leftTable, boolean exactMatch,
-            InitialBuildContext ibc, JoinControl.RedirectionType redirectionType);
+    WritableRowRedirection buildRowRedirectionFromRedirections(QueryTable leftTable, InitialBuildContext ibc,
+            JoinControl.RedirectionType redirectionType);
 
     Context makeProbeContext(ColumnSource<?>[] probeSources, long maxSize);
 

engine/table/src/main/java/io/deephaven/engine/table/impl/IncrementalNaturalJoinStateManager.java

@@ -3,14 +3,58 @@
 //
 package io.deephaven.engine.table.impl;
 
+import io.deephaven.api.NaturalJoinType;
+import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.rowset.RowSet;
+import io.deephaven.engine.rowset.WritableRowSet;
 
 public interface IncrementalNaturalJoinStateManager {
-    long getRightIndex(int slot);
+    long getRightRowKey(int slot);
 
-    RowSet getLeftIndex(int slot);
+    RowSet getRightRowSet(int slot);
+
+    RowSet getLeftRowSet(int slot);
 
     String keyString(int slot);
 
-    void checkExactMatch(boolean exactMatch, long leftKeyIndex, long rightSide);
+    void checkExactMatch(long leftKeyIndex, long rightSide);
+
+    /**
+     * Given the join type, return the correct row key from the set of RHS duplicates.
+     */
+    default long getRightRowKeyFromDuplicates(final WritableRowSet duplicates, final NaturalJoinType joinType) {
+        if (joinType == NaturalJoinType.LAST_MATCH) {
+            return duplicates.lastRowKey();
+        }
+        return duplicates.firstRowKey();
+    }
+
+    /**
+     * Add a key to the RHS duplicates, return the appropriate row key from this set *AFTER* the addition.
+     */
+    default long addRightRowKeyToDuplicates(final WritableRowSet duplicates, final long keyToRemove,
+            final NaturalJoinType joinType) {
+        duplicates.insert(keyToRemove);
+        return getRightRowKeyFromDuplicates(duplicates, joinType);
+    }
+
+    /**
+     * Remove the key from the RHS duplicates, return the appropriate row key from this set *BEFORE* the removal.
+     */
+    default long removeRightRowKeyFromDuplicates(final WritableRowSet duplicates, final long keyToRemove,
+            final NaturalJoinType joinType) {
+        final long originalRowKey = getRightRowKeyFromDuplicates(duplicates, joinType);
+        duplicates.remove(keyToRemove);
+        return originalRowKey;
+    }
+
+    /**
+     * Shift a key in the RHS duplicate row set.
+     */
+    default void shiftOneKey(WritableRowSet duplicates, long shiftedKey, long shiftDelta) {
+        final long sizeBefore = duplicates.size();
+        duplicates.remove(shiftedKey - shiftDelta);
+        duplicates.insert(shiftedKey);
+        Assert.eq(duplicates.size(), "duplicates.size()", sizeBefore, "sizeBefore");
+    }
 }