Skip to content

Commit 5f199a3

Browse files
committed
More prep before deletions.
1 parent 7dccb96 commit 5f199a3

7 files changed

Lines changed: 11 additions & 8 deletions

src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.apache.datasketches.thetacommon.SetOperationCornerCases.AnotbAction;
3636
import org.apache.datasketches.thetacommon.SetOperationCornerCases.CornerCase;
3737
import org.apache.datasketches.thetacommon.ThetaUtil;
38-
import org.apache.datasketches.tuple.Util;
3938

4039
/**
4140
* Computes a set difference, A-AND-NOT-B, of two ArrayOfDoublesSketches.

src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersection.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.apache.datasketches.common.SketchesArgumentException;
2525
import org.apache.datasketches.common.SketchesStateException;
2626
import org.apache.datasketches.memory.WritableMemory;
27-
import org.apache.datasketches.tuple.Util;
2827

2928
/**
3029
* Computes the intersection of two or more tuple sketches of type ArrayOfDoubles.

src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnion.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.datasketches.memory.Memory;
2828
import org.apache.datasketches.memory.WritableMemory;
2929
import org.apache.datasketches.tuple.SerializerDeserializer;
30-
import org.apache.datasketches.tuple.Util;
3130

3231
/**
3332
* The base class for unions of tuple sketches of type ArrayOfDoubles.

src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketch.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@
1919

2020
package org.apache.datasketches.tuple.arrayofdoubles;
2121

22+
import static org.apache.datasketches.common.Util.checkSeedHashes;
23+
import static org.apache.datasketches.common.Util.computeSeedHash;
24+
2225
import java.nio.ByteOrder;
2326

2427
import org.apache.datasketches.common.Family;
2528
import org.apache.datasketches.common.SketchesArgumentException;
2629
import org.apache.datasketches.memory.Memory;
2730
import org.apache.datasketches.memory.WritableMemory;
2831
import org.apache.datasketches.tuple.SerializerDeserializer;
29-
import org.apache.datasketches.tuple.Util;
3032

3133
/**
3234
* Direct Compact Sketch of type ArrayOfDoubles.
@@ -178,7 +180,7 @@ final class DirectArrayOfDoublesCompactSketch extends ArrayOfDoublesCompactSketc
178180
if (isBigEndian ^ ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN)) {
179181
throw new SketchesArgumentException("Byte order mismatch");
180182
}
181-
org.apache.datasketches.common.Util.checkSeedHashes(mem.getShort(SEED_HASH_SHORT), org.apache.datasketches.common.Util.computeSeedHash(seed));
183+
checkSeedHashes(mem.getShort(SEED_HASH_SHORT), computeSeedHash(seed));
182184
isEmpty_ = (mem_.getByte(FLAGS_BYTE) & (1 << Flags.IS_EMPTY.ordinal())) != 0;
183185
thetaLong_ = mem_.getLong(THETA_LONG);
184186
}

src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesQuickSelectSketch.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919

2020
package org.apache.datasketches.tuple.arrayofdoubles;
2121

22+
import static org.apache.datasketches.common.Util.checkSeedHashes;
23+
import static org.apache.datasketches.common.Util.computeSeedHash;
24+
2225
import java.nio.ByteOrder;
2326
import java.util.Arrays;
2427

@@ -152,7 +155,7 @@ private DirectArrayOfDoublesQuickSelectSketch(
152155
SerializerDeserializer.validateType(mem_.getByte(SKETCH_TYPE_BYTE),
153156
SerializerDeserializer.SketchType.ArrayOfDoublesQuickSelectSketch);
154157

155-
org.apache.datasketches.common.Util.checkSeedHashes(mem.getShort(SEED_HASH_SHORT), org.apache.datasketches.common.Util.computeSeedHash(seed));
158+
checkSeedHashes(mem.getShort(SEED_HASH_SHORT), computeSeedHash(seed));
156159
keysOffset_ = ENTRIES_START;
157160
valuesOffset_ = keysOffset_ + (SIZE_OF_KEY_BYTES * getCurrentCapacity());
158161
// to do: make parent take care of its own parts

src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketch.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.datasketches.memory.Memory;
3030
import org.apache.datasketches.memory.WritableMemory;
3131
import org.apache.datasketches.tuple.SerializerDeserializer;
32-
import org.apache.datasketches.tuple.Util;
3332

3433
/**
3534
* The on-heap implementation of tuple Compact Sketch of type ArrayOfDoubles.

src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketch.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
package org.apache.datasketches.tuple.arrayofdoubles;
2121

2222
import static org.apache.datasketches.common.Util.ceilingPowerOf2;
23+
import static org.apache.datasketches.common.Util.checkSeedHashes;
24+
import static org.apache.datasketches.common.Util.computeSeedHash;
2325
import static org.apache.datasketches.common.Util.exactLog2OfLong;
2426

2527
import java.nio.ByteOrder;
@@ -98,7 +100,7 @@ final class HeapArrayOfDoublesQuickSelectSketch extends ArrayOfDoublesQuickSelec
98100
if (isBigEndian ^ ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN)) {
99101
throw new SketchesArgumentException("Byte order mismatch");
100102
}
101-
org.apache.datasketches.common.Util.checkSeedHashes(mem.getShort(SEED_HASH_SHORT), org.apache.datasketches.common.Util.computeSeedHash(seed));
103+
checkSeedHashes(mem.getShort(SEED_HASH_SHORT), computeSeedHash(seed));
102104
isEmpty_ = (flags & (1 << Flags.IS_EMPTY.ordinal())) > 0;
103105
lgNomEntries_ = mem.getByte(LG_NOM_ENTRIES_BYTE);
104106
thetaLong_ = mem.getLong(THETA_LONG);

0 commit comments

Comments
 (0)