This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch ffm_phase2
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
The following commit(s) were added to refs/heads/ffm_phase2 by this push:
new 7b3332186 rename new hll2 back to hll for both main and test
7b3332186 is described below
commit 7b33321862739970e8620c69e50b8d9ecaf62936
Author: Lee Rhodes <[email protected]>
AuthorDate: Thu Jul 3 10:17:42 2025 -0700
rename new hll2 back to hll for both main and test
---
.../{hll2 => hll}/AbstractCoupons.java | 10 ++--
.../{hll2 => hll}/AbstractHllArray.java | 10 ++--
.../datasketches/{hll2 => hll}/AuxHashMap.java | 2 +-
.../datasketches/{hll2 => hll}/BaseHllSketch.java | 10 ++--
.../CompositeInterpolationXTable.java | 2 +-
.../datasketches/{hll2 => hll}/Conversions.java | 8 +--
.../datasketches/{hll2 => hll}/CouponHashSet.java | 32 ++++++------
.../datasketches/{hll2 => hll}/CouponList.java | 18 +++----
.../datasketches/{hll2 => hll}/CouponMapping.java | 2 +-
.../{hll2 => hll}/CubicInterpolation.java | 2 +-
.../apache/datasketches/{hll2 => hll}/CurMode.java | 2 +-
.../{hll2 => hll}/DirectAuxHashMap.java | 18 +++----
.../{hll2 => hll}/DirectCouponHashSet.java | 30 +++++------
.../{hll2 => hll}/DirectCouponList.java | 58 ++++++++++-----------
.../{hll2 => hll}/DirectHll4Array.java | 28 +++++-----
.../{hll2 => hll}/DirectHll6Array.java | 8 +--
.../{hll2 => hll}/DirectHll8Array.java | 8 +--
.../datasketches/{hll2 => hll}/DirectHllArray.java | 52 +++++++++---------
.../{hll2 => hll}/HarmonicNumbers.java | 2 +-
.../datasketches/{hll2 => hll}/HeapAuxHashMap.java | 12 ++---
.../datasketches/{hll2 => hll}/Hll4Array.java | 22 ++++----
.../datasketches/{hll2 => hll}/Hll4Update.java | 6 +--
.../datasketches/{hll2 => hll}/Hll6Array.java | 8 +--
.../datasketches/{hll2 => hll}/Hll8Array.java | 10 ++--
.../datasketches/{hll2 => hll}/HllArray.java | 26 ++++-----
.../datasketches/{hll2 => hll}/HllEstimators.java | 4 +-
.../{hll2 => hll}/HllPairIterator.java | 6 +--
.../datasketches/{hll2 => hll}/HllSketch.java | 18 +++----
.../datasketches/{hll2 => hll}/HllSketchImpl.java | 2 +-
.../apache/datasketches/{hll2 => hll}/HllUtil.java | 16 +++---
.../{hll2 => hll}/IntArrayPairIterator.java | 4 +-
.../IntMemorySegmentPairIterator.java | 4 +-
.../datasketches/{hll2 => hll}/PairIterator.java | 2 +-
.../datasketches/{hll2 => hll}/PreambleUtil.java | 10 ++--
.../{hll2 => hll}/RelativeErrorTables.java | 2 +-
.../datasketches/{hll2 => hll}/TgtHllType.java | 2 +-
.../{hll2 => hll}/ToByteArrayImpl.java | 50 +++++++++---------
.../apache/datasketches/{hll2 => hll}/Union.java | 16 +++---
.../{hll2 => hll}/doc-files/HLL_HIP_K12T20U20.png | Bin
.../doc-files/HLL_UnionTime4_6_8_Java_CPP.png | Bin
.../datasketches/{hll2 => hll}/package-info.java | 2 +-
.../datasketches/{hll2 => hll}/AuxHashMapTest.java | 4 +-
.../{hll2 => hll}/BaseHllSketchTest.java | 7 ++-
.../datasketches/{hll2 => hll}/CouponListTest.java | 7 ++-
.../{hll2 => hll}/CrossCountingTest.java | 11 ++--
.../{hll2 => hll}/DirectAuxHashMapTest.java | 14 ++++-
.../{hll2 => hll}/DirectCouponListTest.java | 8 ++-
.../{hll2 => hll}/DirectHllSketchTest.java | 8 ++-
.../{hll2 => hll}/DirectUnionTest.java | 13 +++--
.../datasketches/{hll2 => hll}/HllArrayTest.java | 13 +++--
.../{hll2 => hll}/HllSketchCrossLanguageTest.java | 9 ++--
.../datasketches/{hll2 => hll}/HllSketchTest.java | 34 +++++++-----
.../datasketches/{hll2 => hll}/IsomorphicTest.java | 21 +++++---
.../{hll2 => hll}/PreambleUtilTest.java | 20 ++++---
.../{hll2 => hll}/SizeAndModeTransitions.java | 4 +-
.../datasketches/{hll2 => hll}/TablesTest.java | 8 +--
.../{hll2 => hll}/ToFromByteArrayTest.java | 10 ++--
.../datasketches/{hll2 => hll}/UnionCaseTest.java | 24 +++++----
.../datasketches/{hll2 => hll}/UnionTest.java | 14 +++--
59 files changed, 417 insertions(+), 336 deletions(-)
diff --git a/src/main/java/org/apache/datasketches/hll2/AbstractCoupons.java
b/src/main/java/org/apache/datasketches/hll/AbstractCoupons.java
similarity index 94%
rename from src/main/java/org/apache/datasketches/hll2/AbstractCoupons.java
rename to src/main/java/org/apache/datasketches/hll/AbstractCoupons.java
index 5f229cee8..774f91884 100644
--- a/src/main/java/org/apache/datasketches/hll2/AbstractCoupons.java
+++ b/src/main/java/org/apache/datasketches/hll/AbstractCoupons.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.Math.max;
-import static org.apache.datasketches.hll2.HllUtil.COUPON_RSE;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.KEY_MASK_26;
-import static org.apache.datasketches.hll2.ToByteArrayImpl.toCouponByteArray;
+import static org.apache.datasketches.hll.HllUtil.COUPON_RSE;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.KEY_MASK_26;
+import static org.apache.datasketches.hll.ToByteArrayImpl.toCouponByteArray;
import org.apache.datasketches.common.SketchesArgumentException;
diff --git a/src/main/java/org/apache/datasketches/hll2/AbstractHllArray.java
b/src/main/java/org/apache/datasketches/hll/AbstractHllArray.java
similarity index 96%
rename from src/main/java/org/apache/datasketches/hll2/AbstractHllArray.java
rename to src/main/java/org/apache/datasketches/hll/AbstractHllArray.java
index 11c440e4b..1a152e7ee 100644
--- a/src/main/java/org/apache/datasketches/hll2/AbstractHllArray.java
+++ b/src/main/java/org/apache/datasketches/hll/AbstractHllArray.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static org.apache.datasketches.common.Util.invPow2;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_BYTE_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_PREINTS;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_BYTE_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_PREINTS;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_6;
import org.apache.datasketches.common.SketchesStateException;
diff --git a/src/main/java/org/apache/datasketches/hll2/AuxHashMap.java
b/src/main/java/org/apache/datasketches/hll/AuxHashMap.java
similarity index 98%
rename from src/main/java/org/apache/datasketches/hll2/AuxHashMap.java
rename to src/main/java/org/apache/datasketches/hll/AuxHashMap.java
index efe611e1f..f255b0fd6 100644
--- a/src/main/java/org/apache/datasketches/hll2/AuxHashMap.java
+++ b/src/main/java/org/apache/datasketches/hll/AuxHashMap.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/BaseHllSketch.java
b/src/main/java/org/apache/datasketches/hll/BaseHllSketch.java
similarity index 98%
rename from src/main/java/org/apache/datasketches/hll2/BaseHllSketch.java
rename to src/main/java/org/apache/datasketches/hll/BaseHllSketch.java
index 3cc8cf5c6..082318ee2 100644
--- a/src/main/java/org/apache/datasketches/hll2/BaseHllSketch.java
+++ b/src/main/java/org/apache/datasketches/hll/BaseHllSketch.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.datasketches.hash.MurmurHash3.hash;
-import static org.apache.datasketches.hll2.HllUtil.HLL_HIP_RSE_FACTOR;
-import static org.apache.datasketches.hll2.HllUtil.HLL_NON_HIP_RSE_FACTOR;
-import static org.apache.datasketches.hll2.HllUtil.KEY_BITS_26;
-import static org.apache.datasketches.hll2.HllUtil.KEY_MASK_26;
+import static org.apache.datasketches.hll.HllUtil.HLL_HIP_RSE_FACTOR;
+import static org.apache.datasketches.hll.HllUtil.HLL_NON_HIP_RSE_FACTOR;
+import static org.apache.datasketches.hll.HllUtil.KEY_BITS_26;
+import static org.apache.datasketches.hll.HllUtil.KEY_MASK_26;
import java.lang.foreign.MemorySegment;
import java.nio.ByteBuffer;
diff --git
a/src/main/java/org/apache/datasketches/hll2/CompositeInterpolationXTable.java
b/src/main/java/org/apache/datasketches/hll/CompositeInterpolationXTable.java
similarity index 99%
rename from
src/main/java/org/apache/datasketches/hll2/CompositeInterpolationXTable.java
rename to
src/main/java/org/apache/datasketches/hll/CompositeInterpolationXTable.java
index f96cd6b87..030a3cf94 100644
---
a/src/main/java/org/apache/datasketches/hll2/CompositeInterpolationXTable.java
+++
b/src/main/java/org/apache/datasketches/hll/CompositeInterpolationXTable.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/hll2/Conversions.java
b/src/main/java/org/apache/datasketches/hll/Conversions.java
similarity index 95%
rename from src/main/java/org/apache/datasketches/hll2/Conversions.java
rename to src/main/java/org/apache/datasketches/hll/Conversions.java
index a81a4c516..db18b1d5e 100644
--- a/src/main/java/org/apache/datasketches/hll2/Conversions.java
+++ b/src/main/java/org/apache/datasketches/hll/Conversions.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.HllUtil.AUX_TOKEN;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.LG_AUX_ARR_INTS;
+import static org.apache.datasketches.hll.HllUtil.AUX_TOKEN;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.LG_AUX_ARR_INTS;
/**
* Converters for one TgtHllType to another. The source can be heap or
direct, but the result is
diff --git a/src/main/java/org/apache/datasketches/hll2/CouponHashSet.java
b/src/main/java/org/apache/datasketches/hll/CouponHashSet.java
similarity index 80%
rename from src/main/java/org/apache/datasketches/hll2/CouponHashSet.java
rename to src/main/java/org/apache/datasketches/hll/CouponHashSet.java
index 8b60964df..4ba67c265 100644
--- a/src/main/java/org/apache/datasketches/hll2/CouponHashSet.java
+++ b/src/main/java/org/apache/datasketches/hll/CouponHashSet.java
@@ -17,24 +17,24 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.LG_INIT_SET_SIZE;
-import static org.apache.datasketches.hll2.HllUtil.RESIZE_DENOM;
-import static org.apache.datasketches.hll2.HllUtil.RESIZE_NUMER;
-import static org.apache.datasketches.hll2.PreambleUtil.HASH_SET_INT_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.HASH_SET_PREINTS;
-import static org.apache.datasketches.hll2.PreambleUtil.LIST_INT_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.computeLgArr;
-import static org.apache.datasketches.hll2.PreambleUtil.extractCompactFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.extractCurMode;
-import static org.apache.datasketches.hll2.PreambleUtil.extractHashSetCount;
-import static org.apache.datasketches.hll2.PreambleUtil.extractInt;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgArr;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgK;
-import static org.apache.datasketches.hll2.PreambleUtil.extractTgtHllType;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.LG_INIT_SET_SIZE;
+import static org.apache.datasketches.hll.HllUtil.RESIZE_DENOM;
+import static org.apache.datasketches.hll.HllUtil.RESIZE_NUMER;
+import static org.apache.datasketches.hll.PreambleUtil.HASH_SET_INT_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.HASH_SET_PREINTS;
+import static org.apache.datasketches.hll.PreambleUtil.LIST_INT_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.computeLgArr;
+import static org.apache.datasketches.hll.PreambleUtil.extractCompactFlag;
+import static org.apache.datasketches.hll.PreambleUtil.extractCurMode;
+import static org.apache.datasketches.hll.PreambleUtil.extractHashSetCount;
+import static org.apache.datasketches.hll.PreambleUtil.extractInt;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgArr;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgK;
+import static org.apache.datasketches.hll.PreambleUtil.extractTgtHllType;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/CouponList.java
b/src/main/java/org/apache/datasketches/hll/CouponList.java
similarity index 91%
rename from src/main/java/org/apache/datasketches/hll2/CouponList.java
rename to src/main/java/org/apache/datasketches/hll/CouponList.java
index 78337414c..bd70dd3ea 100644
--- a/src/main/java/org/apache/datasketches/hll2/CouponList.java
+++ b/src/main/java/org/apache/datasketches/hll/CouponList.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.LG_INIT_LIST_SIZE;
-import static org.apache.datasketches.hll2.HllUtil.LG_INIT_SET_SIZE;
-import static org.apache.datasketches.hll2.PreambleUtil.LIST_INT_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.LIST_PREINTS;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgK;
-import static org.apache.datasketches.hll2.PreambleUtil.extractListCount;
-import static org.apache.datasketches.hll2.PreambleUtil.extractTgtHllType;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.LG_INIT_LIST_SIZE;
+import static org.apache.datasketches.hll.HllUtil.LG_INIT_SET_SIZE;
+import static org.apache.datasketches.hll.PreambleUtil.LIST_INT_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.LIST_PREINTS;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgK;
+import static org.apache.datasketches.hll.PreambleUtil.extractListCount;
+import static org.apache.datasketches.hll.PreambleUtil.extractTgtHllType;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/CouponMapping.java
b/src/main/java/org/apache/datasketches/hll/CouponMapping.java
similarity index 98%
rename from src/main/java/org/apache/datasketches/hll2/CouponMapping.java
rename to src/main/java/org/apache/datasketches/hll/CouponMapping.java
index 5ea38a30c..25d927679 100644
--- a/src/main/java/org/apache/datasketches/hll2/CouponMapping.java
+++ b/src/main/java/org/apache/datasketches/hll/CouponMapping.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/hll2/CubicInterpolation.java
b/src/main/java/org/apache/datasketches/hll/CubicInterpolation.java
similarity index 99%
rename from src/main/java/org/apache/datasketches/hll2/CubicInterpolation.java
rename to src/main/java/org/apache/datasketches/hll/CubicInterpolation.java
index 8797201b7..4bca1a02e 100644
--- a/src/main/java/org/apache/datasketches/hll2/CubicInterpolation.java
+++ b/src/main/java/org/apache/datasketches/hll/CubicInterpolation.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import org.apache.datasketches.common.SketchesArgumentException;
diff --git a/src/main/java/org/apache/datasketches/hll2/CurMode.java
b/src/main/java/org/apache/datasketches/hll/CurMode.java
similarity index 97%
rename from src/main/java/org/apache/datasketches/hll2/CurMode.java
rename to src/main/java/org/apache/datasketches/hll/CurMode.java
index cab1d2fd8..a31266ce4 100644
--- a/src/main/java/org/apache/datasketches/hll2/CurMode.java
+++ b/src/main/java/org/apache/datasketches/hll/CurMode.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
/**
* Represents the three fundamental modes of the HLL Sketch.
diff --git a/src/main/java/org/apache/datasketches/hll2/DirectAuxHashMap.java
b/src/main/java/org/apache/datasketches/hll/DirectAuxHashMap.java
similarity index 92%
rename from src/main/java/org/apache/datasketches/hll2/DirectAuxHashMap.java
rename to src/main/java/org/apache/datasketches/hll/DirectAuxHashMap.java
index 2f44b1426..0f18aa24a 100644
--- a/src/main/java/org/apache/datasketches/hll2/DirectAuxHashMap.java
+++ b/src/main/java/org/apache/datasketches/hll/DirectAuxHashMap.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
import static org.apache.datasketches.common.Util.clear;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.RESIZE_DENOM;
-import static org.apache.datasketches.hll2.HllUtil.RESIZE_NUMER;
-import static org.apache.datasketches.hll2.HllUtil.noWriteAccess;
-import static org.apache.datasketches.hll2.PreambleUtil.extractAuxCount;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgArr;
-import static org.apache.datasketches.hll2.PreambleUtil.insertAuxCount;
-import static org.apache.datasketches.hll2.PreambleUtil.insertLgArr;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.RESIZE_DENOM;
+import static org.apache.datasketches.hll.HllUtil.RESIZE_NUMER;
+import static org.apache.datasketches.hll.HllUtil.noWriteAccess;
+import static org.apache.datasketches.hll.PreambleUtil.extractAuxCount;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgArr;
+import static org.apache.datasketches.hll.PreambleUtil.insertAuxCount;
+import static org.apache.datasketches.hll.PreambleUtil.insertLgArr;
import java.lang.foreign.MemorySegment;
diff --git
a/src/main/java/org/apache/datasketches/hll2/DirectCouponHashSet.java
b/src/main/java/org/apache/datasketches/hll/DirectCouponHashSet.java
similarity index 84%
rename from src/main/java/org/apache/datasketches/hll2/DirectCouponHashSet.java
rename to src/main/java/org/apache/datasketches/hll/DirectCouponHashSet.java
index 0b11f3b7b..692d68c1e 100644
--- a/src/main/java/org/apache/datasketches/hll2/DirectCouponHashSet.java
+++ b/src/main/java/org/apache/datasketches/hll/DirectCouponHashSet.java
@@ -17,25 +17,25 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
import static org.apache.datasketches.common.Util.clear;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.KEY_MASK_26;
-import static org.apache.datasketches.hll2.HllUtil.RESIZE_DENOM;
-import static org.apache.datasketches.hll2.HllUtil.RESIZE_NUMER;
-import static org.apache.datasketches.hll2.HllUtil.noWriteAccess;
-import static org.apache.datasketches.hll2.PreambleUtil.HASH_SET_INT_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.HASH_SET_PREINTS;
-import static org.apache.datasketches.hll2.PreambleUtil.LG_K_BYTE;
-import static org.apache.datasketches.hll2.PreambleUtil.extractHashSetCount;
-import static org.apache.datasketches.hll2.PreambleUtil.extractInt;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgArr;
-import static org.apache.datasketches.hll2.PreambleUtil.insertHashSetCount;
-import static org.apache.datasketches.hll2.PreambleUtil.insertInt;
-import static org.apache.datasketches.hll2.PreambleUtil.insertLgArr;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.KEY_MASK_26;
+import static org.apache.datasketches.hll.HllUtil.RESIZE_DENOM;
+import static org.apache.datasketches.hll.HllUtil.RESIZE_NUMER;
+import static org.apache.datasketches.hll.HllUtil.noWriteAccess;
+import static org.apache.datasketches.hll.PreambleUtil.HASH_SET_INT_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.HASH_SET_PREINTS;
+import static org.apache.datasketches.hll.PreambleUtil.LG_K_BYTE;
+import static org.apache.datasketches.hll.PreambleUtil.extractHashSetCount;
+import static org.apache.datasketches.hll.PreambleUtil.extractInt;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgArr;
+import static org.apache.datasketches.hll.PreambleUtil.insertHashSetCount;
+import static org.apache.datasketches.hll.PreambleUtil.insertInt;
+import static org.apache.datasketches.hll.PreambleUtil.insertLgArr;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/DirectCouponList.java
b/src/main/java/org/apache/datasketches/hll/DirectCouponList.java
similarity index 83%
rename from src/main/java/org/apache/datasketches/hll2/DirectCouponList.java
rename to src/main/java/org/apache/datasketches/hll/DirectCouponList.java
index 4e9c5136e..f548d1710 100644
--- a/src/main/java/org/apache/datasketches/hll2/DirectCouponList.java
+++ b/src/main/java/org/apache/datasketches/hll/DirectCouponList.java
@@ -17,38 +17,38 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
import static org.apache.datasketches.common.Util.clear;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.LG_INIT_LIST_SIZE;
-import static org.apache.datasketches.hll2.HllUtil.LG_INIT_SET_SIZE;
-import static org.apache.datasketches.hll2.HllUtil.noWriteAccess;
-import static org.apache.datasketches.hll2.PreambleUtil.EMPTY_FLAG_MASK;
-import static org.apache.datasketches.hll2.PreambleUtil.HASH_SET_PREINTS;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_PREINTS;
-import static org.apache.datasketches.hll2.PreambleUtil.LIST_INT_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.LIST_PREINTS;
-import static org.apache.datasketches.hll2.PreambleUtil.computeLgArr;
-import static org.apache.datasketches.hll2.PreambleUtil.extractCompactFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.extractInt;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgArr;
-import static org.apache.datasketches.hll2.PreambleUtil.extractListCount;
-import static org.apache.datasketches.hll2.PreambleUtil.insertCurMin;
-import static org.apache.datasketches.hll2.PreambleUtil.insertCurMode;
-import static org.apache.datasketches.hll2.PreambleUtil.insertEmptyFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.insertFamilyId;
-import static org.apache.datasketches.hll2.PreambleUtil.insertFlags;
-import static org.apache.datasketches.hll2.PreambleUtil.insertInt;
-import static org.apache.datasketches.hll2.PreambleUtil.insertKxQ0;
-import static org.apache.datasketches.hll2.PreambleUtil.insertLgArr;
-import static org.apache.datasketches.hll2.PreambleUtil.insertLgK;
-import static org.apache.datasketches.hll2.PreambleUtil.insertListCount;
-import static org.apache.datasketches.hll2.PreambleUtil.insertModes;
-import static org.apache.datasketches.hll2.PreambleUtil.insertNumAtCurMin;
-import static org.apache.datasketches.hll2.PreambleUtil.insertPreInts;
-import static org.apache.datasketches.hll2.PreambleUtil.insertSerVer;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.LG_INIT_LIST_SIZE;
+import static org.apache.datasketches.hll.HllUtil.LG_INIT_SET_SIZE;
+import static org.apache.datasketches.hll.HllUtil.noWriteAccess;
+import static org.apache.datasketches.hll.PreambleUtil.EMPTY_FLAG_MASK;
+import static org.apache.datasketches.hll.PreambleUtil.HASH_SET_PREINTS;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_PREINTS;
+import static org.apache.datasketches.hll.PreambleUtil.LIST_INT_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.LIST_PREINTS;
+import static org.apache.datasketches.hll.PreambleUtil.computeLgArr;
+import static org.apache.datasketches.hll.PreambleUtil.extractCompactFlag;
+import static org.apache.datasketches.hll.PreambleUtil.extractInt;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgArr;
+import static org.apache.datasketches.hll.PreambleUtil.extractListCount;
+import static org.apache.datasketches.hll.PreambleUtil.insertCurMin;
+import static org.apache.datasketches.hll.PreambleUtil.insertCurMode;
+import static org.apache.datasketches.hll.PreambleUtil.insertEmptyFlag;
+import static org.apache.datasketches.hll.PreambleUtil.insertFamilyId;
+import static org.apache.datasketches.hll.PreambleUtil.insertFlags;
+import static org.apache.datasketches.hll.PreambleUtil.insertInt;
+import static org.apache.datasketches.hll.PreambleUtil.insertKxQ0;
+import static org.apache.datasketches.hll.PreambleUtil.insertLgArr;
+import static org.apache.datasketches.hll.PreambleUtil.insertLgK;
+import static org.apache.datasketches.hll.PreambleUtil.insertListCount;
+import static org.apache.datasketches.hll.PreambleUtil.insertModes;
+import static org.apache.datasketches.hll.PreambleUtil.insertNumAtCurMin;
+import static org.apache.datasketches.hll.PreambleUtil.insertPreInts;
+import static org.apache.datasketches.hll.PreambleUtil.insertSerVer;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/DirectHll4Array.java
b/src/main/java/org/apache/datasketches/hll/DirectHll4Array.java
similarity index 87%
rename from src/main/java/org/apache/datasketches/hll2/DirectHll4Array.java
rename to src/main/java/org/apache/datasketches/hll/DirectHll4Array.java
index 9e3c1e415..bd9425e17 100644
--- a/src/main/java/org/apache/datasketches/hll2/DirectHll4Array.java
+++ b/src/main/java/org/apache/datasketches/hll/DirectHll4Array.java
@@ -17,22 +17,22 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
-import static org.apache.datasketches.hll2.HllUtil.AUX_TOKEN;
-import static org.apache.datasketches.hll2.HllUtil.KEY_BITS_26;
-import static org.apache.datasketches.hll2.HllUtil.LG_AUX_ARR_INTS;
-import static org.apache.datasketches.hll2.HllUtil.hiNibbleMask;
-import static org.apache.datasketches.hll2.HllUtil.loNibbleMask;
-import static org.apache.datasketches.hll2.HllUtil.noWriteAccess;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_BYTE_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.extractAuxCount;
-import static org.apache.datasketches.hll2.PreambleUtil.extractCompactFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.insertAuxCount;
-import static org.apache.datasketches.hll2.PreambleUtil.insertCompactFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.insertInt;
-import static org.apache.datasketches.hll2.PreambleUtil.insertLgArr;
+import static org.apache.datasketches.hll.HllUtil.AUX_TOKEN;
+import static org.apache.datasketches.hll.HllUtil.KEY_BITS_26;
+import static org.apache.datasketches.hll.HllUtil.LG_AUX_ARR_INTS;
+import static org.apache.datasketches.hll.HllUtil.hiNibbleMask;
+import static org.apache.datasketches.hll.HllUtil.loNibbleMask;
+import static org.apache.datasketches.hll.HllUtil.noWriteAccess;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_BYTE_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.extractAuxCount;
+import static org.apache.datasketches.hll.PreambleUtil.extractCompactFlag;
+import static org.apache.datasketches.hll.PreambleUtil.insertAuxCount;
+import static org.apache.datasketches.hll.PreambleUtil.insertCompactFlag;
+import static org.apache.datasketches.hll.PreambleUtil.insertInt;
+import static org.apache.datasketches.hll.PreambleUtil.insertLgArr;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/DirectHll6Array.java
b/src/main/java/org/apache/datasketches/hll/DirectHll6Array.java
similarity index 94%
rename from src/main/java/org/apache/datasketches/hll2/DirectHll6Array.java
rename to src/main/java/org/apache/datasketches/hll/DirectHll6Array.java
index 165f34ac5..91355e162 100644
--- a/src/main/java/org/apache/datasketches/hll2/DirectHll6Array.java
+++ b/src/main/java/org/apache/datasketches/hll/DirectHll6Array.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_SHORT_UNALIGNED;
-import static org.apache.datasketches.hll2.HllUtil.VAL_MASK_6;
-import static org.apache.datasketches.hll2.HllUtil.noWriteAccess;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_BYTE_ARR_START;
+import static org.apache.datasketches.hll.HllUtil.VAL_MASK_6;
+import static org.apache.datasketches.hll.HllUtil.noWriteAccess;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_BYTE_ARR_START;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/DirectHll8Array.java
b/src/main/java/org/apache/datasketches/hll/DirectHll8Array.java
similarity index 93%
rename from src/main/java/org/apache/datasketches/hll2/DirectHll8Array.java
rename to src/main/java/org/apache/datasketches/hll/DirectHll8Array.java
index e9d93c09d..be9d919a3 100644
--- a/src/main/java/org/apache/datasketches/hll2/DirectHll8Array.java
+++ b/src/main/java/org/apache/datasketches/hll/DirectHll8Array.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
-import static org.apache.datasketches.hll2.HllUtil.VAL_MASK_6;
-import static org.apache.datasketches.hll2.HllUtil.noWriteAccess;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_BYTE_ARR_START;
+import static org.apache.datasketches.hll.HllUtil.VAL_MASK_6;
+import static org.apache.datasketches.hll.HllUtil.noWriteAccess;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_BYTE_ARR_START;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/DirectHllArray.java
b/src/main/java/org/apache/datasketches/hll/DirectHllArray.java
similarity index 80%
rename from src/main/java/org/apache/datasketches/hll2/DirectHllArray.java
rename to src/main/java/org/apache/datasketches/hll/DirectHllArray.java
index 3c6aa6355..4f479dc54 100644
--- a/src/main/java/org/apache/datasketches/hll2/DirectHllArray.java
+++ b/src/main/java/org/apache/datasketches/hll/DirectHllArray.java
@@ -17,37 +17,37 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
import static java.lang.foreign.ValueLayout.JAVA_DOUBLE_UNALIGNED;
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
import static org.apache.datasketches.common.Util.clear;
-import static org.apache.datasketches.hll2.PreambleUtil.CUR_MIN_COUNT_INT;
-import static org.apache.datasketches.hll2.PreambleUtil.HIP_ACCUM_DOUBLE;
-import static org.apache.datasketches.hll2.PreambleUtil.extractCompactFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.extractCurMin;
-import static org.apache.datasketches.hll2.PreambleUtil.extractCurMode;
-import static org.apache.datasketches.hll2.PreambleUtil.extractEmptyFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.extractHipAccum;
-import static org.apache.datasketches.hll2.PreambleUtil.extractKxQ0;
-import static org.apache.datasketches.hll2.PreambleUtil.extractKxQ1;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgK;
-import static org.apache.datasketches.hll2.PreambleUtil.extractNumAtCurMin;
-import static org.apache.datasketches.hll2.PreambleUtil.extractOooFlag;
-import static
org.apache.datasketches.hll2.PreambleUtil.extractRebuildCurMinNumKxQFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.extractTgtHllType;
-import static org.apache.datasketches.hll2.PreambleUtil.insertAuxCount;
-import static org.apache.datasketches.hll2.PreambleUtil.insertCompactFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.insertCurMin;
-import static org.apache.datasketches.hll2.PreambleUtil.insertEmptyFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.insertHipAccum;
-import static org.apache.datasketches.hll2.PreambleUtil.insertKxQ0;
-import static org.apache.datasketches.hll2.PreambleUtil.insertKxQ1;
-import static org.apache.datasketches.hll2.PreambleUtil.insertLgArr;
-import static org.apache.datasketches.hll2.PreambleUtil.insertNumAtCurMin;
-import static org.apache.datasketches.hll2.PreambleUtil.insertOooFlag;
-import static
org.apache.datasketches.hll2.PreambleUtil.insertRebuildCurMinNumKxQFlag;
+import static org.apache.datasketches.hll.PreambleUtil.CUR_MIN_COUNT_INT;
+import static org.apache.datasketches.hll.PreambleUtil.HIP_ACCUM_DOUBLE;
+import static org.apache.datasketches.hll.PreambleUtil.extractCompactFlag;
+import static org.apache.datasketches.hll.PreambleUtil.extractCurMin;
+import static org.apache.datasketches.hll.PreambleUtil.extractCurMode;
+import static org.apache.datasketches.hll.PreambleUtil.extractEmptyFlag;
+import static org.apache.datasketches.hll.PreambleUtil.extractHipAccum;
+import static org.apache.datasketches.hll.PreambleUtil.extractKxQ0;
+import static org.apache.datasketches.hll.PreambleUtil.extractKxQ1;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgK;
+import static org.apache.datasketches.hll.PreambleUtil.extractNumAtCurMin;
+import static org.apache.datasketches.hll.PreambleUtil.extractOooFlag;
+import static
org.apache.datasketches.hll.PreambleUtil.extractRebuildCurMinNumKxQFlag;
+import static org.apache.datasketches.hll.PreambleUtil.extractTgtHllType;
+import static org.apache.datasketches.hll.PreambleUtil.insertAuxCount;
+import static org.apache.datasketches.hll.PreambleUtil.insertCompactFlag;
+import static org.apache.datasketches.hll.PreambleUtil.insertCurMin;
+import static org.apache.datasketches.hll.PreambleUtil.insertEmptyFlag;
+import static org.apache.datasketches.hll.PreambleUtil.insertHipAccum;
+import static org.apache.datasketches.hll.PreambleUtil.insertKxQ0;
+import static org.apache.datasketches.hll.PreambleUtil.insertKxQ1;
+import static org.apache.datasketches.hll.PreambleUtil.insertLgArr;
+import static org.apache.datasketches.hll.PreambleUtil.insertNumAtCurMin;
+import static org.apache.datasketches.hll.PreambleUtil.insertOooFlag;
+import static
org.apache.datasketches.hll.PreambleUtil.insertRebuildCurMinNumKxQFlag;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/HarmonicNumbers.java
b/src/main/java/org/apache/datasketches/hll/HarmonicNumbers.java
similarity index 98%
rename from src/main/java/org/apache/datasketches/hll2/HarmonicNumbers.java
rename to src/main/java/org/apache/datasketches/hll/HarmonicNumbers.java
index db23921b3..1d236d2f6 100644
--- a/src/main/java/org/apache/datasketches/hll2/HarmonicNumbers.java
+++ b/src/main/java/org/apache/datasketches/hll/HarmonicNumbers.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/hll2/HeapAuxHashMap.java
b/src/main/java/org/apache/datasketches/hll/HeapAuxHashMap.java
similarity index 95%
rename from src/main/java/org/apache/datasketches/hll2/HeapAuxHashMap.java
rename to src/main/java/org/apache/datasketches/hll/HeapAuxHashMap.java
index 740d9d1f8..3a1600676 100644
--- a/src/main/java/org/apache/datasketches/hll2/HeapAuxHashMap.java
+++ b/src/main/java/org/apache/datasketches/hll/HeapAuxHashMap.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.RESIZE_DENOM;
-import static org.apache.datasketches.hll2.HllUtil.RESIZE_NUMER;
-import static org.apache.datasketches.hll2.PreambleUtil.extractInt;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgArr;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.RESIZE_DENOM;
+import static org.apache.datasketches.hll.HllUtil.RESIZE_NUMER;
+import static org.apache.datasketches.hll.PreambleUtil.extractInt;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgArr;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/Hll4Array.java
b/src/main/java/org/apache/datasketches/hll/Hll4Array.java
similarity index 87%
rename from src/main/java/org/apache/datasketches/hll2/Hll4Array.java
rename to src/main/java/org/apache/datasketches/hll/Hll4Array.java
index a80dbb9f9..759174bea 100644
--- a/src/main/java/org/apache/datasketches/hll2/Hll4Array.java
+++ b/src/main/java/org/apache/datasketches/hll/Hll4Array.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
-
-import static org.apache.datasketches.hll2.HllUtil.AUX_TOKEN;
-import static org.apache.datasketches.hll2.HllUtil.KEY_BITS_26;
-import static org.apache.datasketches.hll2.HllUtil.LG_AUX_ARR_INTS;
-import static org.apache.datasketches.hll2.HllUtil.hiNibbleMask;
-import static org.apache.datasketches.hll2.HllUtil.loNibbleMask;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_BYTE_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.extractAuxCount;
-import static org.apache.datasketches.hll2.PreambleUtil.extractCompactFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgK;
+package org.apache.datasketches.hll;
+
+import static org.apache.datasketches.hll.HllUtil.AUX_TOKEN;
+import static org.apache.datasketches.hll.HllUtil.KEY_BITS_26;
+import static org.apache.datasketches.hll.HllUtil.LG_AUX_ARR_INTS;
+import static org.apache.datasketches.hll.HllUtil.hiNibbleMask;
+import static org.apache.datasketches.hll.HllUtil.loNibbleMask;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_BYTE_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.extractAuxCount;
+import static org.apache.datasketches.hll.PreambleUtil.extractCompactFlag;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgK;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/Hll4Update.java
b/src/main/java/org/apache/datasketches/hll/Hll4Update.java
similarity index 98%
rename from src/main/java/org/apache/datasketches/hll2/Hll4Update.java
rename to src/main/java/org/apache/datasketches/hll/Hll4Update.java
index ac006988d..b077b4459 100644
--- a/src/main/java/org/apache/datasketches/hll2/Hll4Update.java
+++ b/src/main/java/org/apache/datasketches/hll/Hll4Update.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.HllUtil.AUX_TOKEN;
-import static org.apache.datasketches.hll2.HllUtil.LG_AUX_ARR_INTS;
+import static org.apache.datasketches.hll.HllUtil.AUX_TOKEN;
+import static org.apache.datasketches.hll.HllUtil.LG_AUX_ARR_INTS;
import org.apache.datasketches.common.SketchesStateException;
diff --git a/src/main/java/org/apache/datasketches/hll2/Hll6Array.java
b/src/main/java/org/apache/datasketches/hll/Hll6Array.java
similarity index 95%
rename from src/main/java/org/apache/datasketches/hll2/Hll6Array.java
rename to src/main/java/org/apache/datasketches/hll/Hll6Array.java
index b2d567230..737a249b0 100644
--- a/src/main/java/org/apache/datasketches/hll2/Hll6Array.java
+++ b/src/main/java/org/apache/datasketches/hll/Hll6Array.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static org.apache.datasketches.common.ByteArrayUtil.getShortLE;
import static org.apache.datasketches.common.ByteArrayUtil.putShortLE;
-import static org.apache.datasketches.hll2.HllUtil.KEY_BITS_26;
-import static org.apache.datasketches.hll2.HllUtil.VAL_MASK_6;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgK;
+import static org.apache.datasketches.hll.HllUtil.KEY_BITS_26;
+import static org.apache.datasketches.hll.HllUtil.VAL_MASK_6;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgK;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/Hll8Array.java
b/src/main/java/org/apache/datasketches/hll/Hll8Array.java
similarity index 92%
rename from src/main/java/org/apache/datasketches/hll2/Hll8Array.java
rename to src/main/java/org/apache/datasketches/hll/Hll8Array.java
index 3b8d9df19..ba3377753 100644
--- a/src/main/java/org/apache/datasketches/hll2/Hll8Array.java
+++ b/src/main/java/org/apache/datasketches/hll/Hll8Array.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.KEY_BITS_26;
-import static org.apache.datasketches.hll2.HllUtil.VAL_MASK_6;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgK;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.KEY_BITS_26;
+import static org.apache.datasketches.hll.HllUtil.VAL_MASK_6;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgK;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/HllArray.java
b/src/main/java/org/apache/datasketches/hll/HllArray.java
similarity index 87%
rename from src/main/java/org/apache/datasketches/hll2/HllArray.java
rename to src/main/java/org/apache/datasketches/hll/HllArray.java
index a0e4183df..20e5df764 100644
--- a/src/main/java/org/apache/datasketches/hll2/HllArray.java
+++ b/src/main/java/org/apache/datasketches/hll/HllArray.java
@@ -17,21 +17,21 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
-import static org.apache.datasketches.hll2.HllUtil.LG_AUX_ARR_INTS;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_BYTE_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.extractCurMin;
-import static org.apache.datasketches.hll2.PreambleUtil.extractEmptyFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.extractHipAccum;
-import static org.apache.datasketches.hll2.PreambleUtil.extractKxQ0;
-import static org.apache.datasketches.hll2.PreambleUtil.extractKxQ1;
-import static org.apache.datasketches.hll2.PreambleUtil.extractNumAtCurMin;
-import static org.apache.datasketches.hll2.PreambleUtil.extractOooFlag;
-import static
org.apache.datasketches.hll2.PreambleUtil.extractRebuildCurMinNumKxQFlag;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
+import static org.apache.datasketches.hll.HllUtil.LG_AUX_ARR_INTS;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_BYTE_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.extractCurMin;
+import static org.apache.datasketches.hll.PreambleUtil.extractEmptyFlag;
+import static org.apache.datasketches.hll.PreambleUtil.extractHipAccum;
+import static org.apache.datasketches.hll.PreambleUtil.extractKxQ0;
+import static org.apache.datasketches.hll.PreambleUtil.extractKxQ1;
+import static org.apache.datasketches.hll.PreambleUtil.extractNumAtCurMin;
+import static org.apache.datasketches.hll.PreambleUtil.extractOooFlag;
+import static
org.apache.datasketches.hll.PreambleUtil.extractRebuildCurMinNumKxQFlag;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_6;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/HllEstimators.java
b/src/main/java/org/apache/datasketches/hll/HllEstimators.java
similarity index 98%
rename from src/main/java/org/apache/datasketches/hll2/HllEstimators.java
rename to src/main/java/org/apache/datasketches/hll/HllEstimators.java
index 02acbfb97..600e725bd 100644
--- a/src/main/java/org/apache/datasketches/hll2/HllEstimators.java
+++ b/src/main/java/org/apache/datasketches/hll/HllEstimators.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.HllUtil.MIN_LOG_K;
+import static org.apache.datasketches.hll.HllUtil.MIN_LOG_K;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/hll2/HllPairIterator.java
b/src/main/java/org/apache/datasketches/hll/HllPairIterator.java
similarity index 93%
rename from src/main/java/org/apache/datasketches/hll2/HllPairIterator.java
rename to src/main/java/org/apache/datasketches/hll/HllPairIterator.java
index f885378ea..6b9f2f078 100644
--- a/src/main/java/org/apache/datasketches/hll2/HllPairIterator.java
+++ b/src/main/java/org/apache/datasketches/hll/HllPairIterator.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.pair;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.pair;
/**
* Iterates over an on-heap HLL byte array producing pairs of index, value.
diff --git a/src/main/java/org/apache/datasketches/hll2/HllSketch.java
b/src/main/java/org/apache/datasketches/hll/HllSketch.java
similarity index 97%
rename from src/main/java/org/apache/datasketches/hll2/HllSketch.java
rename to src/main/java/org/apache/datasketches/hll/HllSketch.java
index 7b12af019..9709ad69d 100644
--- a/src/main/java/org/apache/datasketches/hll2/HllSketch.java
+++ b/src/main/java/org/apache/datasketches/hll/HllSketch.java
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static org.apache.datasketches.common.Util.LS;
import static org.apache.datasketches.common.Util.checkBounds;
import static org.apache.datasketches.common.Util.clear;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.KEY_BITS_26;
-import static org.apache.datasketches.hll2.HllUtil.LG_AUX_ARR_INTS;
-import static org.apache.datasketches.hll2.HllUtil.checkPreamble;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_BYTE_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.extractCompactFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.extractLgK;
-import static org.apache.datasketches.hll2.PreambleUtil.extractTgtHllType;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.KEY_BITS_26;
+import static org.apache.datasketches.hll.HllUtil.LG_AUX_ARR_INTS;
+import static org.apache.datasketches.hll.HllUtil.checkPreamble;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_BYTE_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.extractCompactFlag;
+import static org.apache.datasketches.hll.PreambleUtil.extractLgK;
+import static org.apache.datasketches.hll.PreambleUtil.extractTgtHllType;
import java.lang.foreign.MemorySegment;
import java.util.Objects;
diff --git a/src/main/java/org/apache/datasketches/hll2/HllSketchImpl.java
b/src/main/java/org/apache/datasketches/hll/HllSketchImpl.java
similarity index 98%
rename from src/main/java/org/apache/datasketches/hll2/HllSketchImpl.java
rename to src/main/java/org/apache/datasketches/hll/HllSketchImpl.java
index 3393dee65..5156dd56d 100644
--- a/src/main/java/org/apache/datasketches/hll2/HllSketchImpl.java
+++ b/src/main/java/org/apache/datasketches/hll/HllSketchImpl.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/HllUtil.java
b/src/main/java/org/apache/datasketches/hll/HllUtil.java
similarity index 89%
rename from src/main/java/org/apache/datasketches/hll2/HllUtil.java
rename to src/main/java/org/apache/datasketches/hll/HllUtil.java
index a3fc99093..c089078e3 100644
--- a/src/main/java/org/apache/datasketches/hll2/HllUtil.java
+++ b/src/main/java/org/apache/datasketches/hll/HllUtil.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.Math.log;
import static java.lang.Math.sqrt;
import static org.apache.datasketches.common.Util.checkBounds;
-import static org.apache.datasketches.hll2.PreambleUtil.HASH_SET_PREINTS;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_PREINTS;
-import static org.apache.datasketches.hll2.PreambleUtil.LIST_PREINTS;
-import static org.apache.datasketches.hll2.PreambleUtil.extractCurMode;
-import static org.apache.datasketches.hll2.PreambleUtil.extractFamilyId;
-import static org.apache.datasketches.hll2.PreambleUtil.extractPreInts;
-import static org.apache.datasketches.hll2.PreambleUtil.extractSerVer;
+import static org.apache.datasketches.hll.PreambleUtil.HASH_SET_PREINTS;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_PREINTS;
+import static org.apache.datasketches.hll.PreambleUtil.LIST_PREINTS;
+import static org.apache.datasketches.hll.PreambleUtil.extractCurMode;
+import static org.apache.datasketches.hll.PreambleUtil.extractFamilyId;
+import static org.apache.datasketches.hll.PreambleUtil.extractPreInts;
+import static org.apache.datasketches.hll.PreambleUtil.extractSerVer;
import java.lang.foreign.MemorySegment;
diff --git
a/src/main/java/org/apache/datasketches/hll2/IntArrayPairIterator.java
b/src/main/java/org/apache/datasketches/hll/IntArrayPairIterator.java
similarity index 95%
rename from src/main/java/org/apache/datasketches/hll2/IntArrayPairIterator.java
rename to src/main/java/org/apache/datasketches/hll/IntArrayPairIterator.java
index 0a40a8754..02da61b24 100644
--- a/src/main/java/org/apache/datasketches/hll2/IntArrayPairIterator.java
+++ b/src/main/java/org/apache/datasketches/hll/IntArrayPairIterator.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
/**
* Iterates over an on-heap integer array of pairs extracting
diff --git
a/src/main/java/org/apache/datasketches/hll2/IntMemorySegmentPairIterator.java
b/src/main/java/org/apache/datasketches/hll/IntMemorySegmentPairIterator.java
similarity index 96%
rename from
src/main/java/org/apache/datasketches/hll2/IntMemorySegmentPairIterator.java
rename to
src/main/java/org/apache/datasketches/hll/IntMemorySegmentPairIterator.java
index b1be847e8..59370002c 100644
---
a/src/main/java/org/apache/datasketches/hll2/IntMemorySegmentPairIterator.java
+++
b/src/main/java/org/apache/datasketches/hll/IntMemorySegmentPairIterator.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/PairIterator.java
b/src/main/java/org/apache/datasketches/hll/PairIterator.java
similarity index 98%
rename from src/main/java/org/apache/datasketches/hll2/PairIterator.java
rename to src/main/java/org/apache/datasketches/hll/PairIterator.java
index 6bed27e13..0282152a3 100644
--- a/src/main/java/org/apache/datasketches/hll2/PairIterator.java
+++ b/src/main/java/org/apache/datasketches/hll/PairIterator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/hll2/PreambleUtil.java
b/src/main/java/org/apache/datasketches/hll/PreambleUtil.java
similarity index 98%
rename from src/main/java/org/apache/datasketches/hll2/PreambleUtil.java
rename to src/main/java/org/apache/datasketches/hll/PreambleUtil.java
index bfef754da..d824dea59 100644
--- a/src/main/java/org/apache/datasketches/hll2/PreambleUtil.java
+++ b/src/main/java/org/apache/datasketches/hll/PreambleUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
import static java.lang.foreign.ValueLayout.JAVA_DOUBLE_UNALIGNED;
@@ -26,10 +26,10 @@ import static org.apache.datasketches.common.Util.LS;
import static org.apache.datasketches.common.Util.ceilingPowerOf2;
import static org.apache.datasketches.common.Util.exactLog2OfLong;
import static org.apache.datasketches.common.Util.zeroPad;
-import static org.apache.datasketches.hll2.HllUtil.LG_AUX_ARR_INTS;
-import static org.apache.datasketches.hll2.HllUtil.LG_INIT_SET_SIZE;
-import static org.apache.datasketches.hll2.HllUtil.RESIZE_DENOM;
-import static org.apache.datasketches.hll2.HllUtil.RESIZE_NUMER;
+import static org.apache.datasketches.hll.HllUtil.LG_AUX_ARR_INTS;
+import static org.apache.datasketches.hll.HllUtil.LG_INIT_SET_SIZE;
+import static org.apache.datasketches.hll.HllUtil.RESIZE_DENOM;
+import static org.apache.datasketches.hll.HllUtil.RESIZE_NUMER;
import java.lang.foreign.MemorySegment;
import java.nio.ByteOrder;
diff --git
a/src/main/java/org/apache/datasketches/hll2/RelativeErrorTables.java
b/src/main/java/org/apache/datasketches/hll/RelativeErrorTables.java
similarity index 99%
rename from src/main/java/org/apache/datasketches/hll2/RelativeErrorTables.java
rename to src/main/java/org/apache/datasketches/hll/RelativeErrorTables.java
index 31b6cb58c..5a167f996 100644
--- a/src/main/java/org/apache/datasketches/hll2/RelativeErrorTables.java
+++ b/src/main/java/org/apache/datasketches/hll/RelativeErrorTables.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
/**
* @author Lee Rhodes
diff --git a/src/main/java/org/apache/datasketches/hll2/TgtHllType.java
b/src/main/java/org/apache/datasketches/hll/TgtHllType.java
similarity index 98%
rename from src/main/java/org/apache/datasketches/hll2/TgtHllType.java
rename to src/main/java/org/apache/datasketches/hll/TgtHllType.java
index 422f851cc..b7f8d45ad 100644
--- a/src/main/java/org/apache/datasketches/hll2/TgtHllType.java
+++ b/src/main/java/org/apache/datasketches/hll/TgtHllType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
/**
* Specifies the target type of HLL sketch to be created. It is a target in
that the actual
diff --git a/src/main/java/org/apache/datasketches/hll2/ToByteArrayImpl.java
b/src/main/java/org/apache/datasketches/hll/ToByteArrayImpl.java
similarity index 82%
rename from src/main/java/org/apache/datasketches/hll2/ToByteArrayImpl.java
rename to src/main/java/org/apache/datasketches/hll/ToByteArrayImpl.java
index 26138e0df..c36e1efbf 100644
--- a/src/main/java/org/apache/datasketches/hll2/ToByteArrayImpl.java
+++ b/src/main/java/org/apache/datasketches/hll/ToByteArrayImpl.java
@@ -17,34 +17,34 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
-import static org.apache.datasketches.hll2.AbstractCoupons.find;
-import static org.apache.datasketches.hll2.HllUtil.LG_AUX_ARR_INTS;
-import static org.apache.datasketches.hll2.PreambleUtil.AUX_COUNT_INT;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_BYTE_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.insertAuxCount;
-import static org.apache.datasketches.hll2.PreambleUtil.insertCompactFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.insertCurMin;
-import static org.apache.datasketches.hll2.PreambleUtil.insertCurMode;
-import static org.apache.datasketches.hll2.PreambleUtil.insertEmptyFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.insertFamilyId;
-import static org.apache.datasketches.hll2.PreambleUtil.insertHashSetCount;
-import static org.apache.datasketches.hll2.PreambleUtil.insertHipAccum;
-import static org.apache.datasketches.hll2.PreambleUtil.insertInt;
-import static org.apache.datasketches.hll2.PreambleUtil.insertKxQ0;
-import static org.apache.datasketches.hll2.PreambleUtil.insertKxQ1;
-import static org.apache.datasketches.hll2.PreambleUtil.insertLgArr;
-import static org.apache.datasketches.hll2.PreambleUtil.insertLgK;
-import static org.apache.datasketches.hll2.PreambleUtil.insertListCount;
-import static org.apache.datasketches.hll2.PreambleUtil.insertNumAtCurMin;
-import static org.apache.datasketches.hll2.PreambleUtil.insertOooFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.insertPreInts;
-import static
org.apache.datasketches.hll2.PreambleUtil.insertRebuildCurMinNumKxQFlag;
-import static org.apache.datasketches.hll2.PreambleUtil.insertSerVer;
-import static org.apache.datasketches.hll2.PreambleUtil.insertTgtHllType;
+import static org.apache.datasketches.hll.AbstractCoupons.find;
+import static org.apache.datasketches.hll.HllUtil.LG_AUX_ARR_INTS;
+import static org.apache.datasketches.hll.PreambleUtil.AUX_COUNT_INT;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_BYTE_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.insertAuxCount;
+import static org.apache.datasketches.hll.PreambleUtil.insertCompactFlag;
+import static org.apache.datasketches.hll.PreambleUtil.insertCurMin;
+import static org.apache.datasketches.hll.PreambleUtil.insertCurMode;
+import static org.apache.datasketches.hll.PreambleUtil.insertEmptyFlag;
+import static org.apache.datasketches.hll.PreambleUtil.insertFamilyId;
+import static org.apache.datasketches.hll.PreambleUtil.insertHashSetCount;
+import static org.apache.datasketches.hll.PreambleUtil.insertHipAccum;
+import static org.apache.datasketches.hll.PreambleUtil.insertInt;
+import static org.apache.datasketches.hll.PreambleUtil.insertKxQ0;
+import static org.apache.datasketches.hll.PreambleUtil.insertKxQ1;
+import static org.apache.datasketches.hll.PreambleUtil.insertLgArr;
+import static org.apache.datasketches.hll.PreambleUtil.insertLgK;
+import static org.apache.datasketches.hll.PreambleUtil.insertListCount;
+import static org.apache.datasketches.hll.PreambleUtil.insertNumAtCurMin;
+import static org.apache.datasketches.hll.PreambleUtil.insertOooFlag;
+import static org.apache.datasketches.hll.PreambleUtil.insertPreInts;
+import static
org.apache.datasketches.hll.PreambleUtil.insertRebuildCurMinNumKxQFlag;
+import static org.apache.datasketches.hll.PreambleUtil.insertSerVer;
+import static org.apache.datasketches.hll.PreambleUtil.insertTgtHllType;
import java.lang.foreign.MemorySegment;
diff --git a/src/main/java/org/apache/datasketches/hll2/Union.java
b/src/main/java/org/apache/datasketches/hll/Union.java
similarity index 98%
rename from src/main/java/org/apache/datasketches/hll2/Union.java
rename to src/main/java/org/apache/datasketches/hll/Union.java
index 395526954..ead23b9ff 100644
--- a/src/main/java/org/apache/datasketches/hll2/Union.java
+++ b/src/main/java/org/apache/datasketches/hll/Union.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
import static org.apache.datasketches.common.Util.invPow2;
-import static org.apache.datasketches.hll2.HllUtil.AUX_TOKEN;
-import static org.apache.datasketches.hll2.HllUtil.EMPTY;
-import static org.apache.datasketches.hll2.HllUtil.loNibbleMask;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_BYTE_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.extractTgtHllType;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_8;
+import static org.apache.datasketches.hll.HllUtil.AUX_TOKEN;
+import static org.apache.datasketches.hll.HllUtil.EMPTY;
+import static org.apache.datasketches.hll.HllUtil.loNibbleMask;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_BYTE_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.extractTgtHllType;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_8;
import java.lang.foreign.MemorySegment;
diff --git
a/src/main/java/org/apache/datasketches/hll2/doc-files/HLL_HIP_K12T20U20.png
b/src/main/java/org/apache/datasketches/hll/doc-files/HLL_HIP_K12T20U20.png
similarity index 100%
rename from
src/main/java/org/apache/datasketches/hll2/doc-files/HLL_HIP_K12T20U20.png
rename to
src/main/java/org/apache/datasketches/hll/doc-files/HLL_HIP_K12T20U20.png
diff --git
a/src/main/java/org/apache/datasketches/hll2/doc-files/HLL_UnionTime4_6_8_Java_CPP.png
b/src/main/java/org/apache/datasketches/hll/doc-files/HLL_UnionTime4_6_8_Java_CPP.png
similarity index 100%
rename from
src/main/java/org/apache/datasketches/hll2/doc-files/HLL_UnionTime4_6_8_Java_CPP.png
rename to
src/main/java/org/apache/datasketches/hll/doc-files/HLL_UnionTime4_6_8_Java_CPP.png
diff --git a/src/main/java/org/apache/datasketches/hll2/package-info.java
b/src/main/java/org/apache/datasketches/hll/package-info.java
similarity index 99%
rename from src/main/java/org/apache/datasketches/hll2/package-info.java
rename to src/main/java/org/apache/datasketches/hll/package-info.java
index ec54ec96f..a17a9f646 100644
--- a/src/main/java/org/apache/datasketches/hll2/package-info.java
+++ b/src/main/java/org/apache/datasketches/hll/package-info.java
@@ -157,4 +157,4 @@
* @author Lee Rhodes
* @author Kevin Lang
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
diff --git a/src/test/java/org/apache/datasketches/hll2/AuxHashMapTest.java
b/src/test/java/org/apache/datasketches/hll/AuxHashMapTest.java
similarity index 95%
rename from src/test/java/org/apache/datasketches/hll2/AuxHashMapTest.java
rename to src/test/java/org/apache/datasketches/hll/AuxHashMapTest.java
index 274bf14fa..3f6a80fd4 100644
--- a/src/test/java/org/apache/datasketches/hll2/AuxHashMapTest.java
+++ b/src/test/java/org/apache/datasketches/hll/AuxHashMapTest.java
@@ -17,13 +17,15 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.fail;
import org.apache.datasketches.common.SketchesStateException;
+import org.apache.datasketches.hll.HeapAuxHashMap;
+import org.apache.datasketches.hll.PairIterator;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/hll2/BaseHllSketchTest.java
b/src/test/java/org/apache/datasketches/hll/BaseHllSketchTest.java
similarity index 92%
rename from src/test/java/org/apache/datasketches/hll2/BaseHllSketchTest.java
rename to src/test/java/org/apache/datasketches/hll/BaseHllSketchTest.java
index 95e1dead4..4afb282b6 100644
--- a/src/test/java/org/apache/datasketches/hll2/BaseHllSketchTest.java
+++ b/src/test/java/org/apache/datasketches/hll/BaseHllSketchTest.java
@@ -17,11 +17,16 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
+import org.apache.datasketches.hll.BaseHllSketch;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.PreambleUtil;
+import org.apache.datasketches.hll.TgtHllType;
+import org.apache.datasketches.hll.Union;
import org.testng.annotations.Test;
import java.lang.foreign.MemorySegment;
diff --git a/src/test/java/org/apache/datasketches/hll2/CouponListTest.java
b/src/test/java/org/apache/datasketches/hll/CouponListTest.java
similarity index 94%
rename from src/test/java/org/apache/datasketches/hll2/CouponListTest.java
rename to src/test/java/org/apache/datasketches/hll/CouponListTest.java
index c27f37c52..78a5fb9a6 100644
--- a/src/test/java/org/apache/datasketches/hll2/CouponListTest.java
+++ b/src/test/java/org/apache/datasketches/hll/CouponListTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
@@ -26,6 +26,11 @@ import static org.testng.Assert.assertTrue;
import java.lang.foreign.MemorySegment;
+import org.apache.datasketches.hll.AbstractCoupons;
+import org.apache.datasketches.hll.CurMode;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.PairIterator;
+import org.apache.datasketches.hll.TgtHllType;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/hll2/CrossCountingTest.java
b/src/test/java/org/apache/datasketches/hll/CrossCountingTest.java
similarity index 91%
rename from src/test/java/org/apache/datasketches/hll2/CrossCountingTest.java
rename to src/test/java/org/apache/datasketches/hll/CrossCountingTest.java
index 0efb1ab9f..7bad7e18e 100644
--- a/src/test/java/org/apache/datasketches/hll2/CrossCountingTest.java
+++ b/src/test/java/org/apache/datasketches/hll/CrossCountingTest.java
@@ -17,13 +17,16 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_8;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_6;
+import static org.apache.datasketches.hll.TgtHllType.HLL_8;
import static org.testng.Assert.assertEquals;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.PairIterator;
+import org.apache.datasketches.hll.TgtHllType;
import org.testng.annotations.Test;
/**
diff --git
a/src/test/java/org/apache/datasketches/hll2/DirectAuxHashMapTest.java
b/src/test/java/org/apache/datasketches/hll/DirectAuxHashMapTest.java
similarity index 95%
rename from src/test/java/org/apache/datasketches/hll2/DirectAuxHashMapTest.java
rename to src/test/java/org/apache/datasketches/hll/DirectAuxHashMapTest.java
index e4923f5f2..6a2b54217 100644
--- a/src/test/java/org/apache/datasketches/hll2/DirectAuxHashMapTest.java
+++ b/src/test/java/org/apache/datasketches/hll/DirectAuxHashMapTest.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
-import static org.apache.datasketches.hll2.HllUtil.LG_AUX_ARR_INTS;
+import static org.apache.datasketches.hll.HllUtil.LG_AUX_ARR_INTS;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNull;
@@ -32,6 +32,16 @@ import java.lang.foreign.MemorySegment;
import java.util.HashMap;
import org.apache.datasketches.common.SketchesStateException;
+import org.apache.datasketches.hll.AbstractHllArray;
+import org.apache.datasketches.hll.AuxHashMap;
+import org.apache.datasketches.hll.DirectAuxHashMap;
+import org.apache.datasketches.hll.DirectHllArray;
+import org.apache.datasketches.hll.HeapAuxHashMap;
+import org.apache.datasketches.hll.HllArray;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.HllUtil;
+import org.apache.datasketches.hll.PairIterator;
+import org.apache.datasketches.hll.TgtHllType;
import org.testng.annotations.Test;
/**
diff --git
a/src/test/java/org/apache/datasketches/hll2/DirectCouponListTest.java
b/src/test/java/org/apache/datasketches/hll/DirectCouponListTest.java
similarity index 96%
rename from src/test/java/org/apache/datasketches/hll2/DirectCouponListTest.java
rename to src/test/java/org/apache/datasketches/hll/DirectCouponListTest.java
index 673dabda3..b3bdc63b6 100644
--- a/src/test/java/org/apache/datasketches/hll2/DirectCouponListTest.java
+++ b/src/test/java/org/apache/datasketches/hll/DirectCouponListTest.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
-import static org.apache.datasketches.hll2.PreambleUtil.LG_ARR_BYTE;
+import static org.apache.datasketches.hll.PreambleUtil.LG_ARR_BYTE;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNull;
@@ -29,6 +29,10 @@ import static org.testng.Assert.assertTrue;
import java.lang.foreign.Arena;
import java.lang.foreign.MemorySegment;
+import org.apache.datasketches.hll.AbstractCoupons;
+import org.apache.datasketches.hll.CurMode;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.TgtHllType;
import org.testng.annotations.Test;
/**
diff --git
a/src/test/java/org/apache/datasketches/hll2/DirectHllSketchTest.java
b/src/test/java/org/apache/datasketches/hll/DirectHllSketchTest.java
similarity index 94%
rename from src/test/java/org/apache/datasketches/hll2/DirectHllSketchTest.java
rename to src/test/java/org/apache/datasketches/hll/DirectHllSketchTest.java
index 6514fc38b..4b9554b5e 100644
--- a/src/test/java/org/apache/datasketches/hll2/DirectHllSketchTest.java
+++ b/src/test/java/org/apache/datasketches/hll/DirectHllSketchTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
@@ -28,6 +28,12 @@ import java.util.HashSet;
import org.apache.datasketches.common.SketchesArgumentException;
import org.apache.datasketches.common.SketchesReadOnlyException;
+import org.apache.datasketches.hll.AbstractHllArray;
+import org.apache.datasketches.hll.CurMode;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.IntMemorySegmentPairIterator;
+import org.apache.datasketches.hll.PairIterator;
+import org.apache.datasketches.hll.TgtHllType;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/hll2/DirectUnionTest.java
b/src/test/java/org/apache/datasketches/hll/DirectUnionTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/hll2/DirectUnionTest.java
rename to src/test/java/org/apache/datasketches/hll/DirectUnionTest.java
index d67f48562..9dca85d98 100644
--- a/src/test/java/org/apache/datasketches/hll2/DirectUnionTest.java
+++ b/src/test/java/org/apache/datasketches/hll/DirectUnionTest.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_8;
import static java.lang.Math.min;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_6;
+import static org.apache.datasketches.hll.TgtHllType.HLL_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -32,6 +32,11 @@ import java.lang.foreign.MemorySegment;
import org.testng.annotations.Test;
import org.apache.datasketches.common.SketchesArgumentException;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.HllUtil;
+import org.apache.datasketches.hll.RelativeErrorTables;
+import org.apache.datasketches.hll.TgtHllType;
+import org.apache.datasketches.hll.Union;
/**
* @author Lee Rhodes
diff --git a/src/test/java/org/apache/datasketches/hll2/HllArrayTest.java
b/src/test/java/org/apache/datasketches/hll/HllArrayTest.java
similarity index 94%
rename from src/test/java/org/apache/datasketches/hll2/HllArrayTest.java
rename to src/test/java/org/apache/datasketches/hll/HllArrayTest.java
index f3f5d6f22..27793679b 100644
--- a/src/test/java/org/apache/datasketches/hll2/HllArrayTest.java
+++ b/src/test/java/org/apache/datasketches/hll/HllArrayTest.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_8;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_6;
+import static org.apache.datasketches.hll.TgtHllType.HLL_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -30,6 +30,11 @@ import static org.testng.Assert.fail;
import java.lang.foreign.MemorySegment;
import org.apache.datasketches.common.SketchesStateException;
+import org.apache.datasketches.hll.AbstractHllArray;
+import org.apache.datasketches.hll.HllArray;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.TgtHllType;
+import org.apache.datasketches.hll.Union;
import org.testng.annotations.Test;
/**
diff --git
a/src/test/java/org/apache/datasketches/hll2/HllSketchCrossLanguageTest.java
b/src/test/java/org/apache/datasketches/hll/HllSketchCrossLanguageTest.java
similarity index 93%
rename from
src/test/java/org/apache/datasketches/hll2/HllSketchCrossLanguageTest.java
rename to
src/test/java/org/apache/datasketches/hll/HllSketchCrossLanguageTest.java
index 98fa17f5d..e69d01621 100644
--- a/src/test/java/org/apache/datasketches/hll2/HllSketchCrossLanguageTest.java
+++ b/src/test/java/org/apache/datasketches/hll/HllSketchCrossLanguageTest.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static org.apache.datasketches.common.TestUtil.CHECK_CPP_FILES;
import static org.apache.datasketches.common.TestUtil.GENERATE_JAVA_FILES;
import static org.apache.datasketches.common.TestUtil.cppPath;
import static org.apache.datasketches.common.TestUtil.javaPath;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_8;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_6;
+import static org.apache.datasketches.hll.TgtHllType.HLL_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
@@ -33,6 +33,7 @@ import java.lang.foreign.MemorySegment;
import java.io.IOException;
import java.nio.file.Files;
+import org.apache.datasketches.hll.HllSketch;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/hll2/HllSketchTest.java
b/src/test/java/org/apache/datasketches/hll/HllSketchTest.java
similarity index 93%
rename from src/test/java/org/apache/datasketches/hll2/HllSketchTest.java
rename to src/test/java/org/apache/datasketches/hll/HllSketchTest.java
index 08ddf7559..d0744f857 100644
--- a/src/test/java/org/apache/datasketches/hll2/HllSketchTest.java
+++ b/src/test/java/org/apache/datasketches/hll/HllSketchTest.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
-
-import static
org.apache.datasketches.hll2.HllSketch.getMaxUpdatableSerializationBytes;
-import static org.apache.datasketches.hll2.HllUtil.LG_AUX_ARR_INTS;
-import static org.apache.datasketches.hll2.HllUtil.LG_INIT_LIST_SIZE;
-import static org.apache.datasketches.hll2.HllUtil.LG_INIT_SET_SIZE;
-import static org.apache.datasketches.hll2.PreambleUtil.HASH_SET_INT_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.HLL_BYTE_ARR_START;
-import static org.apache.datasketches.hll2.PreambleUtil.LIST_INT_ARR_START;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_8;
+package org.apache.datasketches.hll;
+
+import static
org.apache.datasketches.hll.HllSketch.getMaxUpdatableSerializationBytes;
+import static org.apache.datasketches.hll.HllUtil.LG_AUX_ARR_INTS;
+import static org.apache.datasketches.hll.HllUtil.LG_INIT_LIST_SIZE;
+import static org.apache.datasketches.hll.HllUtil.LG_INIT_SET_SIZE;
+import static org.apache.datasketches.hll.PreambleUtil.HASH_SET_INT_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.HLL_BYTE_ARR_START;
+import static org.apache.datasketches.hll.PreambleUtil.LIST_INT_ARR_START;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_6;
+import static org.apache.datasketches.hll.TgtHllType.HLL_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNull;
@@ -38,6 +38,16 @@ import static org.testng.Assert.fail;
import java.lang.foreign.MemorySegment;
import org.apache.datasketches.common.SketchesArgumentException;
+import org.apache.datasketches.hll.AbstractCoupons;
+import org.apache.datasketches.hll.AbstractHllArray;
+import org.apache.datasketches.hll.AuxHashMap;
+import org.apache.datasketches.hll.CurMode;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.HllSketchImpl;
+import org.apache.datasketches.hll.HllUtil;
+import org.apache.datasketches.hll.PreambleUtil;
+import org.apache.datasketches.hll.TgtHllType;
+import org.apache.datasketches.hll.Union;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/hll2/IsomorphicTest.java
b/src/test/java/org/apache/datasketches/hll/IsomorphicTest.java
similarity index 96%
rename from src/test/java/org/apache/datasketches/hll2/IsomorphicTest.java
rename to src/test/java/org/apache/datasketches/hll/IsomorphicTest.java
index d60fe4001..90db8088b 100644
--- a/src/test/java/org/apache/datasketches/hll2/IsomorphicTest.java
+++ b/src/test/java/org/apache/datasketches/hll/IsomorphicTest.java
@@ -17,19 +17,24 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
-
-import static org.apache.datasketches.hll2.CurMode.HLL;
-import static org.apache.datasketches.hll2.CurMode.LIST;
-import static org.apache.datasketches.hll2.CurMode.SET;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_8;
+package org.apache.datasketches.hll;
+
+import static org.apache.datasketches.hll.CurMode.HLL;
+import static org.apache.datasketches.hll.CurMode.LIST;
+import static org.apache.datasketches.hll.CurMode.SET;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_6;
+import static org.apache.datasketches.hll.TgtHllType.HLL_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;
import java.lang.foreign.MemorySegment;
+import org.apache.datasketches.hll.AbstractHllArray;
+import org.apache.datasketches.hll.CurMode;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.TgtHllType;
+import org.apache.datasketches.hll.Union;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/hll2/PreambleUtilTest.java
b/src/test/java/org/apache/datasketches/hll/PreambleUtilTest.java
similarity index 90%
rename from src/test/java/org/apache/datasketches/hll2/PreambleUtilTest.java
rename to src/test/java/org/apache/datasketches/hll/PreambleUtilTest.java
index d2f265ab8..bf3c02b75 100644
--- a/src/test/java/org/apache/datasketches/hll2/PreambleUtilTest.java
+++ b/src/test/java/org/apache/datasketches/hll/PreambleUtilTest.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
-import static org.apache.datasketches.hll2.PreambleUtil.EMPTY_FLAG_MASK;
-import static org.apache.datasketches.hll2.PreambleUtil.FAMILY_BYTE;
-import static org.apache.datasketches.hll2.PreambleUtil.SER_VER_BYTE;
-import static org.apache.datasketches.hll2.PreambleUtil.extractFlags;
-import static org.apache.datasketches.hll2.PreambleUtil.insertFamilyId;
-import static org.apache.datasketches.hll2.PreambleUtil.insertPreInts;
-import static org.apache.datasketches.hll2.PreambleUtil.insertSerVer;
+import static org.apache.datasketches.hll.PreambleUtil.EMPTY_FLAG_MASK;
+import static org.apache.datasketches.hll.PreambleUtil.FAMILY_BYTE;
+import static org.apache.datasketches.hll.PreambleUtil.SER_VER_BYTE;
+import static org.apache.datasketches.hll.PreambleUtil.extractFlags;
+import static org.apache.datasketches.hll.PreambleUtil.insertFamilyId;
+import static org.apache.datasketches.hll.PreambleUtil.insertPreInts;
+import static org.apache.datasketches.hll.PreambleUtil.insertSerVer;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -35,6 +35,10 @@ import static org.testng.Assert.fail;
import java.lang.foreign.MemorySegment;
import org.apache.datasketches.common.SketchesArgumentException;
+import org.apache.datasketches.hll.CurMode;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.PreambleUtil;
+import org.apache.datasketches.hll.TgtHllType;
import org.testng.annotations.Test;
/**
diff --git
a/src/test/java/org/apache/datasketches/hll2/SizeAndModeTransitions.java
b/src/test/java/org/apache/datasketches/hll/SizeAndModeTransitions.java
similarity index 96%
rename from
src/test/java/org/apache/datasketches/hll2/SizeAndModeTransitions.java
rename to src/test/java/org/apache/datasketches/hll/SizeAndModeTransitions.java
index 85f27faf7..0d4b921bc 100644
--- a/src/test/java/org/apache/datasketches/hll2/SizeAndModeTransitions.java
+++ b/src/test/java/org/apache/datasketches/hll/SizeAndModeTransitions.java
@@ -17,12 +17,14 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static org.testng.Assert.assertEquals;
import java.lang.foreign.MemorySegment;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.TgtHllType;
import org.testng.annotations.Test;
public class SizeAndModeTransitions {
diff --git a/src/test/java/org/apache/datasketches/hll2/TablesTest.java
b/src/test/java/org/apache/datasketches/hll/TablesTest.java
similarity index 88%
rename from src/test/java/org/apache/datasketches/hll2/TablesTest.java
rename to src/test/java/org/apache/datasketches/hll/TablesTest.java
index 64c2974bf..cb249f811 100644
--- a/src/test/java/org/apache/datasketches/hll2/TablesTest.java
+++ b/src/test/java/org/apache/datasketches/hll/TablesTest.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.CouponMapping.xArr;
-import static org.apache.datasketches.hll2.CouponMapping.yArr;
-import static org.apache.datasketches.hll2.CubicInterpolation.usingXAndYTables;
+import static org.apache.datasketches.hll.CouponMapping.xArr;
+import static org.apache.datasketches.hll.CouponMapping.yArr;
+import static org.apache.datasketches.hll.CubicInterpolation.usingXAndYTables;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;
diff --git
a/src/test/java/org/apache/datasketches/hll2/ToFromByteArrayTest.java
b/src/test/java/org/apache/datasketches/hll/ToFromByteArrayTest.java
similarity index 93%
rename from src/test/java/org/apache/datasketches/hll2/ToFromByteArrayTest.java
rename to src/test/java/org/apache/datasketches/hll/ToFromByteArrayTest.java
index 85f4582b4..537e8b99f 100644
--- a/src/test/java/org/apache/datasketches/hll2/ToFromByteArrayTest.java
+++ b/src/test/java/org/apache/datasketches/hll/ToFromByteArrayTest.java
@@ -17,15 +17,17 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_8;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_6;
+import static org.apache.datasketches.hll.TgtHllType.HLL_8;
import static org.testng.Assert.assertEquals;
import java.lang.foreign.MemorySegment;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.TgtHllType;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/hll2/UnionCaseTest.java
b/src/test/java/org/apache/datasketches/hll/UnionCaseTest.java
similarity index 95%
rename from src/test/java/org/apache/datasketches/hll2/UnionCaseTest.java
rename to src/test/java/org/apache/datasketches/hll/UnionCaseTest.java
index 922a1ec63..fc6a7a40d 100644
--- a/src/test/java/org/apache/datasketches/hll2/UnionCaseTest.java
+++ b/src/test/java/org/apache/datasketches/hll/UnionCaseTest.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
-
-import static org.apache.datasketches.hll2.CurMode.LIST;
-import static org.apache.datasketches.hll2.CurMode.SET;
-import static org.apache.datasketches.hll2.HllUtil.HLL_HIP_RSE_FACTOR;
-import static org.apache.datasketches.hll2.HllUtil.HLL_NON_HIP_RSE_FACTOR;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_8;
+package org.apache.datasketches.hll;
+
+import static org.apache.datasketches.hll.CurMode.LIST;
+import static org.apache.datasketches.hll.CurMode.SET;
+import static org.apache.datasketches.hll.HllUtil.HLL_HIP_RSE_FACTOR;
+import static org.apache.datasketches.hll.HllUtil.HLL_NON_HIP_RSE_FACTOR;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_6;
+import static org.apache.datasketches.hll.TgtHllType.HLL_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -33,6 +33,12 @@ import static org.testng.Assert.assertTrue;
import java.lang.foreign.MemorySegment;
import org.apache.datasketches.common.SketchesStateException;
+import org.apache.datasketches.hll.AbstractHllArray;
+import org.apache.datasketches.hll.DirectHllArray;
+import org.apache.datasketches.hll.HllArray;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.TgtHllType;
+import org.apache.datasketches.hll.Union;
import org.testng.annotations.Test;
/**
diff --git a/src/test/java/org/apache/datasketches/hll2/UnionTest.java
b/src/test/java/org/apache/datasketches/hll/UnionTest.java
similarity index 97%
rename from src/test/java/org/apache/datasketches/hll2/UnionTest.java
rename to src/test/java/org/apache/datasketches/hll/UnionTest.java
index dd0f29c4a..0e1bc5b46 100644
--- a/src/test/java/org/apache/datasketches/hll2/UnionTest.java
+++ b/src/test/java/org/apache/datasketches/hll/UnionTest.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.datasketches.hll2;
+package org.apache.datasketches.hll;
import static java.lang.Math.min;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
-import static org.apache.datasketches.hll2.TgtHllType.HLL_8;
+import static org.apache.datasketches.hll.TgtHllType.HLL_4;
+import static org.apache.datasketches.hll.TgtHllType.HLL_6;
+import static org.apache.datasketches.hll.TgtHllType.HLL_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -31,6 +31,12 @@ import static org.testng.Assert.fail;
import java.lang.foreign.MemorySegment;
import org.apache.datasketches.common.SketchesArgumentException;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.hll.HllUtil;
+import org.apache.datasketches.hll.PreambleUtil;
+import org.apache.datasketches.hll.RelativeErrorTables;
+import org.apache.datasketches.hll.TgtHllType;
+import org.apache.datasketches.hll.Union;
import org.testng.annotations.Test;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
