Browse Source

fix typos

pull/13428/head
dshvaika 1 year ago
parent
commit
eac55693cc
  1. 3
      common/data/src/test/java/org/thingsboard/server/common/data/limit/LimitedApiTest.java
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java
  3. 2
      dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java
  4. 7
      dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java

3
common/data/src/test/java/org/thingsboard/server/common/data/limit/LimitedApiTest.java

@ -98,5 +98,4 @@ class LimitedApiTest {
} }
} }
}
}

2
dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java

@ -54,7 +54,7 @@ public class CassandraBufferedRateReadExecutor extends AbstractBufferedRateExecu
@Autowired RateLimitService rateLimitService, @Autowired RateLimitService rateLimitService,
@Autowired(required = false) TbServiceInfoProvider serviceInfoProvider) { @Autowired(required = false) TbServiceInfoProvider serviceInfoProvider) {
super(queueLimit, concurrencyLimit, maxWaitTime, dispatcherThreads, callbackThreads, pollMs, printQueriesFreq, super(queueLimit, concurrencyLimit, maxWaitTime, dispatcherThreads, callbackThreads, pollMs, printQueriesFreq,
BufferedRateExecutorType.READ, entityService, rateLimitService, serviceInfoProvider, statsFactory, printTenantNames); BufferedRateExecutorType.READ, serviceInfoProvider, rateLimitService, statsFactory, entityService, printTenantNames);
} }
@Scheduled(fixedDelayString = "${cassandra.query.rate_limit_print_interval_ms}") @Scheduled(fixedDelayString = "${cassandra.query.rate_limit_print_interval_ms}")

2
dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java

@ -54,7 +54,7 @@ public class CassandraBufferedRateWriteExecutor extends AbstractBufferedRateExec
@Autowired RateLimitService rateLimitService, @Autowired RateLimitService rateLimitService,
@Autowired(required = false) TbServiceInfoProvider serviceInfoProvider) { @Autowired(required = false) TbServiceInfoProvider serviceInfoProvider) {
super(queueLimit, concurrencyLimit, maxWaitTime, dispatcherThreads, callbackThreads, pollMs, printQueriesFreq, super(queueLimit, concurrencyLimit, maxWaitTime, dispatcherThreads, callbackThreads, pollMs, printQueriesFreq,
BufferedRateExecutorType.WRITE, entityService, rateLimitService, serviceInfoProvider, statsFactory, printTenantNames); BufferedRateExecutorType.WRITE, serviceInfoProvider, rateLimitService, statsFactory, entityService, printTenantNames);
} }
@Scheduled(fixedDelayString = "${cassandra.query.rate_limit_print_interval_ms}") @Scheduled(fixedDelayString = "${cassandra.query.rate_limit_print_interval_ms}")

7
dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java

@ -88,12 +88,12 @@ public abstract class AbstractBufferedRateExecutor<T extends AsyncTask, F extend
private final LimitedApi myLimitedApi; private final LimitedApi myLimitedApi;
public AbstractBufferedRateExecutor(int queueLimit, int concurrencyLimit, long maxWaitTime, int dispatcherThreads, public AbstractBufferedRateExecutor(int queueLimit, int concurrencyLimit, long maxWaitTime, int dispatcherThreads,
int callbackThreads, long pollMs, int printQueriesFreq, BufferedRateExecutorType executorType, int callbackThreads, long pollMs, int printQueriesFreq, BufferedRateExecutorType executorType, TbServiceInfoProvider serviceInfoProvider,
EntityService entityService, RateLimitService rateLimitService, TbServiceInfoProvider serviceInfoProvider, RateLimitService rateLimitService, StatsFactory statsFactory, EntityService entityService, boolean printTenantNames) {
StatsFactory statsFactory, boolean printTenantNames) {
this.maxWaitTime = maxWaitTime; this.maxWaitTime = maxWaitTime;
this.pollMs = pollMs; this.pollMs = pollMs;
this.bufferName = executorType.getDisplayName(); this.bufferName = executorType.getDisplayName();
this.myLimitedApi = resolveLimitedApi(serviceInfoProvider, executorType);
this.concurrencyLimit = concurrencyLimit; this.concurrencyLimit = concurrencyLimit;
this.printQueriesFreq = printQueriesFreq; this.printQueriesFreq = printQueriesFreq;
this.queue = new LinkedBlockingDeque<>(queueLimit); this.queue = new LinkedBlockingDeque<>(queueLimit);
@ -106,7 +106,6 @@ public abstract class AbstractBufferedRateExecutor<T extends AsyncTask, F extend
this.entityService = entityService; this.entityService = entityService;
this.rateLimitService = rateLimitService; this.rateLimitService = rateLimitService;
this.myLimitedApi = resolveLimitedApi(serviceInfoProvider, executorType);
this.printTenantNames = printTenantNames; this.printTenantNames = printTenantNames;
for (int i = 0; i < dispatcherThreads; i++) { for (int i = 0; i < dispatcherThreads; i++) {

Loading…
Cancel
Save