diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/AlpEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/AlpEncodingDecoder.java index 2acc2901..3eeaa10e 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/AlpEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/AlpEncodingDecoder.java @@ -38,14 +38,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_ALP; } - @Override - public boolean accepts(DType dtype) { - if (!(dtype instanceof DType.Primitive p)) { - return false; - } - return p.ptype() == PType.F64 || p.ptype() == PType.F32; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer rawMeta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/AlpRdEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/AlpRdEncodingDecoder.java index fa3006e9..79312922 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/AlpRdEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/AlpRdEncodingDecoder.java @@ -34,14 +34,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_ALPRD; } - @Override - public boolean accepts(DType dtype) { - if (!(dtype instanceof DType.Primitive p)) { - return false; - } - return p.ptype() == PType.F32 || p.ptype() == PType.F64; - } - @Override public Array decode(DecodeContext ctx) { ALPRDMetadata meta = parseMeta(ctx); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/BitpackedEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/BitpackedEncodingDecoder.java index 563a5350..b0b86791 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/BitpackedEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/BitpackedEncodingDecoder.java @@ -31,17 +31,6 @@ public EncodingId encodingId() { return EncodingId.FASTLANES_BITPACKED; } - @Override - public boolean accepts(DType dtype) { - if (!(dtype instanceof DType.Primitive p)) { - return false; - } - return switch (p.ptype()) { - case I8, I16, I32, I64, U8, U16, U32, U64 -> true; - default -> false; - }; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer rawMeta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/BoolEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/BoolEncodingDecoder.java index 5aad4b5d..62ec3121 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/BoolEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/BoolEncodingDecoder.java @@ -1,6 +1,5 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.DType; import io.github.dfa1.vortex.encoding.EncodingId; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaterializedBoolArray; @@ -19,11 +18,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_BOOL; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Bool; - } - @Override public Array decode(DecodeContext ctx) { return new MaterializedBoolArray(ctx.dtype(), ctx.rowCount(), ctx.buffer(0)); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ByteBoolEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ByteBoolEncodingDecoder.java index b4331aef..a28a05f5 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ByteBoolEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ByteBoolEncodingDecoder.java @@ -1,6 +1,5 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.DType; import io.github.dfa1.vortex.encoding.EncodingId; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaterializedBoolArray; @@ -21,11 +20,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_BYTEBOOL; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Bool; - } - @Override public Array decode(DecodeContext ctx) { long n = ctx.rowCount(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ChunkedEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ChunkedEncodingDecoder.java index 96f30a41..e41db0b4 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ChunkedEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ChunkedEncodingDecoder.java @@ -35,13 +35,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_CHUNKED; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Primitive - || dtype instanceof DType.Bool - || dtype instanceof DType.Struct; - } - @Override public Array decode(DecodeContext ctx) { int nchildren = ctx.node().children().length; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ConstantEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ConstantEncodingDecoder.java index d5e13057..b247d3cc 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ConstantEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ConstantEncodingDecoder.java @@ -35,11 +35,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_CONSTANT; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Primitive; - } - @Override public Array decode(DecodeContext ctx) { MemorySegment scalarBuf = ctx.buffer(0); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DateTimePartsEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DateTimePartsEncodingDecoder.java index d6328a20..df064471 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DateTimePartsEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DateTimePartsEncodingDecoder.java @@ -33,11 +33,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_DATETIMEPARTS; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Extension; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer meta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecimalBytePartsEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecimalBytePartsEncodingDecoder.java index 57b99c41..2893c8e5 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecimalBytePartsEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecimalBytePartsEncodingDecoder.java @@ -24,11 +24,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_DECIMAL_BYTE_PARTS; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Decimal; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer meta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecimalEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecimalEncodingDecoder.java index 4d678492..baa8dee6 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecimalEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecimalEncodingDecoder.java @@ -1,6 +1,5 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.DType; import io.github.dfa1.vortex.core.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LazyDecimalArray; @@ -23,11 +22,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_DECIMAL; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Decimal; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer meta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DeltaEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DeltaEncodingDecoder.java index 491cfdca..6a01bc23 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DeltaEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DeltaEncodingDecoder.java @@ -31,17 +31,6 @@ public EncodingId encodingId() { return EncodingId.FASTLANES_DELTA; } - @Override - public boolean accepts(DType dtype) { - if (!(dtype instanceof DType.Primitive p)) { - return false; - } - return switch (p.ptype()) { - case I8, I16, I32, I64, U8, U16, U32, U64 -> true; - default -> false; - }; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer rawMeta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DictEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DictEncodingDecoder.java index 3915d2b0..1c4030fe 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DictEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DictEncodingDecoder.java @@ -43,11 +43,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_DICT; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Primitive || dtype instanceof DType.Utf8; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer meta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/EncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/EncodingDecoder.java index ab4f9783..dd1343c0 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/EncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/EncodingDecoder.java @@ -1,6 +1,5 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.encoding.EncodingId; @@ -16,12 +15,6 @@ public interface EncodingDecoder { /// @return the wire identifier EncodingId encodingId(); - /// Returns whether this decoder handles the given dtype. - /// - /// @param dtype the dtype to test - /// @return `true` if this decoder can handle arrays of `dtype` - boolean accepts(DType dtype); - /// Decodes an array node from the file using the provided context. /// /// @param ctx decoding context containing buffers, dtype, row count, and child registry diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ExtEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ExtEncodingDecoder.java index 174e532e..3618c75c 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ExtEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ExtEncodingDecoder.java @@ -17,11 +17,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_EXT; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Extension; - } - @Override public Array decode(DecodeContext ctx) { if (!(ctx.dtype() instanceof DType.Extension ext)) { diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FixedSizeListEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FixedSizeListEncodingDecoder.java index 5266613a..012edacd 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FixedSizeListEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FixedSizeListEncodingDecoder.java @@ -18,11 +18,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_FIXED_SIZE_LIST; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.FixedSizeList; - } - @Override public Array decode(DecodeContext ctx) { if (!(ctx.dtype() instanceof DType.FixedSizeList fsl)) { diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FrameOfReferenceEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FrameOfReferenceEncodingDecoder.java index 73e592bd..0fbf186e 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FrameOfReferenceEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FrameOfReferenceEncodingDecoder.java @@ -28,11 +28,6 @@ public EncodingId encodingId() { return EncodingId.FASTLANES_FOR; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Primitive p && !p.ptype().isFloating(); - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer rawMeta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FsstEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FsstEncodingDecoder.java index e4ad348e..d6064a7c 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FsstEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/FsstEncodingDecoder.java @@ -28,11 +28,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_FSST; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Utf8 || dtype instanceof DType.Binary; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer rawMeta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ListEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ListEncodingDecoder.java index 46eddc32..bc8ab41c 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ListEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ListEncodingDecoder.java @@ -23,11 +23,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_LIST; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.List; - } - @Override public Array decode(DecodeContext ctx) { if (!(ctx.dtype() instanceof DType.List listDtype)) { diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ListViewEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ListViewEncodingDecoder.java index a94e1f10..5e3141c1 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ListViewEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ListViewEncodingDecoder.java @@ -23,11 +23,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_LISTVIEW; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.List; - } - @Override public Array decode(DecodeContext ctx) { if (!(ctx.dtype() instanceof DType.List listDtype)) { diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/MaskedEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/MaskedEncodingDecoder.java index 4f75fd4a..8f8522e1 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/MaskedEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/MaskedEncodingDecoder.java @@ -19,11 +19,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_MASKED; } - @Override - public boolean accepts(DType dtype) { - return false; - } - @Override public Array decode(DecodeContext ctx) { if (ctx.node().bufferIndices().length != 0) { diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/NullEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/NullEncodingDecoder.java index ebc034ff..1db69b51 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/NullEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/NullEncodingDecoder.java @@ -1,6 +1,5 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.NullArray; import io.github.dfa1.vortex.encoding.EncodingId; @@ -17,11 +16,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_NULL; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Null; - } - @Override public Array decode(DecodeContext ctx) { return new NullArray(ctx.dtype(), ctx.rowCount()); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PatchedEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PatchedEncodingDecoder.java index 3c26a95e..62b4eb00 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PatchedEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PatchedEncodingDecoder.java @@ -30,11 +30,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_PATCHED; } - @Override - public boolean accepts(DType dtype) { - return false; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer rawMeta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PcoEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PcoEncodingDecoder.java index 3c3641e2..a089896e 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PcoEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PcoEncodingDecoder.java @@ -43,11 +43,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_PCO; } - @Override - public boolean accepts(DType dtype) { - return false; - } - @Override public Array decode(DecodeContext ctx) { PcoMetadata meta = parseMeta(ctx); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PrimitiveEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PrimitiveEncodingDecoder.java index 9f405f3a..9c436fa3 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PrimitiveEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PrimitiveEncodingDecoder.java @@ -29,11 +29,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_PRIMITIVE; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Primitive; - } - @Override public Array decode(DecodeContext ctx) { MemorySegment buf = ctx.buffer(0); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/RleEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/RleEncodingDecoder.java index 98caa8bc..7468b6e8 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/RleEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/RleEncodingDecoder.java @@ -38,11 +38,6 @@ public EncodingId encodingId() { return EncodingId.FASTLANES_RLE; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Primitive p && !p.ptype().isFloating(); - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer rawMeta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/RunEndEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/RunEndEncodingDecoder.java index 689d4236..0d0e3aad 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/RunEndEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/RunEndEncodingDecoder.java @@ -38,11 +38,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_RUNEND; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Primitive p && !p.ptype().isFloating(); - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer rawMeta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SequenceEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SequenceEncodingDecoder.java index 2a3e30fe..0ec996ab 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SequenceEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SequenceEncodingDecoder.java @@ -34,11 +34,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_SEQUENCE; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Primitive; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer metaBuf = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SparseEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SparseEncodingDecoder.java index cc7df618..9d152cac 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SparseEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SparseEncodingDecoder.java @@ -43,11 +43,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_SPARSE; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Primitive; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer rawMeta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/StructEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/StructEncodingDecoder.java index 7c47990b..1e32dba7 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/StructEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/StructEncodingDecoder.java @@ -23,11 +23,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_STRUCT; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Struct; - } - @Override public Array decode(DecodeContext ctx) { int numChildren = ctx.node().children().length; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VarBinEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VarBinEncodingDecoder.java index bb08535d..154222ec 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VarBinEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VarBinEncodingDecoder.java @@ -24,11 +24,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_VARBIN; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Utf8 || dtype instanceof DType.Binary; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer rawMeta = ctx.metadata(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VarBinViewEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VarBinViewEncodingDecoder.java index 0b84f43d..ffe8c1ee 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VarBinViewEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VarBinViewEncodingDecoder.java @@ -20,11 +20,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_VARBINVIEW; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Utf8 || dtype instanceof DType.Binary; - } - @Override public Array decode(DecodeContext ctx) { if (!(ctx.dtype() instanceof DType.Utf8 || ctx.dtype() instanceof DType.Binary)) { diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VariantEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VariantEncodingDecoder.java index 029c5f80..e64baaae 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VariantEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/VariantEncodingDecoder.java @@ -26,11 +26,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_VARIANT; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Variant; - } - @Override public Array decode(DecodeContext ctx) { DType shreddedDtype = parseShreddedDtype(ctx.metadata()); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ZigZagEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ZigZagEncodingDecoder.java index 9a295aa1..ed23daaa 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ZigZagEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ZigZagEncodingDecoder.java @@ -30,15 +30,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_ZIGZAG; } - @Override - public boolean accepts(DType dtype) { - if (!(dtype instanceof DType.Primitive p)) { - return false; - } - PType pt = p.ptype(); - return pt == PType.I8 || pt == PType.I16 || pt == PType.I32 || pt == PType.I64; - } - @Override public Array decode(DecodeContext ctx) { if (!(ctx.dtype() instanceof DType.Primitive p)) { diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ZstdEncodingDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ZstdEncodingDecoder.java index c57094f1..00897a0b 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ZstdEncodingDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ZstdEncodingDecoder.java @@ -38,11 +38,6 @@ public EncodingId encodingId() { return EncodingId.VORTEX_ZSTD; } - @Override - public boolean accepts(DType dtype) { - return dtype instanceof DType.Primitive || dtype instanceof DType.Utf8 || dtype instanceof DType.Binary; - } - @Override public Array decode(DecodeContext ctx) { ByteBuffer rawMeta = ctx.metadata(); diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/VortexReaderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/VortexReaderTest.java index 3fe11d78..e332cf34 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/VortexReaderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/VortexReaderTest.java @@ -1,6 +1,5 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.DType; import io.github.dfa1.vortex.core.VortexException; import io.github.dfa1.vortex.core.VortexFormat; import io.github.dfa1.vortex.reader.array.Array; @@ -37,11 +36,6 @@ public EncodingId encodingId() { return encodingId; } - @Override - public boolean accepts(DType dtype) { - return false; - } - @Override public Array decode(DecodeContext ctx) { // Generic zero-length stand-in: scan chunk row count comes from the diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/AlpEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/AlpEncodingDecoderTest.java index f2778af2..31636673 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/AlpEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/AlpEncodingDecoderTest.java @@ -54,15 +54,6 @@ private static MemorySegment leDoubles(double... vs) { return MemorySegment.ofArray(b); } - @Test - void accepts_floatsTrue_otherFalse() { - // Given / When / Then - assertThat(SUT.accepts(F64)).isTrue(); - assertThat(SUT.accepts(F32)).isTrue(); - assertThat(SUT.accepts(new DType.Primitive(PType.I64, false))).isFalse(); - assertThat(SUT.accepts(new DType.Utf8(false))).isFalse(); - } - @Test void decode_nonPrimitiveDtype_throws() { // Given a Utf8 dtype on an ALP node diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DecimalEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DecimalEncodingDecoderTest.java index 5a272486..f077a4b4 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DecimalEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DecimalEncodingDecoderTest.java @@ -1,7 +1,6 @@ package io.github.dfa1.vortex.reader.decode; import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; import io.github.dfa1.vortex.core.VortexException; import io.github.dfa1.vortex.encoding.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; @@ -39,13 +38,6 @@ private static Array decode(ByteBuffer meta, int rowCount, int bufferBytes) { return SUT.decode(ctx); } - @Test - void acceptsDecimalRejectsOthers() { - // Given / When / Then - assertThat(SUT.accepts(DECIMAL)).isTrue(); - assertThat(SUT.accepts(new DType.Primitive(PType.I32, false))).isFalse(); - } - @Test void encodingId() { assertThat(SUT.encodingId()).isEqualTo(EncodingId.VORTEX_DECIMAL); diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DictEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DictEncodingDecoderTest.java index 2dd7b8ea..83256506 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DictEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DictEncodingDecoderTest.java @@ -39,11 +39,9 @@ class DictEncodingDecoderTest { SUT, new PrimitiveEncodingDecoder(), new VarBinEncodingDecoder()); @Test - void acceptsPrimitiveAndUtf8_rejectsOthers() { + void encodingId_isVortexDict() { // Given / When / Then - assertThat(SUT.accepts(new DType.Primitive(PType.I32, false))).isTrue(); - assertThat(SUT.accepts(new DType.Utf8(false))).isTrue(); - assertThat(SUT.accepts(new DType.Bool(false))).isFalse(); + assertThat(SUT.encodingId()).isEqualTo(EncodingId.VORTEX_DICT); } @Nested diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VarBinViewEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VarBinViewEncodingDecoderTest.java index 941ad931..41ffb80d 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VarBinViewEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VarBinViewEncodingDecoderTest.java @@ -25,14 +25,6 @@ void encodingId_isVortexVarBinView() { assertThat(SUT.encodingId()).isEqualTo(EncodingId.VORTEX_VARBINVIEW); } - @Test - void accepts_utf8AndBinary_true_otherFalse() { - // Given / When / Then - assertThat(SUT.accepts(new DType.Utf8(false))).isTrue(); - assertThat(SUT.accepts(new DType.Binary(false))).isTrue(); - assertThat(SUT.accepts(new DType.Primitive(io.github.dfa1.vortex.core.PType.I32, false))).isFalse(); - } - @Test void decode_binaryDtype_inlineViews() { // Given two short (inline) values under a Binary dtype — exercises the diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/ZigZagEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/ZigZagEncodingDecoderTest.java index 78730eab..367f98d5 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/ZigZagEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/ZigZagEncodingDecoderTest.java @@ -12,8 +12,6 @@ import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.array.ShortArray; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; @@ -75,26 +73,6 @@ void encodingId_isZigzag() { assertThat(SUT.encodingId()).isEqualTo(EncodingId.VORTEX_ZIGZAG); } - @ParameterizedTest - @EnumSource(value = PType.class, names = {"I8", "I16", "I32", "I64"}) - void accepts_signedIntegers(PType ptype) { - // Given / When / Then - assertThat(SUT.accepts(new DType.Primitive(ptype, false))).isTrue(); - } - - @ParameterizedTest - @EnumSource(value = PType.class, names = {"U8", "U16", "U32", "U64", "F16", "F32", "F64"}) - void accepts_rejectsNonSigned(PType ptype) { - // Given / When / Then - assertThat(SUT.accepts(new DType.Primitive(ptype, false))).isFalse(); - } - - @Test - void accepts_rejectsNonPrimitive() { - // Given / When / Then - assertThat(SUT.accepts(new DType.Bool(false))).isFalse(); - } - @Test void decode_i8_roundTrip() { // Given diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/AlpRdEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/AlpRdEncodingEncoderTest.java index 23faff54..f6658199 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/AlpRdEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/AlpRdEncodingEncoderTest.java @@ -132,14 +132,10 @@ void encodeDecode_randomF32_isBitExact(int n) { void accepts_floatPtypesOnly() { // Given / When / Then — only F32/F64 are encodable; integers and non-primitives are rejected var encoder = new AlpRdEncodingEncoder(); - var decoder = new AlpRdEncodingDecoder(); assertThat(encoder.accepts(DTypes.F32)).isTrue(); assertThat(encoder.accepts(DTypes.F64)).isTrue(); - assertThat(decoder.accepts(DTypes.F32)).isTrue(); - assertThat(decoder.accepts(DTypes.F64)).isTrue(); assertThat(encoder.accepts(DTypes.I64)).isFalse(); assertThat(encoder.accepts(DTypes.UTF8)).isFalse(); - assertThat(decoder.accepts(DTypes.I32)).isFalse(); } private static Stream sizes() { diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DeltaEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DeltaEncodingEncoderTest.java index eed4307f..a5862c14 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DeltaEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DeltaEncodingEncoderTest.java @@ -164,16 +164,13 @@ void encodeDecode_randomAcrossPtypesAndSizes_isLossless(String name, DType dtype void accepts_everyIntegerPtype_isTrue(String ptype) { // Given / When / Then assertThat(ENCODER.accepts(new DType.Primitive(PType.valueOf(ptype), false))).isTrue(); - assertThat(DECODER.accepts(new DType.Primitive(PType.valueOf(ptype), false))).isTrue(); } @Test void accepts_nonIntegerOrNonPrimitive_isFalse() { - // Given / When / Then — floats and non-primitive dtypes are rejected by both sides + // Given / When / Then — floats and non-primitive dtypes are rejected assertThat(ENCODER.accepts(DTypes.F64)).isFalse(); assertThat(ENCODER.accepts(DTypes.UTF8)).isFalse(); - assertThat(DECODER.accepts(DTypes.F32)).isFalse(); - assertThat(DECODER.accepts(DTypes.BOOL)).isFalse(); } @Test