kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two serious bugs. (#4741)

This commit is contained in:
吴晟 Wu Sheng 2020-05-05 12:55:14 +08:00 committed by GitHub
parent 7b071bd7f7
commit fac4ddc9e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java
View File

@ -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);
}

4
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java
View File

@ -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.getStartTimeBucketInSec())
.lte(duration.getEndTimeBucketInSec()));
if (StringUtil.isNotEmpty(condition.getParentService())) {
final String serviceId = IDManager.ServiceID.buildId(condition.getParentService(), condition.isNormal());

4
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/TopNRecordsQuery.java
View File

@ -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.getStartTimeBucketInSec()))
.and(lte(TopN.TIME_BUCKET, duration.getEndTimeBucketInSec()));
if (StringUtil.isNotEmpty(condition.getParentService())) {
final String serviceId = IDManager.ServiceID.buildId(condition.getParentService(), condition.isNormal());

4
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java
View File

@ -55,9 +55,9 @@ public class H2TopNRecordsQueryDAO implements ITopNRecordsQueryDAO {
}
sql.append(" and ").append(TopN.TIME_BUCKET).append(" >= ?");
parameters.add(duration.getStartTimeBucket());
parameters.add(duration.getStartTimeBucketInSec());
sql.append(" and ").append(TopN.TIME_BUCKET).append(" <= ?");
parameters.add(duration.getEndTimeBucket());
parameters.add(duration.getEndTimeBucketInSec());
sql.append(" order by ").append(valueColumnName);
if (condition.getOrder().equals(Order.DES)) {