This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch thetaRework
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
The following commit(s) were added to refs/heads/thetaRework by this push:
new 5f199a359 More prep before deletions.
5f199a359 is described below
commit 5f199a35903b99e8707584054204ca1f1f4cd8f4
Author: Lee Rhodes <[email protected]>
AuthorDate: Fri Jun 27 16:40:06 2025 -0700
More prep before deletions.
---
.../datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBImpl.java | 1 -
.../tuple/arrayofdoubles/ArrayOfDoublesIntersection.java | 1 -
.../datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnion.java | 1 -
.../tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketch.java | 6 ++++--
.../tuple/arrayofdoubles/DirectArrayOfDoublesQuickSelectSketch.java | 5 ++++-
.../tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketch.java | 1 -
.../tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketch.java | 4 +++-
7 files changed, 11 insertions(+), 8 deletions(-)
diff --git
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBImpl.java
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBImpl.java
index 4bd241768..b4552cc73 100644
---
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBImpl.java
+++
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesAnotBImpl.java
@@ -35,7 +35,6 @@ import
org.apache.datasketches.thetacommon.SetOperationCornerCases;
import org.apache.datasketches.thetacommon.SetOperationCornerCases.AnotbAction;
import org.apache.datasketches.thetacommon.SetOperationCornerCases.CornerCase;
import org.apache.datasketches.thetacommon.ThetaUtil;
-import org.apache.datasketches.tuple.Util;
/**
* Computes a set difference, A-AND-NOT-B, of two ArrayOfDoublesSketches.
diff --git
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersection.java
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersection.java
index 386b70d3b..26f0f2275 100644
---
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersection.java
+++
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesIntersection.java
@@ -24,7 +24,6 @@ import static java.lang.Math.min;
import org.apache.datasketches.common.SketchesArgumentException;
import org.apache.datasketches.common.SketchesStateException;
import org.apache.datasketches.memory.WritableMemory;
-import org.apache.datasketches.tuple.Util;
/**
* Computes the intersection of two or more tuple sketches of type
ArrayOfDoubles.
diff --git
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnion.java
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnion.java
index d76754b85..b0a95eecf 100644
---
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnion.java
+++
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/ArrayOfDoublesUnion.java
@@ -27,7 +27,6 @@ import
org.apache.datasketches.common.SketchesArgumentException;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.WritableMemory;
import org.apache.datasketches.tuple.SerializerDeserializer;
-import org.apache.datasketches.tuple.Util;
/**
* The base class for unions of tuple sketches of type ArrayOfDoubles.
diff --git
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketch.java
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketch.java
index f3497709c..2e0dc3628 100644
---
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketch.java
+++
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesCompactSketch.java
@@ -19,6 +19,9 @@
package org.apache.datasketches.tuple.arrayofdoubles;
+import static org.apache.datasketches.common.Util.checkSeedHashes;
+import static org.apache.datasketches.common.Util.computeSeedHash;
+
import java.nio.ByteOrder;
import org.apache.datasketches.common.Family;
@@ -26,7 +29,6 @@ import
org.apache.datasketches.common.SketchesArgumentException;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.WritableMemory;
import org.apache.datasketches.tuple.SerializerDeserializer;
-import org.apache.datasketches.tuple.Util;
/**
* Direct Compact Sketch of type ArrayOfDoubles.
@@ -178,7 +180,7 @@ final class DirectArrayOfDoublesCompactSketch extends
ArrayOfDoublesCompactSketc
if (isBigEndian ^ ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN)) {
throw new SketchesArgumentException("Byte order mismatch");
}
-
org.apache.datasketches.common.Util.checkSeedHashes(mem.getShort(SEED_HASH_SHORT),
org.apache.datasketches.common.Util.computeSeedHash(seed));
+ checkSeedHashes(mem.getShort(SEED_HASH_SHORT), computeSeedHash(seed));
isEmpty_ = (mem_.getByte(FLAGS_BYTE) & (1 << Flags.IS_EMPTY.ordinal())) !=
0;
thetaLong_ = mem_.getLong(THETA_LONG);
}
diff --git
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesQuickSelectSketch.java
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesQuickSelectSketch.java
index 8073a1b38..2730dc391 100644
---
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesQuickSelectSketch.java
+++
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/DirectArrayOfDoublesQuickSelectSketch.java
@@ -19,6 +19,9 @@
package org.apache.datasketches.tuple.arrayofdoubles;
+import static org.apache.datasketches.common.Util.checkSeedHashes;
+import static org.apache.datasketches.common.Util.computeSeedHash;
+
import java.nio.ByteOrder;
import java.util.Arrays;
@@ -152,7 +155,7 @@ class DirectArrayOfDoublesQuickSelectSketch extends
ArrayOfDoublesQuickSelectSke
SerializerDeserializer.validateType(mem_.getByte(SKETCH_TYPE_BYTE),
SerializerDeserializer.SketchType.ArrayOfDoublesQuickSelectSketch);
-
org.apache.datasketches.common.Util.checkSeedHashes(mem.getShort(SEED_HASH_SHORT),
org.apache.datasketches.common.Util.computeSeedHash(seed));
+ checkSeedHashes(mem.getShort(SEED_HASH_SHORT), computeSeedHash(seed));
keysOffset_ = ENTRIES_START;
valuesOffset_ = keysOffset_ + (SIZE_OF_KEY_BYTES * getCurrentCapacity());
// to do: make parent take care of its own parts
diff --git
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketch.java
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketch.java
index f69babc97..e57dd9552 100644
---
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketch.java
+++
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesCompactSketch.java
@@ -29,7 +29,6 @@ import
org.apache.datasketches.common.SketchesArgumentException;
import org.apache.datasketches.memory.Memory;
import org.apache.datasketches.memory.WritableMemory;
import org.apache.datasketches.tuple.SerializerDeserializer;
-import org.apache.datasketches.tuple.Util;
/**
* The on-heap implementation of tuple Compact Sketch of type ArrayOfDoubles.
diff --git
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketch.java
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketch.java
index ab955a0ee..0aad041ec 100644
---
a/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketch.java
+++
b/src/main/java/org/apache/datasketches/tuple/arrayofdoubles/HeapArrayOfDoublesQuickSelectSketch.java
@@ -20,6 +20,8 @@
package org.apache.datasketches.tuple.arrayofdoubles;
import static org.apache.datasketches.common.Util.ceilingPowerOf2;
+import static org.apache.datasketches.common.Util.checkSeedHashes;
+import static org.apache.datasketches.common.Util.computeSeedHash;
import static org.apache.datasketches.common.Util.exactLog2OfLong;
import java.nio.ByteOrder;
@@ -98,7 +100,7 @@ final class HeapArrayOfDoublesQuickSelectSketch extends
ArrayOfDoublesQuickSelec
if (isBigEndian ^ ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN)) {
throw new SketchesArgumentException("Byte order mismatch");
}
-
org.apache.datasketches.common.Util.checkSeedHashes(mem.getShort(SEED_HASH_SHORT),
org.apache.datasketches.common.Util.computeSeedHash(seed));
+ checkSeedHashes(mem.getShort(SEED_HASH_SHORT), computeSeedHash(seed));
isEmpty_ = (flags & (1 << Flags.IS_EMPTY.ordinal())) > 0;
lgNomEntries_ = mem.getByte(LG_NOM_ENTRIES_BYTE);
thetaLong_ = mem.getLong(THETA_LONG);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
