This is an automated email from the ASF dual-hosted git repository.
nehapawar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 683b22d Handle invalid durations in the duration DSL (#3505)
683b22d is described below
commit 683b22d1c81c8493bf21bee686ca1e49f0c4a909
Author: Jean-François Im <[email protected]>
AuthorDate: Tue Dec 4 14:15:47 2018 -0800
Handle invalid durations in the duration DSL (#3505)
Handle invalid durations in the duration DSL by removing invalid values
when loading (eg. "null DAYS" or "null null"). These values come from
invalid old-style configurations that got migrated to the new config
format.
This does not fully round-trip. For example, an old config with timeUnit
of DAYS and timeValue of null will lose the DAYS qualifier, although
this configuration was invalid (and ignored) in the first place.
---
.../linkedin/pinot/common/config/DurationDsl.java | 23 +++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git
a/pinot-common/src/main/java/com/linkedin/pinot/common/config/DurationDsl.java
b/pinot-common/src/main/java/com/linkedin/pinot/common/config/DurationDsl.java
index d9b72b9..00070ba 100644
---
a/pinot-common/src/main/java/com/linkedin/pinot/common/config/DurationDsl.java
+++
b/pinot-common/src/main/java/com/linkedin/pinot/common/config/DurationDsl.java
@@ -16,26 +16,39 @@
package com.linkedin.pinot.common.config;
import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* DSL for durations, which turns "5 days" into a duration.
*/
public class DurationDsl implements SingleKeyDsl<Duration> {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(DurationDsl.class);
+
@Override
public Duration parse(String text) {
if (text == null || text.isEmpty()) {
return null;
}
- String[] parts = text.split(" ");
- final String unit = parts[1].toUpperCase();
- final String unitCount = parts[0];
- return new Duration(TimeUnit.valueOf(unit), Integer.parseInt(unitCount));
+ try {
+ String[] parts = text.split(" ");
+ final String unit = parts[1].toUpperCase();
+ final String unitCount = parts[0];
+ return new Duration(TimeUnit.valueOf(unit), Integer.parseInt(unitCount));
+ } catch (Exception e) {
+ LOGGER.warn("Caught exception while parsing duration {}, discarding the
invalid duration.", e, text);
+ return null;
+ }
}
@Override
public String unparse(Duration value) {
- return value.getUnitCount() + " " + value.getUnit();
+ if (value != null) {
+ return value.getUnitCount() + " " + value.getUnit();
+ } else {
+ return null;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
