removed check for changing value when update state and moved timeout to config param

application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java

@@ -644,6 +644,10 @@ public class ActorSystemContext {
     @Getter
     private String deviceStateNodeRateLimitConfig;
 
+    @Value("${actors.calculated_fields.calculation_result_timeout:5}")
+    @Getter
+    private long cfCalculationResultTimeout;
+
     @Getter
     @Setter
     private TbActorSystem actorSystem;

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

@@ -275,9 +275,9 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
     private void processStateIfReady(CalculatedFieldCtx ctx, List<CalculatedFieldId> cfIdList, CalculatedFieldState state, UUID tbMsgId, TbMsgType tbMsgType, TbCallback callback) throws CalculatedFieldException {
         CalculatedFieldEntityCtxId ctxId = new CalculatedFieldEntityCtxId(tenantId, ctx.getCfId(), entityId);
         boolean stateSizeOk;
-        if (ctx.isInitialized() && state.isReady()) {
-            try {
-                CalculatedFieldResult calculationResult = state.performCalculation(ctx).get(5, TimeUnit.SECONDS);
+        try {
+            if (ctx.isInitialized() && state.isReady()) {
+                CalculatedFieldResult calculationResult = state.performCalculation(ctx).get(systemContext.getCfCalculationResultTimeout(), TimeUnit.SECONDS);
                 state.checkStateSize(ctxId, ctx.getMaxStateSize());
                 stateSizeOk = state.isSizeOk();
                 if (stateSizeOk) {
@@ -286,21 +286,18 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
                         systemContext.persistCalculatedFieldDebugEvent(tenantId, ctx.getCfId(), entityId, state.getArguments(), tbMsgId, tbMsgType, JacksonUtil.writeValueAsString(calculationResult.getResult()), null);
                     }
                 }
-            } catch (Exception e) {
-                throw CalculatedFieldException.builder().ctx(ctx).eventEntity(entityId).msgId(tbMsgId).msgType(tbMsgType).arguments(state.getArguments()).cause(e).build();
             }
-        } else {
+        } catch (Exception e) {
+            throw CalculatedFieldException.builder().ctx(ctx).eventEntity(entityId).msgId(tbMsgId).msgType(tbMsgType).arguments(state.getArguments()).cause(e).build();
+        } finally {
             state.checkStateSize(ctxId, ctx.getMaxStateSize());
             stateSizeOk = state.isSizeOk();
             if (stateSizeOk) {
-                callback.onSuccess(); // State was updated but no calculation performed;
+                cfStateService.persistState(ctxId, state, callback);
+            } else {
+                removeStateAndRaiseSizeException(ctxId, CalculatedFieldException.builder().ctx(ctx).eventEntity(entityId).errorMessage(ctx.getSizeExceedsLimitMessage()).build(), callback);
             }
         }
-        if (stateSizeOk) {
-            cfStateService.persistState(ctxId, state, callback);
-        } else {
-            removeStateAndRaiseSizeException(ctxId, CalculatedFieldException.builder().ctx(ctx).eventEntity(entityId).errorMessage(ctx.getSizeExceedsLimitMessage()).build(), callback);
-        }
     }
 
     private void removeStateAndRaiseSizeException(CalculatedFieldEntityCtxId ctxId, CalculatedFieldException ex, TbCallback callback) {

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SingleValueArgumentEntry.java

@@ -100,10 +100,6 @@ public class SingleValueArgumentEntry implements ArgumentEntry {
             if (newVersion == null || this.version == null || newVersion > this.version) {
                 this.ts = singleValueEntry.getTs();
                 this.version = newVersion;
-                BasicKvEntry newValue = singleValueEntry.getKvEntryValue();
-                if (this.kvEntryValue != null && this.kvEntryValue.getValue().equals(newValue.getValue())) {
-                    return false;
-                }
                 this.kvEntryValue = singleValueEntry.getKvEntryValue();
                 return true;
             }

application/src/main/resources/thingsboard.yml

@@ -512,6 +512,8 @@ actors:
       enabled: "${ACTORS_CALCULATED_FIELD_DEBUG_MODE_RATE_LIMITS_PER_TENANT_ENABLED:true}"
       # The value of DEBUG mode rate limit. By default, no more than 50 thousand events per hour
       configuration: "${ACTORS_CALCULATED_FIELD_DEBUG_MODE_RATE_LIMITS_PER_TENANT_CONFIGURATION:50000:3600}"
+    # Time in seconds to receive calculation result.
+    calculation_result_timeout: "${ACTORS_CALCULATION_RESULT_TIMEOUT_SEC:5}"
 
 debug:
   settings: