diff --git a/pom.xml b/pom.xml index 12ef51e..9d369f8 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ io.netty netty5-buffer - 5.0.0.Alpha2 + 5.0.0.Alpha3 io.netty diff --git a/src/main/java/it/cavallium/dbengine/client/Hits.java b/src/main/java/it/cavallium/dbengine/client/Hits.java index 3cdc74f..1460951 100644 --- a/src/main/java/it/cavallium/dbengine/client/Hits.java +++ b/src/main/java/it/cavallium/dbengine/client/Hits.java @@ -2,7 +2,6 @@ package it.cavallium.dbengine.client; import io.netty5.buffer.api.Drop; import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.Send; import it.cavallium.dbengine.client.query.current.data.TotalHitsCount; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.database.DiscardingCloseable; diff --git a/src/main/java/it/cavallium/dbengine/client/LuceneIndex.java b/src/main/java/it/cavallium/dbengine/client/LuceneIndex.java index 494741d..46af19f 100644 --- a/src/main/java/it/cavallium/dbengine/client/LuceneIndex.java +++ b/src/main/java/it/cavallium/dbengine/client/LuceneIndex.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.client; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.client.query.ClientQueryParams; import it.cavallium.dbengine.client.query.current.data.Query; import it.cavallium.dbengine.client.query.current.data.TotalHitsCount; diff --git a/src/main/java/it/cavallium/dbengine/client/LuceneIndexImpl.java b/src/main/java/it/cavallium/dbengine/client/LuceneIndexImpl.java index f4e4a3e..be9091a 100644 --- a/src/main/java/it/cavallium/dbengine/client/LuceneIndexImpl.java +++ b/src/main/java/it/cavallium/dbengine/client/LuceneIndexImpl.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.client; -import io.netty5.buffer.api.Resource; +import io.netty5.util.Resource; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.client.query.ClientQueryParams; import it.cavallium.dbengine.client.query.current.data.Query; diff --git a/src/main/java/it/cavallium/dbengine/client/MappedSerializer.java b/src/main/java/it/cavallium/dbengine/client/MappedSerializer.java index e899eaf..a6ce3e4 100644 --- a/src/main/java/it/cavallium/dbengine/client/MappedSerializer.java +++ b/src/main/java/it/cavallium/dbengine/client/MappedSerializer.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.client; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.Serializer; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java b/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java index 343951a..a7ada31 100644 --- a/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java +++ b/src/main/java/it/cavallium/dbengine/client/MappedSerializerFixedLength.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.client; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.SerializerFixedBinaryLength; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/cavallium/dbengine/database/BufSupplier.java b/src/main/java/it/cavallium/dbengine/database/BufSupplier.java index b67f9e1..0a9d83f 100644 --- a/src/main/java/it/cavallium/dbengine/database/BufSupplier.java +++ b/src/main/java/it/cavallium/dbengine/database/BufSupplier.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import java.util.function.Supplier; public abstract class BufSupplier implements SafeCloseable, DiscardingCloseable, Supplier { diff --git a/src/main/java/it/cavallium/dbengine/database/LLDelta.java b/src/main/java/it/cavallium/dbengine/database/LLDelta.java index 1577d92..5bb5d8c 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLDelta.java +++ b/src/main/java/it/cavallium/dbengine/database/LLDelta.java @@ -3,7 +3,7 @@ package it.cavallium.dbengine.database; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.Drop; import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import io.netty5.buffer.api.internal.ResourceSupport; 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 3f34070..17fa22f 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/LLDictionary.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.database.disk.BinarySerializationFunction; import it.cavallium.dbengine.database.serialization.KVSerializationFunction; diff --git a/src/main/java/it/cavallium/dbengine/database/LLEntry.java b/src/main/java/it/cavallium/dbengine/database/LLEntry.java index 2adeb76..5c68385 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLEntry.java +++ b/src/main/java/it/cavallium/dbengine/database/LLEntry.java @@ -3,8 +3,8 @@ package it.cavallium.dbengine.database; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.Drop; import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.Resource; -import io.netty5.buffer.api.Send; +import io.netty5.util.Resource; +import io.netty5.util.Send; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.utils.SimpleResource; import java.util.Objects; diff --git a/src/main/java/it/cavallium/dbengine/database/LLMultiLuceneIndex.java b/src/main/java/it/cavallium/dbengine/database/LLMultiLuceneIndex.java index 6cf0eb7..bd04ad7 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLMultiLuceneIndex.java +++ b/src/main/java/it/cavallium/dbengine/database/LLMultiLuceneIndex.java @@ -1,7 +1,6 @@ package it.cavallium.dbengine.database; import com.google.common.collect.Multimap; -import io.netty5.buffer.api.Resource; import it.cavallium.dbengine.rpc.current.data.IndicizerAnalyzers; import it.cavallium.dbengine.rpc.current.data.IndicizerSimilarities; import it.cavallium.dbengine.client.query.current.data.Query; diff --git a/src/main/java/it/cavallium/dbengine/database/LLRange.java b/src/main/java/it/cavallium/dbengine/database/LLRange.java index 6510a51..dfff5ec 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLRange.java +++ b/src/main/java/it/cavallium/dbengine/database/LLRange.java @@ -3,7 +3,7 @@ package it.cavallium.dbengine.database; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.Drop; import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import io.netty5.buffer.api.internal.ResourceSupport; import java.util.StringJoiner; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/it/cavallium/dbengine/database/LLSingleton.java b/src/main/java/it/cavallium/dbengine/database/LLSingleton.java index 8381c64..0f8499b 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLSingleton.java +++ b/src/main/java/it/cavallium/dbengine/database/LLSingleton.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.disk.BinarySerializationFunction; import it.cavallium.dbengine.database.serialization.SerializationFunction; import it.unimi.dsi.fastutil.bytes.ByteList; diff --git a/src/main/java/it/cavallium/dbengine/database/LLUtils.java b/src/main/java/it/cavallium/dbengine/database/LLUtils.java index 48ebf96..5397206 100644 --- a/src/main/java/it/cavallium/dbengine/database/LLUtils.java +++ b/src/main/java/it/cavallium/dbengine/database/LLUtils.java @@ -11,8 +11,8 @@ 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.api.Resource; -import io.netty5.buffer.api.Send; +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; diff --git a/src/main/java/it/cavallium/dbengine/database/RangeSupplier.java b/src/main/java/it/cavallium/dbengine/database/RangeSupplier.java index d945c42..1f7432b 100644 --- a/src/main/java/it/cavallium/dbengine/database/RangeSupplier.java +++ b/src/main/java/it/cavallium/dbengine/database/RangeSupplier.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import java.util.function.Supplier; public abstract class RangeSupplier implements DiscardingCloseable, Supplier { 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 c20963d..2bee00e 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java @@ -3,7 +3,7 @@ package it.cavallium.dbengine.database.collections; import static java.util.Objects.requireNonNullElseGet; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Resource; +import io.netty5.util.Resource; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.BufSupplier; 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 868b293..3e8ade5 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java @@ -5,7 +5,7 @@ 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.api.Resource; +import io.netty5.util.Resource; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.client.CompositeSnapshot; @@ -168,7 +168,7 @@ public class DatabaseMapDictionaryDeep> extend prefixKey.writerOffset(), suffixLengthAndExtLength ); - prefixKey.skipWritable(suffixLengthAndExtLength); + prefixKey.skipWritableBytes(suffixLengthAndExtLength); } /** @@ -542,7 +542,7 @@ public class DatabaseMapDictionaryDeep> extend var valueBuf = entry.getValueUnsafe(); try { assert keyBuf != null; - keyBuf.skipReadable(deepMap.keyPrefixLength); + keyBuf.skipReadableBytes(deepMap.keyPrefixLength); try (var key1Buf = keyBuf.split(deepMap.keySuffixLength)) { key1 = keySuffix1Serializer.deserialize(key1Buf); } 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 50caf96..1f264e5 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryHashed.java @@ -3,7 +3,7 @@ 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.api.Send; +import io.netty5.util.Send; 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 17e3a2b..d8fe86a 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionary.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; 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/DatabaseSetDictionaryHashed.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionaryHashed.java index 1bac2d1..3e36650 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionaryHashed.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSetDictionaryHashed.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.Drop; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; 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/DatabaseSingleBucket.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java index d5d334a..633b91e 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleBucket.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Drop; import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; 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/DatabaseSingleMapped.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleMapped.java index 62302ed..85eba84 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleMapped.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseSingleMapped.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Drop; import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.client.CompositeSnapshot; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStage.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStage.java index 2c05590..529cc22 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStage.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStage.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Resource; +import io.netty5.util.Resource; 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/DatabaseStageEntry.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStageEntry.java index 573f853..2756408 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStageEntry.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStageEntry.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Resource; +import io.netty5.util.Resource; import it.cavallium.dbengine.client.BadBlock; import reactor.core.publisher.Flux; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStageWithEntry.java b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStageWithEntry.java index a4effc6..4503ae4 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStageWithEntry.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/DatabaseStageWithEntry.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.collections; -import io.netty5.buffer.api.Resource; +import io.netty5.util.Resource; import it.cavallium.dbengine.client.BadBlock; import reactor.core.publisher.Mono; 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 c58a095..a55e0d3 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetter.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetter.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.client.CompositeSnapshot; import it.cavallium.dbengine.database.LLDictionary; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashMap.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashMap.java index bc994c6..f72b1d3 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashMap.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashMap.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Resource; -import io.netty5.buffer.api.Send; +import io.netty5.util.Resource; +import io.netty5.util.Send; 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/SubStageGetterHashSet.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashSet.java index d82b375..6599e46 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashSet.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterHashSet.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Resource; -import io.netty5.buffer.api.Send; +import io.netty5.util.Resource; +import io.netty5.util.Send; 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 a4ac9ac..9720e8c 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMapDeep.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterMapDeep.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Resource; -import io.netty5.buffer.api.Send; +import io.netty5.util.Resource; +import io.netty5.util.Send; 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/SubStageGetterSet.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSet.java index 6ea7783..8934faa 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSet.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSet.java @@ -1,8 +1,8 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Resource; -import io.netty5.buffer.api.Send; +import io.netty5.util.Resource; +import io.netty5.util.Send; 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/SubStageGetterSingle.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingle.java index 889eb3f..35bfb2f 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingle.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingle.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; 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/SubStageGetterSingleBytes.java b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingleBytes.java index 346ed85..d8f1731 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingleBytes.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/SubStageGetterSingleBytes.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.serialization.Serializer; public class SubStageGetterSingleBytes extends SubStageGetterSingle> { diff --git a/src/main/java/it/cavallium/dbengine/database/collections/ValueWithHashSerializer.java b/src/main/java/it/cavallium/dbengine/database/collections/ValueWithHashSerializer.java index 056f16a..de2222f 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/ValueWithHashSerializer.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/ValueWithHashSerializer.java @@ -3,7 +3,7 @@ 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.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.Serializer; diff --git a/src/main/java/it/cavallium/dbengine/database/collections/ValuesSetSerializer.java b/src/main/java/it/cavallium/dbengine/database/collections/ValuesSetSerializer.java index c58c1e1..af5e857 100644 --- a/src/main/java/it/cavallium/dbengine/database/collections/ValuesSetSerializer.java +++ b/src/main/java/it/cavallium/dbengine/database/collections/ValuesSetSerializer.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database.collections; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.serialization.SerializationException; import it.cavallium.dbengine.database.serialization.Serializer; import it.unimi.dsi.fastutil.objects.ObjectArraySet; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/CappedWriteBatch.java b/src/main/java/it/cavallium/dbengine/database/disk/CappedWriteBatch.java index 656f56c..374a89a 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/CappedWriteBatch.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/CappedWriteBatch.java @@ -6,7 +6,7 @@ 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.api.Send; +import io.netty5.util.Send; import io.netty5.util.internal.PlatformDependent; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.disk.RocksDBColumn; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/IndexSearcherManager.java b/src/main/java/it/cavallium/dbengine/database/disk/IndexSearcherManager.java index ac17d74..9e5cd06 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/IndexSearcherManager.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/IndexSearcherManager.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLSnapshot; import it.cavallium.dbengine.database.SafeCloseable; import java.io.IOException; 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 468e145..2778e2d 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java @@ -15,7 +15,7 @@ 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.api.Resource; +import io.netty5.util.Resource; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.database.ColumnUtils; import it.cavallium.dbengine.database.DiscardingCloseable; 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 0821e68..29ded0d 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalEntryReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalEntryReactiveRocksIterator.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.disk; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLEntry; import it.cavallium.dbengine.database.LLRange; import org.rocksdb.ReadOptions; 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 a10a94f..0cdb272 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedEntryReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedEntryReactiveRocksIterator.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.disk; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLEntry; import it.cavallium.dbengine.database.LLRange; import org.rocksdb.ReadOptions; 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 8e332bc..65faa85 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedKeyReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedKeyReactiveRocksIterator.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.disk; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLRange; import org.rocksdb.ReadOptions; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java index 21ae6cf..21ab658 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java @@ -7,7 +7,7 @@ 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.api.Send; +import io.netty5.util.Send; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; 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 ea6b3d1..c1963c6 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyPrefixReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyPrefixReactiveRocksIterator.java @@ -7,7 +7,7 @@ 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.api.Send; +import io.netty5.util.Send; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; 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 322eda9..a8c98df 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyReactiveRocksIterator.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.disk; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLRange; import org.rocksdb.ReadOptions; 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 5b8d12b..54b6c1a 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalMigrationReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalMigrationReactiveRocksIterator.java @@ -4,7 +4,7 @@ import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions; import io.netty5.buffer.api.Drop; import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.database.LLRange; import java.util.function.Supplier; diff --git a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalMultiLuceneIndex.java b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalMultiLuceneIndex.java index 8ec9b3a..8309553 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalMultiLuceneIndex.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalMultiLuceneIndex.java @@ -4,7 +4,7 @@ import static it.cavallium.dbengine.client.UninterruptibleScheduler.uninterrupti import com.google.common.collect.Multimap; import io.micrometer.core.instrument.MeterRegistry; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.client.query.QueryParser; import it.cavallium.dbengine.client.query.current.data.NoSort; import it.cavallium.dbengine.client.query.current.data.Query; 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 abf60a6..dc64a6a 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalReactiveRocksIterator.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalReactiveRocksIterator.java @@ -7,7 +7,7 @@ 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.api.Send; +import io.netty5.util.Send; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.database.LLRange; import it.cavallium.dbengine.database.LLUtils; 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 89d306d..54b87af 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/LLLocalSingleton.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/LLLocalSingleton.java @@ -4,7 +4,7 @@ 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.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLDelta; import it.cavallium.dbengine.database.LLSingleton; import it.cavallium.dbengine.database.LLSnapshot; 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 df94139..0451b81 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/OptimisticRocksDBColumn.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/OptimisticRocksDBColumn.java @@ -7,7 +7,7 @@ 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.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLDelta; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.lucene.ExponentialPageLimits; 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 f2db6bb..b5fb149 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/PessimisticRocksDBColumn.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/PessimisticRocksDBColumn.java @@ -6,7 +6,7 @@ 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.api.Send; +import io.netty5.util.Send; 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 012faf1..db6b7cb 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultCurrent.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultCurrent.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.disk; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; public record UpdateAtomicResultCurrent(Buffer current) implements UpdateAtomicResult { diff --git a/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultDelta.java b/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultDelta.java index dc140ce..bdc7699 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultDelta.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultDelta.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.database.disk; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLDelta; public record UpdateAtomicResultDelta(LLDelta delta) 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 3397205..5b17b16 100644 --- a/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultPrevious.java +++ b/src/main/java/it/cavallium/dbengine/database/disk/UpdateAtomicResultPrevious.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.disk; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; public record UpdateAtomicResultPrevious(Buffer previous) implements UpdateAtomicResult { 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 bf94d1a..72a3407 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 @@ -3,7 +3,7 @@ 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.api.Send; +import io.netty5.util.Send; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.database.LLDelta; import it.cavallium.dbengine.database.SafeCloseable; 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 54c98bf..6b409f1 100644 --- a/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDictionary.java +++ b/src/main/java/it/cavallium/dbengine/database/memory/LLMemoryDictionary.java @@ -2,8 +2,8 @@ package it.cavallium.dbengine.database.memory; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Resource; -import io.netty5.buffer.api.Send; +import io.netty5.util.Resource; +import io.netty5.util.Send; import it.cavallium.dbengine.client.BadBlock; import it.cavallium.dbengine.database.LLDelta; 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 8ab9242..d58d0bf 100644 --- a/src/main/java/it/cavallium/dbengine/database/memory/LLMemorySingleton.java +++ b/src/main/java/it/cavallium/dbengine/database/memory/LLMemorySingleton.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database.memory; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLDelta; import it.cavallium.dbengine.database.LLDictionaryResultType; import it.cavallium.dbengine.database.LLSingleton; 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 719159f..b3a9a68 100644 --- a/src/main/java/it/cavallium/dbengine/database/remote/LLQuicConnection.java +++ b/src/main/java/it/cavallium/dbengine/database/remote/LLQuicConnection.java @@ -6,7 +6,7 @@ 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.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.client.MemoryStats; import it.cavallium.dbengine.client.query.current.data.Query; import it.cavallium.dbengine.client.query.current.data.QueryParams; 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 97d0201..d78a80b 100644 --- a/src/main/java/it/cavallium/dbengine/database/remote/QuicUtils.java +++ b/src/main/java/it/cavallium/dbengine/database/remote/QuicUtils.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database.remote; import io.netty.handler.codec.ByteToMessageCodec; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.data.generator.nativedata.NullableString; import it.cavallium.dbengine.database.OptionalBuf; import it.cavallium.dbengine.rpc.current.data.RPCCrash; 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 55501bf..e37e5ee 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputOwned.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputOwned.java @@ -1,7 +1,7 @@ package it.cavallium.dbengine.database.serialization; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.DiscardingCloseable; import it.cavallium.dbengine.database.SafeCloseable; import java.io.DataInput; 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 dd48c26..7d47f2e 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputShared.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/BufferDataInputShared.java @@ -3,8 +3,7 @@ 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.api.Send; -import io.netty5.buffer.api.adaptor.ByteBufAdaptor; +import io.netty5.util.Send; import it.cavallium.dbengine.database.SafeCloseable; import java.io.DataInput; import java.lang.invoke.MethodHandle; 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 9b061f5..2cfd575 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/CodecSerializer.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/CodecSerializer.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database.serialization; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import java.io.IOError; import java.io.IOException; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/it/cavallium/dbengine/database/serialization/Serializer.java b/src/main/java/it/cavallium/dbengine/database/serialization/Serializer.java index 98acf73..737224d 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/Serializer.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/Serializer.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database.serialization; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import io.netty5.util.internal.StringUtil; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.netty.NullableBuffer; 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 45383e2..3294109 100644 --- a/src/main/java/it/cavallium/dbengine/database/serialization/SerializerFixedBinaryLength.java +++ b/src/main/java/it/cavallium/dbengine/database/serialization/SerializerFixedBinaryLength.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.database.serialization; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.BufferAllocator; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLUtils; import java.nio.charset.StandardCharsets; import java.util.Objects; 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 c0ba401..26e7080 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/directory/RocksDBSliceInputStream.java +++ b/src/main/java/it/cavallium/dbengine/lucene/directory/RocksDBSliceInputStream.java @@ -3,7 +3,6 @@ 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.api.adaptor.ByteBufAdaptor; import org.apache.lucene.store.IndexInput; import java.io.EOFException; diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveMultiSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveMultiSearcher.java index a8b5fbb..7f5819e 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveMultiSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveMultiSearcher.java @@ -5,7 +5,7 @@ import static it.cavallium.dbengine.database.LLUtils.singleOrClose; import static it.cavallium.dbengine.lucene.searcher.AdaptiveLocalSearcher.FORCE_HUGE_PQ; import static it.cavallium.dbengine.lucene.searcher.GlobalQueryRewrite.NO_REWRITE; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.disk.LLIndexSearchers; import it.cavallium.dbengine.database.disk.LLTempHugePqEnv; diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/CountMultiSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/CountMultiSearcher.java index 4cbd0ae..dfcf607 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/CountMultiSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/CountMultiSearcher.java @@ -4,7 +4,7 @@ import static it.cavallium.dbengine.client.UninterruptibleScheduler.uninterrupti import static it.cavallium.dbengine.database.LLUtils.singleOrClose; import static it.cavallium.dbengine.lucene.searcher.GlobalQueryRewrite.NO_REWRITE; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; 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/lucene/searcher/DecimalBucketMultiSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/DecimalBucketMultiSearcher.java index ca6839c..60749d6 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/DecimalBucketMultiSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/DecimalBucketMultiSearcher.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.lucene.searcher; import static it.cavallium.dbengine.client.UninterruptibleScheduler.uninterruptibleScheduler; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.disk.LLIndexSearchers; import it.cavallium.dbengine.lucene.collector.Buckets; diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/LocalSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/LocalSearcher.java index 1e29bf4..52dd9fc 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/LocalSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/LocalSearcher.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.lucene.searcher; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.disk.LLIndexSearcher; import org.jetbrains.annotations.Nullable; import reactor.core.publisher.Mono; diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/MultiSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/MultiSearcher.java index 4a1b0cf..ef54278 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/MultiSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/MultiSearcher.java @@ -2,7 +2,7 @@ package it.cavallium.dbengine.lucene.searcher; import static it.cavallium.dbengine.database.LLUtils.singleOrClose; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.disk.LLIndexSearcher; import it.cavallium.dbengine.database.disk.LLIndexSearchers; import org.jetbrains.annotations.Nullable; 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 6df6223..9f533f0 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/PagedLocalSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/PagedLocalSearcher.java @@ -5,7 +5,7 @@ import static it.cavallium.dbengine.database.LLUtils.singleOrClose; 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.buffer.api.Send; +import io.netty5.util.Send; import io.netty5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.database.LLKeyScore; import it.cavallium.dbengine.database.LLUtils; diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/ScoredPagedMultiSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/ScoredPagedMultiSearcher.java index a3194b5..e478f6c 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/ScoredPagedMultiSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/ScoredPagedMultiSearcher.java @@ -5,7 +5,7 @@ import static it.cavallium.dbengine.database.LLUtils.singleOrClose; import static it.cavallium.dbengine.lucene.searcher.GlobalQueryRewrite.NO_REWRITE; import static it.cavallium.dbengine.lucene.searcher.PaginationInfo.MAX_SINGLE_SEARCH_LIMIT; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLKeyScore; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.disk.LLIndexSearchers; diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/SortedByScoreFullMultiSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/SortedByScoreFullMultiSearcher.java index 4b64b7a..9f86e18 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/SortedByScoreFullMultiSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/SortedByScoreFullMultiSearcher.java @@ -3,7 +3,7 @@ package it.cavallium.dbengine.lucene.searcher; import static it.cavallium.dbengine.client.UninterruptibleScheduler.uninterruptibleScheduler; import static it.cavallium.dbengine.database.LLUtils.singleOrClose; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLKeyScore; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.disk.LLIndexSearchers; diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/SortedScoredFullMultiSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/SortedScoredFullMultiSearcher.java index 86c4023..85310ff 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/SortedScoredFullMultiSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/SortedScoredFullMultiSearcher.java @@ -3,7 +3,7 @@ package it.cavallium.dbengine.lucene.searcher; import static it.cavallium.dbengine.client.UninterruptibleScheduler.uninterruptibleScheduler; import static it.cavallium.dbengine.database.LLUtils.singleOrClose; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.LLKeyScore; import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.disk.LLIndexSearchers; diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/UnsortedStreamingMultiSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/UnsortedStreamingMultiSearcher.java index f000fac..c8709eb 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/UnsortedStreamingMultiSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/UnsortedStreamingMultiSearcher.java @@ -3,7 +3,7 @@ package it.cavallium.dbengine.lucene.searcher; import static it.cavallium.dbengine.client.UninterruptibleScheduler.uninterruptibleScheduler; import static it.cavallium.dbengine.database.LLUtils.singleOrClose; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; 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/NullableBuffer.java b/src/main/java/it/cavallium/dbengine/netty/NullableBuffer.java index 985ebfa..7642bc4 100644 --- a/src/main/java/it/cavallium/dbengine/netty/NullableBuffer.java +++ b/src/main/java/it/cavallium/dbengine/netty/NullableBuffer.java @@ -3,7 +3,7 @@ package it.cavallium.dbengine.netty; import io.netty5.buffer.api.Buffer; import io.netty5.buffer.api.Drop; import io.netty5.buffer.api.Owned; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import io.netty5.buffer.api.internal.ResourceSupport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/it/cavallium/dbengine/SwappableLuceneSearcher.java b/src/test/java/it/cavallium/dbengine/SwappableLuceneSearcher.java index 23fd87c..7049262 100644 --- a/src/test/java/it/cavallium/dbengine/SwappableLuceneSearcher.java +++ b/src/test/java/it/cavallium/dbengine/SwappableLuceneSearcher.java @@ -3,7 +3,7 @@ package it.cavallium.dbengine; import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNullElseGet; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.database.disk.LLIndexSearcher; import it.cavallium.dbengine.database.disk.LLIndexSearchers; import it.cavallium.dbengine.lucene.searcher.GlobalQueryRewrite; diff --git a/src/test/java/it/cavallium/dbengine/TestAllocatorImpl.java b/src/test/java/it/cavallium/dbengine/TestAllocatorImpl.java index 9f04aef..d9de33c 100644 --- a/src/test/java/it/cavallium/dbengine/TestAllocatorImpl.java +++ b/src/test/java/it/cavallium/dbengine/TestAllocatorImpl.java @@ -111,6 +111,11 @@ public class TestAllocatorImpl implements BufferAllocator, AllocatorControl { return instance.sliceMemory(memory, offset, length); } + @Override + public void clearMemory(Object o) { + instance.clearMemory(o); + } + @Override public String implementationName() { return instance.implementationName(); diff --git a/src/test/java/it/cavallium/dbengine/TestLLDictionary.java b/src/test/java/it/cavallium/dbengine/TestLLDictionary.java index 01d698b..46569a4 100644 --- a/src/test/java/it/cavallium/dbengine/TestLLDictionary.java +++ b/src/test/java/it/cavallium/dbengine/TestLLDictionary.java @@ -8,8 +8,8 @@ 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.api.Resource; -import io.netty5.buffer.api.Send; +import io.netty5.util.Resource; +import io.netty5.util.Send; import it.cavallium.dbengine.DbTestUtils.TempDb; import it.cavallium.dbengine.DbTestUtils.TestAllocator; import it.cavallium.dbengine.database.LLDictionary; diff --git a/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java b/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java index 30886e9..c019007 100644 --- a/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java +++ b/src/test/java/it/cavallium/dbengine/TestLLDictionaryLeaks.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import io.netty5.buffer.api.Buffer; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.DbTestUtils.TempDb; import it.cavallium.dbengine.DbTestUtils.TestAllocator; import it.cavallium.dbengine.database.LLDictionary; diff --git a/src/test/java/it/cavallium/dbengine/UnsortedUnscoredSimpleMultiSearcher.java b/src/test/java/it/cavallium/dbengine/UnsortedUnscoredSimpleMultiSearcher.java index 0ec086f..6fb2d0e 100644 --- a/src/test/java/it/cavallium/dbengine/UnsortedUnscoredSimpleMultiSearcher.java +++ b/src/test/java/it/cavallium/dbengine/UnsortedUnscoredSimpleMultiSearcher.java @@ -4,7 +4,7 @@ import static it.cavallium.dbengine.client.UninterruptibleScheduler.uninterrupti import static it.cavallium.dbengine.database.LLUtils.singleOrClose; import static it.cavallium.dbengine.lucene.searcher.GlobalQueryRewrite.NO_REWRITE; -import io.netty5.buffer.api.Send; +import io.netty5.util.Send; import it.cavallium.dbengine.client.query.current.data.TotalHitsCount; import it.cavallium.dbengine.database.LLKeyScore; import it.cavallium.dbengine.database.LLUtils;