Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
javalover123888
SkyWalking
提交
6fd9c3bd
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,发现更多精彩内容 >>
未验证
提交
6fd9c3bd
编写于
2月 28, 2018
作者:
wu-sheng
提交者:
GitHub
2月 28, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #849 from peng-yongsheng/feature/searchServer
"searchServer" and "getAllServer"
上级
4057f37e
43ddc848
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
39 addition
and
26 deletion
+39
-26
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IInstanceUIDAO.java
...ywalking/apm/collector/storage/dao/ui/IInstanceUIDAO.java
+1
-1
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceEsUIDAO.java
...king/apm/collector/storage/es/dao/ui/InstanceEsUIDAO.java
+18
-7
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/InstanceH2UIDAO.java
...king/apm/collector/storage/h2/dao/ui/InstanceH2UIDAO.java
+10
-8
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ServerQuery.java
...apache/skywalking/apm/collector/ui/query/ServerQuery.java
+6
-6
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java
...he/skywalking/apm/collector/ui/service/ServerService.java
+4
-4
未找到文件。
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IInstanceUIDAO.java
浏览文件 @
6fd9c3bd
...
...
@@ -36,7 +36,7 @@ public interface IInstanceUIDAO extends DAO {
Instance
getInstance
(
int
instanceId
);
List
<
AppServerInfo
>
searchServer
(
String
keyword
,
long
start
,
long
end
);
List
<
AppServerInfo
>
searchServer
(
String
keyword
,
long
start
SecondTimeBucket
,
long
endSecondTimeBucket
);
List
<
AppServerInfo
>
getAllServer
(
int
applicationId
,
long
startSecondTimeBucket
,
long
endSecondTimeBucket
);
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceEsUIDAO.java
浏览文件 @
6fd9c3bd
...
...
@@ -97,7 +97,8 @@ public class InstanceEsUIDAO extends EsDAO implements IInstanceUIDAO {
return
heartBeatTime
;
}
@Override
public
List
<
Application
>
getApplications
(
long
startSecondTimeBucket
,
long
endSecondTimeBucket
,
int
...
applicationIds
)
{
@Override
public
List
<
Application
>
getApplications
(
long
startSecondTimeBucket
,
long
endSecondTimeBucket
,
int
...
applicationIds
)
{
logger
.
debug
(
"application list get, start time: {}, end time: {}"
,
startSecondTimeBucket
,
endSecondTimeBucket
);
SearchRequestBuilder
searchRequestBuilder
=
getClient
().
prepareSearch
(
InstanceTable
.
TABLE
);
searchRequestBuilder
.
setTypes
(
InstanceTable
.
TABLE_TYPE
);
...
...
@@ -150,19 +151,26 @@ public class InstanceEsUIDAO extends EsDAO implements IInstanceUIDAO {
return
null
;
}
@Override
public
List
<
AppServerInfo
>
searchServer
(
String
keyword
,
long
start
,
long
end
)
{
logger
.
debug
(
"get instances info, keyword: {}, start: {}, end: {}"
,
keyword
,
start
,
end
);
@Override
public
List
<
AppServerInfo
>
searchServer
(
String
keyword
,
long
startSecondTimeBucket
,
long
endSecondTimeBucket
)
{
logger
.
debug
(
"get instances info, keyword: {}, start: {}, end: {}"
,
keyword
,
startSecondTimeBucket
,
endSecondTimeBucket
);
SearchRequestBuilder
searchRequestBuilder
=
getClient
().
prepareSearch
(
InstanceTable
.
TABLE
);
searchRequestBuilder
.
setTypes
(
InstanceTable
.
TABLE_TYPE
);
searchRequestBuilder
.
setSearchType
(
SearchType
.
DFS_QUERY_THEN_FETCH
);
searchRequestBuilder
.
setSize
(
1000
);
BoolQueryBuilder
boolQuery
=
QueryBuilders
.
boolQuery
();
boolQuery
.
must
().
add
(
QueryBuilders
.
rangeQuery
(
InstanceTable
.
COLUMN_HEARTBEAT_TIME
).
gte
(
start
).
lte
(
end
));
if
(
StringUtils
.
isNotEmpty
(
keyword
))
{
boolQuery
.
must
().
add
(
QueryBuilders
.
queryStringQuery
(
keyword
));
}
boolQuery
.
must
().
add
(
QueryBuilders
.
termQuery
(
InstanceTable
.
COLUMN_IS_ADDRESS
,
BooleanUtils
.
FALSE
));
BoolQueryBuilder
timeBoolQuery
=
QueryBuilders
.
boolQuery
();
timeBoolQuery
.
should
().
add
(
QueryBuilders
.
rangeQuery
(
InstanceTable
.
COLUMN_REGISTER_TIME
).
gte
(
startSecondTimeBucket
).
lte
(
endSecondTimeBucket
));
timeBoolQuery
.
should
().
add
(
QueryBuilders
.
rangeQuery
(
InstanceTable
.
COLUMN_HEARTBEAT_TIME
).
gte
(
startSecondTimeBucket
).
lte
(
endSecondTimeBucket
));
boolQuery
.
must
().
add
(
timeBoolQuery
);
searchRequestBuilder
.
setQuery
(
boolQuery
);
SearchResponse
searchResponse
=
searchRequestBuilder
.
execute
().
actionGet
();
...
...
@@ -180,11 +188,14 @@ public class InstanceEsUIDAO extends EsDAO implements IInstanceUIDAO {
searchRequestBuilder
.
setSize
(
1000
);
BoolQueryBuilder
boolQuery
=
QueryBuilders
.
boolQuery
();
boolQuery
.
must
().
add
(
QueryBuilders
.
rangeQuery
(
InstanceTable
.
COLUMN_REGISTER_TIME
).
gte
(
startSecondTimeBucket
).
lte
(
endSecondTimeBucket
));
boolQuery
.
must
().
add
(
QueryBuilders
.
rangeQuery
(
InstanceTable
.
COLUMN_HEARTBEAT_TIME
).
gte
(
startSecondTimeBucket
));
boolQuery
.
must
().
add
(
QueryBuilders
.
termQuery
(
InstanceTable
.
COLUMN_APPLICATION_ID
,
applicationId
));
boolQuery
.
must
().
add
(
QueryBuilders
.
termQuery
(
InstanceTable
.
COLUMN_IS_ADDRESS
,
BooleanUtils
.
FALSE
));
BoolQueryBuilder
timeBoolQuery
=
QueryBuilders
.
boolQuery
();
timeBoolQuery
.
should
().
add
(
QueryBuilders
.
rangeQuery
(
InstanceTable
.
COLUMN_REGISTER_TIME
).
gte
(
startSecondTimeBucket
).
lte
(
endSecondTimeBucket
));
timeBoolQuery
.
should
().
add
(
QueryBuilders
.
rangeQuery
(
InstanceTable
.
COLUMN_HEARTBEAT_TIME
).
gte
(
startSecondTimeBucket
).
lte
(
endSecondTimeBucket
));
boolQuery
.
must
().
add
(
timeBoolQuery
);
searchRequestBuilder
.
setQuery
(
boolQuery
);
SearchResponse
searchResponse
=
searchRequestBuilder
.
execute
().
actionGet
();
...
...
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/InstanceH2UIDAO.java
浏览文件 @
6fd9c3bd
...
...
@@ -88,7 +88,8 @@ public class InstanceH2UIDAO extends H2DAO implements IInstanceUIDAO {
}
@Override
public
List
<
Application
>
getApplications
(
long
startSecondTimeBucket
,
long
endSecondTimeBucket
,
int
...
applicationIds
)
{
public
List
<
Application
>
getApplications
(
long
startSecondTimeBucket
,
long
endSecondTimeBucket
,
int
...
applicationIds
)
{
H2Client
client
=
getClient
();
List
<
Application
>
applications
=
new
LinkedList
<>();
String
sql
=
SqlBuilder
.
buildSql
(
GET_APPLICATIONS_SQL
,
InstanceTable
.
COLUMN_INSTANCE_ID
,
...
...
@@ -131,20 +132,21 @@ public class InstanceH2UIDAO extends H2DAO implements IInstanceUIDAO {
return
null
;
}
@Override
public
List
<
AppServerInfo
>
searchServer
(
String
keyword
,
long
start
,
long
end
)
{
logger
.
debug
(
"get instances info, keyword: {}, start: {}, end: {}"
,
keyword
,
start
,
end
);
String
dynamicSql
=
"select * from {0} where {1} like ? and {2} >= ? and {2} <= ? and {3} = ?"
;
String
sql
=
SqlBuilder
.
buildSql
(
dynamicSql
,
InstanceTable
.
TABLE
,
InstanceTable
.
COLUMN_OS_INFO
,
InstanceTable
.
COLUMN_HEARTBEAT_TIME
,
InstanceTable
.
COLUMN_IS_ADDRESS
);
Object
[]
params
=
new
Object
[]
{
keyword
,
start
,
end
,
BooleanUtils
.
FALSE
};
@Override
public
List
<
AppServerInfo
>
searchServer
(
String
keyword
,
long
startSecondTimeBucket
,
long
endSecondTimeBucket
)
{
logger
.
debug
(
"get instances info, keyword: {}, start: {}, end: {}"
,
keyword
,
startSecondTimeBucket
,
endSecondTimeBucket
);
String
dynamicSql
=
"select * from {0} where {1} like ? and (({2} >= ? and {2} <= ?) or ({3} >= ? and {3} <= ?)) and {4} = ?"
;
String
sql
=
SqlBuilder
.
buildSql
(
dynamicSql
,
InstanceTable
.
TABLE
,
InstanceTable
.
COLUMN_OS_INFO
,
InstanceTable
.
COLUMN_REGISTER_TIME
,
InstanceTable
.
COLUMN_HEARTBEAT_TIME
,
InstanceTable
.
COLUMN_IS_ADDRESS
);
Object
[]
params
=
new
Object
[]
{
keyword
,
startSecondTimeBucket
,
endSecondTimeBucket
,
startSecondTimeBucket
,
endSecondTimeBucket
,
BooleanUtils
.
FALSE
};
return
buildAppServerInfo
(
sql
,
params
);
}
@Override
public
List
<
AppServerInfo
>
getAllServer
(
int
applicationId
,
long
startSecondTimeBucket
,
long
endSecondTimeBucket
)
{
logger
.
debug
(
"get instances info, applicationId: {}, startSecondTimeBucket: {}, endSecondTimeBucket: {}"
,
applicationId
,
startSecondTimeBucket
,
endSecondTimeBucket
);
String
dynamicSql
=
"select * from {0} where {1} = ? and
{2} >= ? and {2} <= ? and {3} >= ?
and {4} = ?"
;
String
dynamicSql
=
"select * from {0} where {1} = ? and
(({2} >= ? and {2} <= ?) or ({3} >= ? and {3} <= ?))
and {4} = ?"
;
String
sql
=
SqlBuilder
.
buildSql
(
dynamicSql
,
InstanceTable
.
TABLE
,
InstanceTable
.
COLUMN_APPLICATION_ID
,
InstanceTable
.
COLUMN_REGISTER_TIME
,
InstanceTable
.
COLUMN_HEARTBEAT_TIME
,
InstanceTable
.
COLUMN_IS_ADDRESS
);
Object
[]
params
=
new
Object
[]
{
applicationId
,
startSecondTimeBucket
,
endSecondTimeBucket
,
startSecondTimeBucket
,
BooleanUtils
.
FALSE
};
Object
[]
params
=
new
Object
[]
{
applicationId
,
startSecondTimeBucket
,
endSecondTimeBucket
,
startSecondTimeBucket
,
endSecondTimeBucket
,
BooleanUtils
.
FALSE
};
return
buildAppServerInfo
(
sql
,
params
);
}
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ServerQuery.java
浏览文件 @
6fd9c3bd
...
...
@@ -53,15 +53,15 @@ public class ServerQuery implements Query {
}
public
List
<
AppServerInfo
>
searchServer
(
String
keyword
,
Duration
duration
)
throws
ParseException
{
long
start
=
DurationUtils
.
INSTANCE
.
durationToSecondTimeBucket
(
duration
.
getStep
(),
duration
.
getStart
());
long
end
=
DurationUtils
.
INSTANCE
.
durationToSecondTimeBucket
(
duration
.
getStep
(),
duration
.
getEnd
());
return
getServerService
().
searchServer
(
keyword
,
start
,
end
);
long
start
SecondTimeBucket
=
DurationUtils
.
INSTANCE
.
durationToSecondTimeBucket
(
duration
.
getStep
(),
duration
.
getStart
());
long
end
SecondTimeBucket
=
DurationUtils
.
INSTANCE
.
durationToSecondTimeBucket
(
duration
.
getStep
(),
duration
.
getEnd
());
return
getServerService
().
searchServer
(
keyword
,
start
SecondTimeBucket
,
endSecondTimeBucket
);
}
public
List
<
AppServerInfo
>
getAllServer
(
int
applicationId
,
Duration
duration
)
throws
ParseException
{
long
start
=
DurationUtils
.
INSTANCE
.
durationToSecondTimeBucket
(
duration
.
getStep
(),
duration
.
getStart
());
long
end
=
DurationUtils
.
INSTANCE
.
durationToSecondTimeBucket
(
duration
.
getStep
(),
duration
.
getEnd
());
return
getServerService
().
getAllServer
(
applicationId
,
start
,
end
);
long
start
SecondTimeBucket
=
DurationUtils
.
INSTANCE
.
durationToSecondTimeBucket
(
duration
.
getStep
(),
duration
.
getStart
());
long
end
SecondTimeBucket
=
DurationUtils
.
INSTANCE
.
durationToSecondTimeBucket
(
duration
.
getStep
(),
duration
.
getEnd
());
return
getServerService
().
getAllServer
(
applicationId
,
start
SecondTimeBucket
,
endSecondTimeBucket
);
}
public
ResponseTimeTrend
getServerResponseTimeTrend
(
int
serverId
,
Duration
duration
)
throws
ParseException
{
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java
浏览文件 @
6fd9c3bd
...
...
@@ -74,8 +74,8 @@ public class ServerService {
this
.
secondBetweenService
=
new
SecondBetweenService
(
moduleManager
);
}
public
List
<
AppServerInfo
>
searchServer
(
String
keyword
,
long
start
,
long
end
)
{
List
<
AppServerInfo
>
serverInfos
=
instanceUIDAO
.
searchServer
(
keyword
,
start
,
end
);
public
List
<
AppServerInfo
>
searchServer
(
String
keyword
,
long
start
SecondTimeBucket
,
long
endSecondTimeBucket
)
{
List
<
AppServerInfo
>
serverInfos
=
instanceUIDAO
.
searchServer
(
keyword
,
start
SecondTimeBucket
,
endSecondTimeBucket
);
serverInfos
.
forEach
(
serverInfo
->
{
if
(
serverInfo
.
getId
()
==
Const
.
NONE_INSTANCE_ID
)
{
serverInfos
.
remove
(
serverInfo
);
...
...
@@ -86,8 +86,8 @@ public class ServerService {
return
serverInfos
;
}
public
List
<
AppServerInfo
>
getAllServer
(
int
applicationId
,
long
start
,
long
end
)
{
List
<
AppServerInfo
>
serverInfos
=
instanceUIDAO
.
getAllServer
(
applicationId
,
start
,
end
);
public
List
<
AppServerInfo
>
getAllServer
(
int
applicationId
,
long
start
SecondTimeBucket
,
long
endSecondTimeBucket
)
{
List
<
AppServerInfo
>
serverInfos
=
instanceUIDAO
.
getAllServer
(
applicationId
,
start
SecondTimeBucket
,
endSecondTimeBucket
);
buildAppServerInfo
(
serverInfos
);
return
serverInfos
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录