Browse Source
Merge pull request #5787 from volodymyr-babak/fix-for-sub-stats
[3.3.3] Removed incorrect statistics calculation for regularQueryInvocationCnt/regularQueryInvocationTime
pull/5789/head
Andrew Shvayka
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
0 additions and
4 deletions
-
application/src/main/java/org/thingsboard/server/service/subscription/TbAbstractDataSubCtx.java
|
|
@ -74,11 +74,7 @@ public abstract class TbAbstractDataSubCtx<T extends AbstractDataQuery<? extends |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
protected synchronized void update() { |
|
|
protected synchronized void update() { |
|
|
long start = System.currentTimeMillis(); |
|
|
|
|
|
PageData<EntityData> newData = findEntityData(); |
|
|
PageData<EntityData> newData = findEntityData(); |
|
|
long end = System.currentTimeMillis(); |
|
|
|
|
|
stats.getRegularQueryInvocationCnt().incrementAndGet(); |
|
|
|
|
|
stats.getRegularQueryTimeSpent().addAndGet(end - start); |
|
|
|
|
|
Map<EntityId, EntityData> oldDataMap; |
|
|
Map<EntityId, EntityData> oldDataMap; |
|
|
if (data != null && !data.getData().isEmpty()) { |
|
|
if (data != null && !data.getData().isEmpty()) { |
|
|
oldDataMap = data.getData().stream().collect(Collectors.toMap(EntityData::getEntityId, Function.identity(), (a, b) -> a)); |
|
|
oldDataMap = data.getData().stream().collect(Collectors.toMap(EntityData::getEntityId, Function.identity(), (a, b) -> a)); |
|
|
|