diff --git a/src/main/java/it/cavallium/rockserver/core/client/SocketConnection.java b/src/main/java/it/cavallium/rockserver/core/client/SocketConnection.java index 71ce5f2..b274f99 100644 --- a/src/main/java/it/cavallium/rockserver/core/client/SocketConnection.java +++ b/src/main/java/it/cavallium/rockserver/core/client/SocketConnection.java @@ -70,7 +70,7 @@ public abstract class SocketConnection extends BaseConnection { @Override public T get(Arena arena, - long transactionId, + long transactionOrUpdateId, long columnId, MemorySegment @NotNull [] keys, GetCallback callback) throws RocksDBException { diff --git a/src/main/java/it/cavallium/rockserver/core/common/RocksDBAPI.java b/src/main/java/it/cavallium/rockserver/core/common/RocksDBAPI.java index c0149c3..40150d8 100644 --- a/src/main/java/it/cavallium/rockserver/core/common/RocksDBAPI.java +++ b/src/main/java/it/cavallium/rockserver/core/common/RocksDBAPI.java @@ -73,13 +73,13 @@ public interface RocksDBAPI { /** * Get an element from the specified position * @param arena arena - * @param transactionId transaction id, update id for retry operations, or 0 + * @param transactionOrUpdateId transaction id, update id for retry operations, or 0 * @param columnId column id * @param keys column keys, or empty array if not needed * @param callback the callback will be executed on the same thread, exactly once. */ T get(Arena arena, - long transactionId, + long transactionOrUpdateId, long columnId, @NotNull MemorySegment @NotNull[] keys, GetCallback callback) throws RocksDBException; diff --git a/src/main/java/it/cavallium/rockserver/core/impl/EmbeddedDB.java b/src/main/java/it/cavallium/rockserver/core/impl/EmbeddedDB.java index 77a70db..6e04b99 100644 --- a/src/main/java/it/cavallium/rockserver/core/impl/EmbeddedDB.java +++ b/src/main/java/it/cavallium/rockserver/core/impl/EmbeddedDB.java @@ -481,20 +481,20 @@ public class EmbeddedDB implements RocksDBAPI, Closeable { @Override public T get(Arena arena, - long transactionId, + long transactionOrUpdateId, long columnId, MemorySegment @NotNull [] keys, GetCallback callback) throws it.cavallium.rockserver.core.common.RocksDBException { // Column id var col = getColumn(columnId); - Tx tx = transactionId != 0 ? getTransaction(transactionId, true) : null; + Tx tx = transactionOrUpdateId != 0 ? getTransaction(transactionOrUpdateId, true) : null; long updateId; if (callback instanceof Callback.CallbackForUpdate) { if (tx == null) { tx = openTransactionInternal(MAX_TRANSACTION_DURATION_MS, true); updateId = allocateTransactionInternal(tx); } else { - updateId = transactionId; + updateId = transactionOrUpdateId; } } else { updateId = 0;