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

Fix issue#7527, add desc sort function in IBrowserLogQueryDAO of H2 and ES (#7580)

This commit is contained in:
刘威 2021-08-26 22:36:24 +08:00 committed by GitHub
parent e6447d5175
commit 50688c1879
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -49,6 +49,7 @@ Release Notes.
* Support zookeeper grouped dynamic configurations.
* Fix NPE when OAP nodes synchronize events with each other in cluster mode.
* Support k8s configmap grouped dynamic configurations.
* Add desc sort function in H2 and ElasticSearch implementations of IBrowserLogQueryDAO
#### UI

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

@ -32,6 +32,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.sort.SortOrder;
import static java.util.Objects.nonNull;
@ -72,6 +73,7 @@ public class BrowserLogQueryEsDAO extends EsDAO implements IBrowserLogQueryDAO {
boolQueryBuilder.must()
.add(QueryBuilders.termQuery(BrowserErrorLogRecord.ERROR_CATEGORY, category.getValue()));
}
sourceBuilder.sort(BrowserErrorLogRecord.TIMESTAMP, SortOrder.DESC);
sourceBuilder.size(limit);
sourceBuilder.from(from);
SearchResponse response = getClient()

2
oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java
View File

@ -31,6 +31,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.sort.SortOrder;
import static java.util.Objects.nonNull;
@ -71,6 +72,7 @@ public class BrowserLogQueryEs7DAO extends BrowserLogQueryEsDAO {
boolQueryBuilder.must()
.add(QueryBuilders.termQuery(BrowserErrorLogRecord.ERROR_CATEGORY, category.getValue()));
}
sourceBuilder.sort(BrowserErrorLogRecord.TIMESTAMP, SortOrder.DESC);
sourceBuilder.size(limit);
sourceBuilder.from(from);
SearchResponse response = getClient()

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

@ -78,6 +78,8 @@ public class H2BrowserLogQueryDAO implements IBrowserLogQueryDAO {
parameters.add(category.getValue());
}
sql.append(" order by ").append(BrowserErrorLogRecord.TIMESTAMP).append(" DESC ");
BrowserErrorLogs logs = new BrowserErrorLogs();
try (Connection connection = h2Client.getConnection()) {