From 3c32ad10dd0f478093e1ec05fb4e8b2887bf3aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Sat, 31 Oct 2020 02:39:05 +0800 Subject: [PATCH] Revert "Make the duration error message more specific (#5755)" (#5758) --- .../skywalking/oap/server/core/query/DurationUtils.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java index 0bf6661e10..3506318438 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java @@ -30,8 +30,6 @@ import org.joda.time.format.DateTimeFormatter; public enum DurationUtils { INSTANCE; - private static final int MAX_TIME_SPAN = 500; - private static final DateTimeFormatter YYYY_MM_DD = DateTimeFormat.forPattern("yyyy-MM-dd"); private static final DateTimeFormatter YYYY_MM_DD_HH = DateTimeFormat.forPattern("yyyy-MM-dd HH"); private static final DateTimeFormatter YYYY_MM_DD_HHMM = DateTimeFormat.forPattern("yyyy-MM-dd HHmm"); @@ -121,11 +119,9 @@ public enum DurationUtils { break; } i++; - if (i > MAX_TIME_SPAN) { + if (i > 500) { throw new UnexpectedException( - "Duration data error, the span between the start time and the end time is too large, step: " - + step.name() + ", start: " + startTimeBucket + ", end: " + endTimeBucket - + ", max time span: " + MAX_TIME_SPAN); + "Duration data error, step: " + step.name() + ", start: " + startTimeBucket + ", end: " + endTimeBucket); } } while (endTimeBucket != durations.get(durations.size() - 1).getPoint()); -- GitLab