diff --git a/pom.xml b/pom.xml index 64328fe..6351d46 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 0-SNAPSHOT false 1.9.3 - 9.3.0 + 9.4.0 5.9.0 @@ -120,7 +120,7 @@ io.netty netty5-buffer - 5.0.0.Alpha4 + 5.0.0.Alpha5 io.netty diff --git a/src/main/java/it/cavallium/dbengine/MetricUtils.java b/src/main/java/it/cavallium/dbengine/MetricUtils.java index 7ba4418..039860b 100644 --- a/src/main/java/it/cavallium/dbengine/MetricUtils.java +++ b/src/main/java/it/cavallium/dbengine/MetricUtils.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine; -import io.netty5.buffer.api.pool.PoolArenaMetric; -import io.netty5.buffer.api.pool.PooledBufferAllocator; +import io.netty5.buffer.pool.PoolArenaMetric; +import io.netty5.buffer.pool.PooledBufferAllocator; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -24,7 +24,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.netty5.buffer.pool.PooledBufferAllocatorMetric"); // Find the handle of the method handle = lookup.findVirtual(pooledBufferClass, "arenaMetrics", MethodType.methodType(List.class)); } catch (NoSuchMethodException | IllegalAccessException | ClassNotFoundException ex) { diff --git a/src/main/java/it/cavallium/dbengine/client/CompositeDatabase.java b/src/main/java/it/cavallium/dbengine/client/CompositeDatabase.java index c5b3956..3a91ba5 100644 --- a/src/main/java/it/cavallium/dbengine/client/CompositeDatabase.java +++ b/src/main/java/it/cavallium/dbengine/client/CompositeDatabase.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.client; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.database.DatabaseProperties; 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 a6ce3e4..91d8f74 100644 --- a/src/main/java/it/cavallium/dbengine/client/MappedSerializer.java +++ b/src/main/java/it/cavallium/dbengine/client/MappedSerializer.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.client; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.Serializer; diff --git a/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java b/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java index a7ada31..ebe9090 100644 --- a/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java +++ b/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.client; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.SerializerFixedBinaryLength; diff --git a/src/main/java/it/cavallium/dbengine/database/BufSupplier.java b/src/main/java/it/cavallium/dbengine/database/BufSupplier.java index 0a9d83f..06f212c 100644 --- a/src/main/java/it/cavallium/dbengine/database/BufSupplier.java +++ b/src/main/java/it/cavallium/dbengine/database/BufSupplier.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import java.util.function.Supplier; diff --git a/src/main/java/it/cavallium/dbengine/database/LLDatabaseConnection.java b/src/main/java/it/cavallium/dbengine/database/LLDatabaseConnection.java index 84ff03f..1c68a0c 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLDatabaseConnection.java +++ b/src/main/java/it/cavallium/dbengine/database/LLDatabaseConnection.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.lucene.LuceneHacks; import it.cavallium.dbengine.lucene.LuceneRocksDBManager; import it.cavallium.dbengine.rpc.current.data.Column; diff --git a/src/main/java/it/cavallium/dbengine/database/LLDelta.java b/src/main/java/it/cavallium/dbengine/database/LLDelta.java index 836a2d4..25001c5 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.Buffer; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; import io.netty5.util.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.utils.SimpleResource; import java.util.StringJoiner; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/it/cavallium/dbengine/database/LLDictionary.java b/src/main/java/it/cavallium/dbengine/database/LLDictionary.java index 1ea7704..3e8b9cf 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/LLDictionary.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import io.netty5.util.Send; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.database.disk.BinarySerializationFunction; diff --git a/src/main/java/it/cavallium/dbengine/database/LLEntry.java b/src/main/java/it/cavallium/dbengine/database/LLEntry.java index 5c68385..ae65a71 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLEntry.java +++ b/src/main/java/it/cavallium/dbengine/database/LLEntry.java @@ -1,11 +1,11 @@ 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.Buffer; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; import io.netty5.util.Resource; import io.netty5.util.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.utils.SimpleResource; import java.util.Objects; import java.util.StringJoiner; diff --git a/src/main/java/it/cavallium/dbengine/database/LLKeyValueDatabase.java b/src/main/java/it/cavallium/dbengine/database/LLKeyValueDatabase.java index 590b117..cd8e4c4 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLKeyValueDatabase.java +++ b/src/main/java/it/cavallium/dbengine/database/LLKeyValueDatabase.java @@ -3,7 +3,7 @@ package it.cavallium.dbengine.database; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.client.IBackuppable; import it.cavallium.dbengine.client.MemoryStats; import it.cavallium.dbengine.database.collections.DatabaseInt; diff --git a/src/main/java/it/cavallium/dbengine/database/LLMultiDatabaseConnection.java b/src/main/java/it/cavallium/dbengine/database/LLMultiDatabaseConnection.java index a9a04e4..17083c6 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLMultiDatabaseConnection.java +++ b/src/main/java/it/cavallium/dbengine/database/LLMultiDatabaseConnection.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database; import com.google.common.collect.Multimap; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.client.ConnectionSettings.ConnectionPart; import it.cavallium.dbengine.client.ConnectionSettings.ConnectionPart.ConnectionPartLucene; import it.cavallium.dbengine.client.ConnectionSettings.ConnectionPart.ConnectionPartRocksDB; diff --git a/src/main/java/it/cavallium/dbengine/database/LLRange.java b/src/main/java/it/cavallium/dbengine/database/LLRange.java index 66aba39..8de0c8e 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLRange.java +++ b/src/main/java/it/cavallium/dbengine/database/LLRange.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.Buffer; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; import io.netty5.util.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.utils.SimpleResource; import java.util.StringJoiner; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/it/cavallium/dbengine/database/LLSearchResultShard.java b/src/main/java/it/cavallium/dbengine/database/LLSearchResultShard.java index 0130437..e5ab01a 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLSearchResultShard.java +++ b/src/main/java/it/cavallium/dbengine/database/LLSearchResultShard.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.client.LuceneIndexImpl; import it.cavallium.dbengine.client.query.current.data.TotalHitsCount; import it.cavallium.dbengine.lucene.LuceneCloseable; diff --git a/src/main/java/it/cavallium/dbengine/database/LLSingleton.java b/src/main/java/it/cavallium/dbengine/database/LLSingleton.java index 0f8499b..6606366 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLSingleton.java +++ b/src/main/java/it/cavallium/dbengine/database/LLSingleton.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import io.netty5.util.Send; import it.cavallium.dbengine.database.disk.BinarySerializationFunction; import it.cavallium.dbengine.database.serialization.SerializationFunction; diff --git a/src/main/java/it/cavallium/dbengine/database/LLUtils.java b/src/main/java/it/cavallium/dbengine/database/LLUtils.java index 6d0181c..01ea864 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLUtils.java +++ b/src/main/java/it/cavallium/dbengine/database/LLUtils.java @@ -1,21 +1,20 @@ package it.cavallium.dbengine.database; -import static io.netty5.buffer.api.StandardAllocationTypes.OFF_HEAP; +import static io.netty5.buffer.StandardAllocationTypes.OFF_HEAP; +import static io.netty5.buffer.internal.InternalBufferUtils.NO_OP_DROP; import static it.cavallium.dbengine.lucene.LuceneUtils.luceneScheduler; import static org.apache.commons.lang3.ArrayUtils.EMPTY_BYTE_ARRAY; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; -import io.netty5.buffer.api.AllocatorControl; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.CompositeBuffer; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.ReadableComponent; +import io.netty5.buffer.AllocatorControl; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.BufferComponent; +import io.netty5.buffer.CompositeBuffer; +import io.netty5.buffer.Drop; import io.netty5.util.Resource; import io.netty5.util.Send; -import io.netty5.buffer.api.WritableComponent; -import io.netty5.buffer.api.internal.Statics; import io.netty5.util.IllegalReferenceCountException; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.SerializationFunction; @@ -534,7 +533,7 @@ public class LLUtils { try { assert directBuffer.readerOffset() == 0; assert directBuffer.writerOffset() == 0; - var directBufferWriter = ((WritableComponent) directBuffer).writableBuffer(); + var directBufferWriter = ((BufferComponent) directBuffer).writableBuffer(); assert directBufferWriter.position() == 0; assert directBufferWriter.capacity() >= directBuffer.capacity(); assert directBufferWriter.isDirect(); @@ -552,7 +551,7 @@ public class LLUtils { assert directBuffer.readerOffset() == 0; directBuffer.ensureWritable(trueSize); assert directBuffer.writerOffset() == 0; - directBufferWriter = ((WritableComponent) directBuffer).writableBuffer(); + directBufferWriter = ((BufferComponent) directBuffer).writableBuffer(); assert directBufferWriter.position() == 0; assert directBufferWriter.isDirect(); reader.applyAsInt(directBufferWriter.position(0)); @@ -783,16 +782,16 @@ public class LLUtils { private static Drop drop() { // We cannot reliably drop unsafe memory. We have to rely on the cleaner to do that. - return Statics.NO_OP_DROP; + return NO_OP_DROP; } public static boolean isReadOnlyDirect(Buffer inputBuffer) { - return inputBuffer.isDirect() && inputBuffer instanceof ReadableComponent; + return inputBuffer instanceof BufferComponent component && component.readableNativeAddress() != 0; } public static ByteBuffer getReadOnlyDirect(Buffer inputBuffer) { assert isReadOnlyDirect(inputBuffer); - return ((ReadableComponent) inputBuffer).readableBuffer(); + return ((BufferComponent) inputBuffer).readableBuffer(); } public static Buffer fromByteArray(BufferAllocator alloc, byte[] array) { @@ -967,7 +966,7 @@ public class LLUtils { if (readableComponents == 0) { return true; } else if (readableComponents == 1) { - return key.forEachReadable(0, (index, component) -> component.readableBuffer().isDirect()) >= 0; + return key.isDirect(); } else { return false; } diff --git a/src/main/java/it/cavallium/dbengine/database/OptionalBuf.java b/src/main/java/it/cavallium/dbengine/database/OptionalBuf.java index 24df549..35f145f 100644 --- a/src/main/java/it/cavallium/dbengine/database/OptionalBuf.java +++ b/src/main/java/it/cavallium/dbengine/database/OptionalBuf.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import java.util.NoSuchElementException; import java.util.Objects; import java.util.Optional; 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 a8634cc..931db22 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseEmpty.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseEmpty.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.database.BufSupplier; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.serialization.Serializer; 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 af18c29..e908fe1 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java @@ -2,9 +2,9 @@ package it.cavallium.dbengine.database.collections; import static java.util.Objects.requireNonNullElseGet; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Resource; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.BufSupplier; import it.cavallium.dbengine.database.Delta; 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 f3c3a10..b6894ca 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java @@ -1,12 +1,12 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.DefaultBufferAllocators; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.DefaultBufferAllocators; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; import io.netty5.util.Resource; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.BufSupplier; 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 c8d3803..f8477f5 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java @@ -1,15 +1,15 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; import io.netty5.util.Send; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.BufSupplier; import it.cavallium.dbengine.database.LLDictionary; import it.cavallium.dbengine.database.LLUtils; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.database.SubStageEntry; import it.cavallium.dbengine.database.UpdateMode; import it.cavallium.dbengine.database.serialization.Serializer; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapSingle.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapSingle.java index fcab17c..79e3b77 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapSingle.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapSingle.java @@ -1,9 +1,9 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.BufSupplier; 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 c924080..f101944 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.Drop; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.Drop; import io.netty5.util.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.BufSupplier; 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 f6ac3a9..f77be36 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.Drop; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.Drop; import io.netty5.util.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.BufSupplier; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java index 2095631..ceb9389 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java @@ -1,13 +1,13 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; import io.netty5.util.Send; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.Delta; import it.cavallium.dbengine.database.LLUtils; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.database.UpdateReturnMode; import it.cavallium.dbengine.database.serialization.SerializationFunction; import it.cavallium.dbengine.utils.SimpleResource; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleMapped.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleMapped.java index 85ace02..b100c6f 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleMapped.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleMapped.java @@ -1,9 +1,9 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; import io.netty5.util.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.client.Mapper; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleton.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleton.java index cdcaa36..1f2a00e 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleton.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleton.java @@ -1,9 +1,9 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; +import io.netty5.buffer.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/SubStageGetter.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetter.java index a55e0d3..de4e312 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetter.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetter.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; 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 f1b0ad9..e6b07b8 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashMap.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashMap.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Resource; import io.netty5.util.Send; import it.cavallium.dbengine.client.CompositeSnapshot; 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 6a0d94c..8ae917c 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashSet.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashSet.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Resource; import io.netty5.util.Send; import it.cavallium.dbengine.client.CompositeSnapshot; 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 ae124f4..578381d 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMap.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMap.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.BufSupplier; import it.cavallium.dbengine.database.LLDictionary; 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 bcbb986..7d9c187 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMapDeep.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMapDeep.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Resource; import io.netty5.util.Send; import it.cavallium.dbengine.client.CompositeSnapshot; 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 5904fa0..7ae81be 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSet.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSet.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Resource; import io.netty5.util.Send; import it.cavallium.dbengine.client.CompositeSnapshot; 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 a3d76fd..0b90a57 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingle.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingle.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.BufSupplier; 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 d8f1731..e599713 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingleBytes.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingleBytes.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.database.serialization.Serializer; 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 de2222f..6fe90f2 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.CompositeBuffer; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.CompositeBuffer; import io.netty5.util.Send; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.serialization.SerializationException; 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 af5e857..9fc4443 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/ValuesSetSerializer.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/ValuesSetSerializer.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import io.netty5.util.Send; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.Serializer; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/AbstractRocksDBColumn.java b/src/main/java/it/cavallium/dbengine/database/disk/AbstractRocksDBColumn.java index 5f1f65a..11c334c 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/AbstractRocksDBColumn.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/AbstractRocksDBColumn.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import static io.netty5.buffer.api.StandardAllocationTypes.OFF_HEAP; +import static io.netty5.buffer.StandardAllocationTypes.OFF_HEAP; import static it.cavallium.dbengine.database.LLUtils.INITIAL_DIRECT_READ_BYTE_BUF_SIZE_BYTES; import static it.cavallium.dbengine.database.LLUtils.isReadOnlyDirect; import static java.lang.Boolean.parseBoolean; @@ -13,11 +13,10 @@ import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Timer; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.DefaultBufferAllocators; -import io.netty5.buffer.api.ReadableComponent; -import io.netty5.buffer.api.WritableComponent; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.BufferComponent; +import io.netty5.buffer.DefaultBufferAllocators; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.RepeatedElementList; @@ -256,7 +255,7 @@ public sealed abstract class AbstractRocksDBColumn implements requireNonNull(key); AbstractSlice slice; if (allowNettyDirect && USE_DIRECT_BUFFER_BOUNDS && isReadOnlyDirect(key)) { - ByteBuffer keyInternalByteBuffer = ((ReadableComponent) key).readableBuffer(); + ByteBuffer keyInternalByteBuffer = ((BufferComponent) key).readableBuffer(); assert keyInternalByteBuffer.position() == 0; slice = new DirectSlice(keyInternalByteBuffer, key.readableBytes()); assert slice.size() == key.readableBytes(); @@ -371,7 +370,7 @@ public sealed abstract class AbstractRocksDBColumn implements } else { mustCloseKey = false; } - keyNioBuffer = ((ReadableComponent) key).readableBuffer(); + keyNioBuffer = ((BufferComponent) key).readableBuffer(); assert keyNioBuffer.isDirect(); assert keyNioBuffer.limit() == key.readableBytes(); } @@ -389,7 +388,7 @@ public sealed abstract class AbstractRocksDBColumn implements } else { mustCloseValue = false; } - valueNioBuffer = ((ReadableComponent) value).readableBuffer(); + valueNioBuffer = ((BufferComponent) value).readableBuffer(); assert valueNioBuffer.isDirect(); assert valueNioBuffer.limit() == value.readableBytes(); } @@ -434,7 +433,7 @@ public sealed abstract class AbstractRocksDBColumn implements } else { mustCloseKey = false; } - keyNioBuffer = ((ReadableComponent) key).readableBuffer(); + keyNioBuffer = ((BufferComponent) key).readableBuffer(); assert keyNioBuffer.isDirect(); assert keyNioBuffer.limit() == key.readableBytes(); } @@ -508,7 +507,7 @@ public sealed abstract class AbstractRocksDBColumn implements } else { mustCloseKey = false; } - keyNioBuffer = ((ReadableComponent) key).readableBuffer(); + keyNioBuffer = ((BufferComponent) key).readableBuffer(); assert keyNioBuffer.isDirect(); assert keyNioBuffer.limit() == key.readableBytes(); } @@ -549,7 +548,7 @@ public sealed abstract class AbstractRocksDBColumn implements } else { mustCloseKey = false; } - keyNioBuffer = ((ReadableComponent) key).readableBuffer(); + keyNioBuffer = ((BufferComponent) key).readableBuffer(); assert keyNioBuffer.isDirect(); assert keyNioBuffer.limit() == key.readableBytes(); } diff --git a/src/main/java/it/cavallium/dbengine/database/disk/BinarySerializationFunction.java b/src/main/java/it/cavallium/dbengine/database/disk/BinarySerializationFunction.java index 938f7a8..e90d4d1 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/BinarySerializationFunction.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/BinarySerializationFunction.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import it.cavallium.dbengine.database.serialization.SerializationFunction; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/CappedWriteBatch.java b/src/main/java/it/cavallium/dbengine/database/disk/CappedWriteBatch.java index abad999..cc6c81e 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/CappedWriteBatch.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/CappedWriteBatch.java @@ -3,9 +3,9 @@ package it.cavallium.dbengine.database.disk; import static it.cavallium.dbengine.database.LLUtils.isDirect; import static it.cavallium.dbengine.database.LLUtils.isReadOnlyDirect; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.ReadableComponent; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.BufferComponent; import io.netty5.util.Send; import io.netty5.util.internal.PlatformDependent; import it.cavallium.dbengine.database.LLUtils; @@ -116,8 +116,8 @@ public class CappedWriteBatch extends WriteBatch { if (USE_FAST_DIRECT_BUFFERS && (isReadOnlyDirect(key)) && (isReadOnlyDirect(value))) { - ByteBuffer keyNioBuffer = ((ReadableComponent) key).readableBuffer(); - ByteBuffer valueNioBuffer = ((ReadableComponent) value).readableBuffer(); + ByteBuffer keyNioBuffer = ((BufferComponent) key).readableBuffer(); + ByteBuffer valueNioBuffer = ((BufferComponent) value).readableBuffer(); buffersToRelease.add(value); buffersToRelease.add(key); @@ -162,7 +162,7 @@ public class CappedWriteBatch extends WriteBatch { public synchronized void delete(ColumnFamilyHandle columnFamilyHandle, Send keyToReceive) throws RocksDBException { var key = keyToReceive.receive(); if (USE_FAST_DIRECT_BUFFERS && isReadOnlyDirect(key)) { - ByteBuffer keyNioBuffer = ((ReadableComponent) key).readableBuffer(); + ByteBuffer keyNioBuffer = ((BufferComponent) key).readableBuffer(); buffersToRelease.add(key); delete(columnFamilyHandle, keyNioBuffer); } else { diff --git a/src/main/java/it/cavallium/dbengine/database/disk/HugePqEnv.java b/src/main/java/it/cavallium/dbengine/database/disk/HugePqEnv.java index eae59b3..bdbb806 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/HugePqEnv.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/HugePqEnv.java @@ -4,7 +4,7 @@ import static it.cavallium.dbengine.database.disk.LLTempHugePqEnv.getColumnOptio import com.google.common.primitives.Ints; import io.micrometer.core.instrument.composite.CompositeMeterRegistry; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.utils.SimpleResource; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/KeyMayExistGetter.java b/src/main/java/it/cavallium/dbengine/database/disk/KeyMayExistGetter.java index b90fc07..cb8ce3e 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/KeyMayExistGetter.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/KeyMayExistGetter.java @@ -8,11 +8,10 @@ import static org.rocksdb.KeyMayExist.KeyMayExistEnum.kExistsWithValue; import static org.rocksdb.KeyMayExist.KeyMayExistEnum.kExistsWithoutValue; import static org.rocksdb.KeyMayExist.KeyMayExistEnum.kNotExist; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.DefaultBufferAllocators; -import io.netty5.buffer.api.ReadableComponent; -import io.netty5.buffer.api.WritableComponent; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.BufferComponent; +import io.netty5.buffer.DefaultBufferAllocators; import it.cavallium.dbengine.database.LLUtils; import java.nio.ByteBuffer; import java.util.Arrays; @@ -75,7 +74,7 @@ public abstract class KeyMayExistGetter { } else { mustCloseKey = false; } - keyNioBuffer = ((ReadableComponent) key).readableBuffer(); + keyNioBuffer = ((BufferComponent) key).readableBuffer(); assert keyNioBuffer.isDirect(); assert keyNioBuffer.limit() == key.readableBytes(); } @@ -86,14 +85,14 @@ public abstract class KeyMayExistGetter { try { assert resultBuffer.readerOffset() == 0; assert resultBuffer.writerOffset() == 0; - var resultWritable = ((WritableComponent) resultBuffer).writableBuffer(); + var resultWritable = ((BufferComponent) resultBuffer).writableBuffer(); var keyMayExist = keyMayExist(readOptions, keyNioBuffer.rewind(), resultWritable.clear()); if (STRICT_MAYEXIST_NO_VALUE && keyMayExist.exists != kExistsWithValue && keyMayExist.valueLength != 0) { // Create a direct result buffer because RocksDB works only with direct buffers try (var realResultBuffer = bufferAllocator.allocate(INITIAL_DIRECT_READ_BYTE_BUF_SIZE_BYTES)) { var resultWritableF = resultWritable; - var realResultWritable = ((WritableComponent) realResultBuffer).writableBuffer(); + var realResultWritable = ((BufferComponent) realResultBuffer).writableBuffer(); var realSize = get(readOptions, keyNioBuffer.rewind(), realResultWritable); var hexFormat = HexFormat.ofDelimiter(" "); LOG.error( @@ -178,7 +177,7 @@ public abstract class KeyMayExistGetter { return resultBuffer.writerOffset(resultWritable.limit()); } else { resultBuffer.ensureWritable(size); - resultWritable = ((WritableComponent) resultBuffer).writableBuffer(); + resultWritable = ((BufferComponent) resultBuffer).writableBuffer(); assert resultBuffer.readerOffset() == 0; assert resultBuffer.writerOffset() == 0; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearcher.java b/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearcher.java index dff0590..25afc3e 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearcher.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLIndexSearcher.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.database.DiscardingCloseable; import it.cavallium.dbengine.database.SafeCloseable; import it.cavallium.dbengine.utils.SimpleResource; 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 eb5bb53..8fec71f 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDatabaseConnection.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDatabaseConnection.java @@ -3,7 +3,7 @@ package it.cavallium.dbengine.database.disk; import static it.cavallium.dbengine.lucene.LuceneUtils.luceneScheduler; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.database.LLDatabaseConnection; import it.cavallium.dbengine.database.LLLuceneIndex; import it.cavallium.dbengine.lucene.LuceneHacks; 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 9335ffc..52fa7df 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import static io.netty5.buffer.api.StandardAllocationTypes.OFF_HEAP; +import static io.netty5.buffer.StandardAllocationTypes.OFF_HEAP; import static it.cavallium.dbengine.database.LLUtils.ALLOW_STATIC_OPTIONS; import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB; import static it.cavallium.dbengine.database.LLUtils.fromByteArray; @@ -12,9 +12,9 @@ import static java.util.Objects.requireNonNull; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Timer; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.ReadableComponent; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.BufferComponent; import io.netty5.util.Resource; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.database.ColumnUtils; @@ -308,7 +308,7 @@ public class LLLocalDictionary implements LLDictionary { try (var rocksIterator = db.newIterator(readOpts, range.getMinUnsafe(), range.getMaxUnsafe())) { if (!LLLocalDictionary.PREFER_AUTO_SEEK_BOUND && range.hasMin()) { if (nettyDirect && isReadOnlyDirect(range.getMinUnsafe())) { - var seekBuf = ((ReadableComponent) range.getMinUnsafe()).readableBuffer(); + var seekBuf = ((BufferComponent) range.getMinUnsafe()).readableBuffer(); rocksIterator.seek(seekBuf); } else { var seekArray = LLUtils.toArray(range.getMinUnsafe()); 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 be3ccf9..3924a8c 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalEntryReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalEntryReactiveRocksIterator.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.database.LLEntry; import it.cavallium.dbengine.database.LLRange; 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 d0ef504..79c2665 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedEntryReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedEntryReactiveRocksIterator.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.database.LLEntry; import it.cavallium.dbengine.database.LLRange; 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 0e86498..d7bc379 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedKeyReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedKeyReactiveRocksIterator.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.database.LLRange; import java.util.function.Supplier; 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 e25e137..3e3c171 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java @@ -4,7 +4,7 @@ import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB; import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions; import static it.cavallium.dbengine.database.LLUtils.isBoundedRange; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; 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 ca83bc0..61b2b07 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyPrefixReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyPrefixReactiveRocksIterator.java @@ -4,11 +4,11 @@ import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB; import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions; import static it.cavallium.dbengine.database.LLUtils.isBoundedRange; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; import io.netty5.util.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; import java.util.function.Supplier; 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 8e35910..b0d75a2 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyReactiveRocksIterator.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.database.LLRange; import java.util.function.Supplier; 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 c374add..a765a92 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyValueDatabase.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import static io.netty5.buffer.api.StandardAllocationTypes.OFF_HEAP; +import static io.netty5.buffer.StandardAllocationTypes.OFF_HEAP; import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB; import static java.lang.Boolean.parseBoolean; import static java.util.Objects.requireNonNull; @@ -9,7 +9,7 @@ import static org.rocksdb.ColumnFamilyOptionsInterface.DEFAULT_COMPACTION_MEMTAB import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tag; import io.micrometer.core.instrument.Timer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import io.netty5.util.internal.PlatformDependent; import it.cavallium.data.generator.nativedata.NullableString; import it.cavallium.dbengine.client.Backuppable; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalMigrationReactiveRocksIterator.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalMigrationReactiveRocksIterator.java index a79a5f6..1cd58d2 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalMigrationReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalMigrationReactiveRocksIterator.java @@ -2,10 +2,10 @@ package it.cavallium.dbengine.database.disk; import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; import io.netty5.util.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.utils.SimpleResource; 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 c483ae6..7e98b98 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalReactiveRocksIterator.java @@ -4,7 +4,7 @@ import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB; import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions; import static it.cavallium.dbengine.database.LLUtils.isBoundedRange; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; import java.util.function.Supplier; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalSingleton.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalSingleton.java index 54b87af..5e11af9 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalSingleton.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalSingleton.java @@ -2,8 +2,8 @@ package it.cavallium.dbengine.database.disk; import static it.cavallium.dbengine.database.disk.UpdateAtomicResultMode.DELTA; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import io.netty5.util.Send; import it.cavallium.dbengine.database.LLDelta; import it.cavallium.dbengine.database.LLSingleton; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/OptimisticRocksDBColumn.java b/src/main/java/it/cavallium/dbengine/database/disk/OptimisticRocksDBColumn.java index 0451b81..d4b2dd9 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/OptimisticRocksDBColumn.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/OptimisticRocksDBColumn.java @@ -4,9 +4,9 @@ import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB; import io.micrometer.core.instrument.DistributionSummary; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.MemoryManager; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.MemoryManager; import io.netty5.util.Send; import it.cavallium.dbengine.database.LLDelta; import it.cavallium.dbengine.database.LLUtils; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/PessimisticRocksDBColumn.java b/src/main/java/it/cavallium/dbengine/database/disk/PessimisticRocksDBColumn.java index b5fb149..5a83bf3 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/PessimisticRocksDBColumn.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/PessimisticRocksDBColumn.java @@ -3,9 +3,9 @@ package it.cavallium.dbengine.database.disk; import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.MemoryManager; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.MemoryManager; import io.netty5.util.Send; import it.cavallium.dbengine.database.LLDelta; import it.cavallium.dbengine.database.LLUtils; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/RocksDBColumn.java b/src/main/java/it/cavallium/dbengine/database/disk/RocksDBColumn.java index 5e8603a..4cab0d1 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/RocksDBColumn.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/RocksDBColumn.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.disk; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.disk.rocksdb.RocksIteratorObj; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/StandardRocksDBColumn.java b/src/main/java/it/cavallium/dbengine/database/disk/StandardRocksDBColumn.java index 7f6dafa..dfd405d 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/StandardRocksDBColumn.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/StandardRocksDBColumn.java @@ -3,8 +3,8 @@ package it.cavallium.dbengine.database.disk; import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.database.LLDelta; import it.cavallium.dbengine.database.LLUtils; import java.io.IOException; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultCurrent.java b/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultCurrent.java index db6b7cb..e8e10b4 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultCurrent.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultCurrent.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; public record UpdateAtomicResultCurrent(Buffer current) implements UpdateAtomicResult { diff --git a/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultPrevious.java b/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultPrevious.java index 5b17b16..d1a1429 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultPrevious.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultPrevious.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; public record UpdateAtomicResultPrevious(Buffer previous) implements UpdateAtomicResult { diff --git a/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLColumnFamilyHandle.java b/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLColumnFamilyHandle.java index 7e6189b..200c73e 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLColumnFamilyHandle.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLColumnFamilyHandle.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.disk.rocksdb; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.utils.SimpleResource; import org.rocksdb.AbstractSlice; import org.rocksdb.ColumnFamilyHandle; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLCompactionOptions.java b/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLCompactionOptions.java index 73ed247..d11c3bf 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLCompactionOptions.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLCompactionOptions.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.disk.rocksdb; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.utils.SimpleResource; import org.rocksdb.CompactionOptions; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLReadOptions.java b/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLReadOptions.java index 1dfd37a..915074b 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLReadOptions.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLReadOptions.java @@ -1,10 +1,10 @@ package it.cavallium.dbengine.database.disk.rocksdb; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; import io.netty5.util.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.database.LLDelta; import it.cavallium.dbengine.database.SafeCloseable; import it.cavallium.dbengine.database.disk.LLLocalGroupedReactiveRocksIterator; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLWriteOptions.java b/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLWriteOptions.java index 359da6b..2c30bb0 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLWriteOptions.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/LLWriteOptions.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.disk.rocksdb; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.utils.SimpleResource; import org.rocksdb.WriteOptions; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/RocksIteratorObj.java b/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/RocksIteratorObj.java index 1d5e71b..9cd8bae 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/RocksIteratorObj.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/rocksdb/RocksIteratorObj.java @@ -4,11 +4,11 @@ import static it.cavallium.dbengine.database.LLUtils.isReadOnlyDirect; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Timer; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.ReadableComponent; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferComponent; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.utils.SimpleResource; import java.nio.ByteBuffer; @@ -142,7 +142,7 @@ public class RocksIteratorObj extends SimpleResource { public void seekFrom(Buffer key) { ensureOpen(); if (allowNettyDirect && isReadOnlyDirect(key)) { - ByteBuffer keyInternalByteBuffer = ((ReadableComponent) key).readableBuffer(); + ByteBuffer keyInternalByteBuffer = ((BufferComponent) key).readableBuffer(); assert keyInternalByteBuffer.position() == 0; rocksIterator.seekForPrev(keyInternalByteBuffer); // This is useful to retain the key buffer in memory and avoid deallocations @@ -161,7 +161,7 @@ public class RocksIteratorObj extends SimpleResource { public void seekTo(Buffer key) { ensureOpen(); if (allowNettyDirect && isReadOnlyDirect(key)) { - ByteBuffer keyInternalByteBuffer = ((ReadableComponent) key).readableBuffer(); + ByteBuffer keyInternalByteBuffer = ((BufferComponent) key).readableBuffer(); assert keyInternalByteBuffer.position() == 0; startedIterSeek.increment(); iterSeekTime.record(() -> rocksIterator.seek(keyInternalByteBuffer)); 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 d7c8e26..883a4af 100644 --- a/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDatabaseConnection.java +++ b/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDatabaseConnection.java @@ -3,7 +3,7 @@ package it.cavallium.dbengine.database.memory; import static it.cavallium.dbengine.lucene.LuceneUtils.luceneScheduler; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.database.LLDatabaseConnection; import it.cavallium.dbengine.database.LLKeyValueDatabase; import it.cavallium.dbengine.database.LLLuceneIndex; 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 688dacd..f4b5b34 100644 --- a/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDictionary.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.memory; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import io.netty5.util.Resource; import io.netty5.util.Send; import it.cavallium.dbengine.client.BadBlock; 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 a2b1c8a..c33932e 100644 --- a/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryKeyValueDatabase.java +++ b/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryKeyValueDatabase.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.memory; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.client.MemoryStats; import it.cavallium.dbengine.database.ColumnProperty; import it.cavallium.dbengine.database.LLDictionary; 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 d58d0bf..62028e4 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.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import io.netty5.util.Send; import it.cavallium.dbengine.database.LLDelta; import it.cavallium.dbengine.database.LLDictionaryResultType; diff --git a/src/main/java/it/cavallium/dbengine/database/remote/LLQuicConnection.java b/src/main/java/it/cavallium/dbengine/database/remote/LLQuicConnection.java index 4de7c20..a038263 100644 --- a/src/main/java/it/cavallium/dbengine/database/remote/LLQuicConnection.java +++ b/src/main/java/it/cavallium/dbengine/database/remote/LLQuicConnection.java @@ -4,8 +4,8 @@ import com.google.common.collect.Multimap; import io.micrometer.core.instrument.MeterRegistry; import io.netty.handler.ssl.util.InsecureTrustManagerFactory; import io.netty.incubator.codec.quic.QuicSslContextBuilder; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import io.netty5.util.Send; import it.cavallium.dbengine.client.MemoryStats; import it.cavallium.dbengine.client.query.current.data.Query; diff --git a/src/main/java/it/cavallium/dbengine/database/remote/QuicUtils.java b/src/main/java/it/cavallium/dbengine/database/remote/QuicUtils.java index d78a80b..94b7b6c 100644 --- a/src/main/java/it/cavallium/dbengine/database/remote/QuicUtils.java +++ b/src/main/java/it/cavallium/dbengine/database/remote/QuicUtils.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.remote; import io.netty.handler.codec.ByteToMessageCodec; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.data.generator.nativedata.NullableString; import it.cavallium.dbengine.database.OptionalBuf; diff --git a/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputOwned.java b/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputOwned.java index e37e5ee..d095528 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputOwned.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputOwned.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.serialization; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.database.DiscardingCloseable; import it.cavallium.dbengine.database.SafeCloseable; diff --git a/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputShared.java b/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputShared.java index 7d47f2e..7fb19ce 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputShared.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputShared.java @@ -1,8 +1,6 @@ package it.cavallium.dbengine.database.serialization; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.ReadableComponent; -import io.netty5.buffer.api.ReadableComponentProcessor; +import io.netty5.buffer.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.database.SafeCloseable; import java.io.DataInput; 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 adda9f6..16b46e9 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.netty5.buffer.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 2cfd575..7d288a0 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/CodecSerializer.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/CodecSerializer.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.serialization; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import io.netty5.util.Send; import java.io.IOError; import java.io.IOException; 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 93a651e..fab959b 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/Serializer.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/Serializer.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.serialization; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import io.netty5.util.Send; import io.netty5.util.internal.StringUtil; import it.cavallium.dbengine.database.LLUtils; 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 3294109..d9f2e3d 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/SerializerFixedBinaryLength.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/SerializerFixedBinaryLength.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.serialization; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import io.netty5.util.Send; import it.cavallium.dbengine.database.LLUtils; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/it/cavallium/dbengine/lucene/ByteArrayCodec.java b/src/main/java/it/cavallium/dbengine/lucene/ByteArrayCodec.java index b1f5e21..15e09fd 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/ByteArrayCodec.java +++ b/src/main/java/it/cavallium/dbengine/lucene/ByteArrayCodec.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import java.util.function.Function; public class ByteArrayCodec implements HugePqCodec { diff --git a/src/main/java/it/cavallium/dbengine/lucene/BytesRefCodec.java b/src/main/java/it/cavallium/dbengine/lucene/BytesRefCodec.java index e17e354..0205304 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/BytesRefCodec.java +++ b/src/main/java/it/cavallium/dbengine/lucene/BytesRefCodec.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import java.util.function.Function; import org.apache.lucene.util.BytesRef; diff --git a/src/main/java/it/cavallium/dbengine/lucene/DoubleCodec.java b/src/main/java/it/cavallium/dbengine/lucene/DoubleCodec.java index c451977..4a7a400 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/DoubleCodec.java +++ b/src/main/java/it/cavallium/dbengine/lucene/DoubleCodec.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import java.util.function.Function; public class DoubleCodec implements HugePqCodec { diff --git a/src/main/java/it/cavallium/dbengine/lucene/FloatCodec.java b/src/main/java/it/cavallium/dbengine/lucene/FloatCodec.java index 883e1ea..37504b9 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/FloatCodec.java +++ b/src/main/java/it/cavallium/dbengine/lucene/FloatCodec.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import java.util.function.Function; public class FloatCodec implements HugePqCodec { diff --git a/src/main/java/it/cavallium/dbengine/lucene/HugePqArray.java b/src/main/java/it/cavallium/dbengine/lucene/HugePqArray.java index 691c0a1..2f06ae2 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/HugePqArray.java +++ b/src/main/java/it/cavallium/dbengine/lucene/HugePqArray.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import it.cavallium.dbengine.database.DiscardingCloseable; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.SafeCloseable; diff --git a/src/main/java/it/cavallium/dbengine/lucene/HugePqCodec.java b/src/main/java/it/cavallium/dbengine/lucene/HugePqCodec.java index 9abfd13..24dc8c3 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/HugePqCodec.java +++ b/src/main/java/it/cavallium/dbengine/lucene/HugePqCodec.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import java.util.function.Function; import org.apache.lucene.util.BitUtil; import org.apache.lucene.util.NumericUtils; diff --git a/src/main/java/it/cavallium/dbengine/lucene/HugePqPriorityQueue.java b/src/main/java/it/cavallium/dbengine/lucene/HugePqPriorityQueue.java index 00747f8..19d092b 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/HugePqPriorityQueue.java +++ b/src/main/java/it/cavallium/dbengine/lucene/HugePqPriorityQueue.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.SafeCloseable; diff --git a/src/main/java/it/cavallium/dbengine/lucene/IntCodec.java b/src/main/java/it/cavallium/dbengine/lucene/IntCodec.java index c3c9029..eb2f7bb 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/IntCodec.java +++ b/src/main/java/it/cavallium/dbengine/lucene/IntCodec.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import java.util.function.Function; public class IntCodec implements HugePqCodec { diff --git a/src/main/java/it/cavallium/dbengine/lucene/LLFieldDocCodec.java b/src/main/java/it/cavallium/dbengine/lucene/LLFieldDocCodec.java index 9e732a3..8d003f2 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/LLFieldDocCodec.java +++ b/src/main/java/it/cavallium/dbengine/lucene/LLFieldDocCodec.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import java.util.ArrayList; import java.util.function.Function; diff --git a/src/main/java/it/cavallium/dbengine/lucene/LLScoreDocCodec.java b/src/main/java/it/cavallium/dbengine/lucene/LLScoreDocCodec.java index 1427e1d..41c8d90 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/LLScoreDocCodec.java +++ b/src/main/java/it/cavallium/dbengine/lucene/LLScoreDocCodec.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import java.util.function.Function; public class LLScoreDocCodec implements HugePqCodec { diff --git a/src/main/java/it/cavallium/dbengine/lucene/LLSlotDocCodec.java b/src/main/java/it/cavallium/dbengine/lucene/LLSlotDocCodec.java index 5565fb0..537bc49 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/LLSlotDocCodec.java +++ b/src/main/java/it/cavallium/dbengine/lucene/LLSlotDocCodec.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import it.cavallium.dbengine.database.DiscardingCloseable; import it.cavallium.dbengine.database.SafeCloseable; import it.cavallium.dbengine.database.disk.LLTempHugePqEnv; diff --git a/src/main/java/it/cavallium/dbengine/lucene/LongCodec.java b/src/main/java/it/cavallium/dbengine/lucene/LongCodec.java index 42e2ba9..c40b25a 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/LongCodec.java +++ b/src/main/java/it/cavallium/dbengine/lucene/LongCodec.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import java.util.function.Function; public class LongCodec implements HugePqCodec { diff --git a/src/main/java/it/cavallium/dbengine/lucene/LuceneRocksDBManager.java b/src/main/java/it/cavallium/dbengine/lucene/LuceneRocksDBManager.java index fa5ec7d..5e5acd8 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/LuceneRocksDBManager.java +++ b/src/main/java/it/cavallium/dbengine/lucene/LuceneRocksDBManager.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.lucene.directory.RocksDBInstance; import it.cavallium.dbengine.lucene.directory.RocksdbFileStore; import java.io.IOException; diff --git a/src/main/java/it/cavallium/dbengine/lucene/directory/Lucene90NoCompressionStoredFieldsFormat.java b/src/main/java/it/cavallium/dbengine/lucene/directory/Lucene90NoCompressionStoredFieldsFormat.java index 492b8a0..b0ead5b 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/directory/Lucene90NoCompressionStoredFieldsFormat.java +++ b/src/main/java/it/cavallium/dbengine/lucene/directory/Lucene90NoCompressionStoredFieldsFormat.java @@ -26,6 +26,7 @@ import org.apache.lucene.codecs.compressing.Decompressor; import org.apache.lucene.codecs.lucene90.compressing.Lucene90CompressingStoredFieldsFormat; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.SegmentInfo; +import org.apache.lucene.store.ByteBuffersDataInput; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.DataOutput; import org.apache.lucene.store.Directory; @@ -76,8 +77,8 @@ public class Lucene90NoCompressionStoredFieldsFormat extends StoredFieldsFormat private static final Compressor DUMMY_COMPRESSOR = new Compressor() { @Override - public void compress(byte[] bytes, int off, int len, DataOutput out) throws IOException { - out.writeBytes(bytes, off, len); + public void compress(ByteBuffersDataInput byteBuffersDataInput, DataOutput dataOutput) throws IOException { + dataOutput.copyBytes(byteBuffersDataInput, byteBuffersDataInput.size()); } @Override diff --git a/src/main/java/it/cavallium/dbengine/lucene/directory/RocksDBSliceInputStream.java b/src/main/java/it/cavallium/dbengine/lucene/directory/RocksDBSliceInputStream.java index 26e7080..3e30faa 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/directory/RocksDBSliceInputStream.java +++ b/src/main/java/it/cavallium/dbengine/lucene/directory/RocksDBSliceInputStream.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.lucene.directory; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.BufferRef; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.BufferRef; import org.apache.lucene.store.IndexInput; import java.io.EOFException; diff --git a/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbDirectory.java b/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbDirectory.java index 60414b3..608b381 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbDirectory.java +++ b/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbDirectory.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.lucene.directory; import com.google.common.util.concurrent.Striped; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Path; diff --git a/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbFileStore.java b/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbFileStore.java index 6177c08..9b0c168 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbFileStore.java +++ b/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbFileStore.java @@ -2,10 +2,9 @@ package it.cavallium.dbengine.lucene.directory; import com.google.common.primitives.Longs; import com.google.common.util.concurrent.Striped; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.ReadableComponent; -import io.netty5.buffer.api.WritableComponent; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.BufferComponent; import it.cavallium.dbengine.database.LLUtils; import java.io.IOException; import java.nio.ByteBuffer; @@ -119,13 +118,13 @@ public class RocksdbFileStore { private static ByteBuffer readableNioBuffer(Buffer buffer) { assert buffer.countReadableComponents() == 1 : "Readable components count: " + buffer.countReadableComponents(); - return ((ReadableComponent) buffer).readableBuffer(); + return ((BufferComponent) buffer).readableBuffer(); } private static ByteBuffer writableNioBuffer(Buffer buffer, int newWriterOffset) { assert buffer.countWritableComponents() == 1 : "Writable components count: " + buffer.countWritableComponents(); buffer.writerOffset(0).ensureWritable(newWriterOffset); - var byteBuf = ((WritableComponent) buffer).writableBuffer(); + var byteBuf = ((BufferComponent) buffer).writableBuffer(); buffer.writerOffset(newWriterOffset); assert buffer.capacity() >= newWriterOffset : "Returned capacity " + buffer.capacity() + " < " + newWriterOffset; return byteBuf; diff --git a/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbInputStream.java b/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbInputStream.java index e034364..537c587 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbInputStream.java +++ b/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbInputStream.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.lucene.directory; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import java.io.EOFException; import java.io.IOException; import org.apache.lucene.store.IndexInput; diff --git a/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbOutputStream.java b/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbOutputStream.java index 9e98b41..04b22ca 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbOutputStream.java +++ b/src/main/java/it/cavallium/dbengine/lucene/directory/RocksdbOutputStream.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene.directory; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import org.apache.lucene.store.BufferedChecksum; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.util.Accountable; diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/LuceneSearchResult.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/LuceneSearchResult.java index a8e91d4..9a39158 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/LuceneSearchResult.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/LuceneSearchResult.java @@ -1,11 +1,11 @@ package it.cavallium.dbengine.lucene.searcher; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Owned; +import io.netty5.buffer.Drop; +import io.netty5.buffer.Owned; import it.cavallium.dbengine.client.query.current.data.TotalHitsCount; import it.cavallium.dbengine.database.DiscardingCloseable; import it.cavallium.dbengine.database.LLKeyScore; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.utils.SimpleResource; import java.util.Objects; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/PagedLocalSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/PagedLocalSearcher.java index 0271daa..e67a0b3 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/PagedLocalSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/PagedLocalSearcher.java @@ -7,7 +7,7 @@ import static it.cavallium.dbengine.lucene.searcher.CurrentPageInfo.EMPTY_STATUS import static it.cavallium.dbengine.lucene.searcher.PaginationInfo.MAX_SINGLE_SEARCH_LIMIT; import io.netty5.util.Send; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.client.query.current.data.TotalHitsCount; import it.cavallium.dbengine.database.LLKeyScore; import it.cavallium.dbengine.database.LLUtils; diff --git a/src/main/java/it/cavallium/dbengine/netty/NettyMetrics.java b/src/main/java/it/cavallium/dbengine/netty/NettyMetrics.java index 4ba9b09..171ca57 100644 --- a/src/main/java/it/cavallium/dbengine/netty/NettyMetrics.java +++ b/src/main/java/it/cavallium/dbengine/netty/NettyMetrics.java @@ -4,12 +4,12 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tag; import io.micrometer.core.instrument.Tags; import io.micrometer.core.instrument.binder.MeterBinder; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.pool.BufferAllocatorMetric; -import io.netty5.buffer.api.pool.BufferAllocatorMetricProvider; -import io.netty5.buffer.api.pool.PoolArenaMetric; -import io.netty5.buffer.api.pool.PoolChunkListMetric; -import io.netty5.buffer.api.pool.PoolSubpageMetric; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.pool.BufferAllocatorMetric; +import io.netty5.buffer.pool.BufferAllocatorMetricProvider; +import io.netty5.buffer.pool.PoolArenaMetric; +import io.netty5.buffer.pool.PoolChunkListMetric; +import io.netty5.buffer.pool.PoolSubpageMetric; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 97c1e05..5c346b3 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,5 +1,5 @@ module dbengine { - uses io.netty5.buffer.api.pool.BufferAllocatorMetricProvider; + uses io.netty5.buffer.pool.BufferAllocatorMetricProvider; exports it.cavallium.dbengine.lucene; exports it.cavallium.dbengine.database; exports it.cavallium.dbengine.rpc.current.data; diff --git a/src/test/java/it/cavallium/dbengine/DbTestUtils.java b/src/test/java/it/cavallium/dbengine/DbTestUtils.java index eaede65..18210a3 100644 --- a/src/test/java/it/cavallium/dbengine/DbTestUtils.java +++ b/src/test/java/it/cavallium/dbengine/DbTestUtils.java @@ -2,12 +2,12 @@ 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.internal.LeakDetection; -import io.netty5.buffer.api.internal.LifecycleTracer; -import io.netty5.buffer.api.pool.PoolArenaMetric; -import io.netty5.buffer.api.pool.PooledBufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.MemoryManager; +import io.netty5.buffer.internal.LeakDetection; +import io.netty5.buffer.internal.LifecycleTracer; +import io.netty5.buffer.pool.PoolArenaMetric; +import io.netty5.buffer.pool.PooledBufferAllocator; import io.netty5.util.ResourceLeakDetector; import io.netty5.util.ResourceLeakDetector.Level; import io.netty5.util.internal.PlatformDependent; diff --git a/src/test/java/it/cavallium/dbengine/TemporaryDbGenerator.java b/src/test/java/it/cavallium/dbengine/TemporaryDbGenerator.java index 85e63d1..1fd62dc 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.netty5.buffer.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..f83e1b5 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.netty5.buffer.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/TestAllocatorImpl.java b/src/test/java/it/cavallium/dbengine/TestAllocatorImpl.java index d9de33c..18ed705 100644 --- a/src/test/java/it/cavallium/dbengine/TestAllocatorImpl.java +++ b/src/test/java/it/cavallium/dbengine/TestAllocatorImpl.java @@ -1,17 +1,17 @@ package it.cavallium.dbengine; -import static io.netty5.buffer.api.internal.Statics.allocatorClosedException; -import static io.netty5.buffer.api.internal.Statics.standardDrop; +import static io.netty5.buffer.internal.InternalBufferUtils.allocatorClosedException; +import static io.netty5.buffer.internal.InternalBufferUtils.assertValidBufferSize; +import static io.netty5.buffer.internal.InternalBufferUtils.standardDrop; -import io.netty5.buffer.api.AllocationType; -import io.netty5.buffer.api.AllocatorControl; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.MemoryManager; -import io.netty5.buffer.api.StandardAllocationTypes; -import io.netty5.buffer.api.internal.Statics; -import io.netty5.buffer.api.pool.PooledBufferAllocator; +import io.netty5.buffer.AllocationType; +import io.netty5.buffer.AllocatorControl; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; +import io.netty5.buffer.Drop; +import io.netty5.buffer.MemoryManager; +import io.netty5.buffer.StandardAllocationTypes; +import io.netty5.buffer.pool.PooledBufferAllocator; import java.util.concurrent.atomic.LongAdder; import java.util.function.Function; import java.util.function.Supplier; @@ -45,8 +45,8 @@ public class TestAllocatorImpl implements BufferAllocator, AllocatorControl { if (closed) { throw allocatorClosedException(); } - Statics.assertValidBufferSize(size); - return manager.allocateShared(this, size, Statics.standardDrop(manager), allocationType); + assertValidBufferSize(size); + return manager.allocateShared(this, size, standardDrop(manager), allocationType); } @Override diff --git a/src/test/java/it/cavallium/dbengine/TestDictionaryMapDeep.java b/src/test/java/it/cavallium/dbengine/TestDictionaryMapDeep.java index 7551284..935175a 100644 --- a/src/test/java/it/cavallium/dbengine/TestDictionaryMapDeep.java +++ b/src/test/java/it/cavallium/dbengine/TestDictionaryMapDeep.java @@ -11,7 +11,7 @@ import static it.cavallium.dbengine.DbTestUtils.tempDictionary; import static it.cavallium.dbengine.SyncUtils.*; import static org.assertj.core.api.Assertions.*; -import io.netty5.buffer.api.internal.ResourceSupport; +import io.netty5.buffer.internal.ResourceSupport; import it.cavallium.dbengine.DbTestUtils.TestAllocator; import it.cavallium.dbengine.database.UpdateMode; import it.cavallium.dbengine.utils.SimpleResource; diff --git a/src/test/java/it/cavallium/dbengine/TestGetter.java b/src/test/java/it/cavallium/dbengine/TestGetter.java index c0a7fdc..bddb359 100644 --- a/src/test/java/it/cavallium/dbengine/TestGetter.java +++ b/src/test/java/it/cavallium/dbengine/TestGetter.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine; import static java.util.Map.entry; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.database.disk.KeyMayExistGetter; import it.unimi.dsi.fastutil.bytes.ByteList; import java.nio.ByteBuffer; diff --git a/src/test/java/it/cavallium/dbengine/TestHugePq.java b/src/test/java/it/cavallium/dbengine/TestHugePq.java index 0440e20..5315f62 100644 --- a/src/test/java/it/cavallium/dbengine/TestHugePq.java +++ b/src/test/java/it/cavallium/dbengine/TestHugePq.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine; import static org.junit.jupiter.api.Assertions.assertEquals; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import it.cavallium.dbengine.database.disk.LLTempHugePqEnv; import it.cavallium.dbengine.lucene.HugePqCodec; import it.cavallium.dbengine.lucene.HugePqPriorityQueue; diff --git a/src/test/java/it/cavallium/dbengine/TestHugePqHitQueue.java b/src/test/java/it/cavallium/dbengine/TestHugePqHitQueue.java index 6fccb72..bc6c04f 100644 --- a/src/test/java/it/cavallium/dbengine/TestHugePqHitQueue.java +++ b/src/test/java/it/cavallium/dbengine/TestHugePqHitQueue.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine; import com.google.common.collect.Lists; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import it.cavallium.dbengine.database.SafeCloseable; import it.cavallium.dbengine.database.disk.LLTempHugePqEnv; import it.cavallium.dbengine.lucene.LLScoreDoc; diff --git a/src/test/java/it/cavallium/dbengine/TestLLDictionary.java b/src/test/java/it/cavallium/dbengine/TestLLDictionary.java index a38d77c..028eb79 100644 --- a/src/test/java/it/cavallium/dbengine/TestLLDictionary.java +++ b/src/test/java/it/cavallium/dbengine/TestLLDictionary.java @@ -7,7 +7,7 @@ import static it.cavallium.dbengine.SyncUtils.run; import static it.cavallium.dbengine.SyncUtils.runVoid; import static org.junit.jupiter.api.Assertions.assertEquals; -import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.Buffer; import io.netty5.util.Resource; import io.netty5.util.Send; import it.cavallium.dbengine.DbTestUtils.TempDb; diff --git a/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java b/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java index 7f0b8e0..a9bf3f2 100644 --- a/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java +++ b/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java @@ -7,7 +7,7 @@ import static it.cavallium.dbengine.SyncUtils.*; 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.Buffer; import io.netty5.util.Send; import it.cavallium.dbengine.DbTestUtils.TempDb; import it.cavallium.dbengine.DbTestUtils.TestAllocator; 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 dbd7196..a3871d6 100644 --- a/src/test/java/it/cavallium/dbengine/database/collections/TestRanges.java +++ b/src/test/java/it/cavallium/dbengine/database/collections/TestRanges.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.Buffer; +import io.netty5.buffer.BufferAllocator; import it.cavallium.dbengine.database.LLUtils; import java.util.Arrays; import org.junit.jupiter.api.AfterAll;