Skip to content

Commit 7b33321

Browse files
leerholeerho
committed
rename new hll2 back to hll for both main and test
1 parent e5d5d14 commit 7b33321

59 files changed

Lines changed: 417 additions & 336 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/main/java/org/apache/datasketches/hll2/AbstractCoupons.java renamed to src/main/java/org/apache/datasketches/hll/AbstractCoupons.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.datasketches.hll2;
20+
package org.apache.datasketches.hll;
2121

2222
import static java.lang.Math.max;
23-
import static org.apache.datasketches.hll2.HllUtil.COUPON_RSE;
24-
import static org.apache.datasketches.hll2.HllUtil.EMPTY;
25-
import static org.apache.datasketches.hll2.HllUtil.KEY_MASK_26;
26-
import static org.apache.datasketches.hll2.ToByteArrayImpl.toCouponByteArray;
23+
import static org.apache.datasketches.hll.HllUtil.COUPON_RSE;
24+
import static org.apache.datasketches.hll.HllUtil.EMPTY;
25+
import static org.apache.datasketches.hll.HllUtil.KEY_MASK_26;
26+
import static org.apache.datasketches.hll.ToByteArrayImpl.toCouponByteArray;
2727

2828
import org.apache.datasketches.common.SketchesArgumentException;
2929

src/main/java/org/apache/datasketches/hll2/AbstractHllArray.java renamed to src/main/java/org/apache/datasketches/hll/AbstractHllArray.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.datasketches.hll2;
20+
package org.apache.datasketches.hll;
2121

2222
import static org.apache.datasketches.common.Util.invPow2;
23-
import static org.apache.datasketches.hll2.PreambleUtil.HLL_BYTE_ARR_START;
24-
import static org.apache.datasketches.hll2.PreambleUtil.HLL_PREINTS;
25-
import static org.apache.datasketches.hll2.TgtHllType.HLL_4;
26-
import static org.apache.datasketches.hll2.TgtHllType.HLL_6;
23+
import static org.apache.datasketches.hll.PreambleUtil.HLL_BYTE_ARR_START;
24+
import static org.apache.datasketches.hll.PreambleUtil.HLL_PREINTS;
25+
import static org.apache.datasketches.hll.TgtHllType.HLL_4;
26+
import static org.apache.datasketches.hll.TgtHllType.HLL_6;
2727

2828
import org.apache.datasketches.common.SketchesStateException;
2929

src/main/java/org/apache/datasketches/hll2/AuxHashMap.java renamed to src/main/java/org/apache/datasketches/hll/AuxHashMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.datasketches.hll2;
20+
package org.apache.datasketches.hll;
2121

2222
import java.lang.foreign.MemorySegment;
2323

src/main/java/org/apache/datasketches/hll2/BaseHllSketch.java renamed to src/main/java/org/apache/datasketches/hll/BaseHllSketch.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.datasketches.hll2;
20+
package org.apache.datasketches.hll;
2121

2222
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
2323
import static java.nio.charset.StandardCharsets.UTF_8;
2424
import static org.apache.datasketches.hash.MurmurHash3.hash;
25-
import static org.apache.datasketches.hll2.HllUtil.HLL_HIP_RSE_FACTOR;
26-
import static org.apache.datasketches.hll2.HllUtil.HLL_NON_HIP_RSE_FACTOR;
27-
import static org.apache.datasketches.hll2.HllUtil.KEY_BITS_26;
28-
import static org.apache.datasketches.hll2.HllUtil.KEY_MASK_26;
25+
import static org.apache.datasketches.hll.HllUtil.HLL_HIP_RSE_FACTOR;
26+
import static org.apache.datasketches.hll.HllUtil.HLL_NON_HIP_RSE_FACTOR;
27+
import static org.apache.datasketches.hll.HllUtil.KEY_BITS_26;
28+
import static org.apache.datasketches.hll.HllUtil.KEY_MASK_26;
2929

3030
import java.lang.foreign.MemorySegment;
3131
import java.nio.ByteBuffer;

src/main/java/org/apache/datasketches/hll2/CompositeInterpolationXTable.java renamed to src/main/java/org/apache/datasketches/hll/CompositeInterpolationXTable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.datasketches.hll2;
20+
package org.apache.datasketches.hll;
2121

