From 6782abb66d4ab2bc5ba3ee90bdb6fd5bf07b67cb Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Fri, 17 Sep 2021 16:56:28 +0200 Subject: [PATCH] Use Net5 --- pom.xml | 4 +-- .../netty5/buffer/api/pool/MetricUtils.java | 4 +-- .../PooledBufferAllocatorMetricUtils.java | 2 +- .../dbengine/client/CompositeDatabase.java | 2 +- .../dbengine/client/MappedSerializer.java | 4 +-- .../client/MappedSerializerFixedLength.java | 4 +-- .../database/LLDatabaseConnection.java | 2 +- .../cavallium/dbengine/database/LLDelta.java | 10 +++---- .../dbengine/database/LLDictionary.java | 6 ++--- .../cavallium/dbengine/database/LLEntry.java | 10 +++---- .../dbengine/database/LLKeyValueDatabase.java | 2 +- .../cavallium/dbengine/database/LLRange.java | 12 ++++----- .../cavallium/dbengine/database/LLUtils.java | 27 ++++++++++++------- .../database/collections/DatabaseEmpty.java | 6 ++--- .../collections/DatabaseMapDictionary.java | 6 ++--- .../DatabaseMapDictionaryDeep.java | 10 +++---- .../DatabaseMapDictionaryHashed.java | 6 ++--- .../collections/DatabaseSetDictionary.java | 4 +-- .../DatabaseSetDictionaryHashed.java | 4 +-- .../database/collections/DatabaseSingle.java | 6 ++--- .../collections/DatabaseStageMap.java | 2 +- .../database/collections/SubStageGetter.java | 4 +-- .../collections/SubStageGetterHashMap.java | 4 +-- .../collections/SubStageGetterHashSet.java | 4 +-- .../collections/SubStageGetterMap.java | 4 +-- .../collections/SubStageGetterMapDeep.java | 4 +-- .../collections/SubStageGetterSet.java | 4 +-- .../collections/SubStageGetterSingle.java | 4 +-- .../SubStageGetterSingleBytes.java | 4 +-- .../collections/ValueWithHashSerializer.java | 6 ++--- .../collections/ValuesSetSerializer.java | 6 ++--- .../disk/LLLocalDatabaseConnection.java | 2 +- .../database/disk/LLLocalDictionary.java | 14 +++++----- .../LLLocalEntryReactiveRocksIterator.java | 6 ++--- ...ocalGroupedEntryReactiveRocksIterator.java | 6 ++--- ...LLocalGroupedKeyReactiveRocksIterator.java | 6 ++--- .../LLLocalGroupedReactiveRocksIterator.java | 6 ++--- ...LLLocalKeyPrefixReactiveRocksIterator.java | 6 ++--- .../disk/LLLocalKeyReactiveRocksIterator.java | 6 ++--- .../disk/LLLocalKeyValueDatabase.java | 4 +-- .../disk/LLLocalReactiveRocksIterator.java | 8 +++--- .../database/disk/MemorySegmentUtils.java | 2 +- .../database/disk/ReleasableSlice.java | 2 +- .../memory/LLMemoryDatabaseConnection.java | 2 +- .../database/memory/LLMemoryDictionary.java | 6 ++--- .../memory/LLMemoryKeyValueDatabase.java | 2 +- .../database/memory/LLMemorySingleton.java | 4 +-- .../serialization/BufferDataInput.java | 4 +-- .../serialization/BufferDataOutput.java | 2 +- .../serialization/CodecSerializer.java | 6 ++--- .../database/serialization/Serializer.java | 6 ++--- .../SerializerFixedBinaryLength.java | 6 ++--- .../dbengine/netty/JMXNettyMonitoring.java | 2 +- .../netty/JMXNettyMonitoringManager.java | 10 +++---- .../netty/JMXPoolArenaNettyMonitoring.java | 2 +- .../netty/JMXPooledNettyMonitoring.java | 6 ++--- .../java/org/rocksdb/CappedWriteBatch.java | 8 +++--- .../it/cavallium/dbengine/DbTestUtils.java | 14 +++++----- .../dbengine/TemporaryDbGenerator.java | 2 +- .../it/cavallium/dbengine/TestAllocator.java | 2 +- .../dbengine/TestLLDictionaryLeaks.java | 4 +-- .../database/collections/TestRanges.java | 6 ++--- 62 files changed, 173 insertions(+), 166 deletions(-) diff --git a/pom.xml b/pom.xml index e5b1cdf..891bd7a 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ common-utils - io.netty5 + io.net5 netty-buffer @@ -251,7 +251,7 @@ 1.1.4 - io.netty5 + io.net5 netty-buffer 5.0.0.Final-SNAPSHOT diff --git a/src/main/java/io/netty5/buffer/api/pool/MetricUtils.java b/src/main/java/io/netty5/buffer/api/pool/MetricUtils.java index 2e21da4..6ce30db 100644 --- a/src/main/java/io/netty5/buffer/api/pool/MetricUtils.java +++ b/src/main/java/io/netty5/buffer/api/pool/MetricUtils.java @@ -1,4 +1,4 @@ -package io.netty5.buffer.api.pool; +package io.net5.buffer.api.pool; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -19,7 +19,7 @@ public class MetricUtils { MethodHandle handle = null; try { // Find the class - var pooledBufferClass = Class.forName("io.netty5.buffer.api.pool.PooledBufferAllocatorMetric"); + var pooledBufferClass = Class.forName("io.net5.buffer.api.pool.PooledBufferAllocatorMetric"); // Find the handle of the method handle = lookup.findVirtual(pooledBufferClass, "arenaMetrics", MethodType.methodType(List.class)); } catch (NoSuchMethodException | IllegalAccessException | ClassNotFoundException ignored) { diff --git a/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocatorMetricUtils.java b/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocatorMetricUtils.java index 3a57890..4fcc39f 100644 --- a/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocatorMetricUtils.java +++ b/src/main/java/io/netty5/buffer/api/pool/PooledBufferAllocatorMetricUtils.java @@ -1,4 +1,4 @@ -package io.netty5.buffer.api.pool; +package io.net5.buffer.api.pool; import java.util.List; diff --git a/src/main/java/it/cavallium/dbengine/client/CompositeDatabase.java b/src/main/java/it/cavallium/dbengine/client/CompositeDatabase.java index 8fc7c06..5b7b23c 100644 --- a/src/main/java/it/cavallium/dbengine/client/CompositeDatabase.java +++ b/src/main/java/it/cavallium/dbengine/client/CompositeDatabase.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.client; -import io.netty5.buffer.api.BufferAllocator; +import io.net5.buffer.api.BufferAllocator; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/src/main/java/it/cavallium/dbengine/client/MappedSerializer.java b/src/main/java/it/cavallium/dbengine/client/MappedSerializer.java index c7afaf5..353ee52 100644 --- a/src/main/java/it/cavallium/dbengine/client/MappedSerializer.java +++ b/src/main/java/it/cavallium/dbengine/client/MappedSerializer.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.client; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.Serializer; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java b/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java index a5f4847..1db9558 100644 --- a/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java +++ b/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.client; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.SerializerFixedBinaryLength; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/cavallium/dbengine/database/LLDatabaseConnection.java b/src/main/java/it/cavallium/dbengine/database/LLDatabaseConnection.java index f84043b..2743398 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLDatabaseConnection.java +++ b/src/main/java/it/cavallium/dbengine/database/LLDatabaseConnection.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database; -import io.netty5.buffer.api.BufferAllocator; +import io.net5.buffer.api.BufferAllocator; import it.cavallium.dbengine.client.DatabaseOptions; import it.cavallium.dbengine.client.IndicizerAnalyzers; import it.cavallium.dbengine.client.IndicizerSimilarities; diff --git a/src/main/java/it/cavallium/dbengine/database/LLDelta.java b/src/main/java/it/cavallium/dbengine/database/LLDelta.java index 62facce..dbf445b 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLDelta.java +++ b/src/main/java/it/cavallium/dbengine/database/LLDelta.java @@ -1,10 +1,10 @@ package it.cavallium.dbengine.database; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Drop; +import io.net5.buffer.api.Owned; +import io.net5.buffer.api.Send; +import io.net5.buffer.api.internal.ResourceSupport; import java.util.StringJoiner; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/cavallium/dbengine/database/LLDictionary.java b/src/main/java/it/cavallium/dbengine/database/LLDictionary.java index 67e3204..69d9403 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/LLDictionary.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.database.serialization.BiSerializationFunction; import it.cavallium.dbengine.database.serialization.SerializationFunction; diff --git a/src/main/java/it/cavallium/dbengine/database/LLEntry.java b/src/main/java/it/cavallium/dbengine/database/LLEntry.java index aae3135..71c0318 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLEntry.java +++ b/src/main/java/it/cavallium/dbengine/database/LLEntry.java @@ -1,10 +1,10 @@ package it.cavallium.dbengine.database; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Drop; +import io.net5.buffer.api.Owned; +import io.net5.buffer.api.Send; +import io.net5.buffer.api.internal.ResourceSupport; import java.util.StringJoiner; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/cavallium/dbengine/database/LLKeyValueDatabase.java b/src/main/java/it/cavallium/dbengine/database/LLKeyValueDatabase.java index b210913..a62d0cd 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLKeyValueDatabase.java +++ b/src/main/java/it/cavallium/dbengine/database/LLKeyValueDatabase.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; -import io.netty5.buffer.api.BufferAllocator; +import io.net5.buffer.api.BufferAllocator; import it.cavallium.dbengine.database.collections.DatabaseInt; import it.cavallium.dbengine.database.collections.DatabaseLong; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/it/cavallium/dbengine/database/LLRange.java b/src/main/java/it/cavallium/dbengine/database/LLRange.java index 39aafd6..cbbdfb9 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLRange.java +++ b/src/main/java/it/cavallium/dbengine/database/LLRange.java @@ -1,12 +1,12 @@ package it.cavallium.dbengine.database; -import static io.netty5.buffer.Unpooled.wrappedBuffer; +import static io.net5.buffer.Unpooled.wrappedBuffer; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Drop; +import io.net5.buffer.api.Owned; +import io.net5.buffer.api.Send; +import io.net5.buffer.api.internal.ResourceSupport; import java.util.StringJoiner; /** diff --git a/src/main/java/it/cavallium/dbengine/database/LLUtils.java b/src/main/java/it/cavallium/dbengine/database/LLUtils.java index f91490d..d4f47b2 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLUtils.java +++ b/src/main/java/it/cavallium/dbengine/database/LLUtils.java @@ -2,12 +2,12 @@ package it.cavallium.dbengine.database; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.CompositeBuffer; -import io.netty5.buffer.api.Send; -import io.netty5.util.IllegalReferenceCountException; -import io.netty5.util.internal.PlatformDependent; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.CompositeBuffer; +import io.net5.buffer.api.Send; +import io.net5.util.IllegalReferenceCountException; +import io.net5.util.internal.PlatformDependent; import it.cavallium.dbengine.database.collections.DatabaseStage; import it.cavallium.dbengine.database.disk.MemorySegmentUtils; import it.cavallium.dbengine.database.serialization.SerializationException; @@ -23,6 +23,7 @@ import java.util.Map.Entry; import java.util.Objects; import java.util.Optional; import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicLong; import java.util.function.ToIntFunction; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -349,7 +350,7 @@ public class LLUtils { @NotNull public static DirectBuffer convertToDirect(BufferAllocator allocator, Send content) { try (var buf = content.receive()) { - if (buf.nativeAddress() != 0) { + if (buf.countComponents() != 0) { var direct = obtainDirect(buf); return new DirectBuffer(buf.send(), direct); } else { @@ -374,8 +375,14 @@ public class LLUtils { + " Please set \"--enable-preview --add-modules jdk.incubator.foreign -Dforeign.restricted=permit\""); } assert buffer.isAccessible(); - long nativeAddress; - if ((nativeAddress = buffer.nativeAddress()) == 0) { + AtomicLong nativeAddress = new AtomicLong(0); + if (buffer.countComponents() == 1 && buffer.countReadableComponents() == 1) { + buffer.forEachReadable(0, (i, c) -> { + nativeAddress.setPlain(c.readableNativeAddress()); + return false; + }); + } + if (nativeAddress.getPlain() == 0) { if (buffer.capacity() == 0) { return EMPTY_BYTE_BUFFER; } @@ -384,7 +391,7 @@ public class LLUtils { } throw new IllegalStateException("Buffer is not direct"); } - return MemorySegmentUtils.directBuffer(nativeAddress, buffer.capacity()); + return MemorySegmentUtils.directBuffer(nativeAddress.getPlain(), buffer.capacity()); } public static Buffer fromByteArray(BufferAllocator alloc, byte[] array) { diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseEmpty.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseEmpty.java index 5664c54..d33e58d 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseEmpty.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseEmpty.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.serialization.Serializer; import it.cavallium.dbengine.database.serialization.Serializer.DeserializationResult; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java index e2a1e94..a60bf43 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; +import io.net5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.Delta; import it.cavallium.dbengine.database.ExtraKeyOperationResult; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java index f32f316..075b5dc 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java @@ -1,10 +1,10 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Resource; -import io.netty5.buffer.api.Send; -import io.netty5.util.IllegalReferenceCountException; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Resource; +import io.net5.buffer.api.Send; +import io.net5.util.IllegalReferenceCountException; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java index 9459140..9c0d89d 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionary.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionary.java index 3431556..b2506f4 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionary.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.collections.DatabaseEmpty.Nothing; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionaryHashed.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionaryHashed.java index ee3677e..9be9db7 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionaryHashed.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionaryHashed.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.collections.DatabaseEmpty.Nothing; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingle.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingle.java index e47b37c..8dcd6ab 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingle.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingle.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; +import io.net5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.Delta; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStageMap.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStageMap.java index 1c6cadb..42cf458 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStageMap.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStageMap.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; +import io.net5.buffer.api.Buffer; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.Delta; import it.cavallium.dbengine.database.ExtraKeyOperationResult; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetter.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetter.java index d4b502b..af71741 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetter.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetter.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashMap.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashMap.java index e80077d..48e6add 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashMap.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashMap.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.serialization.Serializer; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashSet.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashSet.java index cdd35dc..101b8a6 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashSet.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashSet.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.collections.DatabaseEmpty.Nothing; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMap.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMap.java index ed1b779..dee4cb6 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMap.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMap.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.serialization.Serializer; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMapDeep.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMapDeep.java index 8db2a52..5794c85 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMapDeep.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMapDeep.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.serialization.SerializerFixedBinaryLength; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSet.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSet.java index 8c969e3..0e26fea 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSet.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSet.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.collections.DatabaseEmpty.Nothing; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingle.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingle.java index 68f7e9c..eb71e26 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingle.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingle.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.serialization.Serializer; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingleBytes.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingleBytes.java index f6b94a6..06efe00 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingleBytes.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingleBytes.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.serialization.Serializer; public class SubStageGetterSingleBytes extends SubStageGetterSingle> { diff --git a/src/main/java/it/cavallium/dbengine/database/collections/ValueWithHashSerializer.java b/src/main/java/it/cavallium/dbengine/database/collections/ValueWithHashSerializer.java index 44bcbb1..6a6514b 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/ValueWithHashSerializer.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/ValueWithHashSerializer.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.Serializer; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/ValuesSetSerializer.java b/src/main/java/it/cavallium/dbengine/database/collections/ValuesSetSerializer.java index b463d6d..ec24f86 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/ValuesSetSerializer.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/ValuesSetSerializer.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.Serializer; import it.unimi.dsi.fastutil.objects.ObjectArraySet; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDatabaseConnection.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDatabaseConnection.java index 0a155e8..4b263d9 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDatabaseConnection.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDatabaseConnection.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.BufferAllocator; +import io.net5.buffer.api.BufferAllocator; import it.cavallium.dbengine.client.IndicizerAnalyzers; import it.cavallium.dbengine.client.IndicizerSimilarities; import it.cavallium.dbengine.client.LuceneOptions; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java index 3f36a75..65db216 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java @@ -1,16 +1,16 @@ package it.cavallium.dbengine.database.disk; -import static io.netty5.buffer.Unpooled.wrappedBuffer; +import static io.net5.buffer.Unpooled.wrappedBuffer; import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB; import static it.cavallium.dbengine.database.LLUtils.fromByteArray; import static java.util.Objects.requireNonNull; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Resource; -import io.netty5.buffer.api.Send; -import io.netty5.buffer.api.internal.ResourceSupport; -import io.netty5.util.internal.PlatformDependent; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Resource; +import io.net5.buffer.api.Send; +import io.net5.buffer.api.internal.ResourceSupport; +import io.net5.util.internal.PlatformDependent; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.client.DatabaseOptions; import it.cavallium.dbengine.database.Column; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalEntryReactiveRocksIterator.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalEntryReactiveRocksIterator.java index 91f6cbe..4712fcc 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalEntryReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalEntryReactiveRocksIterator.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.LLEntry; import it.cavallium.dbengine.database.LLRange; import org.rocksdb.ColumnFamilyHandle; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedEntryReactiveRocksIterator.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedEntryReactiveRocksIterator.java index 10b797e..f6243a4 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedEntryReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedEntryReactiveRocksIterator.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.LLEntry; import it.cavallium.dbengine.database.LLRange; import org.rocksdb.ColumnFamilyHandle; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedKeyReactiveRocksIterator.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedKeyReactiveRocksIterator.java index e84d758..61752f3 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedKeyReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedKeyReactiveRocksIterator.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.LLRange; import org.rocksdb.ColumnFamilyHandle; import org.rocksdb.ReadOptions; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java index 2802727..6b268c9 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; import it.unimi.dsi.fastutil.objects.ObjectArrayList; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyPrefixReactiveRocksIterator.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyPrefixReactiveRocksIterator.java index b0d860f..4ef635a 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyPrefixReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyPrefixReactiveRocksIterator.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; import org.rocksdb.ColumnFamilyHandle; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyReactiveRocksIterator.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyReactiveRocksIterator.java index 16f668f..dd3d32d 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyReactiveRocksIterator.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.LLRange; import org.rocksdb.ColumnFamilyHandle; import org.rocksdb.ReadOptions; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java index 08313c9..e5e0f92 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java @@ -2,8 +2,8 @@ package it.cavallium.dbengine.database.disk; import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.util.internal.PlatformDependent; +import io.net5.buffer.api.BufferAllocator; +import io.net5.util.internal.PlatformDependent; import it.cavallium.dbengine.database.Column; import it.cavallium.dbengine.client.DatabaseOptions; import it.cavallium.dbengine.database.LLKeyValueDatabase; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalReactiveRocksIterator.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalReactiveRocksIterator.java index 0020132..d581a19 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalReactiveRocksIterator.java @@ -2,10 +2,10 @@ package it.cavallium.dbengine.database.disk; import static it.cavallium.dbengine.database.disk.LLLocalDictionary.getRocksIterator; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; -import io.netty5.util.IllegalReferenceCountException; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; +import io.net5.util.IllegalReferenceCountException; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/MemorySegmentUtils.java b/src/main/java/it/cavallium/dbengine/database/disk/MemorySegmentUtils.java index ee2f0cc..94f6236 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/MemorySegmentUtils.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/MemorySegmentUtils.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.util.internal.PlatformDependent; +import io.net5.util.internal.PlatformDependent; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles.Lookup; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/ReleasableSlice.java b/src/main/java/it/cavallium/dbengine/database/disk/ReleasableSlice.java index 26ebdb7..0dc925f 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/ReleasableSlice.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/ReleasableSlice.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; +import io.net5.buffer.api.Buffer; import it.cavallium.dbengine.database.SafeCloseable; import org.rocksdb.AbstractSlice; diff --git a/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDatabaseConnection.java b/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDatabaseConnection.java index 650c000..7c09987 100644 --- a/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDatabaseConnection.java +++ b/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDatabaseConnection.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.memory; -import io.netty5.buffer.api.BufferAllocator; +import io.net5.buffer.api.BufferAllocator; import it.cavallium.dbengine.client.DatabaseOptions; import it.cavallium.dbengine.client.IndicizerAnalyzers; import it.cavallium.dbengine.client.IndicizerSimilarities; diff --git a/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDictionary.java b/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDictionary.java index 5fdaf2f..0de957d 100644 --- a/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDictionary.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.memory; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.database.ExtraKeyOperationResult; import it.cavallium.dbengine.database.LLDelta; diff --git a/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryKeyValueDatabase.java b/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryKeyValueDatabase.java index be8edff..8d1b411 100644 --- a/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryKeyValueDatabase.java +++ b/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryKeyValueDatabase.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.memory; -import io.netty5.buffer.api.BufferAllocator; +import io.net5.buffer.api.BufferAllocator; import it.cavallium.dbengine.database.Column; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.LLKeyValueDatabase; diff --git a/src/main/java/it/cavallium/dbengine/database/memory/LLMemorySingleton.java b/src/main/java/it/cavallium/dbengine/database/memory/LLMemorySingleton.java index 45c28e9..11ddf72 100644 --- a/src/main/java/it/cavallium/dbengine/database/memory/LLMemorySingleton.java +++ b/src/main/java/it/cavallium/dbengine/database/memory/LLMemorySingleton.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.memory; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.LLDictionaryResultType; import it.cavallium.dbengine.database.LLSingleton; import it.cavallium.dbengine.database.LLSnapshot; diff --git a/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInput.java b/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInput.java index b53fb2f..0f2a775 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInput.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInput.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.serialization; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.SafeCloseable; import java.io.DataInput; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataOutput.java b/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataOutput.java index d354634..b05d2cb 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataOutput.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataOutput.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.serialization; -import io.netty5.buffer.api.Buffer; +import io.net5.buffer.api.Buffer; import java.io.DataOutput; import java.nio.charset.StandardCharsets; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/cavallium/dbengine/database/serialization/CodecSerializer.java b/src/main/java/it/cavallium/dbengine/database/serialization/CodecSerializer.java index fcb531f..62abfe9 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/CodecSerializer.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/CodecSerializer.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.serialization; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import java.io.IOError; import java.io.IOException; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/cavallium/dbengine/database/serialization/Serializer.java b/src/main/java/it/cavallium/dbengine/database/serialization/Serializer.java index b175ab3..778a787 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/Serializer.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/Serializer.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.serialization; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.LLUtils; import java.nio.charset.StandardCharsets; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/cavallium/dbengine/database/serialization/SerializerFixedBinaryLength.java b/src/main/java/it/cavallium/dbengine/database/serialization/SerializerFixedBinaryLength.java index c1c1e80..d93a942 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/SerializerFixedBinaryLength.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/SerializerFixedBinaryLength.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.serialization; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.database.LLUtils; import java.nio.charset.StandardCharsets; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/cavallium/dbengine/netty/JMXNettyMonitoring.java b/src/main/java/it/cavallium/dbengine/netty/JMXNettyMonitoring.java index 5fae52f..5cf1131 100644 --- a/src/main/java/it/cavallium/dbengine/netty/JMXNettyMonitoring.java +++ b/src/main/java/it/cavallium/dbengine/netty/JMXNettyMonitoring.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.netty; -import io.netty5.buffer.api.pool.BufferAllocatorMetric; +import io.net5.buffer.api.pool.BufferAllocatorMetric; public class JMXNettyMonitoring implements JMXNettyMonitoringMBean { diff --git a/src/main/java/it/cavallium/dbengine/netty/JMXNettyMonitoringManager.java b/src/main/java/it/cavallium/dbengine/netty/JMXNettyMonitoringManager.java index 9d13f2a..c6dc415 100644 --- a/src/main/java/it/cavallium/dbengine/netty/JMXNettyMonitoringManager.java +++ b/src/main/java/it/cavallium/dbengine/netty/JMXNettyMonitoringManager.java @@ -1,10 +1,10 @@ package it.cavallium.dbengine.netty; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.DefaultGlobalBufferAllocator; -import io.netty5.buffer.api.pool.MetricUtils; -import io.netty5.buffer.api.pool.PoolArenaMetric; -import io.netty5.buffer.api.pool.PooledBufferAllocator; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.DefaultGlobalBufferAllocator; +import io.net5.buffer.api.pool.MetricUtils; +import io.net5.buffer.api.pool.PoolArenaMetric; +import io.net5.buffer.api.pool.PooledBufferAllocator; import java.lang.management.ManagementFactory; import java.util.Map; import java.util.Map.Entry; diff --git a/src/main/java/it/cavallium/dbengine/netty/JMXPoolArenaNettyMonitoring.java b/src/main/java/it/cavallium/dbengine/netty/JMXPoolArenaNettyMonitoring.java index 13e15cb..d42e573 100644 --- a/src/main/java/it/cavallium/dbengine/netty/JMXPoolArenaNettyMonitoring.java +++ b/src/main/java/it/cavallium/dbengine/netty/JMXPoolArenaNettyMonitoring.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.netty; -import io.netty5.buffer.api.pool.PoolArenaMetric; +import io.net5.buffer.api.pool.PoolArenaMetric; public class JMXPoolArenaNettyMonitoring implements JMXPoolArenaNettyMonitoringMBean { diff --git a/src/main/java/it/cavallium/dbengine/netty/JMXPooledNettyMonitoring.java b/src/main/java/it/cavallium/dbengine/netty/JMXPooledNettyMonitoring.java index b94dad3..266d985 100644 --- a/src/main/java/it/cavallium/dbengine/netty/JMXPooledNettyMonitoring.java +++ b/src/main/java/it/cavallium/dbengine/netty/JMXPooledNettyMonitoring.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.netty; -import io.netty5.buffer.api.pool.BufferAllocatorMetric; -import io.netty5.buffer.api.pool.PooledBufferAllocator; -import io.netty5.buffer.api.pool.PooledBufferAllocatorMetricUtils; +import io.net5.buffer.api.pool.BufferAllocatorMetric; +import io.net5.buffer.api.pool.PooledBufferAllocator; +import io.net5.buffer.api.pool.PooledBufferAllocatorMetricUtils; import java.lang.reflect.Field; public class JMXPooledNettyMonitoring extends JMXNettyMonitoring implements JMXNettyMonitoringMBean { diff --git a/src/main/java/org/rocksdb/CappedWriteBatch.java b/src/main/java/org/rocksdb/CappedWriteBatch.java index f576704..f5e11d6 100644 --- a/src/main/java/org/rocksdb/CappedWriteBatch.java +++ b/src/main/java/org/rocksdb/CappedWriteBatch.java @@ -2,10 +2,10 @@ package org.rocksdb; import static it.cavallium.dbengine.database.LLUtils.isDirect; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; -import io.netty5.util.internal.PlatformDependent; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.BufferAllocator; +import io.net5.buffer.api.Send; +import io.net5.util.internal.PlatformDependent; import it.cavallium.dbengine.database.LLUtils; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/src/test/java/it/cavallium/dbengine/DbTestUtils.java b/src/test/java/it/cavallium/dbengine/DbTestUtils.java index a4da5c2..dfb27c7 100644 --- a/src/test/java/it/cavallium/dbengine/DbTestUtils.java +++ b/src/test/java/it/cavallium/dbengine/DbTestUtils.java @@ -2,13 +2,13 @@ package it.cavallium.dbengine; import static org.junit.jupiter.api.Assertions.assertEquals; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.MemoryManager; -import io.netty5.buffer.api.Send; -import io.netty5.buffer.api.pool.MetricUtils; -import io.netty5.buffer.api.pool.PoolArenaMetric; -import io.netty5.buffer.api.pool.PooledBufferAllocator; -import io.netty5.util.internal.PlatformDependent; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.MemoryManager; +import io.net5.buffer.api.Send; +import io.net5.buffer.api.pool.MetricUtils; +import io.net5.buffer.api.pool.PoolArenaMetric; +import io.net5.buffer.api.pool.PooledBufferAllocator; +import io.net5.util.internal.PlatformDependent; import it.cavallium.dbengine.database.LLDatabaseConnection; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.LLKeyValueDatabase; diff --git a/src/test/java/it/cavallium/dbengine/TemporaryDbGenerator.java b/src/test/java/it/cavallium/dbengine/TemporaryDbGenerator.java index 85e63d1..3b9ca3a 100644 --- a/src/test/java/it/cavallium/dbengine/TemporaryDbGenerator.java +++ b/src/test/java/it/cavallium/dbengine/TemporaryDbGenerator.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine; -import io.netty5.buffer.api.BufferAllocator; +import io.net5.buffer.api.BufferAllocator; import it.cavallium.dbengine.DbTestUtils.TempDb; import it.cavallium.dbengine.DbTestUtils.TestAllocator; import reactor.core.publisher.Mono; diff --git a/src/test/java/it/cavallium/dbengine/TestAllocator.java b/src/test/java/it/cavallium/dbengine/TestAllocator.java index 21965c0..5b1f9f7 100644 --- a/src/test/java/it/cavallium/dbengine/TestAllocator.java +++ b/src/test/java/it/cavallium/dbengine/TestAllocator.java @@ -4,7 +4,7 @@ import static it.cavallium.dbengine.DbTestUtils.destroyAllocator; import static it.cavallium.dbengine.DbTestUtils.ensureNoLeaks; import static it.cavallium.dbengine.DbTestUtils.newAllocator; -import io.netty5.buffer.api.Buffer; +import io.net5.buffer.api.Buffer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java b/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java index 49541e8..3a15e47 100644 --- a/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java +++ b/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java @@ -6,8 +6,8 @@ import static it.cavallium.dbengine.DbTestUtils.newAllocator; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.net5.buffer.api.Buffer; +import io.net5.buffer.api.Send; import it.cavallium.dbengine.DbTestUtils.TempDb; import it.cavallium.dbengine.DbTestUtils.TestAllocator; import it.cavallium.dbengine.database.LLDictionary; diff --git a/src/test/java/it/cavallium/dbengine/database/collections/TestRanges.java b/src/test/java/it/cavallium/dbengine/database/collections/TestRanges.java index acbdbce..a8c8190 100644 --- a/src/test/java/it/cavallium/dbengine/database/collections/TestRanges.java +++ b/src/test/java/it/cavallium/dbengine/database/collections/TestRanges.java @@ -1,14 +1,14 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.Unpooled; -import io.netty5.buffer.api.BufferAllocator; +import io.net5.buffer.Unpooled; +import io.net5.buffer.api.BufferAllocator; import it.cavallium.dbengine.database.LLUtils; import java.util.Arrays; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import static io.netty5.buffer.Unpooled.*; +import static io.net5.buffer.Unpooled.*; public class TestRanges {