Merge pull request #400 from apache/Minor_cleanups

Minor method renaming that propagated to a lot of places.
apache · Jun 9, 2022 · f68aa7d · f68aa7d
2 parents 4931199 + e5f69a8
commit f68aa7d
Show file tree

Hide file tree

Showing 42 changed files with 557 additions and 468 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/src/main/java/org/apache/datasketches/HashOperations.java b/src/main/java/org/apache/datasketches/HashOperations.java
@@ -21,7 +21,7 @@
 
 import static java.lang.Math.max;
 import static org.apache.datasketches.Util.MIN_LG_ARR_LONGS;
-import static org.apache.datasketches.Util.ceilingPowerOf2;
+import static org.apache.datasketches.Util.ceilingIntPowerOf2;
 
 import org.apache.datasketches.memory.Memory;
 import org.apache.datasketches.memory.WritableMemory;
@@ -350,7 +350,7 @@ public static long[] convertToHashTable(
    */
   public static int minLgHashTableSize(final int count, final double rebuild_threshold) {
     final int upperCount = (int) Math.ceil(count / rebuild_threshold);
-    final int arrLongs = max(ceilingPowerOf2(upperCount), 1 << MIN_LG_ARR_LONGS);
+    final int arrLongs = max(ceilingIntPowerOf2(upperCount), 1 << MIN_LG_ARR_LONGS);
     final int newLgArrLongs = Integer.numberOfTrailingZeros(arrLongs);
     return newLgArrLongs;
   }