You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by gu...@apache.org on 2019/08/13 23:31:11 UTC
[kafka] branch trunk updated: MINOR: remove unnecessary #remove
overrides (#7178)
This is an automated email from the ASF dual-hosted git repository.
guozhang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new e07b46d MINOR: remove unnecessary #remove overrides (#7178)
e07b46d is described below
commit e07b46dd0424717829f5e12fb0fa91065b943fcd
Author: A. Sophie Blee-Goldman <so...@confluent.io>
AuthorDate: Tue Aug 13 16:30:48 2019 -0700
MINOR: remove unnecessary #remove overrides (#7178)
Iterator#remove has a default implementation that throws UnsupportedOperatorException so there's no need to override it with the same thing.
Should be cherry-picked back to whenever we switched to Java 8
Reviewers: Bill Bejeck <bi...@confluent.io>, Matthias J. Sax <ma...@confluent.io>, Guozhang Wang <gu...@confluent.io>
---
.../apache/kafka/streams/state/KeyValueIterator.java | 3 ++-
.../AbstractMergedSortedCacheStoreIterator.java | 5 -----
.../state/internals/CompositeKeyValueIterator.java | 4 ----
.../internals/DelegatingPeekingKeyValueIterator.java | 5 -----
.../state/internals/FilteredCacheIterator.java | 9 ---------
.../state/internals/InMemoryKeyValueStore.java | 5 -----
.../streams/state/internals/KeyValueIterators.java | 3 ---
.../state/internals/MemoryNavigableLRUCache.java | 5 -----
.../state/internals/MeteredKeyValueStore.java | 5 -----
.../state/internals/MeteredWindowStoreIterator.java | 5 -----
.../internals/MeteredWindowedKeyValueIterator.java | 5 -----
.../state/internals/RocksDBTimestampedStore.java | 5 -----
.../streams/state/internals/RocksDbIterator.java | 5 -----
.../streams/state/internals/SegmentIterator.java | 6 ++----
.../kafka/streams/state/internals/ThreadCache.java | 5 -----
.../state/internals/WindowStoreIteratorWrapper.java | 10 ----------
.../state/internals/WrappedSessionStoreIterator.java | 5 -----
.../apache/kafka/streams/state/NoOpWindowStore.java | 4 ----
.../state/internals/ReadOnlyWindowStoreStub.java | 20 --------------------
.../kafka/test/GenericInMemoryKeyValueStore.java | 5 -----
.../GenericInMemoryTimestampedKeyValueStore.java | 5 -----
.../org/apache/kafka/test/KeyValueIteratorStub.java | 4 ----
.../apache/kafka/test/ReadOnlySessionStoreStub.java | 4 ----
23 files changed, 4 insertions(+), 128 deletions(-)
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/KeyValueIterator.java b/streams/src/main/java/org/apache/kafka/streams/state/KeyValueIterator.java
index 70a142b..b1f5e2c 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/KeyValueIterator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/KeyValueIterator.java
@@ -23,9 +23,10 @@ import java.util.Iterator;
/**
* Iterator interface of {@link KeyValue}.
- *
+ * <p>
* Users must call its {@code close} method explicitly upon completeness to release resources,
* or use try-with-resources statement (available since JDK7) for this {@link Closeable} class.
+ * Note that {@code remove()} is not supported.
*
* @param <K> Type of keys
* @param <V> Type of values
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractMergedSortedCacheStoreIterator.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractMergedSortedCacheStoreIterator.java
index dfcd763..16bdbeb 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractMergedSortedCacheStoreIterator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractMergedSortedCacheStoreIterator.java
@@ -148,11 +148,6 @@ abstract class AbstractMergedSortedCacheStoreIterator<K, KS, V, VS> implements K
}
@Override
- public void remove() {
- throw new UnsupportedOperationException("remove() is not supported in " + getClass().getName());
- }
-
- @Override
public void close() {
cacheIterator.close();
storeIterator.close();
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/CompositeKeyValueIterator.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/CompositeKeyValueIterator.java
index faccc16..4ac6fee 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/CompositeKeyValueIterator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/CompositeKeyValueIterator.java
@@ -67,8 +67,4 @@ class CompositeKeyValueIterator<K, V, StoreType> implements KeyValueIterator<K,
return current.next();
}
- @Override
- public void remove() {
- throw new UnsupportedOperationException("Remove not supported");
- }
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/DelegatingPeekingKeyValueIterator.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/DelegatingPeekingKeyValueIterator.java
index 20a434a..245c9e8 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/DelegatingPeekingKeyValueIterator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/DelegatingPeekingKeyValueIterator.java
@@ -79,11 +79,6 @@ public class DelegatingPeekingKeyValueIterator<K, V> implements KeyValueIterator
}
@Override
- public void remove() {
- throw new UnsupportedOperationException("remove() is not supported in " + getClass().getName());
- }
-
- @Override
public KeyValue<K, V> peekNext() {
if (!hasNext()) {
throw new NoSuchElementException();
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/FilteredCacheIterator.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/FilteredCacheIterator.java
index a26f8cf..9b1bfd8 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/FilteredCacheIterator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/FilteredCacheIterator.java
@@ -61,10 +61,6 @@ class FilteredCacheIterator implements PeekingKeyValueIterator<Bytes, LRUCacheEn
return KeyValue.pair(cacheFunction.key(next.key), next.value);
}
- @Override
- public void remove() {
- cacheIterator.remove();
- }
};
}
@@ -96,11 +92,6 @@ class FilteredCacheIterator implements PeekingKeyValueIterator<Bytes, LRUCacheEn
}
@Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
- @Override
public KeyValue<Bytes, LRUCacheEntry> peekNext() {
if (!hasNext()) {
throw new NoSuchElementException();
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStore.java
index 2d68214..9ec5a98 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStore.java
@@ -165,11 +165,6 @@ public class InMemoryKeyValueStore implements KeyValueStore<Bytes, byte[]> {
}
@Override
- public void remove() {
- iter.remove();
- }
-
- @Override
public void close() {
// do nothing
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueIterators.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueIterators.java
index bef6f49..29c3009 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueIterators.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueIterators.java
@@ -46,9 +46,6 @@ class KeyValueIterators {
throw new NoSuchElementException();
}
- @Override
- public void remove() {
- }
}
private static class EmptyWindowStoreIterator<V> extends EmptyKeyValueIterator<Long, V>
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MemoryNavigableLRUCache.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MemoryNavigableLRUCache.java
index 4bf42de..6e0deaa 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MemoryNavigableLRUCache.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MemoryNavigableLRUCache.java
@@ -83,11 +83,6 @@ public class MemoryNavigableLRUCache extends MemoryLRUCache {
}
@Override
- public void remove() {
- // do nothing
- }
-
- @Override
public void close() {
// do nothing
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java
index 51da3ed..4f2df4c 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java
@@ -306,11 +306,6 @@ public class MeteredKeyValueStore<K, V>
}
@Override
- public void remove() {
- iter.remove();
- }
-
- @Override
public void close() {
try {
iter.close();
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreIterator.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreIterator.java
index 2cf70a4..ea665a6 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreIterator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreIterator.java
@@ -57,11 +57,6 @@ class MeteredWindowStoreIterator<V> implements WindowStoreIterator<V> {
}
@Override
- public void remove() {
- iter.remove();
- }
-
- @Override
public void close() {
try {
iter.close();
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowedKeyValueIterator.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowedKeyValueIterator.java
index a12c6eb..9e84a18 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowedKeyValueIterator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowedKeyValueIterator.java
@@ -64,11 +64,6 @@ class MeteredWindowedKeyValueIterator<K, V> implements KeyValueIterator<Windowed
}
@Override
- public void remove() {
- iter.remove();
- }
-
- @Override
public void close() {
try {
iter.close();
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedStore.java
index 74f0919..58cd5c4 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBTimestampedStore.java
@@ -342,11 +342,6 @@ public class RocksDBTimestampedStore extends RocksDBStore implements Timestamped
}
@Override
- public void remove() {
- throw new UnsupportedOperationException("RocksDB iterator does not support remove()");
- }
-
- @Override
public synchronized void close() {
openIterators.remove(this);
iterNoTimestamp.close();
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDbIterator.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDbIterator.java
index b26e7af..9fa747a 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDbIterator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDbIterator.java
@@ -68,11 +68,6 @@ class RocksDbIterator extends AbstractIterator<KeyValue<Bytes, byte[]>> implemen
}
@Override
- public void remove() {
- throw new UnsupportedOperationException("RocksDB iterator does not support remove()");
- }
-
- @Override
public synchronized void close() {
openIterators.remove(this);
iter.close();
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/SegmentIterator.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/SegmentIterator.java
index 0d90bd8..e4f828b 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/SegmentIterator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/SegmentIterator.java
@@ -47,6 +47,7 @@ class SegmentIterator<S extends Segment> implements KeyValueIterator<Bytes, byte
this.to = to;
}
+ @Override
public void close() {
if (currentIterator != null) {
currentIterator.close();
@@ -92,14 +93,11 @@ class SegmentIterator<S extends Segment> implements KeyValueIterator<Bytes, byte
return hasNext;
}
+ @Override
public KeyValue<Bytes, byte[]> next() {
if (!hasNext()) {
throw new NoSuchElementException();
}
return currentIterator.next();
}
-
- public void remove() {
- throw new UnsupportedOperationException("remove() is not supported in " + getClass().getName());
- }
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java
index 116b1ef..1fe99c5 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ThreadCache.java
@@ -318,11 +318,6 @@ public class ThreadCache {
}
@Override
- public void remove() {
- throw new UnsupportedOperationException("remove not supported by MemoryLRUCacheBytesIterator");
- }
-
- @Override
public void close() {
// do nothing
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreIteratorWrapper.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreIteratorWrapper.java
index 4095445..14acb13 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreIteratorWrapper.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowStoreIteratorWrapper.java
@@ -67,11 +67,6 @@ class WindowStoreIteratorWrapper {
}
@Override
- public void remove() {
- throw new UnsupportedOperationException("remove() is not supported in " + getClass().getName());
- }
-
- @Override
public void close() {
bytesIterator.close();
}
@@ -105,11 +100,6 @@ class WindowStoreIteratorWrapper {
}
@Override
- public void remove() {
- throw new UnsupportedOperationException("remove() is not supported in " + getClass().getName());
- }
-
- @Override
public void close() {
bytesIterator.close();
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedSessionStoreIterator.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedSessionStoreIterator.java
index 281297c..ce26029 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedSessionStoreIterator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedSessionStoreIterator.java
@@ -49,9 +49,4 @@ class WrappedSessionStoreIterator implements KeyValueIterator<Windowed<Bytes>, b
final KeyValue<Bytes, byte[]> next = bytesIterator.next();
return KeyValue.pair(SessionKeySchema.from(next.key), next.value);
}
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException("remove() is not supported in " + getClass().getName());
- }
}
\ No newline at end of file
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/NoOpWindowStore.java b/streams/src/test/java/org/apache/kafka/streams/state/NoOpWindowStore.java
index 34d9050..0e8a7b9 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/NoOpWindowStore.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/NoOpWindowStore.java
@@ -45,10 +45,6 @@ public class NoOpWindowStore implements ReadOnlyWindowStore, StateStore {
public KeyValue<Long, KeyValue> next() {
throw new NoSuchElementException();
}
-
- @Override
- public void remove() {
- }
}
private static final WindowStoreIterator<KeyValue> EMPTY_WINDOW_STORE_ITERATOR = new EmptyWindowStoreIterator();
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ReadOnlyWindowStoreStub.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ReadOnlyWindowStoreStub.java
index aad7403..468d551 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ReadOnlyWindowStoreStub.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ReadOnlyWindowStoreStub.java
@@ -121,11 +121,6 @@ public class ReadOnlyWindowStoreStub<K, V> implements ReadOnlyWindowStore<K, V>,
return iterator.next();
}
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException("remove() not supported in " + getClass().getName());
- }
};
}
@@ -168,11 +163,6 @@ public class ReadOnlyWindowStoreStub<K, V> implements ReadOnlyWindowStore<K, V>,
return iterator.next();
}
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException("remove() not supported in " + getClass().getName());
- }
};
}
@@ -219,11 +209,6 @@ public class ReadOnlyWindowStoreStub<K, V> implements ReadOnlyWindowStore<K, V>,
return iterator.next();
}
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException("remove() not supported in " + getClass().getName());
- }
};
}
@@ -298,10 +283,5 @@ public class ReadOnlyWindowStoreStub<K, V> implements ReadOnlyWindowStore<K, V>,
public KeyValue<Long, E> next() {
return underlying.next();
}
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException("remove() not supported in " + getClass().getName());
- }
}
}
diff --git a/streams/src/test/java/org/apache/kafka/test/GenericInMemoryKeyValueStore.java b/streams/src/test/java/org/apache/kafka/test/GenericInMemoryKeyValueStore.java
index a5e345e..649dc5b 100644
--- a/streams/src/test/java/org/apache/kafka/test/GenericInMemoryKeyValueStore.java
+++ b/streams/src/test/java/org/apache/kafka/test/GenericInMemoryKeyValueStore.java
@@ -172,11 +172,6 @@ public class GenericInMemoryKeyValueStore<K extends Comparable, V>
}
@Override
- public void remove() {
- iter.remove();
- }
-
- @Override
public void close() {
// do nothing
}
diff --git a/streams/src/test/java/org/apache/kafka/test/GenericInMemoryTimestampedKeyValueStore.java b/streams/src/test/java/org/apache/kafka/test/GenericInMemoryTimestampedKeyValueStore.java
index 67a67c9..b1b75a1 100644
--- a/streams/src/test/java/org/apache/kafka/test/GenericInMemoryTimestampedKeyValueStore.java
+++ b/streams/src/test/java/org/apache/kafka/test/GenericInMemoryTimestampedKeyValueStore.java
@@ -173,11 +173,6 @@ public class GenericInMemoryTimestampedKeyValueStore<K extends Comparable, V>
}
@Override
- public void remove() {
- iter.remove();
- }
-
- @Override
public void close() {
// do nothing
}
diff --git a/streams/src/test/java/org/apache/kafka/test/KeyValueIteratorStub.java b/streams/src/test/java/org/apache/kafka/test/KeyValueIteratorStub.java
index 2ee5a6f..aa3a4e9 100644
--- a/streams/src/test/java/org/apache/kafka/test/KeyValueIteratorStub.java
+++ b/streams/src/test/java/org/apache/kafka/test/KeyValueIteratorStub.java
@@ -49,8 +49,4 @@ public class KeyValueIteratorStub<K, V> implements KeyValueIterator<K, V> {
return iterator.next();
}
- @Override
- public void remove() {
-
- }
}
diff --git a/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java b/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java
index 39ff614..4f6d5de 100644
--- a/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java
+++ b/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java
@@ -83,10 +83,6 @@ public class ReadOnlySessionStoreStub<K, V> implements ReadOnlySessionStore<K, V
return it.next();
}
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
}
);
}