From 8d104e4f4f5039feee18b1ae8dcaabda7e43ca35 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Wed, 15 Nov 2017 23:08:53 +0800 Subject: [PATCH] Delete the name column in all storage tables. --- .../agent/stream/parser/SegmentParse.java | 4 ++ .../trace/node/NodeComponentSpanListener.java | 25 ++---------- .../disruptor/base/DisruptorEventHandler.java | 1 - .../storage/table/node/NodeComponent.java | 18 --------- .../table/node/NodeComponentTable.java | 2 - .../storage/table/node/NodeMapping.java | 9 ----- .../storage/table/node/NodeMappingTable.java | 1 - .../storage/table/segment/Segment.java | 9 +++++ .../table/serviceref/ServiceReference.java | 27 ------------- .../serviceref/ServiceReferenceTable.java | 3 -- .../es/dao/NodeComponentEsPersistenceDAO.java | 6 --- .../storage/es/dao/NodeComponentEsUIDAO.java | 40 ------------------- .../es/dao/NodeMappingEsPersistenceDAO.java | 3 -- .../storage/es/dao/NodeMappingEsUIDAO.java | 16 +------- .../dao/ServiceReferenceEsPersistenceDAO.java | 9 ----- .../es/define/NodeComponentEsTableDefine.java | 2 - .../es/define/NodeMappingEsTableDefine.java | 1 - .../define/ServiceReferenceEsTableDefine.java | 3 -- .../h2/dao/NodeComponentH2PersistenceDAO.java | 6 --- .../storage/h2/dao/NodeComponentH2UIDAO.java | 14 ------- .../h2/dao/NodeMappingH2PersistenceDAO.java | 3 -- .../storage/h2/dao/NodeMappingH2UIDAO.java | 17 ++------ .../dao/ServiceReferenceH2PersistenceDAO.java | 9 ----- .../h2/define/NodeComponentH2TableDefine.java | 2 - .../h2/define/NodeMappingH2TableDefine.java | 1 - .../define/ServiceReferenceH2TableDefine.java | 3 -- .../ui/service/ServiceTreeService.java | 4 +- 27 files changed, 23 insertions(+), 215 deletions(-) diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/parser/SegmentParse.java b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/parser/SegmentParse.java index ddb3f2ce02..668987fc70 100644 --- a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/parser/SegmentParse.java +++ b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/parser/SegmentParse.java @@ -39,6 +39,7 @@ import org.skywalking.apm.collector.agent.stream.worker.trace.serviceref.Service import org.skywalking.apm.collector.core.graph.Graph; import org.skywalking.apm.collector.core.graph.GraphManager; import org.skywalking.apm.collector.core.module.ModuleManager; +import org.skywalking.apm.collector.core.util.TimeBucketUtils; import org.skywalking.apm.collector.storage.table.segment.Segment; import org.skywalking.apm.network.proto.SpanType; import org.skywalking.apm.network.proto.TraceSegmentObject; @@ -57,6 +58,7 @@ public class SegmentParse { private final List spanListeners; private final ModuleManager moduleManager; private String segmentId; + private long timeBucket = 0; public SegmentParse(ModuleManager moduleManager) { this.moduleManager = moduleManager; @@ -135,6 +137,7 @@ public class SegmentParse { if (spanDecorator.getSpanId() == 0) { notifyFirstListener(spanDecorator, applicationId, applicationInstanceId, segmentId); + timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()); } if (SpanType.Exit.equals(spanDecorator.getSpanType())) { @@ -154,6 +157,7 @@ public class SegmentParse { private void buildSegment(String id, byte[] dataBinary) { Segment segment = new Segment(id); segment.setDataBinary(dataBinary); + segment.setTimeBucket(timeBucket); Graph graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.SEGMENT_GRAPH_ID, Segment.class); graph.start(segment); } diff --git a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentSpanListener.java b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentSpanListener.java index a8a97c40ff..0c2ae793a2 100644 --- a/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentSpanListener.java +++ b/apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentSpanListener.java @@ -47,18 +47,10 @@ public class NodeComponentSpanListener implements EntrySpanListener, ExitSpanLis public void parseExit(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) { NodeComponent nodeComponent = new NodeComponent(Const.EMPTY_STRING); nodeComponent.setComponentId(spanDecorator.getComponentId()); + nodeComponent.setPeerId(spanDecorator.getPeerId()); - String id; - if (spanDecorator.getComponentId() == 0) { - nodeComponent.setComponentName(spanDecorator.getComponent()); - id = nodeComponent.getComponentName(); - } else { - nodeComponent.setComponentName(Const.EMPTY_STRING); - id = String.valueOf(nodeComponent.getComponentId()); - } + String id = String.valueOf(nodeComponent.getComponentId()) + Const.ID_SPLIT + nodeComponent.getPeerId(); - nodeComponent.setPeerId(spanDecorator.getPeerId()); - id = id + Const.ID_SPLIT + nodeComponent.getPeerId(); nodeComponent.setId(id); nodeComponents.add(nodeComponent); } @@ -68,18 +60,9 @@ public class NodeComponentSpanListener implements EntrySpanListener, ExitSpanLis String segmentId) { NodeComponent nodeComponent = new NodeComponent(Const.EMPTY_STRING); nodeComponent.setComponentId(spanDecorator.getComponentId()); - - String id; - if (spanDecorator.getComponentId() == 0) { - nodeComponent.setComponentName(spanDecorator.getComponent()); - id = nodeComponent.getComponentName(); - } else { - id = String.valueOf(nodeComponent.getComponentId()); - nodeComponent.setComponentName(Const.EMPTY_STRING); - } - nodeComponent.setPeerId(applicationId); - id = id + Const.ID_SPLIT + String.valueOf(applicationId); + + String id = String.valueOf(nodeComponent.getComponentId()) + Const.ID_SPLIT + String.valueOf(applicationId); nodeComponent.setId(id); nodeComponents.add(nodeComponent); diff --git a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/skywalking/apm/collector/queue/disruptor/base/DisruptorEventHandler.java b/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/skywalking/apm/collector/queue/disruptor/base/DisruptorEventHandler.java index c0b876a985..edf5754a43 100644 --- a/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/skywalking/apm/collector/queue/disruptor/base/DisruptorEventHandler.java +++ b/apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/skywalking/apm/collector/queue/disruptor/base/DisruptorEventHandler.java @@ -21,7 +21,6 @@ package org.skywalking.apm.collector.queue.disruptor.base; import com.lmax.disruptor.EventHandler; import com.lmax.disruptor.RingBuffer; import org.skywalking.apm.collector.core.CollectorException; -import org.skywalking.apm.collector.core.data.Data; import org.skywalking.apm.collector.core.data.EndOfBatchQueueMessage; import org.skywalking.apm.collector.queue.base.MessageHolder; import org.skywalking.apm.collector.queue.base.QueueEventHandler; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponent.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponent.java index af4a652aeb..94b696e124 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponent.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponent.java @@ -30,8 +30,6 @@ public class NodeComponent extends Data { private static final Column[] STRING_COLUMNS = { new Column(NodeComponentTable.COLUMN_ID, new NonOperation()), - new Column(NodeComponentTable.COLUMN_COMPONENT_NAME, new CoverOperation()), - new Column(NodeComponentTable.COLUMN_PEER, new CoverOperation()), }; private static final Column[] LONG_COLUMNS = { @@ -50,22 +48,6 @@ public class NodeComponent extends Data { super(id, STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS); } - public String getComponentName() { - return getDataString(1); - } - - public void setComponentName(String componentName) { - setDataString(1, componentName); - } - - public String getPeer() { - return getDataString(1); - } - - public void setPeer(String peer) { - setDataString(2, peer); - } - public Long getTimeBucket() { return getDataLong(0); } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java index 9a1181b587..79e73c6274 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java @@ -26,7 +26,5 @@ import org.skywalking.apm.collector.core.data.CommonTable; public class NodeComponentTable extends CommonTable { public static final String TABLE = "node_component"; public static final String COLUMN_COMPONENT_ID = "component_id"; - public static final String COLUMN_COMPONENT_NAME = "component_name"; - public static final String COLUMN_PEER = "peer"; public static final String COLUMN_PEER_ID = "peer_id"; } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMapping.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMapping.java index a7f81b6518..64a3df40b7 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMapping.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMapping.java @@ -30,7 +30,6 @@ public class NodeMapping extends Data { private static final Column[] STRING_COLUMNS = { new Column(NodeMappingTable.COLUMN_ID, new NonOperation()), - new Column(NodeMappingTable.COLUMN_ADDRESS, new CoverOperation()), }; private static final Column[] LONG_COLUMNS = { @@ -49,14 +48,6 @@ public class NodeMapping extends Data { super(id, STRING_COLUMNS, LONG_COLUMNS, DOUBLE_COLUMNS, INTEGER_COLUMNS, BOOLEAN_COLUMNS, BYTE_COLUMNS); } - public String getAddress() { - return getDataString(1); - } - - public void setAddress(String address) { - setDataString(1, address); - } - public int getApplicationId() { return getDataInteger(0); } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java index a2db99ea19..4603f79374 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java @@ -27,5 +27,4 @@ public class NodeMappingTable extends CommonTable { public static final String TABLE = "node_mapping"; public static final String COLUMN_APPLICATION_ID = "application_id"; public static final String COLUMN_ADDRESS_ID = "address_id"; - public static final String COLUMN_ADDRESS = "address"; } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/Segment.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/Segment.java index 01a959ae7a..3c362359bd 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/Segment.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/Segment.java @@ -33,6 +33,7 @@ public class Segment extends Data { }; private static final Column[] LONG_COLUMNS = { + new Column(SegmentTable.COLUMN_TIME_BUCKET, new NonOperation()), }; private static final Column[] DOUBLE_COLUMNS = {}; private static final Column[] INTEGER_COLUMNS = { @@ -54,4 +55,12 @@ public class Segment extends Data { public void setDataBinary(byte[] dataBinary) { setDataBytes(0, dataBinary); } + + public long getTimeBucket() { + return getDataLong(0); + } + + public void setTimeBucket(long timeBucket) { + setDataLong(0, timeBucket); + } } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReference.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReference.java index 2cd84848fe..ef943f802c 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReference.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReference.java @@ -31,9 +31,6 @@ public class ServiceReference extends Data { private static final Column[] STRING_COLUMNS = { new Column(ServiceReferenceTable.COLUMN_ID, new NonOperation()), - new Column(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_NAME, new NonOperation()), - new Column(ServiceReferenceTable.COLUMN_FRONT_SERVICE_NAME, new NonOperation()), - new Column(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_NAME, new NonOperation()), }; private static final Column[] LONG_COLUMNS = { @@ -67,30 +64,6 @@ public class ServiceReference extends Data { setCostSummary(0L); } - public String getEntryServiceName() { - return getDataString(1); - } - - public void setEntryServiceName(String entryServiceName) { - setDataString(1, entryServiceName); - } - - public String getFrontServiceName() { - return getDataString(2); - } - - public void setFrontServiceName(String frontServiceName) { - setDataString(2, frontServiceName); - } - - public String getBehindServiceName() { - return getDataString(3); - } - - public void setBehindServiceName(String behindServiceName) { - setDataString(3, behindServiceName); - } - public Integer getEntryServiceId() { return getDataInteger(0); } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java index 8e99f9e994..8d8b2704b7 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java @@ -26,11 +26,8 @@ import org.skywalking.apm.collector.core.data.CommonTable; public class ServiceReferenceTable extends CommonTable { public static final String TABLE = "service_reference"; public static final String COLUMN_ENTRY_SERVICE_ID = "entry_service_id"; - public static final String COLUMN_ENTRY_SERVICE_NAME = "entry_service_name"; public static final String COLUMN_FRONT_SERVICE_ID = "front_service_id"; - public static final String COLUMN_FRONT_SERVICE_NAME = "front_service_name"; public static final String COLUMN_BEHIND_SERVICE_ID = "behind_service_id"; - public static final String COLUMN_BEHIND_SERVICE_NAME = "behind_service_name"; public static final String COLUMN_S1_LTE = "s1_lte"; public static final String COLUMN_S3_LTE = "s3_lte"; public static final String COLUMN_S5_LTE = "s5_lte"; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsPersistenceDAO.java index 737092822d..5dad91001e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsPersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsPersistenceDAO.java @@ -44,9 +44,7 @@ public class NodeComponentEsPersistenceDAO extends EsDAO implements INodeCompone NodeComponent nodeComponent = new NodeComponent(id); Map source = getResponse.getSource(); nodeComponent.setComponentId(((Number)source.get(NodeComponentTable.COLUMN_COMPONENT_ID)).intValue()); - nodeComponent.setComponentName((String)source.get(NodeComponentTable.COLUMN_COMPONENT_NAME)); nodeComponent.setPeerId(((Number)source.get(NodeComponentTable.COLUMN_PEER_ID)).intValue()); - nodeComponent.setPeer((String)source.get(NodeComponentTable.COLUMN_PEER)); nodeComponent.setTimeBucket((Long)source.get(NodeComponentTable.COLUMN_TIME_BUCKET)); return nodeComponent; } else { @@ -57,9 +55,7 @@ public class NodeComponentEsPersistenceDAO extends EsDAO implements INodeCompone @Override public IndexRequestBuilder prepareBatchInsert(NodeComponent data) { Map source = new HashMap<>(); source.put(NodeComponentTable.COLUMN_COMPONENT_ID, data.getComponentId()); - source.put(NodeComponentTable.COLUMN_COMPONENT_NAME, data.getComponentName()); source.put(NodeComponentTable.COLUMN_PEER_ID, data.getPeerId()); - source.put(NodeComponentTable.COLUMN_PEER, data.getPeer()); source.put(NodeComponentTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); return getClient().prepareIndex(NodeComponentTable.TABLE, data.getId()).setSource(source); @@ -68,9 +64,7 @@ public class NodeComponentEsPersistenceDAO extends EsDAO implements INodeCompone @Override public UpdateRequestBuilder prepareBatchUpdate(NodeComponent data) { Map source = new HashMap<>(); source.put(NodeComponentTable.COLUMN_COMPONENT_ID, data.getComponentId()); - source.put(NodeComponentTable.COLUMN_COMPONENT_NAME, data.getComponentName()); source.put(NodeComponentTable.COLUMN_PEER_ID, data.getPeerId()); - source.put(NodeComponentTable.COLUMN_PEER, data.getPeer()); source.put(NodeComponentTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); return getClient().prepareUpdate(NodeComponentTable.TABLE, data.getId()).setDoc(source); diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsUIDAO.java index 9a14fe0c5a..cad0dd408a 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsUIDAO.java @@ -27,7 +27,6 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; -import org.skywalking.apm.collector.core.util.StringUtils; import org.skywalking.apm.collector.storage.dao.INodeComponentUIDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.node.NodeComponentTable; @@ -50,7 +49,6 @@ public class NodeComponentEsUIDAO extends EsDAO implements INodeComponentUIDAO { logger.debug("node component load, start time: {}, end time: {}", startTime, endTime); JsonArray nodeComponentArray = new JsonArray(); nodeComponentArray.addAll(aggregationByComponentId(startTime, endTime)); - nodeComponentArray.addAll(aggregationByComponentName(startTime, endTime)); return nodeComponentArray; } @@ -62,7 +60,6 @@ public class NodeComponentEsUIDAO extends EsDAO implements INodeComponentUIDAO { searchRequestBuilder.setSize(0); searchRequestBuilder.addAggregation(AggregationBuilders.terms(NodeComponentTable.COLUMN_COMPONENT_ID).field(NodeComponentTable.COLUMN_COMPONENT_ID).size(100) - .subAggregation(AggregationBuilders.terms(NodeComponentTable.COLUMN_PEER).field(NodeComponentTable.COLUMN_PEER).size(100)) .subAggregation(AggregationBuilders.terms(NodeComponentTable.COLUMN_PEER_ID).field(NodeComponentTable.COLUMN_PEER_ID).size(100))); SearchResponse searchResponse = searchRequestBuilder.execute().actionGet(); @@ -80,31 +77,6 @@ public class NodeComponentEsUIDAO extends EsDAO implements INodeComponentUIDAO { return nodeComponentArray; } - private JsonArray aggregationByComponentName(long startTime, long endTime) { - SearchRequestBuilder searchRequestBuilder = getClient().prepareSearch(NodeComponentTable.TABLE); - searchRequestBuilder.setTypes(NodeComponentTable.TABLE_TYPE); - searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH); - searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeComponentTable.COLUMN_TIME_BUCKET).gte(startTime).lte(endTime)); - searchRequestBuilder.setSize(0); - - searchRequestBuilder.addAggregation(AggregationBuilders.terms(NodeComponentTable.COLUMN_COMPONENT_NAME).field(NodeComponentTable.COLUMN_COMPONENT_NAME).size(100) - .subAggregation(AggregationBuilders.terms(NodeComponentTable.COLUMN_PEER).field(NodeComponentTable.COLUMN_PEER).size(100)) - .subAggregation(AggregationBuilders.terms(NodeComponentTable.COLUMN_PEER_ID).field(NodeComponentTable.COLUMN_PEER_ID).size(100))); - - SearchResponse searchResponse = searchRequestBuilder.execute().actionGet(); - - Terms componentNameTerms = searchResponse.getAggregations().get(NodeComponentTable.COLUMN_COMPONENT_NAME); - JsonArray nodeComponentArray = new JsonArray(); - for (Terms.Bucket componentNameBucket : componentNameTerms.getBuckets()) { - String componentName = componentNameBucket.getKeyAsString(); - if (StringUtils.isNotEmpty(componentName)) { - buildComponentArray(componentNameBucket, componentName, nodeComponentArray); - } - } - - return nodeComponentArray; - } - private void buildComponentArray(Terms.Bucket componentBucket, String componentName, JsonArray nodeComponentArray) { Terms peerIdTerms = componentBucket.getAggregations().get(NodeComponentTable.COLUMN_PEER_ID); for (Terms.Bucket peerIdBucket : peerIdTerms.getBuckets()) { @@ -120,17 +92,5 @@ public class NodeComponentEsUIDAO extends EsDAO implements INodeComponentUIDAO { nodeComponentArray.add(nodeComponentObj); } } - - Terms peerTerms = componentBucket.getAggregations().get(NodeComponentTable.COLUMN_PEER); - for (Terms.Bucket peerBucket : peerTerms.getBuckets()) { - String peer = peerBucket.getKeyAsString(); - - if (StringUtils.isNotEmpty(peer)) { - JsonObject nodeComponentObj = new JsonObject(); - nodeComponentObj.addProperty("componentName", componentName); - nodeComponentObj.addProperty("peer", peer); - nodeComponentArray.add(nodeComponentObj); - } - } } } diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsPersistenceDAO.java index 8d7e4ebdf7..0372faadb6 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsPersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsPersistenceDAO.java @@ -45,7 +45,6 @@ public class NodeMappingEsPersistenceDAO extends EsDAO implements INodeMappingPe Map source = getResponse.getSource(); nodeMapping.setApplicationId(((Number)source.get(NodeMappingTable.COLUMN_APPLICATION_ID)).intValue()); nodeMapping.setAddressId(((Number)source.get(NodeMappingTable.COLUMN_ADDRESS_ID)).intValue()); - nodeMapping.setAddress((String)source.get(NodeMappingTable.COLUMN_ADDRESS)); nodeMapping.setTimeBucket(((Number)source.get(NodeMappingTable.COLUMN_TIME_BUCKET)).longValue()); return nodeMapping; } else { @@ -57,7 +56,6 @@ public class NodeMappingEsPersistenceDAO extends EsDAO implements INodeMappingPe Map source = new HashMap<>(); source.put(NodeMappingTable.COLUMN_APPLICATION_ID, data.getApplicationId()); source.put(NodeMappingTable.COLUMN_ADDRESS_ID, data.getAddressId()); - source.put(NodeMappingTable.COLUMN_ADDRESS, data.getAddress()); source.put(NodeMappingTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); return getClient().prepareIndex(NodeMappingTable.TABLE, data.getId()).setSource(source); @@ -67,7 +65,6 @@ public class NodeMappingEsPersistenceDAO extends EsDAO implements INodeMappingPe Map source = new HashMap<>(); source.put(NodeMappingTable.COLUMN_APPLICATION_ID, data.getApplicationId()); source.put(NodeMappingTable.COLUMN_ADDRESS_ID, data.getAddressId()); - source.put(NodeMappingTable.COLUMN_ADDRESS, data.getAddress()); source.put(NodeMappingTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); return getClient().prepareUpdate(NodeMappingTable.TABLE, data.getId()).setDoc(source); } diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsUIDAO.java index 5951bae9eb..8fb003e407 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsUIDAO.java @@ -27,7 +27,6 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; -import org.skywalking.apm.collector.core.util.StringUtils; import org.skywalking.apm.collector.storage.dao.INodeMappingUIDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; import org.skywalking.apm.collector.storage.table.node.NodeMappingTable; @@ -54,8 +53,7 @@ public class NodeMappingEsUIDAO extends EsDAO implements INodeMappingUIDAO { searchRequestBuilder.addAggregation( AggregationBuilders.terms(NodeMappingTable.COLUMN_APPLICATION_ID).field(NodeMappingTable.COLUMN_APPLICATION_ID).size(100) - .subAggregation(AggregationBuilders.terms(NodeMappingTable.COLUMN_ADDRESS_ID).field(NodeMappingTable.COLUMN_ADDRESS_ID).size(100)) - .subAggregation(AggregationBuilders.terms(NodeMappingTable.COLUMN_ADDRESS).field(NodeMappingTable.COLUMN_ADDRESS).size(100))); + .subAggregation(AggregationBuilders.terms(NodeMappingTable.COLUMN_ADDRESS_ID).field(NodeMappingTable.COLUMN_ADDRESS_ID).size(100))); SearchResponse searchResponse = searchRequestBuilder.execute().actionGet(); Terms applicationIdTerms = searchResponse.getAggregations().get(NodeMappingTable.COLUMN_APPLICATION_ID); @@ -78,18 +76,6 @@ public class NodeMappingEsUIDAO extends EsDAO implements INodeMappingUIDAO { nodeMappingArray.add(nodeMappingObj); } } - - Terms addressTerms = applicationIdBucket.getAggregations().get(NodeMappingTable.COLUMN_ADDRESS); - for (Terms.Bucket addressBucket : addressTerms.getBuckets()) { - String address = addressBucket.getKeyAsString(); - - if (StringUtils.isNotEmpty(address)) { - JsonObject nodeMappingObj = new JsonObject(); -// nodeMappingObj.addProperty("applicationCode", applicationCode); - nodeMappingObj.addProperty("address", address); - nodeMappingArray.add(nodeMappingObj); - } - } } logger.debug("node mapping data: {}", nodeMappingArray.toString()); return nodeMappingArray; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsPersistenceDAO.java index ae50524f45..ff96008b44 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsPersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsPersistenceDAO.java @@ -48,11 +48,8 @@ public class ServiceReferenceEsPersistenceDAO extends EsDAO implements IServiceR ServiceReference serviceReference = new ServiceReference(id); Map source = getResponse.getSource(); serviceReference.setEntryServiceId(((Number)source.get(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_ID)).intValue()); - serviceReference.setEntryServiceName((String)source.get(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_NAME)); serviceReference.setFrontServiceId(((Number)source.get(ServiceReferenceTable.COLUMN_FRONT_SERVICE_ID)).intValue()); - serviceReference.setFrontServiceName((String)source.get(ServiceReferenceTable.COLUMN_FRONT_SERVICE_NAME)); serviceReference.setBehindServiceId(((Number)source.get(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_ID)).intValue()); - serviceReference.setBehindServiceName((String)source.get(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_NAME)); serviceReference.setS1Lte(((Number)source.get(ServiceReferenceTable.COLUMN_S1_LTE)).longValue()); serviceReference.setS3Lte(((Number)source.get(ServiceReferenceTable.COLUMN_S3_LTE)).longValue()); serviceReference.setS5Lte(((Number)source.get(ServiceReferenceTable.COLUMN_S5_LTE)).longValue()); @@ -70,11 +67,8 @@ public class ServiceReferenceEsPersistenceDAO extends EsDAO implements IServiceR @Override public IndexRequestBuilder prepareBatchInsert(ServiceReference data) { Map source = new HashMap<>(); source.put(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_ID, data.getEntryServiceId()); - source.put(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_NAME, data.getEntryServiceName()); source.put(ServiceReferenceTable.COLUMN_FRONT_SERVICE_ID, data.getFrontServiceId()); - source.put(ServiceReferenceTable.COLUMN_FRONT_SERVICE_NAME, data.getFrontServiceName()); source.put(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_ID, data.getBehindServiceId()); - source.put(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_NAME, data.getBehindServiceName()); source.put(ServiceReferenceTable.COLUMN_S1_LTE, data.getS1Lte()); source.put(ServiceReferenceTable.COLUMN_S3_LTE, data.getS3Lte()); source.put(ServiceReferenceTable.COLUMN_S5_LTE, data.getS5Lte()); @@ -90,11 +84,8 @@ public class ServiceReferenceEsPersistenceDAO extends EsDAO implements IServiceR @Override public UpdateRequestBuilder prepareBatchUpdate(ServiceReference data) { Map source = new HashMap<>(); source.put(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_ID, data.getEntryServiceId()); - source.put(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_NAME, data.getEntryServiceName()); source.put(ServiceReferenceTable.COLUMN_FRONT_SERVICE_ID, data.getFrontServiceId()); - source.put(ServiceReferenceTable.COLUMN_FRONT_SERVICE_NAME, data.getFrontServiceName()); source.put(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_ID, data.getBehindServiceId()); - source.put(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_NAME, data.getBehindServiceName()); source.put(ServiceReferenceTable.COLUMN_S1_LTE, data.getS1Lte()); source.put(ServiceReferenceTable.COLUMN_S3_LTE, data.getS3Lte()); source.put(ServiceReferenceTable.COLUMN_S5_LTE, data.getS5Lte()); diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java index 4448559c82..75cb22cb2e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java @@ -37,9 +37,7 @@ public class NodeComponentEsTableDefine extends ElasticSearchTableDefine { @Override public void initialize() { addColumn(new ElasticSearchColumnDefine(NodeComponentTable.COLUMN_COMPONENT_ID, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(NodeComponentTable.COLUMN_COMPONENT_NAME, ElasticSearchColumnDefine.Type.Keyword.name())); addColumn(new ElasticSearchColumnDefine(NodeComponentTable.COLUMN_PEER_ID, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(NodeComponentTable.COLUMN_PEER, ElasticSearchColumnDefine.Type.Keyword.name())); addColumn(new ElasticSearchColumnDefine(NodeComponentTable.COLUMN_TIME_BUCKET, ElasticSearchColumnDefine.Type.Long.name())); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java index ebe71f580e..a84fd9a1b2 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java @@ -38,7 +38,6 @@ public class NodeMappingEsTableDefine extends ElasticSearchTableDefine { @Override public void initialize() { addColumn(new ElasticSearchColumnDefine(NodeMappingTable.COLUMN_APPLICATION_ID, ElasticSearchColumnDefine.Type.Integer.name())); addColumn(new ElasticSearchColumnDefine(NodeMappingTable.COLUMN_ADDRESS_ID, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(NodeMappingTable.COLUMN_ADDRESS, ElasticSearchColumnDefine.Type.Keyword.name())); addColumn(new ElasticSearchColumnDefine(NodeMappingTable.COLUMN_TIME_BUCKET, ElasticSearchColumnDefine.Type.Long.name())); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceEsTableDefine.java index 2dd4612c9e..5c6a8b38ef 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceEsTableDefine.java @@ -38,11 +38,8 @@ public class ServiceReferenceEsTableDefine extends ElasticSearchTableDefine { @Override public void initialize() { addColumn(new ElasticSearchColumnDefine(ServiceReferenceTable.COLUMN_AGG, ElasticSearchColumnDefine.Type.Keyword.name())); addColumn(new ElasticSearchColumnDefine(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_ID, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_NAME, ElasticSearchColumnDefine.Type.Keyword.name())); addColumn(new ElasticSearchColumnDefine(ServiceReferenceTable.COLUMN_FRONT_SERVICE_ID, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(ServiceReferenceTable.COLUMN_FRONT_SERVICE_NAME, ElasticSearchColumnDefine.Type.Keyword.name())); addColumn(new ElasticSearchColumnDefine(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_ID, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_NAME, ElasticSearchColumnDefine.Type.Keyword.name())); addColumn(new ElasticSearchColumnDefine(ServiceReferenceTable.COLUMN_S1_LTE, ElasticSearchColumnDefine.Type.Long.name())); addColumn(new ElasticSearchColumnDefine(ServiceReferenceTable.COLUMN_S3_LTE, ElasticSearchColumnDefine.Type.Long.name())); addColumn(new ElasticSearchColumnDefine(ServiceReferenceTable.COLUMN_S5_LTE, ElasticSearchColumnDefine.Type.Long.name())); diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2PersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2PersistenceDAO.java index 2497f1312e..50f0598402 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2PersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2PersistenceDAO.java @@ -55,9 +55,7 @@ public class NodeComponentH2PersistenceDAO extends H2DAO implements INodeCompone if (rs.next()) { NodeComponent nodeComponent = new NodeComponent(id); nodeComponent.setComponentId(rs.getInt(NodeComponentTable.COLUMN_COMPONENT_ID)); - nodeComponent.setComponentName(rs.getString(NodeComponentTable.COLUMN_COMPONENT_NAME)); nodeComponent.setPeerId(rs.getInt(NodeComponentTable.COLUMN_PEER_ID)); - nodeComponent.setPeer(rs.getString(NodeComponentTable.COLUMN_PEER)); nodeComponent.setTimeBucket(rs.getLong(NodeComponentTable.COLUMN_TIME_BUCKET)); return nodeComponent; } @@ -73,9 +71,7 @@ public class NodeComponentH2PersistenceDAO extends H2DAO implements INodeCompone H2SqlEntity entity = new H2SqlEntity(); source.put(NodeComponentTable.COLUMN_ID, data.getId()); source.put(NodeComponentTable.COLUMN_COMPONENT_ID, data.getComponentId()); - source.put(NodeComponentTable.COLUMN_COMPONENT_NAME, data.getComponentName()); source.put(NodeComponentTable.COLUMN_PEER_ID, data.getPeerId()); - source.put(NodeComponentTable.COLUMN_PEER, data.getPeer()); source.put(NodeComponentTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); String sql = SqlBuilder.buildBatchInsertSql(NodeComponentTable.TABLE, source.keySet()); @@ -89,9 +85,7 @@ public class NodeComponentH2PersistenceDAO extends H2DAO implements INodeCompone Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); source.put(NodeComponentTable.COLUMN_COMPONENT_ID, data.getComponentId()); - source.put(NodeComponentTable.COLUMN_COMPONENT_NAME, data.getComponentName()); source.put(NodeComponentTable.COLUMN_PEER_ID, data.getPeerId()); - source.put(NodeComponentTable.COLUMN_PEER, data.getPeer()); source.put(NodeComponentTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); String sql = SqlBuilder.buildBatchUpdateSql(NodeComponentTable.TABLE, source.keySet(), NodeComponentTable.COLUMN_ID); entity.setSql(sql); diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2UIDAO.java index 0db00c6037..b1b577a81a 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2UIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2UIDAO.java @@ -19,12 +19,10 @@ package org.skywalking.apm.collector.storage.h2.dao; import com.google.gson.JsonArray; -import com.google.gson.JsonObject; import java.sql.ResultSet; import java.sql.SQLException; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.core.util.StringUtils; import org.skywalking.apm.collector.storage.base.sql.SqlBuilder; import org.skywalking.apm.collector.storage.dao.INodeComponentUIDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; @@ -56,7 +54,6 @@ public class NodeComponentH2UIDAO extends H2DAO implements INodeComponentUIDAO { JsonArray nodeComponentArray = new JsonArray(); String sql = SqlBuilder.buildSql(AGGREGATE_COMPONENT_SQL, NodeComponentTable.COLUMN_COMPONENT_ID, - NodeComponentTable.COLUMN_PEER, NodeComponentTable.COLUMN_PEER_ID, NodeComponentTable.TABLE, NodeComponentTable.COLUMN_TIME_BUCKET); Object[] params = new Object[] {startTime, endTime}; try (ResultSet rs = client.executeQuery(sql, params)) { @@ -69,21 +66,10 @@ public class NodeComponentH2UIDAO extends H2DAO implements INodeComponentUIDAO { // String peer = ApplicationCache.get(peerId); // nodeComponentArray.add(buildNodeComponent(peer, componentName)); } - String peer = rs.getString(NodeComponentTable.COLUMN_PEER); - if (StringUtils.isNotEmpty(peer)) { - nodeComponentArray.add(buildNodeComponent(peer, componentName)); - } } } catch (SQLException | H2ClientException e) { logger.error(e.getMessage(), e); } return nodeComponentArray; } - - private JsonObject buildNodeComponent(String peer, String componentName) { - JsonObject nodeComponentObj = new JsonObject(); - nodeComponentObj.addProperty("componentName", componentName); - nodeComponentObj.addProperty("peer", peer); - return nodeComponentObj; - } } diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeMappingH2PersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeMappingH2PersistenceDAO.java index 7764546a93..7d170c4a87 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeMappingH2PersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeMappingH2PersistenceDAO.java @@ -56,7 +56,6 @@ public class NodeMappingH2PersistenceDAO extends H2DAO implements INodeMappingPe NodeMapping nodeMapping = new NodeMapping(id); nodeMapping.setApplicationId(rs.getInt(NodeMappingTable.COLUMN_APPLICATION_ID)); nodeMapping.setAddressId(rs.getInt(NodeMappingTable.COLUMN_ADDRESS_ID)); - nodeMapping.setAddress(rs.getString(NodeMappingTable.COLUMN_ADDRESS)); nodeMapping.setTimeBucket(rs.getLong(NodeMappingTable.COLUMN_TIME_BUCKET)); return nodeMapping; } @@ -72,7 +71,6 @@ public class NodeMappingH2PersistenceDAO extends H2DAO implements INodeMappingPe source.put(NodeMappingTable.COLUMN_ID, nodeMapping.getId()); source.put(NodeMappingTable.COLUMN_APPLICATION_ID, nodeMapping.getApplicationId()); source.put(NodeMappingTable.COLUMN_ADDRESS_ID, nodeMapping.getAddressId()); - source.put(NodeMappingTable.COLUMN_ADDRESS, nodeMapping.getAddress()); source.put(NodeMappingTable.COLUMN_TIME_BUCKET, nodeMapping.getTimeBucket()); String sql = SqlBuilder.buildBatchInsertSql(NodeMappingTable.TABLE, source.keySet()); entity.setSql(sql); @@ -86,7 +84,6 @@ public class NodeMappingH2PersistenceDAO extends H2DAO implements INodeMappingPe H2SqlEntity entity = new H2SqlEntity(); source.put(NodeMappingTable.COLUMN_APPLICATION_ID, nodeMapping.getApplicationId()); source.put(NodeMappingTable.COLUMN_ADDRESS_ID, nodeMapping.getAddressId()); - source.put(NodeMappingTable.COLUMN_ADDRESS, nodeMapping.getAddress()); source.put(NodeMappingTable.COLUMN_TIME_BUCKET, nodeMapping.getTimeBucket()); String sql = SqlBuilder.buildBatchUpdateSql(NodeMappingTable.TABLE, source.keySet(), NodeMappingTable.COLUMN_ID); entity.setSql(sql); diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeMappingH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeMappingH2UIDAO.java index 5c8215bd57..2787b22c1e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeMappingH2UIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeMappingH2UIDAO.java @@ -24,7 +24,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.core.util.StringUtils; import org.skywalking.apm.collector.storage.base.sql.SqlBuilder; import org.skywalking.apm.collector.storage.dao.INodeMappingUIDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; @@ -48,8 +47,7 @@ public class NodeMappingH2UIDAO extends H2DAO implements INodeMappingUIDAO { H2Client client = getClient(); JsonArray nodeMappingArray = new JsonArray(); String sql = SqlBuilder.buildSql(NODE_MAPPING_SQL, NodeMappingTable.COLUMN_APPLICATION_ID, - NodeMappingTable.COLUMN_ADDRESS_ID, NodeMappingTable.COLUMN_ADDRESS, - NodeMappingTable.TABLE, NodeMappingTable.COLUMN_TIME_BUCKET); + NodeMappingTable.COLUMN_ADDRESS_ID, NodeMappingTable.TABLE, NodeMappingTable.COLUMN_TIME_BUCKET); Object[] params = new Object[] {startTime, endTime}; try (ResultSet rs = client.executeQuery(sql, params)) { @@ -58,20 +56,11 @@ public class NodeMappingH2UIDAO extends H2DAO implements INodeMappingUIDAO { //TODO ApplicationCache // String applicationCode = ApplicationCache.get(applicationId); int addressId = rs.getInt(NodeMappingTable.COLUMN_ADDRESS_ID); - if (addressId != 0) { // String address = ApplicationCache.get(addressId); - JsonObject nodeMappingObj = new JsonObject(); + JsonObject nodeMappingObj = new JsonObject(); // nodeMappingObj.addProperty("applicationCode", applicationCode); // nodeMappingObj.addProperty("address", address); - nodeMappingArray.add(nodeMappingObj); - } - String address = rs.getString(NodeMappingTable.COLUMN_ADDRESS); - if (StringUtils.isNotEmpty(address)) { - JsonObject nodeMappingObj = new JsonObject(); -// nodeMappingObj.addProperty("applicationCode", applicationCode); - nodeMappingObj.addProperty("address", address); - nodeMappingArray.add(nodeMappingObj); - } + nodeMappingArray.add(nodeMappingObj); } } catch (SQLException | H2ClientException e) { logger.error(e.getMessage(), e); diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2PersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2PersistenceDAO.java index f19b289b27..9b18bb5aae 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2PersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2PersistenceDAO.java @@ -56,11 +56,8 @@ public class ServiceReferenceH2PersistenceDAO extends H2DAO implements IServiceR if (rs.next()) { ServiceReference serviceReference = new ServiceReference(id); serviceReference.setEntryServiceId(rs.getInt(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_ID)); - serviceReference.setEntryServiceName(rs.getString(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_NAME)); serviceReference.setFrontServiceId(rs.getInt(ServiceReferenceTable.COLUMN_FRONT_SERVICE_ID)); - serviceReference.setFrontServiceName(rs.getString(ServiceReferenceTable.COLUMN_FRONT_SERVICE_NAME)); serviceReference.setBehindServiceId(rs.getInt(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_ID)); - serviceReference.setBehindServiceName(rs.getString(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_NAME)); serviceReference.setS1Lte(rs.getLong(ServiceReferenceTable.COLUMN_S1_LTE)); serviceReference.setS3Lte(rs.getLong(ServiceReferenceTable.COLUMN_S3_LTE)); serviceReference.setS5Lte(rs.getLong(ServiceReferenceTable.COLUMN_S5_LTE)); @@ -83,11 +80,8 @@ public class ServiceReferenceH2PersistenceDAO extends H2DAO implements IServiceR Map source = new HashMap<>(); source.put(ServiceReferenceTable.COLUMN_ID, data.getId()); source.put(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_ID, data.getEntryServiceId()); - source.put(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_NAME, data.getEntryServiceName()); source.put(ServiceReferenceTable.COLUMN_FRONT_SERVICE_ID, data.getFrontServiceId()); - source.put(ServiceReferenceTable.COLUMN_FRONT_SERVICE_NAME, data.getFrontServiceName()); source.put(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_ID, data.getBehindServiceId()); - source.put(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_NAME, data.getBehindServiceName()); source.put(ServiceReferenceTable.COLUMN_S1_LTE, data.getS1Lte()); source.put(ServiceReferenceTable.COLUMN_S3_LTE, data.getS3Lte()); source.put(ServiceReferenceTable.COLUMN_S5_LTE, data.getS5Lte()); @@ -108,11 +102,8 @@ public class ServiceReferenceH2PersistenceDAO extends H2DAO implements IServiceR H2SqlEntity entity = new H2SqlEntity(); Map source = new HashMap<>(); source.put(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_ID, data.getEntryServiceId()); - source.put(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_NAME, data.getEntryServiceName()); source.put(ServiceReferenceTable.COLUMN_FRONT_SERVICE_ID, data.getFrontServiceId()); - source.put(ServiceReferenceTable.COLUMN_FRONT_SERVICE_NAME, data.getFrontServiceName()); source.put(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_ID, data.getBehindServiceId()); - source.put(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_NAME, data.getBehindServiceName()); source.put(ServiceReferenceTable.COLUMN_S1_LTE, data.getS1Lte()); source.put(ServiceReferenceTable.COLUMN_S3_LTE, data.getS3Lte()); source.put(ServiceReferenceTable.COLUMN_S5_LTE, data.getS5Lte()); diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java index 166522864f..4e2f31b581 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java @@ -34,9 +34,7 @@ public class NodeComponentH2TableDefine extends H2TableDefine { @Override public void initialize() { addColumn(new H2ColumnDefine(NodeComponentTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(NodeComponentTable.COLUMN_COMPONENT_ID, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(NodeComponentTable.COLUMN_COMPONENT_NAME, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(NodeComponentTable.COLUMN_PEER_ID, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(NodeComponentTable.COLUMN_PEER, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(NodeComponentTable.COLUMN_TIME_BUCKET, H2ColumnDefine.Type.Bigint.name())); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java index a615ab64a8..bfef22f8f4 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java @@ -35,7 +35,6 @@ public class NodeMappingH2TableDefine extends H2TableDefine { addColumn(new H2ColumnDefine(NodeMappingTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(NodeMappingTable.COLUMN_APPLICATION_ID, H2ColumnDefine.Type.Int.name())); addColumn(new H2ColumnDefine(NodeMappingTable.COLUMN_ADDRESS_ID, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(NodeMappingTable.COLUMN_ADDRESS, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(NodeMappingTable.COLUMN_TIME_BUCKET, H2ColumnDefine.Type.Bigint.name())); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceH2TableDefine.java index 97f2514394..97b873d342 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceH2TableDefine.java @@ -34,11 +34,8 @@ public class ServiceReferenceH2TableDefine extends H2TableDefine { @Override public void initialize() { addColumn(new H2ColumnDefine(ServiceReferenceTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_ID, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(ServiceReferenceTable.COLUMN_ENTRY_SERVICE_NAME, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(ServiceReferenceTable.COLUMN_FRONT_SERVICE_ID, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(ServiceReferenceTable.COLUMN_FRONT_SERVICE_NAME, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_ID, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_NAME, H2ColumnDefine.Type.Varchar.name())); addColumn(new H2ColumnDefine(ServiceReferenceTable.COLUMN_S1_LTE, H2ColumnDefine.Type.Bigint.name())); addColumn(new H2ColumnDefine(ServiceReferenceTable.COLUMN_S3_LTE, H2ColumnDefine.Type.Bigint.name())); addColumn(new H2ColumnDefine(ServiceReferenceTable.COLUMN_S5_LTE, H2ColumnDefine.Type.Bigint.name())); diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java index cb2a1ca74c..5dfd11956d 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java @@ -74,8 +74,8 @@ public class ServiceTreeService { int behindServiceId = serviceReference.get(ColumnNameUtils.INSTANCE.rename(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_ID)).getAsInt(); String frontServiceName = serviceNameCacheService.getSplitServiceName(serviceNameCacheService.get(frontServiceId)); String behindServiceName = serviceNameCacheService.getSplitServiceName(serviceNameCacheService.get(behindServiceId)); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceTable.COLUMN_FRONT_SERVICE_NAME), frontServiceName); - serviceReference.addProperty(ColumnNameUtils.INSTANCE.rename(ServiceReferenceTable.COLUMN_BEHIND_SERVICE_NAME), behindServiceName); + serviceReference.addProperty("frontServiceName", frontServiceName); + serviceReference.addProperty("behindServiceName", behindServiceName); }); return buildTreeData(serviceReferenceMap); } -- GitLab