This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch log-endpoint-query
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/log-endpoint-query by this
push:
new 0e238e1 Fix missing changes.
0e238e1 is described below
commit 0e238e16e4840ee9be9a45db25b81b4294b6aec0
Author: Wu Sheng <[email protected]>
AuthorDate: Wed Aug 11 22:12:48 2021 +0800
Fix missing changes.
---
.../oap/server/core/analysis/manual/log/AbstractLogRecord.java | 1 -
.../oap/server/storage/plugin/jdbc/h2/dao/H2LogRecordBuilder.java | 3 ---
2 files changed, 4 deletions(-)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java
index 670127f..583bd6a 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java
@@ -37,7 +37,6 @@ public abstract class AbstractLogRecord extends Record {
public static final String SERVICE_ID = "service_id";
public static final String SERVICE_INSTANCE_ID = "service_instance_id";
- public static final String ENDPOINT_NAME = "endpoint_name";
public static final String ENDPOINT_ID = "endpoint_id";
public static final String TRACE_ID = "trace_id";
public static final String TRACE_SEGMENT_ID = "trace_segment_id";
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/H2LogRecordBuilder.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogRecordBuilder.java
index 721dd95..a83b420 100644
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogRecordBuilder.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogRecordBuilder.java
@@ -31,7 +31,6 @@ import static
org.apache.skywalking.oap.server.core.analysis.manual.log.Abstract
import static
org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.CONTENT;
import static
org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.CONTENT_TYPE;
import static
org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.ENDPOINT_ID;
-import static
org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.ENDPOINT_NAME;
import static
org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.SERVICE_ID;
import static
org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.SERVICE_INSTANCE_ID;
import static
org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.SPAN_ID;
@@ -56,7 +55,6 @@ public class H2LogRecordBuilder extends
AbstractSearchTagBuilder<Record> {
record.setServiceId((String) dbMap.get(SERVICE_ID));
record.setServiceInstanceId((String) dbMap.get(SERVICE_INSTANCE_ID));
record.setEndpointId((String) dbMap.get(ENDPOINT_ID));
- record.setEndpointName((String) dbMap.get(ENDPOINT_NAME));
record.setTraceId((String) dbMap.get(TRACE_ID));
record.setTraceSegmentId((String) dbMap.get(TRACE_SEGMENT_ID));
record.setSpanId(((Number) dbMap.get(SPAN_ID)).intValue());
@@ -81,7 +79,6 @@ public class H2LogRecordBuilder extends
AbstractSearchTagBuilder<Record> {
map.put(SERVICE_ID, storageData.getServiceId());
map.put(SERVICE_INSTANCE_ID, storageData.getServiceInstanceId());
map.put(ENDPOINT_ID, storageData.getEndpointId());
- map.put(ENDPOINT_NAME, storageData.getEndpointName());
map.put(TRACE_ID, storageData.getTraceId());
map.put(TRACE_SEGMENT_ID, storageData.getTraceSegmentId());
map.put(SPAN_ID, storageData.getSpanId());
