This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-skywalking-oal-tool.git
The following commit(s) were added to refs/heads/master by this push:
new ec8e105 Fix CI.
ec8e105 is described below
commit ec8e105709a1377c62448cafe9049e79959827f1
Author: Wu Sheng <[email protected]>
AuthorDate: Thu Sep 13 12:51:14 2018 +0800
Fix CI.
---
.../IndicatorImplementorExpected.java | 39 +++++++++++++---------
.../expectedFiles/ServiceDispatcherExpected.java | 2 +-
2 files changed, 24 insertions(+), 17 deletions(-)
diff --git
a/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java
b/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java
index 7564eb4..f01fe75 100644
---
a/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java
+++
b/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java
@@ -41,21 +41,28 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_avg", builder =
ServiceAvgIndicator.Builder.class)
public class ServiceAvgIndicator extends LongAvgIndicator implements
AlarmSupported {
- @Setter @Getter @Column(columnName = "id") @IDColumn private int id;
+ @Setter @Getter @Column(columnName = "entity_id") @IDColumn private String
entityId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
- splitJointId += Const.ID_SPLIT + String.valueOf(id);
+ splitJointId += Const.ID_SPLIT + entityId;
return splitJointId;
}
@Override public int hashCode() {
int result = 17;
- result = 31 * result + id;
+ result = 31 * result + entityId.hashCode();
result = 31 * result + (int)getTimeBucket();
return result;
}
+
+ @Override public int remoteHashCode() {
+ int result = 17;
+ result = 31 * result + entityId.hashCode();
+ return result;
+ }
+
@Override public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -65,7 +72,7 @@ public class ServiceAvgIndicator extends LongAvgIndicator
implements AlarmSuppor
return false;
ServiceAvgIndicator indicator = (ServiceAvgIndicator)obj;
- if (id != indicator.id)
+ if (entityId != indicator.entityId)
return false;
if (getTimeBucket() != indicator.getTimeBucket())
@@ -76,42 +83,42 @@ public class ServiceAvgIndicator extends LongAvgIndicator
implements AlarmSuppor
@Override public RemoteData.Builder serialize() {
RemoteData.Builder remoteBuilder = RemoteData.newBuilder();
- remoteBuilder.setDataStrings(0, getStringField());
+ remoteBuilder.setDataStrings(0, getEntityId());
+ remoteBuilder.setDataStrings(1, getStringField());
remoteBuilder.setDataLongs(0, getSummation());
remoteBuilder.setDataLongs(1, getValue());
remoteBuilder.setDataLongs(2, getTimeBucket());
- remoteBuilder.setDataIntegers(0, getId());
- remoteBuilder.setDataIntegers(1, getCount());
+ remoteBuilder.setDataIntegers(0, getCount());
return remoteBuilder;
}
@Override public void deserialize(RemoteData remoteData) {
- setStringField(remoteData.getDataStrings(0));
+ setEntityId(remoteData.getDataStrings(0));
+ setStringField(remoteData.getDataStrings(1));
setSummation(remoteData.getDataLongs(0));
setValue(remoteData.getDataLongs(1));
setTimeBucket(remoteData.getDataLongs(2));
- setId(remoteData.getDataIntegers(0));
- setCount(remoteData.getDataIntegers(1));
+ setCount(remoteData.getDataIntegers(0));
}
@Override public AlarmMeta getAlarmMeta() {
- return new AlarmMeta("generate_indicator", Scope.Service, id);
+ return new AlarmMeta("generate_indicator", Scope.Service, entityId);
}
@Override
public Indicator toHour() {
ServiceAvgIndicator indicator = new ServiceAvgIndicator();
indicator.setTimeBucket(toTimeBucketInHour());
- indicator.setId(this.getId());
+ indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
@@ -124,7 +131,7 @@ public class ServiceAvgIndicator extends LongAvgIndicator
implements AlarmSuppor
public Indicator toDay() {
ServiceAvgIndicator indicator = new ServiceAvgIndicator();
indicator.setTimeBucket(toTimeBucketInDay());
- indicator.setId(this.getId());
+ indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
@@ -137,7 +144,7 @@ public class ServiceAvgIndicator extends LongAvgIndicator
implements AlarmSuppor
public Indicator toMonth() {
ServiceAvgIndicator indicator = new ServiceAvgIndicator();
indicator.setTimeBucket(toTimeBucketInMonth());
- indicator.setId(this.getId());
+ indicator.setEntityId(this.getEntityId());
indicator.setSummation(this.getSummation());
indicator.setCount(this.getCount());
indicator.setValue(this.getValue());
@@ -150,7 +157,7 @@ public class ServiceAvgIndicator extends LongAvgIndicator
implements AlarmSuppor
@Override public Map<String, Object> data2Map(ServiceAvgIndicator
storageData) {
Map<String, Object> map = new HashMap<>();
- map.put("id", storageData.getId());
+ map.put("entity_id", storageData.getEntityId());
map.put("summation", storageData.getSummation());
map.put("count", storageData.getCount());
map.put("value", storageData.getValue());
@@ -161,7 +168,7 @@ public class ServiceAvgIndicator extends LongAvgIndicator
implements AlarmSuppor
@Override public ServiceAvgIndicator map2Data(Map<String, Object>
dbMap) {
ServiceAvgIndicator indicator = new ServiceAvgIndicator();
- indicator.setId(((Number)dbMap.get("id")).intValue());
+ indicator.setEntityId((String)dbMap.get("entity_id"));
indicator.setSummation(((Number)dbMap.get("summation")).longValue());
indicator.setCount(((Number)dbMap.get("count")).intValue());
indicator.setValue(((Number)dbMap.get("value")).longValue());
diff --git
a/oal-parser/src/test/resources/expectedFiles/ServiceDispatcherExpected.java
b/oal-parser/src/test/resources/expectedFiles/ServiceDispatcherExpected.java
index 830fa66..b0a6a1d 100644
--- a/oal-parser/src/test/resources/expectedFiles/ServiceDispatcherExpected.java
+++ b/oal-parser/src/test/resources/expectedFiles/ServiceDispatcherExpected.java
@@ -42,7 +42,7 @@ public class ServiceDispatcher implements
SourceDispatcher<Service> {
}
indicator.setTimeBucket(source.getTimeBucket());
- indicator.setId(source.getId());
+ indicator.setEntityId(source.getEntityId());
indicator.combine(source.getLatency(), 1);
IndicatorProcess.INSTANCE.in(indicator);
}
