dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Actor system implementation draft

Browse Source
This commit is contained in:
Andrii Shvaika 2025-01-27 17:57:39 +02:00
parent d3278f05bb
commit 3d42a4ca04
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java
View File

@ -78,6 +78,10 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
this.ctx = ctx; this.ctx = ctx;
} }
public void process(CalculatedFieldStateRestoreMsg msg) {
states.put(msg.getId().cfId(), msg.getState());
}
public void process(EntityCalculatedFieldTelemetryMsg msg) { public void process(EntityCalculatedFieldTelemetryMsg msg) {
var proto = msg.getProto(); var proto = msg.getProto();
var numberOfCallbacks = CALLBACKS_PER_CF * (msg.getEntityIdFields().size() + msg.getProfileIdFields().size()); var numberOfCallbacks = CALLBACKS_PER_CF * (msg.getEntityIdFields().size() + msg.getProfileIdFields().size());
@ -192,8 +196,4 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
} }
return cfIds; return cfIds;
} }
public void process(CalculatedFieldStateRestoreMsg msg) {
states.put(msg.getId().cfId(), msg.getState());
}
} }

6
application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldExecutionService.java
View File

@ -837,8 +837,10 @@ public class DefaultCalculatedFieldExecutionService extends AbstractPartitionBas
telemetryMsg.setEntityIdMSB(entityId.getId().getMostSignificantBits()); telemetryMsg.setEntityIdMSB(entityId.getId().getMostSignificantBits());
telemetryMsg.setEntityIdLSB(entityId.getId().getLeastSignificantBits()); telemetryMsg.setEntityIdLSB(entityId.getId().getLeastSignificantBits());
for (CalculatedFieldId cfId : calculatedFieldIds) { if(calculatedFieldIds != null) {
telemetryMsg.addPreviousCalculatedFields(toProto(cfId)); for (CalculatedFieldId cfId : calculatedFieldIds) {
telemetryMsg.addPreviousCalculatedFields(toProto(cfId));
}
} }
return telemetryMsg; return telemetryMsg;

1
application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldState.java
View File

@ -44,5 +44,6 @@ public interface CalculatedFieldState {
ListenableFuture<CalculatedFieldResult> performCalculation(CalculatedFieldCtx ctx); ListenableFuture<CalculatedFieldResult> performCalculation(CalculatedFieldCtx ctx);
@JsonIgnore
boolean isReady(); boolean isReady();
} }

10
common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
View File

@ -644,11 +644,13 @@ public class ProtoUtils {
} }
public static TransportProtos.TsKvProto toTsKvProto(TsKvEntry tsKvEntry) { public static TransportProtos.TsKvProto toTsKvProto(TsKvEntry tsKvEntry) {
return TransportProtos.TsKvProto.newBuilder() var builder = TransportProtos.TsKvProto.newBuilder()
.setTs(tsKvEntry.getTs()) .setTs(tsKvEntry.getTs())
.setKv(toKeyValueProto(tsKvEntry)) .setKv(toKeyValueProto(tsKvEntry));
.setVersion(tsKvEntry.getVersion()) if (tsKvEntry.getVersion() != null) {
.build(); builder.setVersion(tsKvEntry.getVersion());
}
return builder.build();
} }
public static TransportProtos.KeyValueProto toKeyValueProto(KvEntry kvEntry) { public static TransportProtos.KeyValueProto toKeyValueProto(KvEntry kvEntry) {

2
dao/src/main/java/org/thingsboard/server/dao/sql/cf/DefaultNativeCalculatedFieldRepository.java
View File

@ -77,7 +77,7 @@ public class DefaultNativeCalculatedFieldRepository implements NativeCalculatedF
String name = (String) row.get("name"); String name = (String) row.get("name");
int configurationVersion = (int) row.get("configuration_version"); int configurationVersion = (int) row.get("configuration_version");
JsonNode configuration = JacksonUtil.toJsonNode((String) row.get("configuration")); JsonNode configuration = JacksonUtil.toJsonNode((String) row.get("configuration"));
long version = (long) row.get("version"); long version = row.get("version") != null ? (long) row.get("version") : 0;
Object externalIdObj = row.get("external_id"); Object externalIdObj = row.get("external_id");
CalculatedField calculatedField = new CalculatedField(); CalculatedField calculatedField = new CalculatedField();