Skip to content

use appropriate fn for readability. (maybe) #8577

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
hachikuji merged 1 commit into from
May 2, 2020
Merged

use appropriate fn for readability. (maybe) #8577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions clients/src/main/java/org/apache/kafka/common/metrics/stats/Histogram.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,7 @@ public int toBin(double x) {
if (binNumber < MIN_BIN_NUMBER) {
return MIN_BIN_NUMBER;
}
if (binNumber > maxBinNumber) {
return maxBinNumber;
}
return binNumber;
return Math.min(binNumber, maxBinNumber);
}
}

Expand Down
2 changes: 1 addition & 1 deletion clients/src/main/java/org/apache/kafka/common/metrics/stats/SimpleRate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ public class SimpleRate extends Rate {
public long windowSize(MetricConfig config, long now) {
stat.purgeObsoleteSamples(config, now);
long elapsed = now - stat.oldest(now).lastWindowMs;
return elapsed < config.timeWindowMs() ? config.timeWindowMs() : elapsed;
return Math.max(elapsed, config.timeWindowMs());
}
}
5 changes: 1 addition & 4 deletions clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,10 +371,7 @@ private static int calculateCapacity(int expectedNumElements) {
// Avoid using even-sized capacities, to get better key distribution.
int newCapacity = (2 * expectedNumElements) + 1;
// Don't use a capacity that is too small.
if (newCapacity < MIN_NONEMPTY_CAPACITY) {
return MIN_NONEMPTY_CAPACITY;
}
return newCapacity;
return Math.max(newCapacity, MIN_NONEMPTY_CAPACITY);
}

/**
Expand Down