Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
d0b020e5
S
SkyWalking
项目概览
killuaz丶x
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
d0b020e5
编写于
10月 02, 2020
作者:
D
Daming
提交者:
GitHub
10月 02, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix timebucket converter issue (#5585)
上级
d02ee0af
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
34 deletion
+34
-34
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/TimeBucket.java
...pache/skywalking/oap/server/core/analysis/TimeBucket.java
+5
-0
oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/TimeBucketTest.java
...e/skywalking/oap/server/core/analysis/TimeBucketTest.java
+29
-34
未找到文件。
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/TimeBucket.java
浏览文件 @
d0b020e5
...
...
@@ -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
;
...
...
oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/TimeBucketTest.java
浏览文件 @
d0b020e5
...
...
@@ -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
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录