Skip to content

fix: round relative time seconds exactly #25994

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

Open
hiSandog wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −4
Open

fix: round relative time seconds exactly #25994

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
3 changes: 1 addition & 2 deletions pulsar-cli-utils/src/main/java/org/apache/pulsar/cli/converters/RelativeTimeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ public static long parseRelativeTimeInSeconds(String relativeTime) {
* @return seconds
*/
public static double nsToSeconds(long ns) {
double seconds = (double) ns / 1_000_000_000;
BigDecimal bd = new BigDecimal(seconds);
BigDecimal bd = BigDecimal.valueOf(ns, 9);
return bd.setScale(3, RoundingMode.HALF_UP).doubleValue();
}
}
1 change: 1 addition & 0 deletions pulsar-cli-utils/src/test/java/org/apache/pulsar/cli/converters/TimeConversionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public void testFailingParsing() {
public void testNsToSeconds() {
assertEquals(RelativeTimeUtil.nsToSeconds(1_000_000_000), 1.000);
assertEquals(RelativeTimeUtil.nsToSeconds(1_500_000_000), 1.500);
assertEquals(RelativeTimeUtil.nsToSeconds(1_234_500_000), 1.235);
assertEquals(RelativeTimeUtil.nsToSeconds(1_555_555_555), 1.556);
}
}
3 changes: 1 addition & 2 deletions pulsar-common/src/main/java/org/apache/pulsar/common/util/RelativeTimeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ public static long parseRelativeTimeInSeconds(String relativeTime) {
* @return seconds
*/
public static double nsToSeconds(long ns) {
double seconds = (double) ns / 1_000_000_000;
BigDecimal bd = new BigDecimal(seconds);
BigDecimal bd = BigDecimal.valueOf(ns, 9);
return bd.setScale(3, RoundingMode.HALF_UP).doubleValue();
}
}
8 changes: 8 additions & 0 deletions pulsar-common/src/test/java/org/apache/pulsar/common/util/RelativeTimeUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,12 @@ public void testParseRelativeTime() {
// expected
}
}

@Test
public void testNsToSeconds() {
assertEquals(RelativeTimeUtil.nsToSeconds(1_000_000_000), 1.000);
assertEquals(RelativeTimeUtil.nsToSeconds(1_500_000_000), 1.500);
assertEquals(RelativeTimeUtil.nsToSeconds(1_234_500_000), 1.235);
assertEquals(RelativeTimeUtil.nsToSeconds(1_555_555_555), 1.556);
}
}