This is an automated email from the ASF dual-hosted git repository.
alsay pushed a commit to branch theta_compact_iterator
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git
The following commit(s) were added to refs/heads/theta_compact_iterator by this
push:
new 4d61d8d3 removed unnecessary member
4d61d8d3 is described below
commit 4d61d8d3ea3544c6aaa1a5bfb90bdde9f6df5085
Author: AlexanderSaydakov <[email protected]>
AuthorDate: Wed Feb 8 14:43:17 2023 -0800
removed unnecessary member
---
src/main/java/org/apache/datasketches/theta/EmptyCompactSketch.java | 2 +-
src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java | 2 +-
src/main/java/org/apache/datasketches/theta/HeapHashIterator.java | 6 ++----
.../java/org/apache/datasketches/theta/HeapQuickSelectSketch.java | 2 +-
src/main/java/org/apache/datasketches/theta/SingleItemSketch.java | 2 +-
5 files changed, 6 insertions(+), 8 deletions(-)
diff --git
a/src/main/java/org/apache/datasketches/theta/EmptyCompactSketch.java
b/src/main/java/org/apache/datasketches/theta/EmptyCompactSketch.java
index 1dd1de72..888ceaab 100644
--- a/src/main/java/org/apache/datasketches/theta/EmptyCompactSketch.java
+++ b/src/main/java/org/apache/datasketches/theta/EmptyCompactSketch.java
@@ -113,7 +113,7 @@ final class EmptyCompactSketch extends CompactSketch {
@Override
public HashIterator iterator() {
- return new HeapHashIterator(new long[0], 0, Long.MAX_VALUE);
+ return new HeapHashIterator(new long[0], Long.MAX_VALUE);
}
/**
diff --git a/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java
b/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java
index 23d0027a..3ee7c488 100644
--- a/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java
+++ b/src/main/java/org/apache/datasketches/theta/HeapAlphaSketch.java
@@ -163,7 +163,7 @@ final class HeapAlphaSketch extends HeapUpdateSketch {
@Override
public HashIterator iterator() {
- return new HeapHashIterator(cache_, 1 << lgArrLongs_, thetaLong_);
+ return new HeapHashIterator(cache_, thetaLong_);
}
@Override
diff --git a/src/main/java/org/apache/datasketches/theta/HeapHashIterator.java
b/src/main/java/org/apache/datasketches/theta/HeapHashIterator.java
index 30b223aa..9562da7d 100644
--- a/src/main/java/org/apache/datasketches/theta/HeapHashIterator.java
+++ b/src/main/java/org/apache/datasketches/theta/HeapHashIterator.java
@@ -24,14 +24,12 @@ package org.apache.datasketches.theta;
*/
class HeapHashIterator implements HashIterator {
private long[] cache;
- private int arrLongs;
private long thetaLong;
private int index;
private long hash;
- HeapHashIterator(final long[] cache, final int arrLongs, final long
thetaLong) {
+ HeapHashIterator(final long[] cache, final long thetaLong) {
this.cache = cache;
- this.arrLongs = arrLongs;
this.thetaLong = thetaLong;
index = -1;
hash = 0;
@@ -44,7 +42,7 @@ class HeapHashIterator implements HashIterator {
@Override
public boolean next() {
- while (++index < arrLongs) {
+ while (++index < cache.length) {
hash = cache[index];
if ((hash != 0) && (hash < thetaLong)) {
return true;
diff --git
a/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java
b/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java
index b580ff58..37b61545 100644
--- a/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java
+++ b/src/main/java/org/apache/datasketches/theta/HeapQuickSelectSketch.java
@@ -166,7 +166,7 @@ class HeapQuickSelectSketch extends HeapUpdateSketch {
@Override
public HashIterator iterator() {
- return new HeapHashIterator(cache_, 1 << lgArrLongs_, thetaLong_);
+ return new HeapHashIterator(cache_, thetaLong_);
}
@Override
diff --git a/src/main/java/org/apache/datasketches/theta/SingleItemSketch.java
b/src/main/java/org/apache/datasketches/theta/SingleItemSketch.java
index 4ef57b7d..81f9b884 100644
--- a/src/main/java/org/apache/datasketches/theta/SingleItemSketch.java
+++ b/src/main/java/org/apache/datasketches/theta/SingleItemSketch.java
@@ -320,7 +320,7 @@ final class SingleItemSketch extends CompactSketch {
@Override
public HashIterator iterator() {
- return new HeapHashIterator(new long[] { hash_ }, 1, Long.MAX_VALUE);
+ return new HeapHashIterator(new long[] { hash_ }, Long.MAX_VALUE);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
