This is an automated email from the ASF dual-hosted git repository.
wusheng 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 0bd8149 LogQuery remove unused field (#6246)
0bd8149 is described below
commit 0bd81495965d801315dd7417bb17333ae0eccf3b
Author: zhang-wei <[email protected]>
AuthorDate: Sun Jan 24 19:13:31 2021 +0800
LogQuery remove unused field (#6246)
---
.../skywalking/oap/server/core/query/LogQueryService.java | 6 ++----
.../oap/server/core/query/input/LogQueryCondition.java | 1 -
.../skywalking/oap/server/core/storage/query/ILogQueryDAO.java | 3 +--
.../apache/skywalking/oap/query/graphql/resolver/LogQuery.java | 1 -
.../query-graphql-plugin/src/main/resources/query-protocol | 2 +-
.../storage/plugin/elasticsearch/query/LogQueryEsDAO.java | 5 ++---
.../storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java | 5 ++---
.../oap/server/storage/plugin/influxdb/query/LogQuery.java | 8 ++++----
.../oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java | 5 ++---
.../main/java/org/apache/skywalking/e2e/SimpleQueryClient.java | 1 -
.../src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java | 10 ----------
test/e2e/e2e-data/src/main/resources/logs.gql | 3 +--
12 files changed, 15 insertions(+), 35 deletions(-)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java
index 2a23636..4bc5fc4 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java
@@ -53,8 +53,7 @@ public class LogQueryService implements Service {
return getLogQueryDAO().supportQueryLogsByKeywords();
}
- public Logs queryLogs(String metricName,
- String serviceId,
+ public Logs queryLogs(String serviceId,
String serviceInstanceId,
String endpointId,
String endpointName,
@@ -69,8 +68,7 @@ public class LogQueryService implements Service {
final List<String> excludingKeywordsOfContent)
throws IOException {
PaginationUtils.Page page = PaginationUtils.INSTANCE.exchange(paging);
- Logs logs = getLogQueryDAO().queryLogs(metricName,
- serviceId,
+ Logs logs = getLogQueryDAO().queryLogs(serviceId,
serviceInstanceId,
endpointId,
endpointName,
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/LogQueryCondition.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/LogQueryCondition.java
index 9a7a78d..5da7f8b 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/LogQueryCondition.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/LogQueryCondition.java
@@ -29,7 +29,6 @@ import
org.apache.skywalking.oap.server.core.query.type.Pagination;
@Getter
@Setter
public class LogQueryCondition {
- private String metricName;
private String serviceId;
private String serviceInstanceId;
private String endpointId;
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java
index b13e70c..8098dd5 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java
@@ -37,8 +37,7 @@ public interface ILogQueryDAO extends Service {
return false;
}
- Logs queryLogs(String metricName,
- String serviceId,
+ Logs queryLogs(String serviceId,
String serviceInstanceId,
String endpointId,
String endpointName,
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
index 29f83ff..d85004c 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
@@ -63,7 +63,6 @@ public class LogQuery implements GraphQLQueryResolver {
Order queryOrder = isNull(condition.getQueryOrder()) ? Order.DES :
condition.getQueryOrder();
return getQueryService().queryLogs(
- condition.getMetricName(),
condition.getServiceId(),
condition.getServiceInstanceId(),
condition.getEndpointId(),
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
index 154b7c4..98d2dfd 160000
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
@@ -1 +1 @@
-Subproject commit 154b7c41b53376b7161bee3c4e716330cc752254
+Subproject commit 98d2dfd8b4cc549d64d7541c45b6808de907c42b
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
index 2c88e3e..6640efe 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
@@ -60,8 +60,7 @@ public class LogQueryEsDAO extends EsDAO implements
ILogQueryDAO {
}
@Override
- public Logs queryLogs(String metricName,
- final String serviceId,
+ public Logs queryLogs(final String serviceId,
final String serviceInstanceId,
final String endpointId,
final String endpointName,
@@ -149,7 +148,7 @@ public class LogQueryEsDAO extends EsDAO implements
ILogQueryDAO {
sourceBuilder.size(limit);
sourceBuilder.from(from);
- SearchResponse response = getClient().search(metricName,
sourceBuilder);
+ SearchResponse response = getClient().search(LogRecord.INDEX_NAME,
sourceBuilder);
Logs logs = new Logs();
logs.setTotal((int) response.getHits().totalHits);
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
index d859fc9..7032cde 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
@@ -60,8 +60,7 @@ public class LogQueryEs7DAO extends EsDAO implements
ILogQueryDAO {
}
@Override
- public Logs queryLogs(String metricName,
- final String serviceId,
+ public Logs queryLogs(final String serviceId,
final String serviceInstanceId,
final String endpointId,
final String endpointName,
@@ -152,7 +151,7 @@ public class LogQueryEs7DAO extends EsDAO implements
ILogQueryDAO {
sourceBuilder.size(limit);
sourceBuilder.from(from);
- SearchResponse response = getClient().search(metricName,
sourceBuilder);
+ SearchResponse response = getClient().search(LogRecord.INDEX_NAME,
sourceBuilder);
Logs logs = new Logs();
logs.setTotal((int) response.getHits().getTotalHits().value);
diff --git
a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java
b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java
index a3ef276..6b130ea 100644
---
a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java
+++
b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import
org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord;
+import org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord;
import org.apache.skywalking.oap.server.core.analysis.manual.searchtag.Tag;
import org.apache.skywalking.oap.server.core.query.enumeration.Order;
import org.apache.skywalking.oap.server.core.query.input.TraceScopeCondition;
@@ -72,8 +73,7 @@ public class LogQuery implements ILogQueryDAO {
}
@Override
- public Logs queryLogs(String metricName,
- final String serviceId,
+ public Logs queryLogs(final String serviceId,
final String serviceInstanceId,
final String endpointId,
final String endpointName,
@@ -93,7 +93,7 @@ public class LogQuery implements ILogQueryDAO {
queryOrder) ? InfluxConstants.SORT_DES : InfluxConstants.SORT_ASC,
AbstractLogRecord.TIMESTAMP, limit + from
)
-
.from(client.getDatabase(), metricName)
+
.from(client.getDatabase(), LogRecord.INDEX_NAME)
.where();
if (isNotEmpty(serviceId)) {
@@ -143,7 +143,7 @@ public class LogQuery implements ILogQueryDAO {
nested.close();
}
- SelectQueryImpl countQuery =
select().count(ENDPOINT_ID).from(client.getDatabase(), metricName);
+ SelectQueryImpl countQuery =
select().count(ENDPOINT_ID).from(client.getDatabase(), LogRecord.INDEX_NAME);
for (ConjunctionClause clause : recallQuery.getClauses()) {
countQuery.where(clause);
}
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/H2LogQueryDAO.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java
index c787330..547f75a 100644
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java
@@ -78,8 +78,7 @@ public class H2LogQueryDAO implements ILogQueryDAO {
}
@Override
- public Logs queryLogs(String metricName,
- String serviceId,
+ public Logs queryLogs(String serviceId,
String serviceInstanceId,
String endpointId,
String endpointName,
@@ -105,7 +104,7 @@ public class H2LogQueryDAO implements ILogQueryDAO {
StringBuilder sql = new StringBuilder();
List<Object> parameters = new ArrayList<>(10);
- sql.append("from ").append(metricName).append(" where ");
+ sql.append("from ").append(LogRecord.INDEX_NAME).append(" where ");
sql.append(" 1=1 ");
if (startSecondTB != 0 && endSecondTB != 0) {
sql.append(" and ").append(AbstractLogRecord.TIME_BUCKET).append("
>= ?");
diff --git
a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java
b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java
index 6dc9fe1..90d20ad 100644
---
a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java
+++
b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java
@@ -396,7 +396,6 @@ public class SimpleQueryClient {
final String queryString = Resources.readLines(queryFileUrl,
StandardCharsets.UTF_8)
.stream().filter(it ->
!it.startsWith("#"))
.collect(Collectors.joining())
- .replace("{metricName}",
query.metricName())
.replace("{state}", query.state())
.replace("{serviceId}",
query.serviceId())
.replace("{serviceInstanceId}",
query.serviceInstanceId())
diff --git
a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java
b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java
index 825b522..4fd1fca 100644
---
a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java
+++
b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java
@@ -21,7 +21,6 @@ import org.apache.skywalking.e2e.AbstractQuery;
public class LogsQuery extends AbstractQuery<LogsQuery> {
- private String metricName = "log";
private String state = "ALL";
private String serviceId;
private String serviceInstanceId;
@@ -38,15 +37,6 @@ public class LogsQuery extends AbstractQuery<LogsQuery> {
private String keywordsOfContent = "";
private String excludingKeywordsOfContent = "";
- public String metricName() {
- return metricName;
- }
-
- public LogsQuery metricName(String metricName) {
- this.metricName = metricName;
- return this;
- }
-
public String state() {
return state;
}
diff --git a/test/e2e/e2e-data/src/main/resources/logs.gql
b/test/e2e/e2e-data/src/main/resources/logs.gql
index 3f40c87..b757c21 100644
--- a/test/e2e/e2e-data/src/main/resources/logs.gql
+++ b/test/e2e/e2e-data/src/main/resources/logs.gql
@@ -36,8 +36,7 @@
}",
"variables": {
"condition": {
- "metricName": "log",
- "state": "ALL",
+ "state": "{state}",
"serviceId": "{serviceId}",
"serviceInstanceId": "{serviceInstanceId}",
"endpointId": "{endpointId}",
