This is an automated email from the ASF dual-hosted git repository. srowen 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 fe6f70c6630 [SPARK-39042][CORE][SQL][SS] Use `Map.values()` instead of `Map.entrySet()` in scene that don't use keys fe6f70c6630 is described below commit fe6f70c6630b51ea032dcb68c444f43e1c801f1a Author: yangjie01 <yangji...@baidu.com> AuthorDate: Thu Apr 28 18:50:32 2022 -0500 [SPARK-39042][CORE][SQL][SS] Use `Map.values()` instead of `Map.entrySet()` in scene that don't use keys ### What changes were proposed in this pull request? Some code in Spark use `Map.entrySet()`, but doesn't need a keys, this pr use `Map.values()` to simplified them. ### Why are the changes needed? Code simplification ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Pass GA Closes #36372 from LuciferYang/SPARK-39042. Authored-by: yangjie01 <yangji...@baidu.com> Signed-off-by: Sean Owen <sro...@gmail.com> --- .../org/apache/spark/network/client/TransportResponseHandler.java | 4 ++-- .../org/apache/spark/sql/execution/streaming/state/RocksDB.scala | 2 +- .../java/org/apache/hive/service/cli/operation/LogDivertAppender.java | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java b/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java index 261f20540a2..a19767ae201 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java @@ -113,9 +113,9 @@ public class TransportResponseHandler extends MessageHandler<ResponseMessage> { logger.warn("ChunkReceivedCallback.onFailure throws exception", e); } } - for (Map.Entry<Long, BaseResponseCallback> entry : outstandingRpcs.entrySet()) { + for (BaseResponseCallback callback : outstandingRpcs.values()) { try { - entry.getValue().onFailure(cause); + callback.onFailure(cause); } catch (Exception e) { logger.warn("RpcResponseCallback.onFailure throws exception", e); } diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala index 048db5b53ff..ae16faa41dc 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/RocksDB.scala @@ -450,7 +450,7 @@ class RocksDB( } private def closePrefixScanIterators(): Unit = { - prefixScanReuseIter.entrySet().asScala.foreach(_.getValue.close()) + prefixScanReuseIter.values().asScala.foreach(_.close()) prefixScanReuseIter.clear() } diff --git a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/operation/LogDivertAppender.java b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/operation/LogDivertAppender.java index 64730f39bf3..12d7f407093 100644 --- a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/operation/LogDivertAppender.java +++ b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/operation/LogDivertAppender.java @@ -264,8 +264,7 @@ public class LogDivertAppender extends AbstractWriterAppender<WriterManager> { StringLayout layout = null; Map<String, Appender> appenders = root.getAppenders(); - for (Map.Entry<String, Appender> entry : appenders.entrySet()) { - Appender ap = entry.getValue(); + for (Appender ap : appenders.values()) { if (ap.getClass().equals(ConsoleAppender.class)) { Layout l = ap.getLayout(); if (l instanceof StringLayout) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org