Viacheslav Klimov
8 months ago
committed by
GitHub
GitHub
11 changed files with 361 additions and 112 deletions
@ -0,0 +1,75 @@ |
|||
/** |
|||
* Copyright © 2016-2025 The Thingsboard Authors |
|||
* |
|||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|||
* you may not use this file except in compliance with the License. |
|||
* You may obtain a copy of the License at |
|||
* |
|||
* http://www.apache.org/licenses/LICENSE-2.0
|
|||
* |
|||
* Unless required by applicable law or agreed to in writing, software |
|||
* distributed under the License is distributed on an "AS IS" BASIS, |
|||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
* See the License for the specific language governing permissions and |
|||
* limitations under the License. |
|||
*/ |
|||
package org.thingsboard.server.utils; |
|||
|
|||
import lombok.NonNull; |
|||
import org.apache.commons.lang3.math.NumberUtils; |
|||
import org.thingsboard.server.common.data.StringUtils; |
|||
import org.thingsboard.server.common.data.cf.configuration.Argument; |
|||
import org.thingsboard.server.common.data.kv.AttributeKvEntry; |
|||
import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; |
|||
import org.thingsboard.server.common.data.kv.BasicTsKvEntry; |
|||
import org.thingsboard.server.common.data.kv.BooleanDataEntry; |
|||
import org.thingsboard.server.common.data.kv.DoubleDataEntry; |
|||
import org.thingsboard.server.common.data.kv.KvEntry; |
|||
import org.thingsboard.server.common.data.kv.StringDataEntry; |
|||
import org.thingsboard.server.common.data.kv.TsKvEntry; |
|||
import org.thingsboard.server.service.cf.ctx.state.ArgumentEntry; |
|||
import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldCtx; |
|||
import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldState; |
|||
import org.thingsboard.server.service.cf.ctx.state.ScriptCalculatedFieldState; |
|||
import org.thingsboard.server.service.cf.ctx.state.SimpleCalculatedFieldState; |
|||
import org.thingsboard.server.service.cf.ctx.state.SingleValueArgumentEntry; |
|||
|
|||
import static org.thingsboard.server.service.cf.ctx.state.SingleValueArgumentEntry.DEFAULT_VERSION; |
|||
|
|||
public class CalculatedFieldArgumentUtils { |
|||
|
|||
public static ArgumentEntry transformSingleValueArgument(@NonNull KvEntry kvEntry) { |
|||
return kvEntry.getValue() != null ? ArgumentEntry.createSingleValueArgument(kvEntry) : new SingleValueArgumentEntry(); |
|||
} |
|||
|
|||
public static TsKvEntry createDefaultTsKvEntry(Argument argument, long ts) { |
|||
return new BasicTsKvEntry(ts, createDefaultKvEntry(argument), DEFAULT_VERSION); |
|||
} |
|||
|
|||
public static AttributeKvEntry createDefaultAttributeEntry(Argument argument, long ts) { |
|||
return new BaseAttributeKvEntry(createDefaultKvEntry(argument), ts, DEFAULT_VERSION); |
|||
} |
|||
|
|||
private static KvEntry createDefaultKvEntry(Argument argument) { |
|||
String key = argument.getRefEntityKey().getKey(); |
|||
String defaultValue = argument.getDefaultValue(); |
|||
if (StringUtils.isBlank(defaultValue)) { |
|||
return new StringDataEntry(key, null); |
|||
} |
|||
if (NumberUtils.isParsable(defaultValue)) { |
|||
return new DoubleDataEntry(key, Double.parseDouble(defaultValue)); |
|||
} |
|||
if ("true".equalsIgnoreCase(defaultValue) || "false".equalsIgnoreCase(defaultValue)) { |
|||
return new BooleanDataEntry(key, Boolean.parseBoolean(defaultValue)); |
|||
} |
|||
return new StringDataEntry(key, defaultValue); |
|||
} |
|||
|
|||
public static CalculatedFieldState createStateByType(CalculatedFieldCtx ctx) { |
|||
return switch (ctx.getCfType()) { |
|||
case SIMPLE -> new SimpleCalculatedFieldState(ctx.getArgNames()); |
|||
case SCRIPT -> new ScriptCalculatedFieldState(ctx.getArgNames()); |
|||
}; |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,111 @@ |
|||
/** |
|||
* Copyright © 2016-2025 The Thingsboard Authors |
|||
* |
|||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|||
* you may not use this file except in compliance with the License. |
|||
* You may obtain a copy of the License at |
|||
* |
|||
* http://www.apache.org/licenses/LICENSE-2.0
|
|||
* |
|||
* Unless required by applicable law or agreed to in writing, software |
|||
* distributed under the License is distributed on an "AS IS" BASIS, |
|||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|||
* See the License for the specific language governing permissions and |
|||
* limitations under the License. |
|||
*/ |
|||
package org.thingsboard.server.dao.sqlts.dictionary; |
|||
|
|||
import org.junit.Test; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.thingsboard.server.dao.dictionary.KeyDictionaryDao; |
|||
import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryCompositeKey; |
|||
import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryEntry; |
|||
import org.thingsboard.server.dao.service.AbstractServiceTest; |
|||
import org.thingsboard.server.dao.service.DaoSqlTest; |
|||
|
|||
import java.util.Arrays; |
|||
import java.util.Optional; |
|||
import java.util.concurrent.CountDownLatch; |
|||
import java.util.concurrent.ExecutorService; |
|||
import java.util.concurrent.Executors; |
|||
import java.util.concurrent.TimeUnit; |
|||
|
|||
import static org.assertj.core.api.Assertions.assertThat; |
|||
|
|||
@DaoSqlTest |
|||
public class KeyDictionaryDaoTest extends AbstractServiceTest { |
|||
|
|||
@Autowired |
|||
private KeyDictionaryDao keyDictionaryDao; |
|||
|
|||
@Autowired |
|||
private KeyDictionaryRepository keyDictionaryRepository; |
|||
|
|||
private static final String KEY = "testKeyDictionaryDaoTestKey"; |
|||
|
|||
@Test |
|||
public void testGetOrSaveKeyId_concurrent() throws Exception { |
|||
int threads = 8; |
|||
ExecutorService executor = Executors.newFixedThreadPool(threads); |
|||
|
|||
CountDownLatch allReady = new CountDownLatch(threads); |
|||
CountDownLatch start = new CountDownLatch(1); |
|||
CountDownLatch allDone = new CountDownLatch(threads); |
|||
|
|||
Integer[] keyIds = new Integer[threads]; |
|||
|
|||
try { |
|||
for (int i = 0; i < threads; i++) { |
|||
final int idx = i; |
|||
executor.submit(() -> { |
|||
allReady.countDown(); |
|||
try { |
|||
// wait until all threads are ready
|
|||
start.await(); |
|||
// concurrent call
|
|||
Integer id = keyDictionaryDao.getOrSaveKeyId(KEY); |
|||
keyIds[idx] = id; |
|||
} catch (InterruptedException e) { |
|||
Thread.currentThread().interrupt(); |
|||
} finally { |
|||
allDone.countDown(); |
|||
} |
|||
}); |
|||
} |
|||
|
|||
// ensure all threads are queued
|
|||
allReady.await(5, TimeUnit.SECONDS); |
|||
// fire the start gun
|
|||
start.countDown(); |
|||
// wait for all to finish
|
|||
allDone.await(10, TimeUnit.SECONDS); |
|||
} finally { |
|||
executor.shutdownNow(); |
|||
} |
|||
|
|||
// basic sanity
|
|||
for (int i = 0; i < threads; i++) { |
|||
assertThat(keyIds[i]) |
|||
.as("keyId[%s]", i) |
|||
.isNotNull() |
|||
.isGreaterThan(0); |
|||
} |
|||
|
|||
// all threads must see the same keyId
|
|||
int first = keyIds[0]; |
|||
assertThat(first).isGreaterThan(0); |
|||
assertThat(Arrays.stream(keyIds).distinct().count()) |
|||
.as("all threads should get the same keyId") |
|||
.isEqualTo(1); |
|||
|
|||
// DB must have exactly one row for this key and the same id
|
|||
KeyDictionaryCompositeKey id = new KeyDictionaryCompositeKey(KEY); |
|||
Optional<KeyDictionaryEntry> entry = keyDictionaryRepository.findById(id); |
|||
|
|||
assertThat(entry.isPresent()).isTrue(); |
|||
assertThat(entry.get().getKeyId()).isEqualTo(first); |
|||
|
|||
keyDictionaryRepository.deleteById(id); |
|||
} |
|||
|
|||
} |
|||
Loading…
Reference in new issue