Delete the name column in all storage tables. (8d104e4f) · Commits · SUMMER2020 / students / proj-2005254

apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/parser/SegmentParse.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -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<SpanListener> 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<Segment> graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.SEGMENT_GRAPH_ID, Segment.class);
		graph.start(segment);
		}

apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentSpanListener.java

+4 −21

Original line number	Diff line number	Diff line
		@@ -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);

apm-collector/apm-collector-queue/collector-queue-disruptor-provider/src/main/java/org/skywalking/apm/collector/queue/disruptor/base/DisruptorEventHandler.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponent.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -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);
		}

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -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";
		}