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

Cache async relation queries.

Browse Source
This commit is contained in:
Igor Kulikov 2018-08-23 14:38:41 +03:00
parent 42a831a311
commit 43d7c16f66
2 changed files with 64 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,9 +16,7 @@
package org.thingsboard.server.dao.relation; package org.thingsboard.server.dao.relation;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.*;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache; import org.springframework.cache.Cache;
@ -272,8 +270,10 @@ public class BaseRelationService implements RelationService {
@Cacheable(cacheNames = RELATIONS_CACHE, key = "{#from, #typeGroup}") @Cacheable(cacheNames = RELATIONS_CACHE, key = "{#from, #typeGroup}")
@Override @Override
public List<EntityRelation> findByFrom(EntityId from, RelationTypeGroup typeGroup) { public List<EntityRelation> findByFrom(EntityId from, RelationTypeGroup typeGroup) {
validate(from);
validateTypeGroup(typeGroup);
try { try {
return findByFromAsync(from, typeGroup).get(); return relationDao.findAllByFrom(from, typeGroup).get();
} catch (InterruptedException | ExecutionException e) { } catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -284,7 +284,28 @@ public class BaseRelationService implements RelationService {
log.trace("Executing findByFrom [{}][{}]", from, typeGroup); log.trace("Executing findByFrom [{}][{}]", from, typeGroup);
validate(from); validate(from);
validateTypeGroup(typeGroup); validateTypeGroup(typeGroup);
return relationDao.findAllByFrom(from, typeGroup);
List<Object> fromAndTypeGroup = new ArrayList<>();
fromAndTypeGroup.add(from);
fromAndTypeGroup.add(typeGroup);
Cache cache = cacheManager.getCache(RELATIONS_CACHE);
List<EntityRelation> fromCache = cache.get(fromAndTypeGroup, List.class);
if (fromCache != null) {
return Futures.immediateFuture(fromCache);
} else {
ListenableFuture<List<EntityRelation>> relationsFuture = relationDao.findAllByFrom(from, typeGroup);
Futures.addCallback(relationsFuture,
new FutureCallback<List<EntityRelation>>() {
@Override
public void onSuccess(@Nullable List<EntityRelation> result) {
cache.putIfAbsent(fromAndTypeGroup, result);
}
@Override
public void onFailure(Throwable t) {}
});
return relationsFuture;
}
} }
@Override @Override
@ -327,8 +348,10 @@ public class BaseRelationService implements RelationService {
@Cacheable(cacheNames = RELATIONS_CACHE, key = "{#to, #typeGroup}") @Cacheable(cacheNames = RELATIONS_CACHE, key = "{#to, #typeGroup}")
@Override @Override
public List<EntityRelation> findByTo(EntityId to, RelationTypeGroup typeGroup) { public List<EntityRelation> findByTo(EntityId to, RelationTypeGroup typeGroup) {
validate(to);
validateTypeGroup(typeGroup);
try { try {
return findByToAsync(to, typeGroup).get(); return relationDao.findAllByTo(to, typeGroup).get();
} catch (InterruptedException | ExecutionException e) { } catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -339,7 +362,28 @@ public class BaseRelationService implements RelationService {
log.trace("Executing findByTo [{}][{}]", to, typeGroup); log.trace("Executing findByTo [{}][{}]", to, typeGroup);
validate(to); validate(to);
validateTypeGroup(typeGroup); validateTypeGroup(typeGroup);
return relationDao.findAllByTo(to, typeGroup);
List<Object> toAndTypeGroup = new ArrayList<>();
toAndTypeGroup.add(to);
toAndTypeGroup.add(typeGroup);
Cache cache = cacheManager.getCache(RELATIONS_CACHE);
List<EntityRelation> fromCache = cache.get(toAndTypeGroup, List.class);
if (fromCache != null) {
return Futures.immediateFuture(fromCache);
} else {
ListenableFuture<List<EntityRelation>> relationsFuture = relationDao.findAllByTo(to, typeGroup);
Futures.addCallback(relationsFuture,
new FutureCallback<List<EntityRelation>>() {
@Override
public void onSuccess(@Nullable List<EntityRelation> result) {
cache.putIfAbsent(toAndTypeGroup, result);
}
@Override
public void onFailure(Throwable t) {}
});
return relationsFuture;
}
} }
@Override @Override

13
dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java
View File

@ -227,6 +227,13 @@ public abstract class BaseRelationServiceTest extends AbstractServiceTest {
Assert.assertTrue(relations.contains(relationA)); Assert.assertTrue(relations.contains(relationA));
Assert.assertTrue(relations.contains(relationB)); Assert.assertTrue(relations.contains(relationB));
Assert.assertTrue(relations.contains(relationC)); Assert.assertTrue(relations.contains(relationC));
//Test from cache
relations = relationService.findByQuery(query).get();
Assert.assertEquals(3, relations.size());
Assert.assertTrue(relations.contains(relationA));
Assert.assertTrue(relations.contains(relationB));
Assert.assertTrue(relations.contains(relationC));
} }
@Test @Test
@ -253,6 +260,12 @@ public abstract class BaseRelationServiceTest extends AbstractServiceTest {
Assert.assertEquals(2, relations.size()); Assert.assertEquals(2, relations.size());
Assert.assertTrue(relations.contains(relationAB)); Assert.assertTrue(relations.contains(relationAB));
Assert.assertTrue(relations.contains(relationBC)); Assert.assertTrue(relations.contains(relationBC));
//Test from cache
relations = relationService.findByQuery(query).get();
Assert.assertEquals(2, relations.size());
Assert.assertTrue(relations.contains(relationAB));
Assert.assertTrue(relations.contains(relationBC));
} }