You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/02/12 13:38:32 UTC

[skywalking] 01/01: Make Profile entities could be disable by OAL

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch disable_profile_idx
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 3f65a732d01e1b14db4a8298ac3a45c414ae6b95
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Feb 12 21:38:09 2020 +0800

    Make Profile entities could be disable by OAL
---
 .../apache/skywalking/oal/rt/grammar/OALLexer.g4   |  4 ++
 .../apache/skywalking/oal/rt/grammar/OALParser.g4  |  3 +-
 ...ProfileTaskNoneStream.java => ProfileTask.java} | 12 +++---
 .../server/core/profile/ProfileTaskLogRecord.java  |  2 +-
 .../core/profile/ProfileTaskMutationService.java   |  5 +--
 .../elasticsearch/query/ProfileTaskQueryEsDAO.java | 43 +++++++++++-----------
 .../plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java  | 43 +++++++++++-----------
 7 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4 b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4
index 7ab88fc..72bdf72 100644
--- a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4
+++ b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4
@@ -45,6 +45,7 @@ SRC_SERVICE_INSTANCE_CLR_THREAD: 'ServiceInstanceCLRThread';
 SRC_ENVOY_INSTANCE_METRIC: 'EnvoyInstanceMetric';
 
 //hard code sources, only used when need to be deactived.
+//Disable is targeting @Stream#name
 SRC_SEGMENT: 'segment';
 SRC_TOP_N_DB_STATEMENT: 'top_n_database_statement';
 SRC_ENDPOINT_RELATION_SERVER_SIDE: 'endpoint_relation_server_side';
@@ -55,6 +56,9 @@ SRC_HTTP_ACCESS_LOG: 'http_access_log';
 
 SRC_ZIPKIN_SPAN: 'zipkin_span';
 SRC_JAEGER_SPAN: 'jaeger_span';
+SRC_PROFILE_TASK: 'profile_task';
+SRC_PROFILE_TASK_LOG: 'profile_task_log';
+SRC_PROFILE_THREAD_SHANPSHOT: 'profile_task_segment_snapshot';
 
 // Literals
 
diff --git a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4 b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4
index d574f78..75a2a2d 100644
--- a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4
+++ b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4
@@ -59,7 +59,8 @@ source
 
 disableSource
     : SRC_SEGMENT | SRC_TOP_N_DB_STATEMENT | SRC_ENDPOINT_RELATION_SERVER_SIDE | SRC_SERVICE_RELATION_SERVER_SIDE |
-      SRC_SERVICE_RELATION_CLIENT_SIDE | SRC_ALARM_RECORD | SRC_HTTP_ACCESS_LOG | SRC_ZIPKIN_SPAN | SRC_JAEGER_SPAN
+      SRC_SERVICE_RELATION_CLIENT_SIDE | SRC_ALARM_RECORD | SRC_HTTP_ACCESS_LOG | SRC_ZIPKIN_SPAN | SRC_JAEGER_SPAN |
+      SRC_PROFILE_TASK | SRC_PROFILE_TASK_LOG | SRC_PROFILE_THREAD_SHANPSHOT
     ;
 
 sourceAttribute
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskNoneStream.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTask.java
similarity index 90%
rename from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskNoneStream.java
rename to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTask.java
index fb92f23..4fd930a 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskNoneStream.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTask.java
@@ -38,8 +38,8 @@ import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.PR
 @Getter
 @Setter
 @ScopeDeclaration(id = PROFILE_TASK, name = "ProfileTask")
