Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
javalover123888
SkyWalking
提交
a81b9920
S
SkyWalking
项目概览
javalover123888
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
2
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,发现更多精彩内容 >>
提交
a81b9920
编写于
10月 12, 2018
作者:
彭
彭勇升 pengys
提交者:
wu-sheng
10月 12, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set the function attribute for indicator and use AVG function to be the default value. (#1757)
上级
474b25e7
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
23 addition
and
16 deletion
+23
-16
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/CPMIndicator.java
...king/oap/server/core/analysis/indicator/CPMIndicator.java
+4
-6
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/CountIndicator.java
...ng/oap/server/core/analysis/indicator/CountIndicator.java
+2
-1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java
...ap/server/core/analysis/indicator/DoubleAvgIndicator.java
+2
-1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PercentIndicator.java
.../oap/server/core/analysis/indicator/PercentIndicator.java
+2
-1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java
...king/oap/server/core/analysis/indicator/PxxIndicator.java
+2
-1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/SumIndicator.java
...king/oap/server/core/analysis/indicator/SumIndicator.java
+4
-6
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
.../storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
+7
-0
未找到文件。
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/CPMIndicator.java
浏览文件 @
a81b9920
...
...
@@ -18,11 +18,9 @@
package
org.apache.skywalking.oap.server.core.analysis.indicator
;
import
lombok.Getter
;
import
lombok.Setter
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.ConstOne
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Entrance
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorOperator
;
import
lombok.*
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*
;
import
org.apache.skywalking.oap.server.core.query.sql.Function
;
import
org.apache.skywalking.oap.server.core.storage.annotation.Column
;
/**
...
...
@@ -34,7 +32,7 @@ public abstract class CPMIndicator extends Indicator implements LongValueHolder
protected
static
final
String
VALUE
=
"value"
;
protected
static
final
String
TOTAL
=
"total"
;
@Getter
@Setter
@Column
(
columnName
=
VALUE
,
isValue
=
true
)
private
long
value
;
@Getter
@Setter
@Column
(
columnName
=
VALUE
,
isValue
=
true
,
function
=
Function
.
Avg
)
private
long
value
;
@Getter
@Setter
@Column
(
columnName
=
TOTAL
)
private
long
total
;
@Entrance
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/CountIndicator.java
浏览文件 @
a81b9920
...
...
@@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.indicator;
import
lombok.*
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*
;
import
org.apache.skywalking.oap.server.core.query.sql.Function
;
import
org.apache.skywalking.oap.server.core.storage.annotation.Column
;
/**
...
...
@@ -30,7 +31,7 @@ public abstract class CountIndicator extends Indicator implements LongValueHolde
protected
static
final
String
VALUE
=
"value"
;
@Getter
@Setter
@Column
(
columnName
=
VALUE
)
private
long
value
;
@Getter
@Setter
@Column
(
columnName
=
VALUE
,
isValue
=
true
,
function
=
Function
.
Sum
)
private
long
value
;
@Entrance
public
final
void
combine
(
@ConstOne
long
count
)
{
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java
浏览文件 @
a81b9920
...
...
@@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.core.analysis.indicator;
import
lombok.*
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*
;
import
org.apache.skywalking.oap.server.core.query.sql.Function
;
import
org.apache.skywalking.oap.server.core.storage.annotation.Column
;
/**
...
...
@@ -34,7 +35,7 @@ public abstract class DoubleAvgIndicator extends Indicator implements DoubleValu
@Getter
@Setter
@Column
(
columnName
=
SUMMATION
)
private
double
summation
;
@Getter
@Setter
@Column
(
columnName
=
COUNT
)
private
int
count
;
@Getter
@Setter
@Column
(
columnName
=
VALUE
)
private
double
value
;
@Getter
@Setter
@Column
(
columnName
=
VALUE
,
isValue
=
true
,
function
=
Function
.
Avg
)
private
double
value
;
@Entrance
public
final
void
combine
(
@SourceFrom
double
summation
,
@ConstOne
int
count
)
{
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PercentIndicator.java
浏览文件 @
a81b9920
...
...
@@ -21,6 +21,7 @@ package org.apache.skywalking.oap.server.core.analysis.indicator;
import
lombok.*
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.expression.EqualMatch
;
import
org.apache.skywalking.oap.server.core.query.sql.Function
;
import
org.apache.skywalking.oap.server.core.storage.annotation.Column
;
/**
...
...
@@ -33,7 +34,7 @@ public abstract class PercentIndicator extends Indicator implements IntValueHold
protected
static
final
String
PERCENTAGE
=
"percentage"
;
@Getter
@Setter
@Column
(
columnName
=
TOTAL
)
private
long
total
;
@Getter
@Setter
@Column
(
columnName
=
PERCENTAGE
,
isValue
=
true
)
private
int
percentage
;
@Getter
@Setter
@Column
(
columnName
=
PERCENTAGE
,
isValue
=
true
,
function
=
Function
.
Avg
)
private
int
percentage
;
@Getter
@Setter
@Column
(
columnName
=
MATCH
)
private
long
match
;
@Entrance
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicator.java
浏览文件 @
a81b9920
...
...
@@ -21,6 +21,7 @@ package org.apache.skywalking.oap.server.core.analysis.indicator;
import
java.util.*
;
import
lombok.*
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*
;
import
org.apache.skywalking.oap.server.core.query.sql.Function
;
import
org.apache.skywalking.oap.server.core.storage.annotation.Column
;
/**
...
...
@@ -38,7 +39,7 @@ public abstract class PxxIndicator extends Indicator implements IntValueHolder {
protected
static
final
String
VALUE
=
"value"
;
protected
static
final
String
PRECISION
=
"precision"
;
@Getter
@Setter
@Column
(
columnName
=
VALUE
,
isValue
=
true
)
private
int
value
;
@Getter
@Setter
@Column
(
columnName
=
VALUE
,
isValue
=
true
,
function
=
Function
.
Avg
)
private
int
value
;
@Getter
@Setter
@Column
(
columnName
=
PRECISION
)
private
int
precision
;
@Getter
@Setter
@Column
(
columnName
=
DETAIL_GROUP
)
private
IntKeyLongValueArray
detailGroup
;
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/SumIndicator.java
浏览文件 @
a81b9920
...
...
@@ -18,11 +18,9 @@
package
org.apache.skywalking.oap.server.core.analysis.indicator
;
import
lombok.Getter
;
import
lombok.Setter
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Entrance
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorOperator
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.SourceFrom
;
import
lombok.*
;
import
org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*
;
import
org.apache.skywalking.oap.server.core.query.sql.Function
;
import
org.apache.skywalking.oap.server.core.storage.annotation.Column
;
/**
...
...
@@ -33,7 +31,7 @@ public abstract class SumIndicator extends Indicator implements LongValueHolder
protected
static
final
String
VALUE
=
"value"
;
@Getter
@Setter
@Column
(
columnName
=
VALUE
)
private
long
value
;
@Getter
@Setter
@Column
(
columnName
=
VALUE
,
isValue
=
true
,
function
=
Function
.
Sum
)
private
long
value
;
@Entrance
public
final
void
combine
(
@SourceFrom
long
count
)
{
...
...
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
浏览文件 @
a81b9920
...
...
@@ -71,6 +71,10 @@ public class MetricQueryEsDAO extends EsDAO implements IMetricQueryDAO {
Avg
avg
=
idBucket
.
getAggregations
().
get
(
valueCName
);
value
=
(
int
)
avg
.
getValue
();
break
;
default
:
avg
=
idBucket
.
getAggregations
().
get
(
valueCName
);
value
=
(
int
)
avg
.
getValue
();
break
;
}
KVInt
kvInt
=
new
KVInt
();
...
...
@@ -89,6 +93,9 @@ public class MetricQueryEsDAO extends EsDAO implements IMetricQueryDAO {
case
Sum:
parentAggBuilder
.
subAggregation
(
AggregationBuilders
.
sum
(
valueCName
).
field
(
valueCName
));
break
;
default
:
parentAggBuilder
.
subAggregation
(
AggregationBuilders
.
avg
(
valueCName
).
field
(
valueCName
));
break
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录