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

Remove unnecessary parameter in the profile log query (#4549) 

* Remove unnecessary parameter in the profile log query

* Replace gone images

Co-authored-by: Mrproliu <mrproliu@lagou.com>
Co-authored-by: kezhenxu94 <kezhenxu94@163.com>
This commit is contained in:
mrproliu 2020-03-22 12:49:43 +08:00 committed by GitHub
parent 2e9f001633
commit a9d34e3b61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProfileTaskQueryService.java
View File

@ -162,7 +162,7 @@ public class ProfileTaskQueryService implements Service {
final List<ProfileTask> tasks = getProfileTaskDAO().getTaskList(serviceId, endpointName, null, null, null);
// query all and filter on task to match logs
List<ProfileTaskLog> taskLogList = getProfileTaskLogQueryDAO().getTaskLogList(null);
List<ProfileTaskLog> taskLogList = getProfileTaskLogQueryDAO().getTaskLogList();
if (taskLogList == null) {
taskLogList = Collections.emptyList();
}

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskLogQueryDAO.java
View File

@ -30,9 +30,7 @@ public interface IProfileTaskLogQueryDAO extends DAO {
/**
* search all task log list in appoint profile task id
*
* @param taskId profile task id, maybe null
*/
List<ProfileTaskLog> getTaskLogList(final String taskId) throws IOException;
List<ProfileTaskLog> getTaskLogList() throws IOException;
}

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

@ -45,16 +45,12 @@ public class ProfileTaskLogEsDAO extends EsDAO implements IProfileTaskLogQueryDA
}
@Override
public List<ProfileTaskLog> getTaskLogList(String taskId) throws IOException {
public List<ProfileTaskLog> getTaskLogList() throws IOException {
final SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
final BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
sourceBuilder.query(boolQueryBuilder);
if (taskId != null) {
boolQueryBuilder.must().add(QueryBuilders.termQuery(ProfileTaskLogRecord.TASK_ID, taskId));
}
sourceBuilder.sort(ProfileTaskLogRecord.OPERATION_TIME, SortOrder.DESC);
sourceBuilder.size(queryMaxSize);

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

@ -25,7 +25,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.apm.util.StringUtil;
import org.apache.skywalking.oap.server.core.profile.ProfileTaskLogRecord;
import org.apache.skywalking.oap.server.core.query.entity.ProfileTaskLog;
import org.apache.skywalking.oap.server.core.query.entity.ProfileTaskLogOperationType;
@ -35,7 +34,6 @@ import org.influxdb.dto.QueryResult;
import org.influxdb.querybuilder.SelectQueryImpl;
import org.influxdb.querybuilder.WhereQueryImpl;
import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.eq;
import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.select;
@Slf4j
@ -49,7 +47,7 @@ public class ProfileTaskLogQuery implements IProfileTaskLogQueryDAO {
}
@Override
public List<ProfileTaskLog> getTaskLogList(String taskId) throws IOException {
public List<ProfileTaskLog> getTaskLogList() throws IOException {
WhereQueryImpl<SelectQueryImpl> query = select()
.function("top", ProfileTaskLogRecord.OPERATION_TIME, fetchTaskLogMaxSize)
.column("id")
@ -60,10 +58,6 @@ public class ProfileTaskLogQuery implements IProfileTaskLogQueryDAO {
.from(client.getDatabase(), ProfileTaskLogRecord.INDEX_NAME)
.where();
if (StringUtil.isNotEmpty(taskId)) {
query.and(eq(ProfileTaskLogRecord.TASK_ID, taskId));
}
QueryResult.Series series = client.queryForSingleSeries(query);
if (log.isDebugEnabled()) {
log.debug("SQL: {} result set: {}", query.getCommand(), series);

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

@ -41,15 +41,11 @@ public class H2ProfileTaskLogQueryDAO implements IProfileTaskLogQueryDAO {
}
@Override
public List<ProfileTaskLog> getTaskLogList(String taskId) throws IOException {
public List<ProfileTaskLog> getTaskLogList() throws IOException {
final StringBuilder sql = new StringBuilder();
final ArrayList<Object> condition = new ArrayList<>(1);
sql.append("select * from ").append(ProfileTaskLogRecord.INDEX_NAME).append(" where 1=1 ");
if (taskId != null) {
sql.append(" and ").append(ProfileTaskLogRecord.TASK_ID).append(" = ?");
}
sql.append("ORDER BY ").append(ProfileTaskLogRecord.OPERATION_TIME).append(" DESC ");
try (Connection connection = h2Client.getConnection()) {

2
test/e2e/e2e-test/docker/Dockerfile.consumer
View File

@ -14,7 +14,7 @@
# limitations under the License.
ARG SW_AGENT_JDK_VERSION=8
ARG AGENT_JDK_BASE=adoptopenjdk/openjdk${SW_AGENT_JDK_VERSION}:alpine-slim
ARG AGENT_JDK_BASE=adoptopenjdk/openjdk${SW_AGENT_JDK_VERSION}:alpine
FROM ${AGENT_JDK_BASE}

2
test/e2e/e2e-test/docker/Dockerfile.provider
View File

@ -14,7 +14,7 @@
# limitations under the License.
ARG SW_AGENT_JDK_VERSION=8
ARG AGENT_JDK_BASE=adoptopenjdk/openjdk${SW_AGENT_JDK_VERSION}:alpine-slim
ARG AGENT_JDK_BASE=adoptopenjdk/openjdk${SW_AGENT_JDK_VERSION}:alpine
FROM ${AGENT_JDK_BASE}

2
test/e2e/e2e-test/docker/profile/Dockerfile.h2
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM adoptopenjdk/openjdk8:alpine-slim
FROM adoptopenjdk/openjdk8:alpine
WORKDIR /h2