kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix timebucket converter issue (#5585)

This commit is contained in:
Daming 2020-10-02 17:05:50 +08:00 committed by GitHub
parent d02ee0af3e
commit d0b020e5a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/TimeBucket.java
View File

@ -104,17 +104,22 @@ public class TimeBucket {
public static long getTimestamp(long timeBucket, DownSampling downsampling) {
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.HOUR_OF_DAY, 0);
switch (downsampling) {
case Second:
calendar.set(Calendar.SECOND, (int) (timeBucket % 100));
timeBucket /= 100;
// Fall through
case Minute:
calendar.set(Calendar.MINUTE, (int) (timeBucket % 100));
timeBucket /= 100;
// Fall through
case Hour:
calendar.set(Calendar.HOUR_OF_DAY, (int) (timeBucket % 100));
timeBucket /= 100;
// Fall through
case Day:
calendar.set(Calendar.DAY_OF_MONTH, (int) (timeBucket % 100));
timeBucket /= 100;

63
oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/TimeBucketTest.java
View File

@ -18,63 +18,58 @@
package org.apache.skywalking.oap.server.core.analysis;
import java.util.concurrent.TimeUnit;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.HOURS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
import java.util.Calendar;
import java.util.TimeZone;
@RunWith(Parameterized.class)
public class TimeBucketTest {
private static final long NOW = System.currentTimeMillis();
@Parameterized.Parameters
public static Object[][] parameters() {
return new Object[][] {
{
public static Object[] parameters() {
return new Object[]{
DownSampling.Second,
SECONDS,
MILLISECONDS.toSeconds(NOW)
},
{
DownSampling.Minute,
MINUTES,
MILLISECONDS.toMinutes(NOW)
},
{
DownSampling.Hour,
HOURS,
MILLISECONDS.toHours(NOW)
},
{
DownSampling.Day,
DAYS,
MILLISECONDS.toDays(NOW)
}
DownSampling.Day
};
}
private DownSampling downSampling;
private TimeUnit unit;
private long time;
public TimeBucketTest(DownSampling downSampling, TimeUnit unit, long time) {
public TimeBucketTest(DownSampling downSampling) {
this.downSampling = downSampling;
this.unit = unit;
this.time = time;
}
@Test
public void testConversion() {
long timestamp = TimeBucket
.getTimestamp(TimeBucket.getTimeBucket(NOW, downSampling));
Assert.assertEquals(timestamp, unit.toMillis(time));
}
long timestamp = TimeBucket.getTimestamp(TimeBucket.getTimeBucket(NOW, downSampling));
Calendar instance = Calendar.getInstance(TimeZone.getDefault());
instance.setTimeInMillis(NOW);
switch (downSampling) {
case Day: {
instance.set(Calendar.HOUR_OF_DAY, 0);
// Fall through
}
case Hour: {
instance.set(Calendar.MINUTE, 0);
// Fall through
}
case Minute: {
instance.set(Calendar.SECOND, 0);
// Fall through
}
case Second: {
instance.set(Calendar.MILLISECOND, 0);
// Fall through
}
}
Assert.assertEquals(instance.getTimeInMillis(), timestamp);
}
}