Merge pull request #490 from apache/function_name_change

Changed the name of a utility function that should have been defined for longs.
apache · Jan 9, 2024 · 1e7cfb5 · 1e7cfb5
2 parents 4e906b2 + fc91b4e
commit 1e7cfb5
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 88 deletions.
diff --git a/src/main/java/org/apache/datasketches/common/Util.java b/src/main/java/org/apache/datasketches/common/Util.java
@@ -747,7 +747,7 @@ public static final int bitAt(final long number, final int bitPos) {
    * @param n the given number
    * @return the number of decimal digits of the number n
    */
-  public static int numDigits(int n) {
+  public static int numDigits(long n) {
     if (n % 10 == 0) { n++; }
     return (int) ceil(log(n) / log(10));
   }
@@ -764,8 +764,8 @@ public static int numDigits(int n) {
    * @param length the desired string length.
    * @return the given number to a string prepended with spaces
    */
-  public static String intToFixedLengthString(final int number, final int length) {
-    final String num = Integer.toString(number);
+  public static String longToFixedLengthString(final long number, final int length) {
+    final String num = Long.toString(number);
     return characterPad(num, length, ' ', false);
   }
 

diff --git a/src/test/java/org/apache/datasketches/kll/KllCrossLanguageTest.java b/src/test/java/org/apache/datasketches/kll/KllCrossLanguageTest.java
@@ -73,7 +73,7 @@ public void generateKllItemsSketchBinaries() throws IOException {
     for (int n: nArr) {
       final int digits = Util.numDigits(n);
       final KllItemsSketch<String> sk = KllItemsSketch.newHeapInstance(Comparator.naturalOrder(), serDe);
-      for (int i = 1; i <= n; i++) { sk.update(Util.intToFixedLengthString(i, digits)); }
+      for (int i = 1; i <= n; i++) { sk.update(Util.longToFixedLengthString(i, digits)); }
       Files.newOutputStream(javaPath.resolve("kll_string_n" + n + "_java.sk")).write(sk.toByteArray());
     }
   }

diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectCompactItemsSketchIteratorTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectCompactItemsSketchIteratorTest.java
@@ -117,7 +117,7 @@ public void bigSketches() {
     for (int n = 1000; n < 100_000; n += 2000) {
       KllItemsSketch<String> sk = KllItemsSketch.newHeapInstance(Comparator.naturalOrder(), serDe);
       for (int i = 0; i < n; i++) {
-        sk.update(Util.intToFixedLengthString(i, digits));
+        sk.update(Util.longToFixedLengthString(i, digits));
       }
       byte[] byteArr = sk.toByteArray();
       KllItemsSketch<String> sk2 = KllItemsSketch.wrap(Memory.wrap(byteArr), Comparator.naturalOrder(), serDe);

diff --git a/src/test/java/org/apache/datasketches/kll/KllDirectCompactItemsSketchTest.java b/src/test/java/org/apache/datasketches/kll/KllDirectCompactItemsSketchTest.java
@@ -42,7 +42,7 @@ public void checkRODirectCompact() {
     final int n = 21;
     final int digits = Util.numDigits(n);
     KllItemsSketch<String> sk = KllItemsSketch.newHeapInstance(k, Comparator.naturalOrder(), serDe);
-    for (int i = 1; i <= n; i++) { sk.update(Util.intToFixedLengthString(i, digits)); }
+    for (int i = 1; i <= n; i++) { sk.update(Util.longToFixedLengthString(i, digits)); }
     byte[] byteArr = KllHelper.toByteArray(sk, true); //request for updatable is denied -> COMPACT, RO
     Memory srcMem = Memory.wrap(byteArr);  //compact RO fmt
     KllItemsSketch<String> sk2 = KllItemsSketch.wrap(srcMem, Comparator.naturalOrder(), serDe);
@@ -144,7 +144,7 @@ public void checkHeapAndDirectCompactGetRetainedItemsArray() {
     assertEquals(retArr.length, 1);
     assertEquals(retArr[0], " 1");
 
-    for (int i = 2; i <= 21; i++) { sk.update(Util.intToFixedLengthString(i, 2)); }
+    for (int i = 2; i <= 21; i++) { sk.update(Util.longToFixedLengthString(i, 2)); }
     retArr = sk.getRetainedItemsArray();
     assertEquals(retArr.length, sk.getNumRetained());
     assertEquals(retArr.length, 11);
@@ -165,7 +165,7 @@ public void checkMinAndMax() {
     sk2 = KllItemsSketch.wrap(Memory.wrap(sk.toByteArray()), Comparator.naturalOrder(), serDe);
     assertEquals(sk2.getMaxItem()," 1");
     assertEquals(sk2.getMinItem()," 1");
-    for (int i = 2; i <= 21; i++) { sk.update(Util.intToFixedLengthString(i, 2)); }
+    for (int i = 2; i <= 21; i++) { sk.update(Util.longToFixedLengthString(i, 2)); }
     sk2 = KllItemsSketch.wrap(Memory.wrap(sk.toByteArray()), Comparator.naturalOrder(), serDe);
     assertEquals(sk2.getMaxItem(),"21");
     assertEquals(sk2.getMinItem()," 1");
@@ -174,7 +174,7 @@ public void checkMinAndMax() {
   @Test
   public void checkQuantile() {
     KllItemsSketch<String> sk1 = KllItemsSketch.newHeapInstance(Comparator.naturalOrder(), serDe);
-    for (int i = 1; i <= 1000; i++) { sk1.update(Util.intToFixedLengthString(i, 4)); }
+    for (int i = 1; i <= 1000; i++) { sk1.update(Util.longToFixedLengthString(i, 4)); }
     KllItemsSketch<String> sk2 = KllItemsSketch.wrap(Memory.wrap(sk1.toByteArray()), Comparator.naturalOrder(), serDe);
     String med2 = sk2.getQuantile(0.5);
     String med1 = sk1.getQuantile(0.5);
@@ -192,7 +192,7 @@ public void checkCompactSingleItemMerge() {
     KllItemsSketch<String> skDC1 = //Direct Compact with 1 (single)
         KllItemsSketch.wrap(Memory.wrap(skH1.toByteArray()), Comparator.naturalOrder(), serDe);
     KllItemsSketch<String> skH20 =  KllItemsSketch.newHeapInstance(k, Comparator.naturalOrder(), serDe); //Heap with 20
-    for (int i = 1; i <= 20; i++) { skH20.update(Util.intToFixedLengthString(i, 2)); }
+    for (int i = 1; i <= 20; i++) { skH20.update(Util.longToFixedLengthString(i, 2)); }
     skH20.merge(skDC1);
     assertEquals(skH20.getN(), 21);
   }

diff --git a/src/test/java/org/apache/datasketches/kll/KllHelperTest.java b/src/test/java/org/apache/datasketches/kll/KllHelperTest.java
@@ -170,7 +170,7 @@ public void checkUpdatableSerDeItem() {
     KllItemsSketch<String> sk = KllItemsSketch.newHeapInstance(200, Comparator.naturalOrder(), serDe);
     final int n = 533;
     final int digits = Util.numDigits(n);
-    for (int i = 1; i <= n; i++) { sk.update(Util.intToFixedLengthString(i, digits)); }
+    for (int i = 1; i <= n; i++) { sk.update(Util.longToFixedLengthString(i, digits)); }
 
     int retained = sk.getNumRetained();
     int numLevels = ((KllSketch)sk).getNumLevels();

diff --git a/src/test/java/org/apache/datasketches/kll/KllItemsSketchSerDeTest.java b/src/test/java/org/apache/datasketches/kll/KllItemsSketchSerDeTest.java
@@ -97,7 +97,7 @@ public void serializeDeserializeMultipleValues() {
     final KllItemsSketch<String> sk1 = KllItemsSketch.newHeapInstance(Comparator.naturalOrder(), serDe);
     final int n = 1000;
     for (int i = 0; i < n; i++) {
-      sk1.update(Util.intToFixedLengthString(i, 4));
+      sk1.update(Util.longToFixedLengthString(i, 4));
     }
     assertEquals(sk1.getMinItem(), "   0");
     assertEquals(sk1.getMaxItem(), " 999");