Skip to content

[FLINK-22510][core] Format durations with highest unit #15809

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

Closed
wants to merge 1 commit into from
+33 −5
Closed

[FLINK-22510][core] Format durations with highest unit #15809

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
2 changes: 1 addition & 1 deletion flink-core/src/main/java/org/apache/flink/configuration/ConfigurationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ static String convertToString(Object o) {
return (String) o;
} else if (o.getClass() == Duration.class) {
Duration duration = (Duration) o;
return String.format("%d ns", duration.toNanos());
return TimeUtils.formatWithHighestUnit(duration);
} else if (o instanceof List) {
return ((List<?>) o)
.stream()
Expand Down
3 changes: 1 addition & 2 deletions flink-core/src/test/java/org/apache/flink/configuration/ConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,7 @@ public void testToMap() {

assertEquals(listValues, configuration.toMap().get(listConfigOption.key()));
assertEquals(mapValues, configuration.toMap().get(mapConfigOption.key()));
assertEquals(
duration.toNanos() + " ns", configuration.toMap().get(durationConfigOption.key()));
assertEquals("3 s", configuration.toMap().get(durationConfigOption.key()));
}

enum TestEnum {
Expand Down
29 changes: 29 additions & 0 deletions flink-core/src/test/java/org/apache/flink/configuration/ConfigurationUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@

import org.junit.Test;

import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;

/** Tests for the {@link ConfigurationUtils}. */
Expand Down Expand Up @@ -92,4 +96,29 @@ public void testGetPrefixedKeyValuePairs() {

assertThat(resultKeyValuePairs, is(equalTo(expectedKeyValuePairs)));
}

@Test
public void testConvertToString() {
// String
assertEquals("Simple String", ConfigurationUtils.convertToString("Simple String"));

// Duration
assertEquals("0 ms", ConfigurationUtils.convertToString(Duration.ZERO));
assertEquals("123 ms", ConfigurationUtils.convertToString(Duration.ofMillis(123L)));
assertEquals("1234 s", ConfigurationUtils.convertToString(Duration.ofMillis(1_234_000L)));
assertEquals("25 h", ConfigurationUtils.convertToString(Duration.ofHours(25L)));

// List
final List<Object> listElements = new ArrayList<>();
listElements.add("Test;String");
listElements.add(Duration.ZERO);
listElements.add(42);
assertEquals("'Test;String';0 ms;42", ConfigurationUtils.convertToString(listElements));

// Map
final Map<Object, Object> mapElements = new HashMap<>();
mapElements.put("A:,B", "C:,D");
mapElements.put(10, 20);
assertEquals("'''A:,B'':''C:,D''',10:20", ConfigurationUtils.convertToString(mapElements));
}
}
4 changes: 2 additions & 2 deletions ...nk-sql-client/src/test/java/org/apache/flink/table/client/config/YamlConfigUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ public void testExecutionEntryToConfigOption() throws Exception {
"parallelism.default=1",
"pipeline.auto-watermark-interval=99",
"pipeline.max-parallelism=16",
"restart-strategy.failure-rate.delay=1000000000 ns",
"restart-strategy.failure-rate.failure-rate-interval=99000000000 ns",
"restart-strategy.failure-rate.delay=1 s",
"restart-strategy.failure-rate.failure-rate-interval=99 s",
"restart-strategy.failure-rate.max-failures-per-interval=10",
"restart-strategy.fixed-delay.delay=1000",
"restart-strategy=failure-rate",
Expand Down