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

LogQuery remove unused field (#6246)

This commit is contained in:
zhang-wei 2021-01-24 19:13:31 +08:00 committed by GitHub
parent 777c670c66
commit 0bd8149596
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java
View File

@ -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,

1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/LogQueryCondition.java
View File

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

3
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java
View File

@ -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,

1
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
View File

@ -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(),

2
oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol

@ -1 +1 @@
Subproject commit 154b7c41b53376b7161bee3c4e716330cc752254
Subproject commit 98d2dfd8b4cc549d64d7541c45b6808de907c42b

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

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

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

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

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

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

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

@ -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(" >= ?");

1
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java
View File

@ -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())

10
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java
View File

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

3
test/e2e/e2e-data/src/main/resources/logs.gql
View File

@ -36,8 +36,7 @@
}",
"variables": {
"condition": {
"metricName": "log",
"state": "ALL",
"state": "{state}",
"serviceId": "{serviceId}",
"serviceInstanceId": "{serviceInstanceId}",
"endpointId": "{endpointId}",