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

Refactor executeScript to not load script on init, but on execute

Browse Source
This commit is contained in:
Andrii Landiak 2025-01-20 17:44:09 +02:00
parent f4372feff9
commit 5d07beb0de
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/cache/src/main/java/org/thingsboard/server/cache/RedisTbTransactionalCache.java vendored
View File

@ -271,24 +271,17 @@ public abstract class RedisTbTransactionalCache<K extends Serializable, V extend
connection.stringCommands().set(rawKey, rawValue, this.cacheTtl, setOption); connection.stringCommands().set(rawKey, rawValue, this.cacheTtl, setOption);
} }
protected void loadLuaScript(byte[] expectedSha, byte[] luaScript) {
try (var connection = getConnection(expectedSha)) {
log.debug("Loading LUA with expected SHA [{}], connection [{}]", new String(expectedSha), connection.getNativeConnection());
String actualSha = connection.scriptingCommands().scriptLoad(luaScript);
if (!Arrays.equals(expectedSha, StringRedisSerializer.UTF_8.serialize(actualSha))) {
String message = String.format("SHA for LUA script wrong! Expected [%s], but actual [%s], connection [%s]",
new String(expectedSha), actualSha, connection.getNativeConnection());
throw new IllegalStateException(message);
}
}
}
protected void executeScript(RedisConnection connection, byte[] scriptSha, byte[] luaScript, ReturnType returnType, int numKeys, byte[]... keysAndArgs) { protected void executeScript(RedisConnection connection, byte[] scriptSha, byte[] luaScript, ReturnType returnType, int numKeys, byte[]... keysAndArgs) {
try { try {
connection.scriptingCommands().evalSha(scriptSha, returnType, numKeys, keysAndArgs); connection.scriptingCommands().evalSha(scriptSha, returnType, numKeys, keysAndArgs);
} catch (InvalidDataAccessApiUsageException ignored) { } catch (InvalidDataAccessApiUsageException ignored) {
log.debug("Loading LUA [{}]", connection.getNativeConnection()); log.debug("Loading LUA with expected SHA [{}], connection [{}]", new String(scriptSha), connection.getNativeConnection());
connection.scriptingCommands().scriptLoad(luaScript); String actualSha = connection.scriptingCommands().scriptLoad(luaScript);
if (!Arrays.equals(scriptSha, StringRedisSerializer.UTF_8.serialize(actualSha))) {
String message = String.format("SHA for LUA script wrong! Expected [%s], but actual [%s], connection [%s]",
new String(scriptSha), actualSha, connection.getNativeConnection());
throw new IllegalStateException(message);
}
try { try {
connection.scriptingCommands().evalSha(scriptSha, returnType, numKeys, keysAndArgs); connection.scriptingCommands().evalSha(scriptSha, returnType, numKeys, keysAndArgs);
} catch (InvalidDataAccessApiUsageException exception) { } catch (InvalidDataAccessApiUsageException exception) {

6
common/cache/src/main/java/org/thingsboard/server/cache/VersionedRedisTbCache.java vendored
View File

@ -15,7 +15,6 @@
*/ */
package org.thingsboard.server.cache; package org.thingsboard.server.cache;
import jakarta.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.lang3.NotImplementedException;
import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.RedisConnection;
@ -63,11 +62,6 @@ public abstract class VersionedRedisTbCache<K extends VersionedCacheKey, V exten
super(cacheName, cacheSpecsMap, connectionFactory, configuration, valueSerializer); super(cacheName, cacheSpecsMap, connectionFactory, configuration, valueSerializer);
} }
@PostConstruct
public void init() {
loadLuaScript(SET_VERSIONED_VALUE_SHA, SET_VERSIONED_VALUE_LUA_SCRIPT);
}
@Override @Override
protected byte[] doGet(K key, RedisConnection connection) { protected byte[] doGet(K key, RedisConnection connection) {
if (!key.isVersioned()) { if (!key.isVersioned()) {