Skip to content

[FLINK-14962] fix findbugs WMI_WRONG_MAP_ITERATOR warning #10328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 3, 2019
Merged

[FLINK-14962] fix findbugs WMI_WRONG_MAP_ITERATOR warning #10328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a64c61
FLINK-14962 FindBugs warnings: Inefficient use of keySet iterator ins…
caidezhi Nov 27, 2019
730119e
[FLINK-14962] FindBugs warnings: Inefficient use of keySet iterator i…
caidezhi Nov 27, 2019
05b6cbc
[FLINK-14962] fix findbugs WMI_WRONG_MAP_ITERATOR warning
caidezhi Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;

/**
Expand Down Expand Up @@ -893,11 +892,12 @@ private void handlePendingFilesForPreviousCheckpoints(Map<Long, List<String>> pe

LOG.debug("Moving pending files to final location on restore.");

Set<Long> pastCheckpointIds = pendingFilesPerCheckpoint.keySet();
for (Long pastCheckpointId : pastCheckpointIds) {
for (Map.Entry<Long, List<String>> entry : pendingFilesPerCheckpoint.entrySet()) {
Long pastCheckpointId = entry.getKey();
Copy link
Contributor

@KurtYoung KurtYoung Dec 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep the comment.

Copy link
Contributor Author

@caidezhi caidezhi Dec 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kurt, thanks for reviewing. I add back the original comments as you suggested.

List<String> pendingFiles = entry.getValue();
// All the pending files are buckets that have been completed but are waiting to be renamed
// to their final name
for (String filename : pendingFilesPerCheckpoint.get(pastCheckpointId)) {
for (String filename : pendingFiles) {
Path finalPath = new Path(filename);
Path pendingPath = getPendingPathFor(finalPath);

Expand Down
10 changes: 6 additions & 4 deletions ...s/flink-parquet/src/main/java/org/apache/flink/formats/parquet/ParquetMapInputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,21 @@ private void convert(Map<String, Object> map, Row row, TypeInformation<?>[] fiel
private void convert(Map<String, Object> target, Map<String, Object> source, MapTypeInfo mapTypeInfo) {
TypeInformation valueTypeInfp = mapTypeInfo.getValueTypeInfo();

for (String key : source.keySet()) {
for (Map.Entry<String, Object> entry : source.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
if (valueTypeInfp instanceof RowTypeInfo) {
Map<String, Object> nestedRow = new HashMap<>();
convert(nestedRow, (Row) source.get(key),
convert(nestedRow, (Row) value,
((RowTypeInfo) valueTypeInfp).getFieldTypes(), ((RowTypeInfo) valueTypeInfp).getFieldNames());
target.put(key, nestedRow);
} else if (valueTypeInfp instanceof MapTypeInfo) {
Map<String, Object> nestedMap = new HashMap<>();
convert(nestedMap, (Map<String, Object>) source.get(key), (MapTypeInfo) valueTypeInfp);
convert(nestedMap, (Map<String, Object>) value, (MapTypeInfo) valueTypeInfp);
target.put(key, nestedMap);
} else if (valueTypeInfp instanceof ObjectArrayTypeInfo) {
List<Object> nestedObjectList = new ArrayList<>();
convert(nestedObjectList, (Object[]) source.get(key), (ObjectArrayTypeInfo) valueTypeInfp);
convert(nestedObjectList, (Object[]) value, (ObjectArrayTypeInfo) valueTypeInfp);
target.put(key, nestedObjectList);
}
}
Expand Down
8 changes: 5 additions & 3 deletions ...ibraries/flink-gelly/src/main/java/org/apache/flink/graph/library/CommunityDetection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,12 @@ public void updateVertex(Vertex<K, Tuple2<Long, Double>> vertex,
// find the label with the highest score from the ones received
double maxScore = -Double.MAX_VALUE;
long maxScoreLabel = vertex.getValue().f0;
for (long curLabel : receivedLabelsWithScores.keySet()) {
for (Map.Entry<Long, Double> entry : receivedLabelsWithScores.entrySet()) {
long curLabel = entry.getKey();
double curValue = entry.getValue();

if (receivedLabelsWithScores.get(curLabel) > maxScore) {
maxScore = receivedLabelsWithScores.get(curLabel);
if (curValue > maxScore) {
maxScore = curValue;
maxScoreLabel = curLabel;
}
}
Expand Down