Repository: kylin Updated Branches: refs/heads/2.x-staging f0a8078a0 -> f7057e87c
KYLIN-1270 bug fix by removing formatTs's affections Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/280fce6c Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/280fce6c Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/280fce6c Branch: refs/heads/2.x-staging Commit: 280fce6cc817f85b4ebdbe71513fb3b4b7d329c3 Parents: f0a8078 Author: honma <ho...@ebay.com> Authored: Tue Jan 5 10:43:56 2016 +0800 Committer: honma <ho...@ebay.com> Committed: Tue Jan 5 16:10:58 2016 +0800 ---------------------------------------------------------------------- .../kylin/source/kafka/TimedJsonStreamParser.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/280fce6c/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java ---------------------------------------------------------------------- diff --git a/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java b/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java index c1d8379..0907623 100644 --- a/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java +++ b/source-kafka/src/main/java/org/apache/kylin/source/kafka/TimedJsonStreamParser.java @@ -65,7 +65,7 @@ public final class TimedJsonStreamParser extends StreamingParser { private static final Logger logger = LoggerFactory.getLogger(TimedJsonStreamParser.class); private List<TblColRef> allColumns; - private boolean formatTs = false; + private boolean formatTs = false;//not used private final ObjectMapper mapper = new ObjectMapper(); private String tsColName = "timestamp"; private final JavaType mapType = MapType.construct(HashMap.class, SimpleType.construct(String.class), SimpleType.construct(String.class)); @@ -119,26 +119,26 @@ public final class TimedJsonStreamParser extends StreamingParser { String columnName = column.getName(); if (columnName.equalsIgnoreCase("minute_start")) { normalized = TimeUtil.getMinuteStart(t); - result.add(formatTs ? DateFormat.formatToTimeStr(normalized) : String.valueOf(normalized)); + result.add(DateFormat.formatToTimeStr(normalized)); } else if (columnName.equalsIgnoreCase("hour_start")) { normalized = TimeUtil.getHourStart(t); - result.add(formatTs ? DateFormat.formatToTimeStr(normalized) : String.valueOf(normalized)); + result.add(DateFormat.formatToTimeStr(normalized)); } else if (columnName.equalsIgnoreCase("day_start")) { //from day_start on, formatTs will output date format normalized = TimeUtil.getDayStart(t); - result.add(formatTs ? DateFormat.formatToDateStr(normalized) : String.valueOf(normalized)); + result.add(DateFormat.formatToDateStr(normalized)); } else if (columnName.equalsIgnoreCase("week_start")) { normalized = TimeUtil.getWeekStart(t); - result.add(formatTs ? DateFormat.formatToDateStr(normalized) : String.valueOf(normalized)); + result.add(DateFormat.formatToDateStr(normalized)); } else if (columnName.equalsIgnoreCase("month_start")) { normalized = TimeUtil.getMonthStart(t); - result.add(formatTs ? DateFormat.formatToDateStr(normalized) : String.valueOf(normalized)); + result.add(DateFormat.formatToDateStr(normalized)); } else if (columnName.equalsIgnoreCase("quarter_start")) { normalized = TimeUtil.getQuarterStart(t); - result.add(formatTs ? DateFormat.formatToDateStr(normalized) : String.valueOf(normalized)); + result.add(DateFormat.formatToDateStr(normalized)); } else if (columnName.equalsIgnoreCase("year_start")) { normalized = TimeUtil.getYearStart(t); - result.add(formatTs ? DateFormat.formatToDateStr(normalized) : String.valueOf(normalized)); + result.add(DateFormat.formatToDateStr(normalized)); } else { String x = root.get(columnName.toLowerCase()); result.add(x);
