Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
d264f914
S
SkyWalking
项目概览
润土的好友猹
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
9
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,发现更多精彩内容 >>
未验证
提交
d264f914
编写于
7月 02, 2020
作者:
D
Daming
提交者:
GitHub
7月 02, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix timebucket conversion issue (#5014)
上级
00619a9a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
87 addition
and
5 deletion
+87
-5
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/TimeBucket.java
...pache/skywalking/oap/server/core/analysis/TimeBucket.java
+3
-1
oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/TimeBucketTest.java
...e/skywalking/oap/server/core/analysis/TimeBucketTest.java
+80
-0
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AggregationQuery.java
...erver/storage/plugin/influxdb/query/AggregationQuery.java
+2
-2
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetricsQuery.java
...ap/server/storage/plugin/influxdb/query/MetricsQuery.java
+2
-2
未找到文件。
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/TimeBucket.java
浏览文件 @
d264f914
...
@@ -104,6 +104,7 @@ public class TimeBucket {
...
@@ -104,6 +104,7 @@ public class TimeBucket {
public
static
long
getTimestamp
(
long
timeBucket
,
DownSampling
downsampling
)
{
public
static
long
getTimestamp
(
long
timeBucket
,
DownSampling
downsampling
)
{
Calendar
calendar
=
Calendar
.
getInstance
();
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTimeInMillis
(
0
);
calendar
.
setTimeInMillis
(
0
);
switch
(
downsampling
)
{
switch
(
downsampling
)
{
case
Second:
case
Second:
calendar
.
set
(
Calendar
.
SECOND
,
(
int
)
(
timeBucket
%
100
));
calendar
.
set
(
Calendar
.
SECOND
,
(
int
)
(
timeBucket
%
100
));
...
@@ -117,11 +118,12 @@ public class TimeBucket {
...
@@ -117,11 +118,12 @@ public class TimeBucket {
case
Day:
case
Day:
calendar
.
set
(
Calendar
.
DAY_OF_MONTH
,
(
int
)
(
timeBucket
%
100
));
calendar
.
set
(
Calendar
.
DAY_OF_MONTH
,
(
int
)
(
timeBucket
%
100
));
timeBucket
/=
100
;
timeBucket
/=
100
;
calendar
.
set
(
Calendar
.
MONTH
,
(
int
)
(
timeBucket
%
100
)
-
1
);
calendar
.
set
(
Calendar
.
YEAR
,
(
int
)
(
timeBucket
/
100
));
break
;
break
;
default
:
default
:
throw
new
UnexpectedException
(
"Unknown downsampling value."
);
throw
new
UnexpectedException
(
"Unknown downsampling value."
);
}
}
return
calendar
.
getTimeInMillis
();
return
calendar
.
getTimeInMillis
();
}
}
...
...
oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/TimeBucketTest.java
0 → 100644
浏览文件 @
d264f914
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
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
;
@RunWith
(
Parameterized
.
class
)
public
class
TimeBucketTest
{
private
static
final
long
NOW
=
System
.
currentTimeMillis
();
@Parameterized
.
Parameters
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
)
},
};
}
private
DownSampling
downSampling
;
private
TimeUnit
unit
;
private
long
time
;
public
TimeBucketTest
(
DownSampling
downSampling
,
TimeUnit
unit
,
long
time
)
{
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
));
}
}
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/AggregationQuery.java
浏览文件 @
d264f914
...
@@ -79,8 +79,8 @@ public class AggregationQuery implements IAggregationQueryDAO {
...
@@ -79,8 +79,8 @@ public class AggregationQuery implements IAggregationQueryDAO {
});
});
}
}
final
SelectSubQueryImpl
<
SelectQueryImpl
>
subQuery
=
where
final
SelectSubQueryImpl
<
SelectQueryImpl
>
subQuery
=
where
.
and
(
gte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
(
duration
.
getStartTimeBucket
()
)))
.
and
(
gte
(
InfluxClient
.
TIME
,
duration
.
getStartTimestamp
(
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
(
duration
.
getEndTimeBucket
()
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
duration
.
getEndTimestamp
(
)))
.
groupBy
(
InfluxConstants
.
TagName
.
ENTITY_ID
);
.
groupBy
(
InfluxConstants
.
TagName
.
ENTITY_ID
);
query
.
setSubQuery
(
subQuery
);
query
.
setSubQuery
(
subQuery
);
...
...
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetricsQuery.java
浏览文件 @
d264f914
...
@@ -82,8 +82,8 @@ public class MetricsQuery implements IMetricsQueryDAO {
...
@@ -82,8 +82,8 @@ public class MetricsQuery implements IMetricsQueryDAO {
}
}
queryWhereQuery
queryWhereQuery
.
and
(
gte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
(
duration
.
getStartTimeBucket
()
)))
.
and
(
gte
(
InfluxClient
.
TIME
,
duration
.
getStartTimestamp
(
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
InfluxClient
.
timeInterval
(
duration
.
getEndTimeBucket
()
)))
.
and
(
lte
(
InfluxClient
.
TIME
,
duration
.
getEndTimestamp
(
)))
.
groupBy
(
InfluxConstants
.
TagName
.
ENTITY_ID
);
.
groupBy
(
InfluxConstants
.
TagName
.
ENTITY_ID
);
List
<
QueryResult
.
Series
>
seriesList
=
client
.
queryForSeries
(
queryWhereQuery
);
List
<
QueryResult
.
Series
>
seriesList
=
client
.
queryForSeries
(
queryWhereQuery
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录