2222
/**
2323
* @author Lee Rhodes

src/main/java/org/apache/datasketches/hll2/Conversions.java renamed to src/main/java/org/apache/datasketches/hll/Conversions.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.datasketches.hll2;
20+
package org.apache.datasketches.hll;
2121

22-
import static org.apache.datasketches.hll2.HllUtil.AUX_TOKEN;
23-
import static org.apache.datasketches.hll2.HllUtil.EMPTY;
24-
import static org.apache.datasketches.hll2.HllUtil.LG_AUX_ARR_INTS;
22+
import static org.apache.datasketches.hll.HllUtil.AUX_TOKEN;
23+
import static org.apache.datasketches.hll.HllUtil.EMPTY;
24+
import static org.apache.datasketches.hll.HllUtil.LG_AUX_ARR_INTS;
2525

2626
/**
2727
* Converters for one TgtHllType to another. The source can be heap or direct, but the result is

src/main/java/org/apache/datasketches/hll2/CouponHashSet.java renamed to src/main/java/org/apache/datasketches/hll/CouponHashSet.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.datasketches.hll2;
20+
package org.apache.datasketches.hll;
2121

2222
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
23-
import static org.apache.datasketches.hll2.HllUtil.EMPTY;
24-
import static org.apache.datasketches.hll2.HllUtil.LG_INIT_SET_SIZE;
25-
import static org.apache.datasketches.hll2.HllUtil.RESIZE_DENOM;
26-
import static org.apache.datasketches.hll2.HllUtil.RESIZE_NUMER;
27-
import static org.apache.datasketches.hll2.PreambleUtil.HASH_SET_INT_ARR_START;
28-
import static org.apache.datasketches.hll2.PreambleUtil.HASH_SET_PREINTS;
29-
import static org.apache.datasketches.hll2.PreambleUtil.LIST_INT_ARR_START;
30-
import static org.apache.datasketches.hll2.PreambleUtil.computeLgArr;
31-
import static org.apache.datasketches.hll2.PreambleUtil.extractCompactFlag;
32-
import static org.apache.datasketches.hll2.PreambleUtil.extractCurMode;
33-
import static org.apache.datasketches.hll2.PreambleUtil.extractHashSetCount;
34-
import static org.apache.datasketches.hll2.PreambleUtil.extractInt;
35-
import static org.apache.datasketches.hll2.PreambleUtil.extractLgArr;
36-
import static org.apache.datasketches.hll2.PreambleUtil.extractLgK;
37-
import static org.apache.datasketches.hll2.PreambleUtil.extractTgtHllType;
23+
import static org.apache.datasketches.hll.HllUtil.EMPTY;
24+
import static org.apache.datasketches.hll.HllUtil.LG_INIT_SET_SIZE;
25+
import static org.apache.datasketches.hll.HllUtil.RESIZE_DENOM;
26+
import static org.apache.datasketches.hll.HllUtil.RESIZE_NUMER;
27+
import static org.apache.datasketches.hll.PreambleUtil.HASH_SET_INT_ARR_START;
28+
import static org.apache.datasketches.hll.PreambleUtil.HASH_SET_PREINTS;
29+
import static org.apache.datasketches.hll.PreambleUtil.LIST_INT_ARR_START;
30+
import static org.apache.datasketches.hll.PreambleUtil.computeLgArr;
31+
import static org.apache.datasketches.hll.PreambleUtil.extractCompactFlag;
32+
import static org.apache.datasketches.hll.PreambleUtil.extractCurMode;
33+
import static org.apache.datasketches.hll.PreambleUtil.extractHashSetCount;
34+
import static org.apache.datasketches.hll.PreambleUtil.extractInt;
35+
import static org.apache.datasketches.hll.PreambleUtil.extractLgArr;
36+
import static org.apache.datasketches.hll.PreambleUtil.extractLgK;
37+
import static org.apache.datasketches.hll.PreambleUtil.extractTgtHllType;
3838

3939
import java.lang.foreign.MemorySegment;
4040

src/main/java/org/apache/datasketches/hll2/CouponList.java renamed to src/main/java/org/apache/datasketches/hll/CouponList.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.datasketches.hll2;
20+
package org.apache.datasketches.hll;
2121

2222
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
23-
import static org.apache.datasketches.hll2.HllUtil.EMPTY;
24-
import static org.apache.datasketches.hll2.HllUtil.LG_INIT_LIST_SIZE;
25-
import static org.apache.datasketches.hll2.HllUtil.LG_INIT_SET_SIZE;
26-
import static org.apache.datasketches.hll2.PreambleUtil.LIST_INT_ARR_START;
27-
import static org.apache.datasketches.hll2.PreambleUtil.LIST_PREINTS;
28-
import static org.apache.datasketches.hll2.PreambleUtil.extractLgK;
29-
import static org.apache.datasketches.hll2.PreambleUtil.extractListCount;
30-
import static org.apache.datasketches.hll2.PreambleUtil.extractTgtHllType;
23+
import static org.apache.datasketches.hll.HllUtil.EMPTY;
24+
import static org.apache.datasketches.hll.HllUtil.LG_INIT_LIST_SIZE;
25+
import static org.apache.datasketches.hll.HllUtil.LG_INIT_SET_SIZE;
26+
import static org.apache.datasketches.hll.PreambleUtil.LIST_INT_ARR_START;
27+
import static org.apache.datasketches.hll.PreambleUtil.LIST_PREINTS;
28+
import static org.apache.datasketches.hll.PreambleUtil.extractLgK;
29+
import static org.apache.datasketches.hll.PreambleUtil.extractListCount;
30+
import static org.apache.datasketches.hll.PreambleUtil.extractTgtHllType;
3131

3232
import java.lang.foreign.MemorySegment;
3333

src/main/java/org/apache/datasketches/hll2/CouponMapping.java renamed to src/main/java/org/apache/datasketches/hll/CouponMapping.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.datasketches.hll2;
20+
package org.apache.datasketches.hll;
2121

2222
/**
2323
* @author Lee Rhodes

src/main/java/org/apache/datasketches/hll2/CubicInterpolation.java renamed to src/main/java/org/apache/datasketches/hll/CubicInterpolation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.datasketches.hll2;
20+
package org.apache.datasketches.hll;
2121

2222
import org.apache.datasketches.common.SketchesArgumentException;
2323

0 commit comments

Comments
 (0)