This is an automated email from the ASF dual-hosted git repository.
huaxingao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new af935e6ef19 [SPARK-42031][CORE][SQL] Clean up `remove` methods that do
not need override
af935e6ef19 is described below
commit af935e6ef19e34329d0210ebc17cc6e7359458d2
Author: yangjie01 <[email protected]>
AuthorDate: Thu Jan 12 13:47:56 2023 -0800
[SPARK-42031][CORE][SQL] Clean up `remove` methods that do not need override
### What changes were proposed in this pull request?
Java 8 began to provide the default remove method implementation for the
`java.util.Iterator` interface.
https://github.com/openjdk/jdk/blob/9a9add8825a040565051a09010b29b099c2e7d49/jdk/src/share/classes/java/util/Iterator.java#L92-L94
```java
default void remove() {
throw new UnsupportedOperationException("remove");
}
```
So this pr cleans up unnecessary remove method `overrdie` in Spark code.
### Why are the changes needed?
Code cleanup
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Pass Github Actions
Closes #39533 from LuciferYang/cleanup-remove.
Authored-by: yangjie01 <[email protected]>
Signed-off-by: huaxingao <[email protected]>
---
.../src/main/java/org/apache/spark/util/kvstore/InMemoryStore.java | 5 -----
.../src/main/java/org/apache/spark/util/kvstore/LevelDBIterator.java | 5 -----
.../src/main/java/org/apache/spark/util/kvstore/RocksDBIterator.java | 5 -----
core/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java | 5 -----
.../src/main/java/org/apache/spark/sql/vectorized/ColumnarBatch.java | 5 -----
.../apache/spark/sql/execution/vectorized/ColumnarBatchSuite.scala | 4 ----
.../src/main/java/org/apache/hive/service/cli/ColumnBasedSet.java | 5 -----
7 files changed, 34 deletions(-)
diff --git
a/common/kvstore/src/main/java/org/apache/spark/util/kvstore/InMemoryStore.java
b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/InMemoryStore.java
index 431c7e42774..a353a53d4b8 100644
---
a/common/kvstore/src/main/java/org/apache/spark/util/kvstore/InMemoryStore.java
+++
b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/InMemoryStore.java
@@ -468,11 +468,6 @@ public class InMemoryStore implements KVStore {
return iter.next();
}
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
@Override
public List<T> next(int max) {
List<T> list = new ArrayList<>(max);
diff --git
a/common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDBIterator.java
b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDBIterator.java
index 62f7768ea7f..35d0c6065fb 100644
---
a/common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDBIterator.java
+++
b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/LevelDBIterator.java
@@ -143,11 +143,6 @@ class LevelDBIterator<T> implements KVStoreIterator<T> {
}
}
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
@Override
public List<T> next(int max) {
List<T> list = new ArrayList<>(max);
diff --git
a/common/kvstore/src/main/java/org/apache/spark/util/kvstore/RocksDBIterator.java
b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/RocksDBIterator.java
index fce50a5fc22..2b12fddef65 100644
---
a/common/kvstore/src/main/java/org/apache/spark/util/kvstore/RocksDBIterator.java
+++
b/common/kvstore/src/main/java/org/apache/spark/util/kvstore/RocksDBIterator.java
@@ -134,11 +134,6 @@ class RocksDBIterator<T> implements KVStoreIterator<T> {
}
}
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
@Override
public List<T> next(int max) {
List<T> list = new ArrayList<>(max);
diff --git
a/core/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
b/core/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
index f4f4052b4fa..35c5efc77f6 100644
--- a/core/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
+++ b/core/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
@@ -387,11 +387,6 @@ public final class BytesToBytesMap extends MemoryConsumer {
return released;
}
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
private void handleFailedDelete() {
if (spillWriters.size() > 0) {
// remove the spill file from disk
diff --git
a/sql/catalyst/src/main/java/org/apache/spark/sql/vectorized/ColumnarBatch.java
b/sql/catalyst/src/main/java/org/apache/spark/sql/vectorized/ColumnarBatch.java
index b0fd1486420..9e859e77644 100644
---
a/sql/catalyst/src/main/java/org/apache/spark/sql/vectorized/ColumnarBatch.java
+++
b/sql/catalyst/src/main/java/org/apache/spark/sql/vectorized/ColumnarBatch.java
@@ -67,11 +67,6 @@ public class ColumnarBatch implements AutoCloseable {
row.rowId = rowId++;
return row;
}
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
};
}
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/execution/vectorized/ColumnarBatchSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/execution/vectorized/ColumnarBatchSuite.scala
index 8ee6da10b5e..38807b16ccc 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/execution/vectorized/ColumnarBatchSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/execution/vectorized/ColumnarBatchSuite.scala
@@ -1347,10 +1347,6 @@ class ColumnarBatchSuite extends SparkFunSuite {
rowId += 1
row
}
-
- override def remove(): Unit = {
- throw new UnsupportedOperationException
- }
}
}
}
diff --git
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/ColumnBasedSet.java
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/ColumnBasedSet.java
index 4729fdf2e8e..629d9abdac2 100644
---
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/ColumnBasedSet.java
+++
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/ColumnBasedSet.java
@@ -179,11 +179,6 @@ public class ColumnBasedSet implements RowSet {
index++;
return convey;
}
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException("remove");
- }
};
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
