wu-sheng closed pull request #6: Delete call type from service relation.
URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/6
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java
b/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java
index c171290..6b2fce3 100644
---
a/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java
+++
b/oal-parser/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java
@@ -18,8 +18,7 @@
package org.apache.skywalking.oal.tool.parser;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
public class SourceColumnsFactory {
public static List<SourceColumn> getColumns(String source) {
@@ -67,8 +66,6 @@
columnList.add(sourceService);
SourceColumn destService = new SourceColumn("destServiceId",
"dest_service_id", int.class, true);
columnList.add(destService);
- SourceColumn callType = new SourceColumn("callType",
"call_type", int.class, true);
- columnList.add(callType);
return columnList;
case "ServiceInstanceRelation":
columnList = new LinkedList<>();
@@ -85,7 +82,7 @@
columnList = new LinkedList<>();
SourceColumn sourceEndpointColumn = new
SourceColumn("endpointId", "endpoint_id", int.class, true);
columnList.add(sourceEndpointColumn);
- SourceColumn childEndpointColumne = new
SourceColumn("childEndpointId", "child_endpoint_id", int.class, true);
+ SourceColumn childEndpointColumne = new
SourceColumn("childEndpointId", "child_endpoint_id", int.class, true);
columnList.add(childEndpointColumne);
sourceService = new SourceColumn("serviceId", "service_id",
int.class, false);
columnList.add(sourceService);
diff --git a/oal-parser/src/test/resources/oal_test.oal
b/oal-parser/src/test/resources/oal_test.oal
index bbd1893..8a8ec03 100644
--- a/oal-parser/src/test/resources/oal_test.oal
+++ b/oal-parser/src/test/resources/oal_test.oal
@@ -22,7 +22,9 @@ ServiceInstance_RespTime=
from(ServiceInstance.latency).longAvg();
Service_Calls_Sum = from(Service.*).sum();
-Service_Relation_Calls_Sum = from(ServiceRelation.*).sum();
+Service_Relation_Client_Calls_Sum = from(ServiceRelation.*).filter(detectPoint
== DetectPoint.CLIENT).sum();
+
+Service_Relation_Server_Calls_Sum = from(ServiceRelation.*).filter(detectPoint
== DetectPoint.SERVER).sum();
endpoint_Avg = from(Endpoint.latency).longAvg();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
