From ec579d61dc176cd508437d89978c61f6c36f5ef6 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 22 Jan 2023 01:48:35 +0100 Subject: [PATCH] Update serializer --- pom.xml | 2 +- .../it/cavallium/dbengine/client/Sort.java | 4 ++-- .../dbengine/client/query/QueryMoshi.java | 14 ++++++------- .../dbengine/client/query/QueryParser.java | 20 +++++++++---------- .../dbengine/database/remote/RPCCodecs.java | 7 ++++--- .../cavallium/dbengine/ExpectedQueryType.java | 4 ++-- 6 files changed, 26 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index 436afc0..0c0c0a1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 1.9.5 9.4.2 5.9.0 - 1.0.204 + 1.0.235 diff --git a/src/main/java/it/cavallium/dbengine/client/Sort.java b/src/main/java/it/cavallium/dbengine/client/Sort.java index dde5b1f..7d04631 100644 --- a/src/main/java/it/cavallium/dbengine/client/Sort.java +++ b/src/main/java/it/cavallium/dbengine/client/Sort.java @@ -1,6 +1,6 @@ package it.cavallium.dbengine.client; -import it.cavallium.dbengine.client.query.BasicType; +import it.cavallium.dbengine.client.query.BaseType; import it.cavallium.dbengine.client.query.current.data.DocSort; import it.cavallium.dbengine.client.query.current.data.NoSort; import it.cavallium.dbengine.client.query.current.data.NumericSort; @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; public record Sort(@NotNull it.cavallium.dbengine.client.query.current.data.Sort querySort) { public boolean isSorted() { - return querySort.getBasicType$() != BasicType.NoSort; + return querySort.getBaseType$() != BaseType.NoSort; } public static Sort random() { diff --git a/src/main/java/it/cavallium/dbengine/client/query/QueryMoshi.java b/src/main/java/it/cavallium/dbengine/client/query/QueryMoshi.java index c01f23c..722fa55 100644 --- a/src/main/java/it/cavallium/dbengine/client/query/QueryMoshi.java +++ b/src/main/java/it/cavallium/dbengine/client/query/QueryMoshi.java @@ -3,8 +3,8 @@ package it.cavallium.dbengine.client.query; import com.squareup.moshi.JsonAdapter; import it.cavallium.dbengine.client.IntOpenHashSetJsonAdapter; import it.cavallium.dbengine.client.query.current.CurrentVersion; -import it.cavallium.dbengine.client.query.current.data.IBasicType; -import it.cavallium.dbengine.client.query.current.data.IType; +import it.cavallium.dbengine.client.query.current.IBaseType; +import it.cavallium.dbengine.client.query.current.IType; import it.unimi.dsi.fastutil.booleans.BooleanList; import it.unimi.dsi.fastutil.bytes.ByteList; import it.unimi.dsi.fastutil.chars.CharList; @@ -40,17 +40,17 @@ public class QueryMoshi extends MoshiPolymorphic { // Add all super types with their implementations for (var superTypeClass : CurrentVersion.getSuperTypeClasses()) { - for (Class superTypeSubtypesClass : CurrentVersion.getSuperTypeSubtypesClasses( + for (Class superTypeSubtypesClass : CurrentVersion.getSuperTypeSubtypesClasses( superTypeClass)) { concreteClasses.add((Class) (Class) superTypeSubtypesClass); } abstractClasses.add((Class) (Class) superTypeClass); } - // Add IBasicType with all basic types - abstractClasses.add((Class) (Class) IBasicType.class); - for (BasicType basicType : BasicType.values()) { - concreteClasses.add((Class) (Class) CurrentVersion.VERSION.getClass(basicType)); + // Add IBaseType with all basic types + abstractClasses.add((Class) (Class) IBaseType.class); + for (BaseType BaseType : BaseType.values()) { + concreteClasses.add((Class) (Class) CurrentVersion.getClass(BaseType)); } this.abstractClasses = abstractClasses; diff --git a/src/main/java/it/cavallium/dbengine/client/query/QueryParser.java b/src/main/java/it/cavallium/dbengine/client/query/QueryParser.java index 7265dce..84cf9f2 100644 --- a/src/main/java/it/cavallium/dbengine/client/query/QueryParser.java +++ b/src/main/java/it/cavallium/dbengine/client/query/QueryParser.java @@ -88,7 +88,7 @@ public class QueryParser { if (query == null) { return null; } - switch (query.getBasicType$()) { + switch (query.getBaseType$()) { case StandardQuery: var standardQuery = (it.cavallium.dbengine.client.query.current.data.StandardQuery) query; @@ -130,12 +130,12 @@ public class QueryParser { var booleanQuery = (it.cavallium.dbengine.client.query.current.data.BooleanQuery) query; var bq = new Builder(); for (BooleanQueryPart part : booleanQuery.parts()) { - Occur occur = switch (part.occur().getBasicType$()) { + Occur occur = switch (part.occur().getBaseType$()) { case OccurFilter -> Occur.FILTER; case OccurMust -> Occur.MUST; case OccurShould -> Occur.SHOULD; case OccurMustNot -> Occur.MUST_NOT; - default -> throw new IllegalStateException("Unexpected value: " + part.occur().getBasicType$()); + default -> throw new IllegalStateException("Unexpected value: " + part.occur().getBaseType$()); }; bq.add(toQuery(part.query(), analyzer), occur); } @@ -320,24 +320,24 @@ public class QueryParser { var wildcardQuery = (WildcardQuery) query; return new org.apache.lucene.search.WildcardQuery(new Term(wildcardQuery.field(), wildcardQuery.pattern())); default: - throw new IllegalStateException("Unexpected value: " + query.getBasicType$()); + throw new IllegalStateException("Unexpected value: " + query.getBaseType$()); } } private static NumberFormat toNumberFormat(it.cavallium.dbengine.client.query.current.data.NumberFormat numberFormat) { - return switch (numberFormat.getBasicType$()) { + return switch (numberFormat.getBaseType$()) { case NumberFormatDecimal -> new DecimalFormat(); - default -> throw new UnsupportedOperationException("Unsupported type: " + numberFormat.getBasicType$()); + default -> throw new UnsupportedOperationException("Unsupported type: " + numberFormat.getBaseType$()); }; } private static Class toType(PointType type) { - return switch (type.getBasicType$()) { + return switch (type.getBaseType$()) { case PointTypeInt -> Integer.class; case PointTypeLong -> Long.class; case PointTypeFloat -> Float.class; case PointTypeDouble -> Double.class; - default -> throw new UnsupportedOperationException("Unsupported type: " + type.getBasicType$()); + default -> throw new UnsupportedOperationException("Unsupported type: " + type.getBaseType$()); }; } @@ -346,7 +346,7 @@ public class QueryParser { } public static Sort toSort(it.cavallium.dbengine.client.query.current.data.Sort sort) { - switch (sort.getBasicType$()) { + switch (sort.getBaseType$()) { case NoSort: return null; case ScoreSort: @@ -359,7 +359,7 @@ public class QueryParser { case RandomSort: return new Sort(new RandomSortField()); default: - throw new IllegalStateException("Unexpected value: " + sort.getBasicType$()); + throw new IllegalStateException("Unexpected value: " + sort.getBaseType$()); } } diff --git a/src/main/java/it/cavallium/dbengine/database/remote/RPCCodecs.java b/src/main/java/it/cavallium/dbengine/database/remote/RPCCodecs.java index 5232e27..af71133 100644 --- a/src/main/java/it/cavallium/dbengine/database/remote/RPCCodecs.java +++ b/src/main/java/it/cavallium/dbengine/database/remote/RPCCodecs.java @@ -9,7 +9,7 @@ import io.netty.handler.codec.ByteToMessageCodec; import it.cavallium.dbengine.rpc.current.data.BoxedRPCEvent; import it.cavallium.dbengine.rpc.current.data.ClientBoundRequest; import it.cavallium.dbengine.rpc.current.data.ClientBoundResponse; -import it.cavallium.dbengine.rpc.current.data.IBasicType; +import it.cavallium.dbengine.rpc.current.IBaseType; import it.cavallium.dbengine.rpc.current.data.RPCEvent; import it.cavallium.dbengine.rpc.current.data.ServerBoundRequest; import it.cavallium.dbengine.rpc.current.data.ServerBoundResponse; @@ -23,12 +23,13 @@ public class RPCCodecs { public static class RPCEventCodec extends ByteToMessageCodec { public static final ChannelHandler INSTANCE = new RPCEventCodec(); + public static final BoxedRPCEventSerializer SERIALIZER_INSTANCE = new BoxedRPCEventSerializer(); @Override protected void encode(ChannelHandlerContext ctx, RPCEvent msg, ByteBuf out) throws Exception { try (var bbos = new ByteBufOutputStream(out)) { try (var dos = new DataOutputStream(bbos)) { - BoxedRPCEventSerializer.INSTANCE.serialize(dos, BoxedRPCEvent.of(msg)); + SERIALIZER_INSTANCE.serialize(dos, BoxedRPCEvent.of(msg)); } } } @@ -37,7 +38,7 @@ public class RPCCodecs { protected void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) throws Exception { try (var bbis = new ByteBufInputStream(msg)) { try (var dis = new DataInputStream(bbis)) { - out.add(BoxedRPCEventSerializer.INSTANCE.deserialize(dis).val()); + out.add(SERIALIZER_INSTANCE.deserialize(dis).val()); } } } diff --git a/src/test/java/it/cavallium/dbengine/ExpectedQueryType.java b/src/test/java/it/cavallium/dbengine/ExpectedQueryType.java index 1f3ab80..4fd2a2e 100644 --- a/src/test/java/it/cavallium/dbengine/ExpectedQueryType.java +++ b/src/test/java/it/cavallium/dbengine/ExpectedQueryType.java @@ -1,11 +1,11 @@ package it.cavallium.dbengine; import it.cavallium.dbengine.client.Sort; -import it.cavallium.dbengine.client.query.BasicType; +import it.cavallium.dbengine.client.query.BaseType; record ExpectedQueryType(boolean shard, boolean sorted, boolean sortedByScore, boolean complete, boolean onlyCount) { public ExpectedQueryType(boolean shard, Sort multiSort, boolean complete, boolean onlyCount) { - this(shard, multiSort.isSorted(), multiSort.querySort().getBasicType$() == BasicType.ScoreSort, complete, onlyCount); + this(shard, multiSort.isSorted(), multiSort.querySort().getBaseType$() == BaseType.ScoreSort, complete, onlyCount); } }