-@Stream(name = ProfileTaskNoneStream.INDEX_NAME, scopeId = PROFILE_TASK, builder = ProfileTaskNoneStream.Builder.class, processor = NoneStreamingProcessor.class)
-public class ProfileTaskNoneStream extends NoneStream {
+@Stream(name = ProfileTask.INDEX_NAME, scopeId = PROFILE_TASK, builder = ProfileTask.Builder.class, processor = NoneStreamingProcessor.class)
+public class ProfileTask extends NoneStream {
 
     public static final String INDEX_NAME = "profile_task";
     public static final String SERVICE_ID = "service_id";
@@ -73,11 +73,11 @@ public class ProfileTaskNoneStream extends NoneStream {
     @Column(columnName = MAX_SAMPLING_COUNT)
     private int maxSamplingCount;
 
-    public static class Builder implements StorageBuilder<ProfileTaskNoneStream> {
+    public static class Builder implements StorageBuilder<ProfileTask> {
 
         @Override
-        public ProfileTaskNoneStream map2Data(Map<String, Object> dbMap) {
-            final ProfileTaskNoneStream record = new ProfileTaskNoneStream();
+        public ProfileTask map2Data(Map<String, Object> dbMap) {
+            final ProfileTask record = new ProfileTask();
             record.setServiceId(((Number) dbMap.get(SERVICE_ID)).intValue());
             record.setEndpointName((String) dbMap.get(ENDPOINT_NAME));
             record.setStartTime(((Number) dbMap.get(START_TIME)).longValue());
@@ -91,7 +91,7 @@ public class ProfileTaskNoneStream extends NoneStream {
         }
 
         @Override
-        public Map<String, Object> data2Map(ProfileTaskNoneStream storageData) {
+        public Map<String, Object> data2Map(ProfileTask storageData) {
             final HashMap<String, Object> map = new HashMap<>();
             map.put(SERVICE_ID, storageData.getServiceId());
             map.put(ENDPOINT_NAME, storageData.getEndpointName());
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskLogRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskLogRecord.java
index ebbdd2d..a585673 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskLogRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskLogRecord.java
@@ -37,7 +37,7 @@ import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.PR
  */
 @Getter
 @Setter
-@ScopeDeclaration(id = PROFILE_TASK_LOG, name = "ProfileTaskLog")
+@ScopeDeclaration(id = PROFILE_TASK_LOG, name = ProfileTaskLogRecord.INDEX_NAME)
 @Stream(name = ProfileTaskLogRecord.INDEX_NAME, scopeId = PROFILE_TASK_LOG, builder = ProfileTaskLogRecord.Builder.class, processor = RecordStreamProcessor.class)
 public class ProfileTaskLogRecord extends Record {
 
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java
index b9f703a..8159c35 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java
@@ -27,7 +27,6 @@ import org.apache.skywalking.oap.server.core.analysis.Downsampling;
 import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
 import org.apache.skywalking.oap.server.core.analysis.worker.NoneStreamingProcessor;
 import org.apache.skywalking.oap.server.core.profile.entity.ProfileTaskCreationResult;
-import org.apache.skywalking.oap.server.core.query.entity.ProfileTask;
 import org.apache.skywalking.oap.server.core.storage.StorageModule;
 import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskQueryDAO;
 import org.apache.skywalking.oap.server.library.module.ModuleManager;
@@ -80,7 +79,7 @@ public class ProfileTaskMutationService implements Service {
 
         // create task
         final long createTime = System.currentTimeMillis();
-        final ProfileTaskNoneStream task = new ProfileTaskNoneStream();
+        final ProfileTask task = new ProfileTask();
         task.setServiceId(serviceId);
         task.setEndpointName(endpointName.trim());
         task.setStartTime(taskStartTime);
@@ -131,7 +130,7 @@ public class ProfileTaskMutationService implements Service {
         // Each service can monitor up to 1 endpoints during the execution of tasks
         long startTimeBucket = TimeBucket.getTimeBucket(monitorStartTime, Downsampling.Second);
         long endTimeBucket = TimeBucket.getTimeBucket(monitorEndTime, Downsampling.Second);
-        final List<ProfileTask> alreadyHaveTaskList = getProfileTaskDAO().getTaskList(serviceId, null, startTimeBucket, endTimeBucket, 1);
+        final List<org.apache.skywalking.oap.server.core.query.entity.ProfileTask> alreadyHaveTaskList = getProfileTaskDAO().getTaskList(serviceId, null, startTimeBucket, endTimeBucket, 1);
         if (CollectionUtils.isNotEmpty(alreadyHaveTaskList)) {
             // if any task time bucket in this range, means already have task, because time bucket is base on task end time
             return "current service already has monitor task execute at this time";
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java
index 93c7aad..3e80394 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java
@@ -19,8 +19,7 @@
 package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query;
 
 import org.apache.skywalking.apm.util.StringUtil;
-import org.apache.skywalking.oap.server.core.profile.ProfileTaskNoneStream;
-import org.apache.skywalking.oap.server.core.query.entity.ProfileTask;
+import org.apache.skywalking.oap.server.core.profile.ProfileTask;
 import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskQueryDAO;
 import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
 import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO;
@@ -45,7 +44,7 @@ public class ProfileTaskQueryEsDAO extends EsDAO implements IProfileTaskQueryDAO
     }
 
     @Override
-    public List<ProfileTask> getTaskList(Integer serviceId, String endpointName, Long startTimeBucket,
+    public List<org.apache.skywalking.oap.server.core.query.entity.ProfileTask> getTaskList(Integer serviceId, String endpointName, Long startTimeBucket,
         Long endTimeBucket, Integer limit) throws IOException {
         SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
 
@@ -53,20 +52,20 @@ public class ProfileTaskQueryEsDAO extends EsDAO implements IProfileTaskQueryDAO
         sourceBuilder.query(boolQueryBuilder);
 
         if (serviceId != null) {
-            boolQueryBuilder.must().add(QueryBuilders.termQuery(ProfileTaskNoneStream.SERVICE_ID, serviceId));
+            boolQueryBuilder.must().add(QueryBuilders.termQuery(ProfileTask.SERVICE_ID, serviceId));
         }
 
         if (StringUtil.isNotEmpty(endpointName)) {
-            boolQueryBuilder.must().add(QueryBuilders.termQuery(ProfileTaskNoneStream.ENDPOINT_NAME, endpointName));
+            boolQueryBuilder.must().add(QueryBuilders.termQuery(ProfileTask.ENDPOINT_NAME, endpointName));
         }
 
         if (startTimeBucket != null) {
             boolQueryBuilder.must()
-                            .add(QueryBuilders.rangeQuery(ProfileTaskNoneStream.TIME_BUCKET).gte(startTimeBucket));
+                            .add(QueryBuilders.rangeQuery(ProfileTask.TIME_BUCKET).gte(startTimeBucket));
         }
 
         if (endTimeBucket != null) {
-            boolQueryBuilder.must().add(QueryBuilders.rangeQuery(ProfileTaskNoneStream.TIME_BUCKET).lte(endTimeBucket));
+            boolQueryBuilder.must().add(QueryBuilders.rangeQuery(ProfileTask.TIME_BUCKET).lte(endTimeBucket));
         }
 
         if (limit != null) {
@@ -75,11 +74,11 @@ public class ProfileTaskQueryEsDAO extends EsDAO implements IProfileTaskQueryDAO
             sourceBuilder.size(queryMaxSize);
         }
 
-        sourceBuilder.sort(ProfileTaskNoneStream.START_TIME, SortOrder.DESC);
+        sourceBuilder.sort(ProfileTask.START_TIME, SortOrder.DESC);
 
-        final SearchResponse response = getClient().search(ProfileTaskNoneStream.INDEX_NAME, sourceBuilder);
+        final SearchResponse response = getClient().search(ProfileTask.INDEX_NAME, sourceBuilder);
 
-        final LinkedList<ProfileTask> tasks = new LinkedList<>();
+        final LinkedList<org.apache.skywalking.oap.server.core.query.entity.ProfileTask> tasks = new LinkedList<>();
         for (SearchHit searchHit : response.getHits().getHits()) {
             tasks.add(parseTask(searchHit));
         }
@@ -88,7 +87,7 @@ public class ProfileTaskQueryEsDAO extends EsDAO implements IProfileTaskQueryDAO
     }
 
     @Override
-    public ProfileTask getById(String id) throws IOException {
+    public org.apache.skywalking.oap.server.core.query.entity.ProfileTask getById(String id) throws IOException {
         if (StringUtil.isEmpty(id)) {
             return null;
         }
@@ -97,7 +96,7 @@ public class ProfileTaskQueryEsDAO extends EsDAO implements IProfileTaskQueryDAO
         sourceBuilder.query(QueryBuilders.idsQuery().addIds(id));
         sourceBuilder.size(1);
 
-        final SearchResponse response = getClient().search(ProfileTaskNoneStream.INDEX_NAME, sourceBuilder);
+        final SearchResponse response = getClient().search(ProfileTask.INDEX_NAME, sourceBuilder);
 
         if (response.getHits().getHits().length > 0) {
             return parseTask(response.getHits().getHits()[0]);
@@ -106,21 +105,21 @@ public class ProfileTaskQueryEsDAO extends EsDAO implements IProfileTaskQueryDAO
         return null;
     }
 
-    private ProfileTask parseTask(SearchHit data) {
-        return ProfileTask.builder()
+    private org.apache.skywalking.oap.server.core.query.entity.ProfileTask parseTask(SearchHit data) {
+        return org.apache.skywalking.oap.server.core.query.entity.ProfileTask.builder()
                           .id(data.getId())
-                          .serviceId(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.SERVICE_ID)).intValue())
-                          .endpointName((String) data.getSourceAsMap().get(ProfileTaskNoneStream.ENDPOINT_NAME))
-                          .startTime(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.START_TIME)).longValue())
+                          .serviceId(((Number) data.getSourceAsMap().get(ProfileTask.SERVICE_ID)).intValue())
+                          .endpointName((String) data.getSourceAsMap().get(ProfileTask.ENDPOINT_NAME))
+                          .startTime(((Number) data.getSourceAsMap().get(ProfileTask.START_TIME)).longValue())
                           .createTime(((Number) data.getSourceAsMap()
-                                                    .get(ProfileTaskNoneStream.CREATE_TIME)).longValue())
-                          .duration(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.DURATION)).intValue())
+                                                    .get(ProfileTask.CREATE_TIME)).longValue())
+                          .duration(((Number) data.getSourceAsMap().get(ProfileTask.DURATION)).intValue())
                           .minDurationThreshold(((Number) data.getSourceAsMap()
-                                                              .get(ProfileTaskNoneStream.MIN_DURATION_THRESHOLD)).intValue())
+                                                              .get(ProfileTask.MIN_DURATION_THRESHOLD)).intValue())
                           .dumpPeriod(((Number) data.getSourceAsMap()
-                                                    .get(ProfileTaskNoneStream.DUMP_PERIOD)).intValue())
+                                                    .get(ProfileTask.DUMP_PERIOD)).intValue())
                           .maxSamplingCount(((Number) data.getSourceAsMap()
-                                                          .get(ProfileTaskNoneStream.MAX_SAMPLING_COUNT)).intValue())
+                                                          .get(ProfileTask.MAX_SAMPLING_COUNT)).intValue())
                           .build();
     }
 }
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/H2ProfileTaskQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java
index c8313c1..2fb2557 100644
--- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java
+++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java
@@ -19,8 +19,7 @@
 package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao;
 
 import org.apache.skywalking.apm.util.StringUtil;
-import org.apache.skywalking.oap.server.core.profile.ProfileTaskNoneStream;
-import org.apache.skywalking.oap.server.core.query.entity.ProfileTask;
+import org.apache.skywalking.oap.server.core.profile.ProfileTask;
 import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskQueryDAO;
 import org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException;
 import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient;
@@ -41,33 +40,33 @@ public class H2ProfileTaskQueryDAO implements IProfileTaskQueryDAO {
     }
 
     @Override
-    public List<ProfileTask> getTaskList(Integer serviceId, String endpointName, Long startTimeBucket,
+    public List<org.apache.skywalking.oap.server.core.query.entity.ProfileTask> getTaskList(Integer serviceId, String endpointName, Long startTimeBucket,
         Long endTimeBucket, Integer limit) throws IOException {
         final StringBuilder sql = new StringBuilder();
         final ArrayList<Object> condition = new ArrayList<>(4);
-        sql.append("select * from ").append(ProfileTaskNoneStream.INDEX_NAME).append(" where 1=1 ");
+        sql.append("select * from ").append(ProfileTask.INDEX_NAME).append(" where 1=1 ");
 
         if (startTimeBucket != null) {
-            sql.append(" and ").append(ProfileTaskNoneStream.TIME_BUCKET).append(" >= ? ");
+            sql.append(" and ").append(ProfileTask.TIME_BUCKET).append(" >= ? ");
             condition.add(startTimeBucket);
         }
 
         if (endTimeBucket != null) {
-            sql.append(" and ").append(ProfileTaskNoneStream.TIME_BUCKET).append(" <= ? ");
+            sql.append(" and ").append(ProfileTask.TIME_BUCKET).append(" <= ? ");
             condition.add(endTimeBucket);
         }
 
         if (serviceId != null) {
-            sql.append(" and ").append(ProfileTaskNoneStream.SERVICE_ID).append("=? ");
+            sql.append(" and ").append(ProfileTask.SERVICE_ID).append("=? ");
             condition.add(serviceId);
         }
 
         if (StringUtil.isNotEmpty(endpointName)) {
-            sql.append(" and ").append(ProfileTaskNoneStream.ENDPOINT_NAME).append("=?");
+            sql.append(" and ").append(ProfileTask.ENDPOINT_NAME).append("=?");
             condition.add(endpointName);
         }
 
-        sql.append(" ORDER BY ").append(ProfileTaskNoneStream.START_TIME).append(" DESC ");
+        sql.append(" ORDER BY ").append(ProfileTask.START_TIME).append(" DESC ");
 
         if (limit != null) {
             sql.append(" LIMIT ").append(limit);
@@ -75,7 +74,7 @@ public class H2ProfileTaskQueryDAO implements IProfileTaskQueryDAO {
 
         try (Connection connection = h2Client.getConnection()) {
             try (ResultSet resultSet = h2Client.executeQuery(connection, sql.toString(), condition.toArray(new Object[0]))) {
-                final LinkedList<ProfileTask> tasks = new LinkedList<>();
+                final LinkedList<org.apache.skywalking.oap.server.core.query.entity.ProfileTask> tasks = new LinkedList<>();
                 while (resultSet.next()) {
                     tasks.add(parseTask(resultSet));
                 }
@@ -87,14 +86,14 @@ public class H2ProfileTaskQueryDAO implements IProfileTaskQueryDAO {
     }
 
     @Override
-    public ProfileTask getById(String id) throws IOException {
+    public org.apache.skywalking.oap.server.core.query.entity.ProfileTask getById(String id) throws IOException {
         if (StringUtil.isEmpty(id)) {
             return null;
         }
 
         final StringBuilder sql = new StringBuilder();
         final ArrayList<Object> condition = new ArrayList<>(1);
-        sql.append("select * from ").append(ProfileTaskNoneStream.INDEX_NAME).append(" where id=? LIMIT 1");
+        sql.append("select * from ").append(ProfileTask.INDEX_NAME).append(" where id=? LIMIT 1");
         condition.add(id);
 
         try (Connection connection = h2Client.getConnection()) {
@@ -112,17 +111,17 @@ public class H2ProfileTaskQueryDAO implements IProfileTaskQueryDAO {
     /**
      * parse profile task data
      */
-    private ProfileTask parseTask(ResultSet data) throws SQLException {
-        return ProfileTask.builder()
+    private org.apache.skywalking.oap.server.core.query.entity.ProfileTask parseTask(ResultSet data) throws SQLException {
+        return org.apache.skywalking.oap.server.core.query.entity.ProfileTask.builder()
                           .id(data.getString("id"))
-                          .serviceId(data.getInt(ProfileTaskNoneStream.SERVICE_ID))
-                          .endpointName(data.getString(ProfileTaskNoneStream.ENDPOINT_NAME))
-                          .startTime(data.getLong(ProfileTaskNoneStream.START_TIME))
-                          .createTime(data.getLong(ProfileTaskNoneStream.CREATE_TIME))
-                          .duration(data.getInt(ProfileTaskNoneStream.DURATION))
-                          .minDurationThreshold(data.getInt(ProfileTaskNoneStream.MIN_DURATION_THRESHOLD))
-                          .dumpPeriod(data.getInt(ProfileTaskNoneStream.DUMP_PERIOD))
-                          .maxSamplingCount(data.getInt(ProfileTaskNoneStream.MAX_SAMPLING_COUNT))
+                          .serviceId(data.getInt(ProfileTask.SERVICE_ID))
+                          .endpointName(data.getString(ProfileTask.ENDPOINT_NAME))
+                          .startTime(data.getLong(ProfileTask.START_TIME))
+                          .createTime(data.getLong(ProfileTask.CREATE_TIME))
+                          .duration(data.getInt(ProfileTask.DURATION))
+                          .minDurationThreshold(data.getInt(ProfileTask.MIN_DURATION_THRESHOLD))
+                          .dumpPeriod(data.getInt(ProfileTask.DUMP_PERIOD))
+                          .maxSamplingCount(data.getInt(ProfileTask.MAX_SAMPLING_COUNT))
                           .build();
     }
 }