You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by zh...@apache.org on 2021/08/26 14:36:42 UTC
[skywalking] branch master updated: Fix issue#7527,
add desc sort function in IBrowserLogQueryDAO of H2 and ES (#7580)
This is an automated email from the ASF dual-hosted git repository.
zhangwei24 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 50688c1 Fix issue#7527, add desc sort function in IBrowserLogQueryDAO of H2 and ES (#7580)
50688c1 is described below
commit 50688c18795ee69adb97e896de880a5f1a6d0506
Author: 刘威 <51...@users.noreply.github.com>
AuthorDate: Thu Aug 26 22:36:24 2021 +0800
Fix issue#7527, add desc sort function in IBrowserLogQueryDAO of H2 and ES (#7580)
---
CHANGES.md | 1 +
.../server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java | 2 ++
.../storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java | 2 ++
.../oap/server/storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java | 2 ++
4 files changed, 7 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 5a40b60..8ba29c6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -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
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java
index f17824e..8751c8d 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java
@@ -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()
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java
index 344a3f0..652c4b2 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java
@@ -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()
diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java
index 3c23e2b..e80ef95 100644
--- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java
+++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java
@@ -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()) {