Browse Source

Minor improvements

pull/12681/head
Andrii Shvaika 2 years ago
parent
commit
d75bc3ac28
  1. 5
      application/src/main/java/org/thingsboard/server/service/cf/ctx/state/RocksDBCalculatedFieldStateService.java
  2. 1
      common/queue/src/main/java/org/thingsboard/server/queue/util/AfterStartUp.java

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

@ -47,7 +47,7 @@ import java.util.stream.Collectors;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@ConditionalOnProperty(prefix = "zk", value = "enabled", havingValue = "false", matchIfMissing = true) @ConditionalOnProperty(prefix = "zk", value = "enabled", havingValue = "false", matchIfMissing = true) // Queue type in mem or Kafka;
public class RocksDBCalculatedFieldStateService implements CalculatedFieldStateService { public class RocksDBCalculatedFieldStateService implements CalculatedFieldStateService {
private final ActorSystemContext actorSystemContext; private final ActorSystemContext actorSystemContext;
@ -66,12 +66,11 @@ public class RocksDBCalculatedFieldStateService implements CalculatedFieldStateS
restoreStates().forEach((k, v) -> actorSystemContext.tell(new CalculatedFieldStateRestoreMsg(k, v))); restoreStates().forEach((k, v) -> actorSystemContext.tell(new CalculatedFieldStateRestoreMsg(k, v)));
} }
@Override @Override
public void persistState(CalculatedFieldCtx ctx, CalculatedFieldEntityCtxId stateId, CalculatedFieldState state, TbCallback callback) { public void persistState(CalculatedFieldCtx ctx, CalculatedFieldEntityCtxId stateId, CalculatedFieldState state, TbCallback callback) {
CalculatedFieldStateProto stateProto = toProto(stateId, state); CalculatedFieldStateProto stateProto = toProto(stateId, state);
long maxStateSizeInKBytes = ctx.getMaxStateSizeInKBytes(); long maxStateSizeInKBytes = ctx.getMaxStateSizeInKBytes();
if (maxStateSizeInKBytes <= 0 || stateProto.getSerializedSize() <= ctx.getMaxStateSizeInKBytes()) { if (maxStateSizeInKBytes <= 0 || stateProto.getSerializedSize() <= maxStateSizeInKBytes) {
rocksDBService.put(toProto(stateId), stateProto); rocksDBService.put(toProto(stateId), stateProto);
} }
callback.onSuccess(); callback.onSuccess();

1
common/queue/src/main/java/org/thingsboard/server/queue/util/AfterStartUp.java

@ -41,7 +41,6 @@ public @interface AfterStartUp {
int CF_READ_PROFILE_ENTITIES_SERVICE = 10; int CF_READ_PROFILE_ENTITIES_SERVICE = 10;
int CF_READ_CF_SERVICE = 11; int CF_READ_CF_SERVICE = 11;
int CF_STATE_RESTORE_SERVICE = 12; int CF_STATE_RESTORE_SERVICE = 12;
int CF_CONSUMER_SERVICE = 13;
int BEFORE_TRANSPORT_SERVICE = Integer.MAX_VALUE - 1001; int BEFORE_TRANSPORT_SERVICE = Integer.MAX_VALUE - 1001;
int TRANSPORT_SERVICE = Integer.MAX_VALUE - 1000; int TRANSPORT_SERVICE = Integer.MAX_VALUE - 1000;

Loading…
Cancel
Save