Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
fac4ddc9
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
fac4ddc9
编写于
5月 05, 2020
作者:
wu-sheng
提交者:
GitHub
5月 05, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix two serious bugs. (#4741)
上级
7b071bd7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
6 deletion
+7
-6
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java
.../server/core/analysis/worker/MetricsPersistentWorker.java
+1
-0
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java
...age/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java
+2
-2
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java
...erver/storage/plugin/influxdb/query/TopNRecordsQuery.java
+2
-2
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java
...ver/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java
+2
-2
未找到文件。
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java
浏览文件 @
fac4ddc9
...
...
@@ -169,6 +169,7 @@ public class MetricsPersistentWorker extends PersistenceWorker<Metrics> {
nextExportWorker
.
ifPresent
(
exportEvenWorker
->
exportEvenWorker
.
in
(
new
ExportEvent
(
metrics
,
ExportEvent
.
EventType
.
INCREMENT
)));
}
else
{
metrics
.
calculate
();
prepareRequests
.
add
(
metricsDAO
.
prepareBatchInsert
(
model
,
metrics
));
nextWorker
(
metrics
);
}
...
...
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java
浏览文件 @
fac4ddc9
...
...
@@ -50,8 +50,8 @@ public class TopNRecordsQueryEsDAO extends EsDAO implements ITopNRecordsQueryDAO
SearchSourceBuilder
sourceBuilder
=
SearchSourceBuilder
.
searchSource
();
BoolQueryBuilder
boolQueryBuilder
=
QueryBuilders
.
boolQuery
();
boolQueryBuilder
.
must
().
add
(
QueryBuilders
.
rangeQuery
(
TopN
.
TIME_BUCKET
)
.
gte
(
duration
.
getStartTimeBucket
())
.
lte
(
duration
.
getEndTimeBucket
()));
.
gte
(
duration
.
getStartTimeBucket
InSec
())
.
lte
(
duration
.
getEndTimeBucket
InSec
()));
if
(
StringUtil
.
isNotEmpty
(
condition
.
getParentService
()))
{
final
String
serviceId
=
IDManager
.
ServiceID
.
buildId
(
condition
.
getParentService
(),
condition
.
isNormal
());
...
...
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java
浏览文件 @
fac4ddc9
...
...
@@ -68,8 +68,8 @@ public class TopNRecordsQuery implements ITopNRecordsQueryDAO {
.
column
(
TopN
.
TRACE_ID
)
.
from
(
client
.
getDatabase
(),
condition
.
getName
())
.
where
()
.
and
(
gte
(
TopN
.
TIME_BUCKET
,
duration
.
getStartTimeBucket
()))
.
and
(
lte
(
TopN
.
TIME_BUCKET
,
duration
.
getEndTimeBucket
()));
.
and
(
gte
(
TopN
.
TIME_BUCKET
,
duration
.
getStartTimeBucket
InSec
()))
.
and
(
lte
(
TopN
.
TIME_BUCKET
,
duration
.
getEndTimeBucket
InSec
()));
if
(
StringUtil
.
isNotEmpty
(
condition
.
getParentService
()))
{
final
String
serviceId
=
IDManager
.
ServiceID
.
buildId
(
condition
.
getParentService
(),
condition
.
isNormal
());
...
...
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java
浏览文件 @
fac4ddc9
...
...
@@ -55,9 +55,9 @@ public class H2TopNRecordsQueryDAO implements ITopNRecordsQueryDAO {
}
sql
.
append
(
" and "
).
append
(
TopN
.
TIME_BUCKET
).
append
(
" >= ?"
);
parameters
.
add
(
duration
.
getStartTimeBucket
());
parameters
.
add
(
duration
.
getStartTimeBucket
InSec
());
sql
.
append
(
" and "
).
append
(
TopN
.
TIME_BUCKET
).
append
(
" <= ?"
);
parameters
.
add
(
duration
.
getEndTimeBucket
());
parameters
.
add
(
duration
.
getEndTimeBucket
InSec
());
sql
.
append
(
" order by "
).
append
(
valueColumnName
);
if
(
condition
.
getOrder
().
equals
(
Order
.
DES
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录