Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gdyjdao
SkyWalking
提交
ba244901
S
SkyWalking
项目概览
gdyjdao
/
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,发现更多精彩内容 >>
提交
ba244901
编写于
7月 10, 2019
作者:
wu-sheng
提交者:
Jared Tan
7月 10, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove "IDs can't be null" in backend, as UI hasn't fixed this for a long time. (#3039)
上级
3bc03f8e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
24 addition
and
8 deletion
+24
-8
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java
.../skywalking/oap/server/core/query/MetricQueryService.java
+24
-8
未找到文件。
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java
浏览文件 @
ba244901
...
...
@@ -20,25 +20,32 @@ package org.apache.skywalking.oap.server.core.query;
import
java.io.IOException
;
import
java.text.ParseException
;
import
java.util.*
;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.apache.skywalking.apm.util.StringUtil
;
import
org.apache.skywalking.oap.server.core.Const
;
import
org.apache.skywalking.oap.server.core.analysis.Downsampling
;
import
org.apache.skywalking.oap.server.core.analysis.metrics.Metrics
;
import
org.apache.skywalking.oap.server.core.query.entity.*
;
import
org.apache.skywalking.oap.server.core.query.sql.*
;
import
org.apache.skywalking.oap.server.core.query.entity.IntValues
;
import
org.apache.skywalking.oap.server.core.query.entity.Thermodynamic
;
import
org.apache.skywalking.oap.server.core.query.sql.KeyValues
;
import
org.apache.skywalking.oap.server.core.query.sql.Where
;
import
org.apache.skywalking.oap.server.core.storage.StorageModule
;
import
org.apache.skywalking.oap.server.core.storage.annotation.ValueColumnIds
;
import
org.apache.skywalking.oap.server.core.storage.query.IMetricsQueryDAO
;
import
org.apache.skywalking.oap.server.library.module.ModuleManager
;
import
org.apache.skywalking.oap.server.library.module.Service
;
import
org.apache.skywalking.oap.server.library.module.*
;
import
org.apache.skywalking.oap.server.library.util.CollectionUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* @author peng-yongsheng
*/
public
class
MetricQueryService
implements
Service
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
MetricQueryService
.
class
);
private
final
ModuleManager
moduleManager
;
private
IMetricsQueryDAO
metricQueryDAO
;
...
...
@@ -53,10 +60,17 @@ public class MetricQueryService implements Service {
return
metricQueryDAO
;
}
public
IntValues
getValues
(
final
String
indName
,
final
List
<
String
>
ids
,
final
Downsampling
downsampling
,
final
long
startTB
,
public
IntValues
getValues
(
final
String
indName
,
final
List
<
String
>
ids
,
final
Downsampling
downsampling
,
final
long
startTB
,
final
long
endTB
)
throws
IOException
{
if
(
CollectionUtils
.
isEmpty
(
ids
))
{
throw
new
RuntimeException
(
"IDs can't be null"
);
/**
* Don't support query values w/o ID. but UI still did this(as bug),
* we return an empty list, and a debug level log,
* rather than an exception, which always being considered as a serious error from new users.
*/
logger
.
debug
(
"query metrics[{}] w/o IDs"
,
indName
);
return
new
IntValues
();
}
Where
where
=
new
Where
();
...
...
@@ -68,7 +82,8 @@ public class MetricQueryService implements Service {
return
getMetricQueryDAO
().
getValues
(
indName
,
downsampling
,
startTB
,
endTB
,
where
,
ValueColumnIds
.
INSTANCE
.
getValueCName
(
indName
),
ValueColumnIds
.
INSTANCE
.
getValueFunction
(
indName
));
}
public
IntValues
getLinearIntValues
(
final
String
indName
,
final
String
id
,
final
Downsampling
downsampling
,
final
long
startTB
,
public
IntValues
getLinearIntValues
(
final
String
indName
,
final
String
id
,
final
Downsampling
downsampling
,
final
long
startTB
,
final
long
endTB
)
throws
IOException
,
ParseException
{
List
<
DurationPoint
>
durationPoints
=
DurationUtils
.
INSTANCE
.
getDurationPoints
(
downsampling
,
startTB
,
endTB
);
List
<
String
>
ids
=
new
ArrayList
<>();
...
...
@@ -81,7 +96,8 @@ public class MetricQueryService implements Service {
return
getMetricQueryDAO
().
getLinearIntValues
(
indName
,
downsampling
,
ids
,
ValueColumnIds
.
INSTANCE
.
getValueCName
(
indName
));
}
public
Thermodynamic
getThermodynamic
(
final
String
indName
,
final
String
id
,
final
Downsampling
downsampling
,
final
long
startTB
,
public
Thermodynamic
getThermodynamic
(
final
String
indName
,
final
String
id
,
final
Downsampling
downsampling
,
final
long
startTB
,
final
long
endTB
)
throws
IOException
,
ParseException
{
List
<
DurationPoint
>
durationPoints
=
DurationUtils
.
INSTANCE
.
getDurationPoints
(
downsampling
,
startTB
,
endTB
);
List
<
String
>
ids
=
new
ArrayList
<>();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录