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

Merge pull request #769 from dmytro-landiak/master 

relation cache fixes
pull/782/head
Andrew Shvayka 9 years ago
committed by GitHub
parent
50e698eb37 eba98b80e6
commit
9b1c59a915
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 94
      dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java

94
dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
View File

@ -170,12 +170,12 @@ public class BaseRelationService implements RelationService {
Cache cache = cacheManager.getCache(RELATIONS_CACHE); Cache cache = cacheManager.getCache(RELATIONS_CACHE);
log.trace("Executing deleteEntityRelations [{}]", entity); log.trace("Executing deleteEntityRelations [{}]", entity);
validate(entity); validate(entity);
List<ListenableFuture<List<EntityRelation>>> inboundRelationsListTo = new ArrayList<>(); List<ListenableFuture<List<EntityRelation>>> inboundRelationsList = new ArrayList<>();
for (RelationTypeGroup typeGroup : RelationTypeGroup.values()) { for (RelationTypeGroup typeGroup : RelationTypeGroup.values()) {
inboundRelationsListTo.add(relationDao.findAllByTo(entity, typeGroup)); inboundRelationsList.add(relationDao.findAllByTo(entity, typeGroup));
} }
ListenableFuture<List<List<EntityRelation>>> inboundRelationsTo = Futures.allAsList(inboundRelationsListTo); ListenableFuture<List<List<EntityRelation>>> inboundRelations = Futures.allAsList(inboundRelationsList);
ListenableFuture<List<Boolean>> inboundDeletions = Futures.transform(inboundRelationsTo, (List<List<EntityRelation>> relations) -> ListenableFuture<List<Boolean>> inboundDeletions = Futures.transform(inboundRelations, (List<List<EntityRelation>> relations) ->
getBooleans(relations, cache, true)); getBooleans(relations, cache, true));
ListenableFuture<Boolean> inboundFuture = Futures.transform(inboundDeletions, getListToBooleanFunction()); ListenableFuture<Boolean> inboundFuture = Futures.transform(inboundDeletions, getListToBooleanFunction());
@ -186,12 +186,12 @@ public class BaseRelationService implements RelationService {
log.error("Error deleting entity inbound relations", e); log.error("Error deleting entity inbound relations", e);
} }
List<ListenableFuture<List<EntityRelation>>> inboundRelationsListFrom = new ArrayList<>(); List<ListenableFuture<List<EntityRelation>>> outboundRelationsList = new ArrayList<>();
for (RelationTypeGroup typeGroup : RelationTypeGroup.values()) { for (RelationTypeGroup typeGroup : RelationTypeGroup.values()) {
inboundRelationsListFrom.add(relationDao.findAllByFrom(entity, typeGroup)); outboundRelationsList.add(relationDao.findAllByFrom(entity, typeGroup));
} }
ListenableFuture<List<List<EntityRelation>>> inboundRelationsFrom = Futures.allAsList(inboundRelationsListFrom); ListenableFuture<List<List<EntityRelation>>> outboundRelations = Futures.allAsList(outboundRelationsList);
Futures.transform(inboundRelationsFrom, (Function<List<List<EntityRelation>>, List<Boolean>>) relations -> Futures.transform(outboundRelations, (Function<List<List<EntityRelation>>, List<Boolean>>) relations ->
getBooleans(relations, cache, false)); getBooleans(relations, cache, false));
boolean outboundDeleteResult = relationDao.deleteOutboundRelations(entity); boolean outboundDeleteResult = relationDao.deleteOutboundRelations(entity);
@ -201,9 +201,7 @@ public class BaseRelationService implements RelationService {
private List<Boolean> getBooleans(List<List<EntityRelation>> relations, Cache cache, boolean isRemove) { private List<Boolean> getBooleans(List<List<EntityRelation>> relations, Cache cache, boolean isRemove) {
List<Boolean> results = new ArrayList<>(); List<Boolean> results = new ArrayList<>();
for (List<EntityRelation> relationList : relations) { for (List<EntityRelation> relationList : relations) {
relationList.stream().forEach(relation -> { relationList.stream().forEach(relation -> checkFromDeleteSync(cache, results, relation, isRemove));
checkFromDeleteSync(cache, results, relation, isRemove);
});
} }
return results; return results;
} }
@ -211,10 +209,8 @@ public class BaseRelationService implements RelationService {
private void checkFromDeleteSync(Cache cache, List<Boolean> results, EntityRelation relation, boolean isRemove) { private void checkFromDeleteSync(Cache cache, List<Boolean> results, EntityRelation relation, boolean isRemove) {
if (isRemove) { if (isRemove) {
results.add(relationDao.deleteRelation(relation)); results.add(relationDao.deleteRelation(relation));
cacheEviction(relation, relation.getTo(), cache);
} else {
cacheEviction(relation, relation.getFrom(), cache);
} }
cacheEviction(relation, cache);
} }
@Override @Override
@ -222,12 +218,12 @@ public class BaseRelationService implements RelationService {
Cache cache = cacheManager.getCache(RELATIONS_CACHE); Cache cache = cacheManager.getCache(RELATIONS_CACHE);
log.trace("Executing deleteEntityRelationsAsync [{}]", entity); log.trace("Executing deleteEntityRelationsAsync [{}]", entity);
validate(entity); validate(entity);
List<ListenableFuture<List<EntityRelation>>> inboundRelationsListTo = new ArrayList<>(); List<ListenableFuture<List<EntityRelation>>> inboundRelationsList = new ArrayList<>();
for (RelationTypeGroup typeGroup : RelationTypeGroup.values()) { for (RelationTypeGroup typeGroup : RelationTypeGroup.values()) {
inboundRelationsListTo.add(relationDao.findAllByTo(entity, typeGroup)); inboundRelationsList.add(relationDao.findAllByTo(entity, typeGroup));
} }
ListenableFuture<List<List<EntityRelation>>> inboundRelationsTo = Futures.allAsList(inboundRelationsListTo); ListenableFuture<List<List<EntityRelation>>> inboundRelations = Futures.allAsList(inboundRelationsList);
ListenableFuture<List<Boolean>> inboundDeletions = Futures.transform(inboundRelationsTo, ListenableFuture<List<Boolean>> inboundDeletions = Futures.transform(inboundRelations,
(AsyncFunction<List<List<EntityRelation>>, List<Boolean>>) relations -> { (AsyncFunction<List<List<EntityRelation>>, List<Boolean>>) relations -> {
List<ListenableFuture<Boolean>> results = getListenableFutures(relations, cache, true); List<ListenableFuture<Boolean>> results = getListenableFutures(relations, cache, true);
return Futures.allAsList(results); return Futures.allAsList(results);
@ -235,12 +231,12 @@ public class BaseRelationService implements RelationService {
ListenableFuture<Boolean> inboundFuture = Futures.transform(inboundDeletions, getListToBooleanFunction()); ListenableFuture<Boolean> inboundFuture = Futures.transform(inboundDeletions, getListToBooleanFunction());
List<ListenableFuture<List<EntityRelation>>> inboundRelationsListFrom = new ArrayList<>(); List<ListenableFuture<List<EntityRelation>>> outboundRelationsList = new ArrayList<>();
for (RelationTypeGroup typeGroup : RelationTypeGroup.values()) { for (RelationTypeGroup typeGroup : RelationTypeGroup.values()) {
inboundRelationsListFrom.add(relationDao.findAllByTo(entity, typeGroup)); outboundRelationsList.add(relationDao.findAllByFrom(entity, typeGroup));
} }
ListenableFuture<List<List<EntityRelation>>> inboundRelationsFrom = Futures.allAsList(inboundRelationsListFrom); ListenableFuture<List<List<EntityRelation>>> outboundRelations = Futures.allAsList(outboundRelationsList);
Futures.transform(inboundRelationsFrom, (AsyncFunction<List<List<EntityRelation>>, List<Boolean>>) relations -> { Futures.transform(outboundRelations, (AsyncFunction<List<List<EntityRelation>>, List<Boolean>>) relations -> {
List<ListenableFuture<Boolean>> results = getListenableFutures(relations, cache, false); List<ListenableFuture<Boolean>> results = getListenableFutures(relations, cache, false);
return Futures.allAsList(results); return Futures.allAsList(results);
}); });
@ -252,9 +248,7 @@ public class BaseRelationService implements RelationService {
private List<ListenableFuture<Boolean>> getListenableFutures(List<List<EntityRelation>> relations, Cache cache, boolean isRemove) { private List<ListenableFuture<Boolean>> getListenableFutures(List<List<EntityRelation>> relations, Cache cache, boolean isRemove) {
List<ListenableFuture<Boolean>> results = new ArrayList<>(); List<ListenableFuture<Boolean>> results = new ArrayList<>();
for (List<EntityRelation> relationList : relations) { for (List<EntityRelation> relationList : relations) {
relationList.stream().forEach(relation -> { relationList.stream().forEach(relation -> checkFromDeleteAsync(cache, results, relation, isRemove));
checkFromDeleteAsync(cache, results, relation, isRemove);
});
} }
return results; return results;
} }
@ -262,25 +256,39 @@ public class BaseRelationService implements RelationService {
private void checkFromDeleteAsync(Cache cache, List<ListenableFuture<Boolean>> results, EntityRelation relation, boolean isRemove) { private void checkFromDeleteAsync(Cache cache, List<ListenableFuture<Boolean>> results, EntityRelation relation, boolean isRemove) {
if (isRemove) { if (isRemove) {
results.add(relationDao.deleteRelationAsync(relation)); results.add(relationDao.deleteRelationAsync(relation));
cacheEviction(relation, relation.getTo(), cache);
} else {
cacheEviction(relation, relation.getFrom(), cache);
} }
} cacheEviction(relation, cache);
}
private void cacheEviction(EntityRelation relation, EntityId entityId, Cache cache) {
cache.evict(entityId); private void cacheEviction(EntityRelation relation, Cache cache) {
List<Object> toAndGroup = new ArrayList<>();
List<Object> toAndType = new ArrayList<>(); toAndGroup.add(relation.getTo());
toAndType.add(entityId); toAndGroup.add(relation.getTypeGroup());
toAndType.add(relation.getType()); cache.evict(toAndGroup);
cache.evict(toAndType);
List<Object> toTypeAndGroup = new ArrayList<>();
List<Object> fromToAndType = new ArrayList<>(); toTypeAndGroup.add(relation.getTo());
fromToAndType.add(relation.getFrom()); toTypeAndGroup.add(relation.getType());
fromToAndType.add(relation.getTo()); toTypeAndGroup.add(relation.getTypeGroup());
fromToAndType.add(relation.getType()); cache.evict(toTypeAndGroup);
cache.evict(fromToAndType);
List<Object> fromAndGroup = new ArrayList<>();
fromAndGroup.add(relation.getFrom());
fromAndGroup.add(relation.getTypeGroup());
cache.evict(fromAndGroup);
List<Object> fromTypeAndGroup = new ArrayList<>();
fromTypeAndGroup.add(relation.getFrom());
fromTypeAndGroup.add(relation.getType());
fromTypeAndGroup.add(relation.getTypeGroup());
cache.evict(fromTypeAndGroup);
List<Object> fromToTypeAndGroup = new ArrayList<>();
fromToTypeAndGroup.add(relation.getFrom());
fromToTypeAndGroup.add(relation.getTo());
fromToTypeAndGroup.add(relation.getType());
fromToTypeAndGroup.add(relation.getTypeGroup());
cache.evict(fromToTypeAndGroup);
} }
@Cacheable(cacheNames = RELATIONS_CACHE, key = "{#from, #typeGroup}") @Cacheable(cacheNames = RELATIONS_CACHE, key = "{#from, #typeGroup}")

Write Preview
Loading…
Cancel
Save