tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

refactoring

pull/15274/head
dashevchenko 6 months ago
parent
f651f0a721
commit
262565a411
3 changed files with 53 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java
  2. 21
      application/src/main/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCache.java
  3. 21
      application/src/main/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCache.java

35
application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java
View File

@ -40,6 +40,7 @@ import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldCtx;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
@ -196,17 +197,42 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
case TENANT:
TenantId tenantId = event.getTenantId();
var removedCfIds = new HashSet<CalculatedFieldId>();
calculatedFields.forEach((cfId, cf) -> {
var removedCfEntityIds = new HashSet<EntityId>();
var removedLinkEntityIds = new HashSet<EntityId>();
for (Map.Entry<CalculatedFieldId, CalculatedField> entry : calculatedFields.entrySet()) {
CalculatedFieldId cfId = entry.getKey();
CalculatedField cf = entry.getValue();
if (cf.getTenantId().equals(tenantId)) {
calculatedFields.remove(cfId);
calculatedFieldLinks.remove(cfId);
List<CalculatedFieldLink> links = calculatedFieldLinks.remove(cfId);
if (links != null) {
links.forEach(link -> removedLinkEntityIds.add(link.getEntityId()));
}
calculatedFieldsCtx.remove(cfId);
removedCfIds.add(cfId);
removedCfEntityIds.add(cf.getEntityId());
log.debug("[{}] evict calculated field from cache on tenant deletion: {}", cfId, cf);
}
}
removedCfEntityIds.forEach(entityId -> {
List<CalculatedField> cfs = entityIdCalculatedFields.get(entityId);
if (cfs != null) {
cfs.removeIf(cf -> removedCfIds.contains(cf.getId()));
if (cfs.isEmpty()) {
entityIdCalculatedFields.remove(entityId);
}
}
});
removedLinkEntityIds.forEach(entityId -> {
List<CalculatedFieldLink> entityLinks = entityIdCalculatedFieldLinks.get(entityId);
if (entityLinks != null) {
entityLinks.removeIf(link -> removedCfIds.contains(link.getCalculatedFieldId()));
if (entityLinks.isEmpty()) {
entityIdCalculatedFieldLinks.remove(entityId);
}
}
});
entityIdCalculatedFields.values().forEach(list -> list.removeIf(cf -> removedCfIds.contains(cf.getId())));
entityIdCalculatedFieldLinks.values().forEach(list -> list.removeIf(link -> removedCfIds.contains(link.getCalculatedFieldId())));
removedCfIds.forEach(calculatedFieldFetchLocks::remove);
break;
case DEVICE:
case ASSET:
@ -224,6 +250,7 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
log.debug("[{}] evict calculated field from cache on entity deletion: {}", cf.getId(), cf);
});
entityIdCalculatedFieldLinks.values().forEach(list -> list.removeIf(link -> cfIds.contains(link.getCalculatedFieldId())));
cfIds.forEach(calculatedFieldFetchLocks::remove);
}
entityIdCalculatedFieldLinks.remove(entityId);
break;

21
application/src/main/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCache.java
View File

@ -30,6 +30,7 @@ import org.thingsboard.server.dao.asset.AssetProfileService;
import org.thingsboard.server.dao.asset.AssetService;
import java.util.HashSet;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.locks.Lock;
@ -154,18 +155,18 @@ public class DefaultTbAssetProfileCache implements TbAssetProfileCache {
if (event.getEvent() == ComponentLifecycleEvent.DELETED) {
TenantId tenantId = event.getTenantId();
var removedProfileIds = new HashSet<AssetProfileId>();
assetProfilesMap.forEach((assetProfileId, assetProfile) -> {
if (assetProfile.getTenantId().equals(tenantId)) {
assetProfilesMap.remove(assetProfileId);
removedProfileIds.add(assetProfileId);
log.debug("[{}] evict asset profile from cache: {}", assetProfileId, assetProfile);
for (Map.Entry<AssetProfileId, AssetProfile> entry : assetProfilesMap.entrySet()) {
if (entry.getValue().getTenantId().equals(tenantId)) {
assetProfilesMap.remove(entry.getKey());
removedProfileIds.add(entry.getKey());
log.debug("[{}] evict asset profile from cache: {}", entry.getKey(), entry.getValue());
}
});
assetsMap.forEach((assetId, assetProfileId) -> {
if (removedProfileIds.contains(assetProfileId)) {
assetsMap.remove(assetId);
}
for (Map.Entry<AssetId, AssetProfileId> entry : assetsMap.entrySet()) {
if (removedProfileIds.contains(entry.getValue())) {
assetsMap.remove(entry.getKey());
}
});
}
profileListeners.remove(tenantId);
assetProfileListeners.remove(tenantId);
}

21
application/src/main/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCache.java
View File

@ -30,6 +30,7 @@ import org.thingsboard.server.dao.device.DeviceProfileService;
import org.thingsboard.server.dao.device.DeviceService;
import java.util.HashSet;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.locks.Lock;
@ -154,18 +155,18 @@ public class DefaultTbDeviceProfileCache implements TbDeviceProfileCache {
if (event.getEvent() == ComponentLifecycleEvent.DELETED) {
TenantId tenantId = event.getTenantId();
var removedProfileIds = new HashSet<DeviceProfileId>();
deviceProfilesMap.forEach((deviceProfileId, deviceProfile) -> {
if (deviceProfile.getTenantId().equals(tenantId)) {
deviceProfilesMap.remove(deviceProfileId);
removedProfileIds.add(deviceProfileId);
log.debug("[{}] evict device profile from cache: {}", deviceProfileId, deviceProfile);
for (Map.Entry<DeviceProfileId, DeviceProfile> entry : deviceProfilesMap.entrySet()) {
if (entry.getValue().getTenantId().equals(tenantId)) {
deviceProfilesMap.remove(entry.getKey());
removedProfileIds.add(entry.getKey());
log.debug("[{}] evict device profile from cache: {}", entry.getKey(), entry.getValue());
}
});
devicesMap.forEach((deviceId, deviceProfileId) -> {
if (removedProfileIds.contains(deviceProfileId)) {
devicesMap.remove(deviceId);
}
for (Map.Entry<DeviceId, DeviceProfileId> entry : devicesMap.entrySet()) {
if (removedProfileIds.contains(entry.getValue())) {
devicesMap.remove(entry.getKey());
}
});
}
profileListeners.remove(tenantId);
deviceProfileListeners.remove(tenantId);
}

Write Preview
Loading…
Cancel
Save