refactor: use ObjectComparisons.compare for fixupObjectComparisons (d…

…eephaven#5781)
lbooker42 · Jul 18, 2024 · 7ee9aed · 7ee9aed
1 parent 2ea2363
commit 7ee9aed
Show file tree

Hide file tree

Showing 32 changed files with 73 additions and 295 deletions.
diff --git a/...c/main/java/io/deephaven/engine/table/impl/by/ssmcountdistinct/ObjectSsmBackedSource.java b/...c/main/java/io/deephaven/engine/table/impl/by/ssmcountdistinct/ObjectSsmBackedSource.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.by.ssmcountdistinct;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.vector.ObjectVector;
 import io.deephaven.engine.table.impl.AbstractColumnSource;

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmminmax/ObjectSetResult.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmminmax/ObjectSetResult.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.by.ssmminmax;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.engine.table.WritableColumnSource;
 import io.deephaven.engine.table.impl.sources.ObjectArraySource;

diff --git a/...main/java/io/deephaven/engine/table/impl/by/ssmpercentile/ObjectPercentileTypeHelper.java b/...main/java/io/deephaven/engine/table/impl/by/ssmpercentile/ObjectPercentileTypeHelper.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.by.ssmpercentile;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.ChunkLengths;
 import io.deephaven.chunk.attributes.Values;

diff --git a/.../src/main/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectDupCompactKernel.java b/.../src/main/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectDupCompactKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.join.dupcompact;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
@@ -109,19 +110,8 @@ private static int compactDuplicatesPreferFirst(
  // region comparison functions
  // ascending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return -1;
- }
- if (rhs == null) {
- return 1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)lhs).compareTo(rhs);
+ return ObjectComparisons.compare(lhs, rhs);
  }
-
  // endregion comparison functions
 
  private static boolean leq(Object lhs, Object rhs) {

diff --git a/...in/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectReverseDupCompactKernel.java b/...in/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectReverseDupCompactKernel.java
@@ -9,8 +9,10 @@
 package io.deephaven.engine.table.impl.join.dupcompact;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
@@ -112,17 +114,7 @@ private static int compactDuplicatesPreferFirst(
  // region comparison functions
  // descending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return 1;
- }
- if (rhs == null) {
- return -1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)rhs).compareTo(lhs);
+ return ObjectComparisons.compare(rhs, lhs);
  }
  // endregion comparison functions
 

diff --git a/...le/src/main/java/io/deephaven/engine/table/impl/join/dupexpand/ObjectDupExpandKernel.java b/...le/src/main/java/io/deephaven/engine/table/impl/join/dupexpand/ObjectDupExpandKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.join.dupexpand;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;

diff --git a/.../main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactReverseStampKernel.java b/.../main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactReverseStampKernel.java
@@ -9,8 +9,10 @@
 package io.deephaven.engine.table.impl.join.stamp;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -84,17 +86,7 @@ static private void computeRedirections(ObjectChunk<Object, Values> leftStamps,
  // region comparison functions
  // descending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return 1;
- }
- if (rhs == null) {
- return -1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)rhs).compareTo(lhs);
+ return ObjectComparisons.compare(rhs, lhs);
  }
  // endregion comparison functions
 

diff --git a/...ble/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactStampKernel.java b/...ble/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactStampKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.join.stamp;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -81,19 +82,8 @@ static private void computeRedirections(ObjectChunk<Object, Values> leftStamps,
  // region comparison functions
  // ascending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return -1;
- }
- if (rhs == null) {
- return 1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)lhs).compareTo(rhs);
+ return ObjectComparisons.compare(lhs, rhs);
  }
-
  // endregion comparison functions
 
  private static boolean lt(Object lhs, Object rhs) {

diff --git a/...ble/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectReverseStampKernel.java b/...ble/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectReverseStampKernel.java
@@ -9,8 +9,10 @@
 package io.deephaven.engine.table.impl.join.stamp;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -87,17 +89,7 @@ static private void computeRedirections(ObjectChunk<Object, Values> leftStamps,
  // region comparison functions
  // descending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return 1;
- }
- if (rhs == null) {
- return -1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)rhs).compareTo(lhs);
+ return ObjectComparisons.compare(rhs, lhs);
  }
  // endregion comparison functions
 

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectStampKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectStampKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.join.stamp;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -84,19 +85,8 @@ static private void computeRedirections(ObjectChunk<Object, Values> leftStamps,
  // region comparison functions
  // ascending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return -1;
- }
- if (rhs == null) {
- return 1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)lhs).compareTo(rhs);
+ return ObjectComparisons.compare(lhs, rhs);
  }
-
  // endregion comparison functions
 
  private static boolean lt(Object lhs, Object rhs) {

diff --git a/...n/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortDescendingKernel.java b/...n/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortDescendingKernel.java
@@ -9,6 +9,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -204,17 +205,7 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
  // region comparison functions
  // descending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return 1;
- }
- if (rhs == null) {
- return -1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)rhs).compareTo(lhs);
+ return ObjectComparisons.compare(rhs, lhs);
  }
  // endregion comparison functions
 

diff --git a/...le/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortKernel.java b/...le/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -203,19 +204,8 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
  // region comparison functions
  // ascending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return -1;
- }
- if (rhs == null) {
- return 1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)lhs).compareTo(rhs);
+ return ObjectComparisons.compare(lhs, rhs);
  }
-
  // endregion comparison functions
 
  @VisibleForTesting

diff --git a/...in/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortDescendingKernel.java b/...in/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortDescendingKernel.java
@@ -9,6 +9,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -204,17 +205,7 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
  // region comparison functions
  // descending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return 1;
- }
- if (rhs == null) {
- return -1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)rhs).compareTo(lhs);
+ return ObjectComparisons.compare(rhs, lhs);
  }
  // endregion comparison functions
 

diff --git a/...ble/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortKernel.java b/...ble/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -203,19 +204,8 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
  // region comparison functions
  // ascending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return -1;
- }
- if (rhs == null) {
- return 1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)lhs).compareTo(rhs);
+ return ObjectComparisons.compare(lhs, rhs);
  }
-
  // endregion comparison functions
 
  @VisibleForTesting

diff --git a/...n/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortDescendingKernel.java b/...n/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortDescendingKernel.java
@@ -9,6 +9,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -204,17 +205,7 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
  // region comparison functions
  // descending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return 1;
- }
- if (rhs == null) {
- return -1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)rhs).compareTo(lhs);
+ return ObjectComparisons.compare(rhs, lhs);
  }
  // endregion comparison functions
 

diff --git a/...le/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortKernel.java b/...le/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -203,19 +204,8 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
  // region comparison functions
  // ascending comparison
  private static int doComparison(Object lhs, Object rhs) {
- if (lhs == rhs) {
- return 0;
- }
- if (lhs == null) {
- return -1;
- }
- if (rhs == null) {
- return 1;
- }
- //noinspection unchecked,rawtypes
- return ((Comparable)lhs).compareTo(rhs);
+ return ObjectComparisons.compare(lhs, rhs);
  }
-
  // endregion comparison functions
 
  @VisibleForTesting