diff --git a/CHANGELOG.md b/CHANGELOG.md index 88a82ac7..13977a53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Vortex now ships with **no FlatBuffers or Protobuf runtime dependency**: the `.f ### Changed +- **Breaking:** every `vortex-core` type now lives under `io.github.dfa1.vortex.core.*` — `core.model` (`DType`, `PType`, `TimeUnit`, `EncodingId`, `ExtensionId`, `TimeDtype`, `TimestampDtype`), `core.io` (`IoBounds`, `PTypeIO`, `VortexFormat`), `core.error` (`VortexException`), `core.compute` (`FastLanes`, `PrimitiveArrays`), and `core.fbs` / `core.proto` for the wire codecs. Update imports accordingly (e.g. `io.github.dfa1.vortex.core.DType` → `io.github.dfa1.vortex.core.model.DType`). - Removed the `com.google.flatbuffers:flatbuffers-java` runtime dependency. The `.fbs`/`.proto` schemas are now compiled in-house to `MemorySegment`-native Java, dropping the last automatic-module dependency so a named JPMS `module-info` is viable (ADR 0017). - Generated FlatBuffers/Protobuf wire classes are prefixed `Fbs*`/`Proto*`, so the generic type names (`Array`, `Buffer`, `DType`, `Null`, …) no longer collide on the consumer classpath. diff --git a/CLAUDE.md b/CLAUDE.md index 0bca850d..ebeab79d 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -22,8 +22,12 @@ Benchmark classes follow this: `JavaVsJni{Read,Write,Filter}Benchmark`, ## Module structure ``` -core — DType, PType, VortexException, VortexFormat + generated fbs/proto - encoding: EncodingId, TimeUnit, PTypeIO extension: ExtensionId +core — everything lives under `io.github.dfa1.vortex.core.*`: + core.model DType, PType, TimeUnit, EncodingId, ExtensionId, TimeDtype, TimestampDtype + core.io IoBounds, PTypeIO, VortexFormat + core.error VortexException + core.compute FastLanes, PrimitiveArrays + core.fbs / core.proto — generated wire codecs + their runtimes reader — VortexReader, VortexHttpReader, VortexHandle, ReadRegistry, ExtensionDecoder, Chunk, ArrayStats, ScanOptions, RowFilter; file internals (Footer, Layout, Trailer, PostscriptParser, …) @@ -71,7 +75,7 @@ Both schema languages are compiled in-process to MemorySegment-native Java, with `flatc`/`protoc` and no `com.google.flatbuffers`/`protobuf-java` runtime (ADR 0017): - **`.fbs` → `fbs-gen`** (`io.github.dfa1.vortex.fbsgen`): generates readers extending `FbsTable`/`FbsStruct` and builders over `FbsBuilder`, all in the same generated package - `io.github.dfa1.vortex.fbs`. The runtime base classes `FbsTable`/`FbsStruct` are + `io.github.dfa1.vortex.core.fbs`. The runtime base classes `FbsTable`/`FbsStruct` are package-private (only generated readers extend them); `FbsBuilder` is public because the writer module assembles FlatBuffers with it. - **`.proto` → `proto-gen`**: one record per message with static `decode(MemorySegment, long, @@ -246,7 +250,7 @@ MemorySegment metaSeg = MemorySegment.ofBuffer(ctx.metadata().duplicate()); FooMetadata meta = FooMetadata.decode(metaSeg, 0, metaSeg.byteSize()); ``` -Generated proto records live in `io.github.dfa1.vortex.proto`; the runtime (`ProtoReader`, +Generated proto records live in `io.github.dfa1.vortex.core.proto`; the runtime (`ProtoReader`, `ProtoWriter`) is package-private. For oneof messages (e.g. `ScalarValue`) prefer the static `ofXxxValue(v)` factory over the multi-arg constructor. diff --git a/SECURITY.md b/SECURITY.md index 5128139b..597e804a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -34,7 +34,7 @@ Maven Central metadata. In scope: - Any malformed `.vortex` input that causes the reader to throw an exception other than - `io.github.dfa1.vortex.core.VortexException` (e.g. `IndexOutOfBoundsException`, + `io.github.dfa1.vortex.core.error.VortexException` (e.g. `IndexOutOfBoundsException`, `NegativeArraySizeException`, `OutOfMemoryError`, `StackOverflowError`, raw FlatBuffer runtime exceptions, raw `IOException` from the proto3 reader, or a JVM crash via the FFM layer). - Any malformed `.vortex` input that causes the reader to allocate memory disproportionate diff --git a/cli/src/main/java/io/github/dfa1/vortex/cli/FilterCommand.java b/cli/src/main/java/io/github/dfa1/vortex/cli/FilterCommand.java index 4a148eb4..4eb8915c 100644 --- a/cli/src/main/java/io/github/dfa1/vortex/cli/FilterCommand.java +++ b/cli/src/main/java/io/github/dfa1/vortex/cli/FilterCommand.java @@ -56,7 +56,7 @@ static int run(String[] args) { CsvExporter.exportCsvFiltered(path, stdout, ExportOptions.defaults(), scanOptions, rowPred); stdout.flush(); return ExitStatus.OK; - } catch (IOException | io.github.dfa1.vortex.core.VortexException e) { + } catch (IOException | io.github.dfa1.vortex.core.error.VortexException e) { // VortexException is unchecked but surfaces user-facing failures (e.g. unknown // column on a typo'd filter); catching it here keeps the CLI from dumping a // stack trace and lets shell pipelines branch on the exit code. diff --git a/cli/src/main/java/io/github/dfa1/vortex/cli/SchemaCommand.java b/cli/src/main/java/io/github/dfa1/vortex/cli/SchemaCommand.java index 90b3e656..cfce43ef 100644 --- a/cli/src/main/java/io/github/dfa1/vortex/cli/SchemaCommand.java +++ b/cli/src/main/java/io/github/dfa1/vortex/cli/SchemaCommand.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.cli; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.VortexReader; import java.io.IOException; diff --git a/cli/src/main/java/io/github/dfa1/vortex/cli/StatsCommand.java b/cli/src/main/java/io/github/dfa1/vortex/cli/StatsCommand.java index 5cc180cd..45676362 100644 --- a/cli/src/main/java/io/github/dfa1/vortex/cli/StatsCommand.java +++ b/cli/src/main/java/io/github/dfa1/vortex/cli/StatsCommand.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.cli; import io.github.dfa1.vortex.reader.ArrayStats; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.VortexReader; import java.io.IOException; diff --git a/cli/src/main/java/io/github/dfa1/vortex/cli/tui/GridRender.java b/cli/src/main/java/io/github/dfa1/vortex/cli/tui/GridRender.java index b8a22dae..8423a6e1 100644 --- a/cli/src/main/java/io/github/dfa1/vortex/cli/tui/GridRender.java +++ b/cli/src/main/java/io/github/dfa1/vortex/cli/tui/GridRender.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.cli.tui; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.ByteArray; diff --git a/cli/src/main/java/io/github/dfa1/vortex/cli/tui/InspectorRender.java b/cli/src/main/java/io/github/dfa1/vortex/cli/tui/InspectorRender.java index 1cc0cbdb..20df7dd4 100644 --- a/cli/src/main/java/io/github/dfa1/vortex/cli/tui/InspectorRender.java +++ b/cli/src/main/java/io/github/dfa1/vortex/cli/tui/InspectorRender.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.cli.tui; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.ByteArray; diff --git a/cli/src/main/java/io/github/dfa1/vortex/cli/tui/LazyGridSource.java b/cli/src/main/java/io/github/dfa1/vortex/cli/tui/LazyGridSource.java index 064e5dab..e0584f51 100644 --- a/cli/src/main/java/io/github/dfa1/vortex/cli/tui/LazyGridSource.java +++ b/cli/src/main/java/io/github/dfa1/vortex/cli/tui/LazyGridSource.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.cli.tui; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.Chunk; import io.github.dfa1.vortex.reader.ScanIterator; import io.github.dfa1.vortex.reader.ScanOptions; diff --git a/cli/src/main/java/io/github/dfa1/vortex/cli/tui/VortexInspectorTui.java b/cli/src/main/java/io/github/dfa1/vortex/cli/tui/VortexInspectorTui.java index e750c298..51c4b3cc 100644 --- a/cli/src/main/java/io/github/dfa1/vortex/cli/tui/VortexInspectorTui.java +++ b/cli/src/main/java/io/github/dfa1/vortex/cli/tui/VortexInspectorTui.java @@ -2,7 +2,7 @@ import io.github.dfa1.vortex.reader.Layout; import io.github.dfa1.vortex.reader.SegmentSpec; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.cli.tui.term.Ansi; import io.github.dfa1.vortex.cli.tui.term.Key; diff --git a/cli/src/test/java/io/github/dfa1/vortex/cli/CliTestSupport.java b/cli/src/test/java/io/github/dfa1/vortex/cli/CliTestSupport.java index 8c8e62e2..e80658af 100644 --- a/cli/src/test/java/io/github/dfa1/vortex/cli/CliTestSupport.java +++ b/cli/src/test/java/io/github/dfa1/vortex/cli/CliTestSupport.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.cli; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.writer.VortexWriter; import io.github.dfa1.vortex.writer.WriteOptions; diff --git a/cli/src/test/java/io/github/dfa1/vortex/cli/SchemaCommandTest.java b/cli/src/test/java/io/github/dfa1/vortex/cli/SchemaCommandTest.java index 9bb36eaa..7d8742c6 100644 --- a/cli/src/test/java/io/github/dfa1/vortex/cli/SchemaCommandTest.java +++ b/cli/src/test/java/io/github/dfa1/vortex/cli/SchemaCommandTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.cli; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; diff --git a/cli/src/test/java/io/github/dfa1/vortex/cli/tui/ArrayFixtures.java b/cli/src/test/java/io/github/dfa1/vortex/cli/tui/ArrayFixtures.java index 5d6f632a..3f24dbf6 100644 --- a/cli/src/test/java/io/github/dfa1/vortex/cli/tui/ArrayFixtures.java +++ b/cli/src/test/java/io/github/dfa1/vortex/cli/tui/ArrayFixtures.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.cli.tui; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.ByteArray; import io.github.dfa1.vortex.reader.array.DoubleArray; diff --git a/cli/src/test/java/io/github/dfa1/vortex/cli/tui/GridRenderTest.java b/cli/src/test/java/io/github/dfa1/vortex/cli/tui/GridRenderTest.java index 70477f1c..23ac2070 100644 --- a/cli/src/test/java/io/github/dfa1/vortex/cli/tui/GridRenderTest.java +++ b/cli/src/test/java/io/github/dfa1/vortex/cli/tui/GridRenderTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.cli.tui; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.TimeUnit; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.TimeUnit; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.ByteArray; import io.github.dfa1.vortex.reader.array.FixedSizeListArray; diff --git a/cli/src/test/java/io/github/dfa1/vortex/cli/tui/InspectorRenderTest.java b/cli/src/test/java/io/github/dfa1/vortex/cli/tui/InspectorRenderTest.java index 53e98a3a..3e545338 100644 --- a/cli/src/test/java/io/github/dfa1/vortex/cli/tui/InspectorRenderTest.java +++ b/cli/src/test/java/io/github/dfa1/vortex/cli/tui/InspectorRenderTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.cli.tui; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.GenericArray; import io.github.dfa1.vortex.reader.array.IntArray; diff --git a/cli/src/test/java/io/github/dfa1/vortex/cli/tui/LazyGridSourceTest.java b/cli/src/test/java/io/github/dfa1/vortex/cli/tui/LazyGridSourceTest.java index da17064f..11918655 100644 --- a/cli/src/test/java/io/github/dfa1/vortex/cli/tui/LazyGridSourceTest.java +++ b/cli/src/test/java/io/github/dfa1/vortex/cli/tui/LazyGridSourceTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.cli.tui; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.VortexHandle; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/cli/src/test/java/io/github/dfa1/vortex/cli/tui/TuiTestSupport.java b/cli/src/test/java/io/github/dfa1/vortex/cli/tui/TuiTestSupport.java index d885d6e7..ee2e7107 100644 --- a/cli/src/test/java/io/github/dfa1/vortex/cli/tui/TuiTestSupport.java +++ b/cli/src/test/java/io/github/dfa1/vortex/cli/tui/TuiTestSupport.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.cli.tui; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.VortexHandle; import io.github.dfa1.vortex.reader.VortexReader; import io.github.dfa1.vortex.writer.VortexWriter; diff --git a/core/pom.xml b/core/pom.xml index f53a4878..241cf912 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -91,7 +91,7 @@ ${project.basedir}/../fbs-gen/target/classes io.github.dfa1.vortex.fbsgen.Main --out - ${project.basedir}/src/main/java/io/github/dfa1/vortex/fbs + ${project.basedir}/src/main/java/io/github/dfa1/vortex/core/fbs ${project.basedir}/src/main/fbs/array.fbs ${project.basedir}/src/main/fbs/dtype.fbs ${project.basedir}/src/main/fbs/footer.fbs @@ -112,7 +112,7 @@ ${project.basedir}/../proto-gen/target/classes io.github.dfa1.vortex.protogen.Main --out - ${project.basedir}/src/main/java/io/github/dfa1/vortex/proto + ${project.basedir}/src/main/java/io/github/dfa1/vortex/core/proto ${project.basedir}/src/main/proto/dtype.proto ${project.basedir}/src/main/proto/scalar.proto ${project.basedir}/src/main/proto/encodings.proto @@ -138,8 +138,8 @@ pitest-maven - io.github.dfa1.vortex.core.IoBounds - io.github.dfa1.vortex.encoding.PTypeIO + io.github.dfa1.vortex.core.io.IoBounds + io.github.dfa1.vortex.core.io.PTypeIO diff --git a/core/src/main/fbs/array.fbs b/core/src/main/fbs/array.fbs index e8db352c..c48bb586 100644 --- a/core/src/main/fbs/array.fbs +++ b/core/src/main/fbs/array.fbs @@ -3,7 +3,7 @@ /// An Array describes the hierarchy of an array as well as the locations of the data buffers that appear /// immediately after the message in the byte stream. -namespace io.github.dfa1.vortex.fbs; +namespace io.github.dfa1.vortex.core.fbs; table Array { /// The array's hierarchical definition. diff --git a/core/src/main/fbs/dtype.fbs b/core/src/main/fbs/dtype.fbs index 0759411d..02fa483f 100644 --- a/core/src/main/fbs/dtype.fbs +++ b/core/src/main/fbs/dtype.fbs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -namespace io.github.dfa1.vortex.fbs; +namespace io.github.dfa1.vortex.core.fbs; enum PType: uint8 { U8, diff --git a/core/src/main/fbs/footer.fbs b/core/src/main/fbs/footer.fbs index aa43a300..608a5930 100644 --- a/core/src/main/fbs/footer.fbs +++ b/core/src/main/fbs/footer.fbs @@ -4,7 +4,7 @@ include "array.fbs"; include "layout.fbs"; -namespace io.github.dfa1.vortex.fbs; +namespace io.github.dfa1.vortex.core.fbs; // [postscript] /// The `Postscript` is guaranteed by the file format to never exceed diff --git a/core/src/main/fbs/layout.fbs b/core/src/main/fbs/layout.fbs index ecc59251..6b954368 100644 --- a/core/src/main/fbs/layout.fbs +++ b/core/src/main/fbs/layout.fbs @@ -15,7 +15,7 @@ /// `encoding` to embed additional information that may be useful for the reader. For example, the `ChunkedLayout` /// uses the first byte of the `metadata` array as a boolean to indicate whether the first child Layout represents /// the statistics table for the other chunks. -namespace io.github.dfa1.vortex.fbs; +namespace io.github.dfa1.vortex.core.fbs; table Layout { /// The ID of the encoding used for this Layout. diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/FastLanes.java b/core/src/main/java/io/github/dfa1/vortex/core/compute/FastLanes.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/encoding/FastLanes.java rename to core/src/main/java/io/github/dfa1/vortex/core/compute/FastLanes.java index 2844d55a..3ad0ca1a 100644 --- a/core/src/main/java/io/github/dfa1/vortex/encoding/FastLanes.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/compute/FastLanes.java @@ -1,6 +1,6 @@ -package io.github.dfa1.vortex.encoding; +package io.github.dfa1.vortex.core.compute; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.PType; /// Shared FastLanes layout constants and index math used by the bit-packing and delta encodings on /// both the read and write sides. diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/PrimitiveArrays.java b/core/src/main/java/io/github/dfa1/vortex/core/compute/PrimitiveArrays.java similarity index 94% rename from core/src/main/java/io/github/dfa1/vortex/encoding/PrimitiveArrays.java rename to core/src/main/java/io/github/dfa1/vortex/core/compute/PrimitiveArrays.java index ec3ada59..25d68e4d 100644 --- a/core/src/main/java/io/github/dfa1/vortex/encoding/PrimitiveArrays.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/compute/PrimitiveArrays.java @@ -1,7 +1,9 @@ -package io.github.dfa1.vortex.encoding; +package io.github.dfa1.vortex.core.compute; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/core/src/main/java/io/github/dfa1/vortex/core/VortexException.java b/core/src/main/java/io/github/dfa1/vortex/core/error/VortexException.java similarity index 96% rename from core/src/main/java/io/github/dfa1/vortex/core/VortexException.java rename to core/src/main/java/io/github/dfa1/vortex/core/error/VortexException.java index 7e1675b0..f4521aa9 100644 --- a/core/src/main/java/io/github/dfa1/vortex/core/VortexException.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/error/VortexException.java @@ -1,6 +1,6 @@ -package io.github.dfa1.vortex.core; +package io.github.dfa1.vortex.core.error; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import java.util.Optional; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsArray.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArray.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsArray.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArray.java index 0531cff5..22957a21 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsArray.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArray.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsArrayNode.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArrayNode.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsArrayNode.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArrayNode.java index 3bbc8a73..8e2ffeba 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsArrayNode.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArrayNode.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsArraySpec.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArraySpec.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsArraySpec.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArraySpec.java index 756516a5..3c231ed2 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsArraySpec.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArraySpec.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsArrayStats.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArrayStats.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsArrayStats.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArrayStats.java index bc56c13e..eb8da494 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsArrayStats.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsArrayStats.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsBinary.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBinary.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsBinary.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBinary.java index 7dfc8f66..90bfb9b8 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsBinary.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBinary.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsBool.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBool.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsBool.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBool.java index 4b352377..85646d6d 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsBool.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBool.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsBuffer.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBuffer.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsBuffer.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBuffer.java index ea463c7f..52e45fee 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsBuffer.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBuffer.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsBuilder.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBuilder.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsBuilder.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBuilder.java index b85d1974..63ef8f44 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsBuilder.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsBuilder.java @@ -1,10 +1,10 @@ -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_DOUBLE; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_FLOAT; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_LONG; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_SHORT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_DOUBLE; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_FLOAT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_LONG; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_SHORT; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsCompression.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsCompression.java similarity index 91% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsCompression.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsCompression.java index 83aa998c..add35d9e 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsCompression.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsCompression.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsCompressionScheme.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsCompressionScheme.java similarity index 93% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsCompressionScheme.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsCompressionScheme.java index fa00758e..b7a87315 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsCompressionScheme.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsCompressionScheme.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsCompressionSpec.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsCompressionSpec.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsCompressionSpec.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsCompressionSpec.java index f7608b6a..b287a357 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsCompressionSpec.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsCompressionSpec.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsDType.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsDType.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsDType.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsDType.java index 8609e331..54e8bae4 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsDType.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsDType.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsDecimal.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsDecimal.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsDecimal.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsDecimal.java index 3084c802..2fa2d2f2 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsDecimal.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsDecimal.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsEncryptionSpec.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsEncryptionSpec.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsEncryptionSpec.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsEncryptionSpec.java index 5cf41a9a..01cbbdd0 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsEncryptionSpec.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsEncryptionSpec.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsExtension.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsExtension.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsExtension.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsExtension.java index 66acdef2..7c84a107 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsExtension.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsExtension.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsFileStatistics.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsFileStatistics.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsFileStatistics.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsFileStatistics.java index 26804e1b..206602aa 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsFileStatistics.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsFileStatistics.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsFixedSizeList.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsFixedSizeList.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsFixedSizeList.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsFixedSizeList.java index 5c24489b..1c0c5c83 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsFixedSizeList.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsFixedSizeList.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsFooter.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsFooter.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsFooter.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsFooter.java index f5f6535f..f0d6fc37 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsFooter.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsFooter.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsLayout.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsLayout.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsLayout.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsLayout.java index 7364100f..94a7d86e 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsLayout.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsLayout.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsLayoutSpec.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsLayoutSpec.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsLayoutSpec.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsLayoutSpec.java index 9fccdb2e..696d83c2 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsLayoutSpec.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsLayoutSpec.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsList.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsList.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsList.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsList.java index d6d4b7e2..1824bdf8 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsList.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsList.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsNull.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsNull.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsNull.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsNull.java index 59a95374..52c23efe 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsNull.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsNull.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsPType.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPType.java similarity index 95% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsPType.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPType.java index 0a9bdeb9..532b3057 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsPType.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPType.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsPostscript.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPostscript.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsPostscript.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPostscript.java index f728afa2..81bff440 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsPostscript.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPostscript.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsPostscriptSegment.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPostscriptSegment.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsPostscriptSegment.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPostscriptSegment.java index b3829109..28679bb0 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsPostscriptSegment.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPostscriptSegment.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsPrecision.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPrecision.java similarity index 91% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsPrecision.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPrecision.java index 22857c88..8aa29ce1 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsPrecision.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPrecision.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsPrimitive.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPrimitive.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsPrimitive.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPrimitive.java index b320819b..2ff86a1c 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsPrimitive.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsPrimitive.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsSegmentSpec.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsSegmentSpec.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsSegmentSpec.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsSegmentSpec.java index 9c055489..c800597c 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsSegmentSpec.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsSegmentSpec.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsStruct.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsStruct.java similarity index 87% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsStruct.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsStruct.java index dfd6d4ba..97239e2c 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsStruct.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsStruct.java @@ -1,10 +1,10 @@ -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_DOUBLE; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_FLOAT; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_LONG; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_SHORT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_DOUBLE; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_FLOAT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_LONG; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_SHORT; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsStruct_.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsStruct_.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsStruct_.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsStruct_.java index a95d99ae..567ffc61 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsStruct_.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsStruct_.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsTable.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsTable.java similarity index 95% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsTable.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsTable.java index 46c8088b..8f98b956 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsTable.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsTable.java @@ -1,10 +1,10 @@ -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_DOUBLE; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_FLOAT; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_LONG; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_SHORT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_DOUBLE; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_FLOAT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_LONG; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_SHORT; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsType.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsType.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsType.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsType.java index aefb9ada..4c68bcfd 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsType.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsType.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsUnion.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsUnion.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsUnion.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsUnion.java index 7176d308..8c89b952 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsUnion.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsUnion.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsUtf8.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsUtf8.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsUtf8.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsUtf8.java index 59e91631..2515335b 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsUtf8.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsUtf8.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsVariant.java b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsVariant.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/fbs/FbsVariant.java rename to core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsVariant.java index 3fa51b87..df17fe08 100644 --- a/core/src/main/java/io/github/dfa1/vortex/fbs/FbsVariant.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/fbs/FbsVariant.java @@ -1,6 +1,6 @@ // Generated by vortex-fbs-gen. Do not edit. -package io.github.dfa1.vortex.fbs; +package io.github.dfa1.vortex.core.fbs; import java.lang.foreign.MemorySegment; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/core/IoBounds.java b/core/src/main/java/io/github/dfa1/vortex/core/io/IoBounds.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/core/IoBounds.java rename to core/src/main/java/io/github/dfa1/vortex/core/io/IoBounds.java index 6a7451bc..ba1d98b1 100644 --- a/core/src/main/java/io/github/dfa1/vortex/core/IoBounds.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/io/IoBounds.java @@ -1,4 +1,6 @@ -package io.github.dfa1.vortex.core; +package io.github.dfa1.vortex.core.io; + +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/PTypeIO.java b/core/src/main/java/io/github/dfa1/vortex/core/io/PTypeIO.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/encoding/PTypeIO.java rename to core/src/main/java/io/github/dfa1/vortex/core/io/PTypeIO.java index 897b59cd..4ec48301 100644 --- a/core/src/main/java/io/github/dfa1/vortex/encoding/PTypeIO.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/io/PTypeIO.java @@ -1,6 +1,6 @@ -package io.github.dfa1.vortex.encoding; +package io.github.dfa1.vortex.core.io; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.PType; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/core/VortexFormat.java b/core/src/main/java/io/github/dfa1/vortex/core/io/VortexFormat.java similarity index 96% rename from core/src/main/java/io/github/dfa1/vortex/core/VortexFormat.java rename to core/src/main/java/io/github/dfa1/vortex/core/io/VortexFormat.java index 65ccc88b..3df9bf68 100644 --- a/core/src/main/java/io/github/dfa1/vortex/core/VortexFormat.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/io/VortexFormat.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.core; +package io.github.dfa1.vortex.core.io; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/core/DType.java b/core/src/main/java/io/github/dfa1/vortex/core/model/DType.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/core/DType.java rename to core/src/main/java/io/github/dfa1/vortex/core/model/DType.java index b187cc5e..ecfbe940 100644 --- a/core/src/main/java/io/github/dfa1/vortex/core/DType.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/model/DType.java @@ -1,4 +1,6 @@ -package io.github.dfa1.vortex.core; +package io.github.dfa1.vortex.core.model; + +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.util.ArrayList; diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/EncodingId.java b/core/src/main/java/io/github/dfa1/vortex/core/model/EncodingId.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/encoding/EncodingId.java rename to core/src/main/java/io/github/dfa1/vortex/core/model/EncodingId.java index 9264042d..10271c5a 100644 --- a/core/src/main/java/io/github/dfa1/vortex/encoding/EncodingId.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/model/EncodingId.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.encoding; +package io.github.dfa1.vortex.core.model; import java.util.Map; import java.util.Optional; diff --git a/core/src/main/java/io/github/dfa1/vortex/extension/ExtensionId.java b/core/src/main/java/io/github/dfa1/vortex/core/model/ExtensionId.java similarity index 93% rename from core/src/main/java/io/github/dfa1/vortex/extension/ExtensionId.java rename to core/src/main/java/io/github/dfa1/vortex/core/model/ExtensionId.java index 4a1c489a..baa112fe 100644 --- a/core/src/main/java/io/github/dfa1/vortex/extension/ExtensionId.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/model/ExtensionId.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.extension; +package io.github.dfa1.vortex.core.model; import java.util.Map; import java.util.Optional; @@ -7,7 +7,7 @@ import java.util.stream.Stream; /// Strongly-typed identifier for the spec-defined Vortex extension types. -/// Mirrors [io.github.dfa1.vortex.encoding.EncodingId] in shape so callers +/// Mirrors [io.github.dfa1.vortex.core.model.EncodingId] in shape so callers /// reach for the same pattern across both registries. /// /// Unknown wire ids (e.g. `"acme.geopoint"`) are not represented here — diff --git a/core/src/main/java/io/github/dfa1/vortex/core/PType.java b/core/src/main/java/io/github/dfa1/vortex/core/model/PType.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/core/PType.java rename to core/src/main/java/io/github/dfa1/vortex/core/model/PType.java index 86c2f8a7..a682f74b 100644 --- a/core/src/main/java/io/github/dfa1/vortex/core/PType.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/model/PType.java @@ -1,4 +1,6 @@ -package io.github.dfa1.vortex.core; +package io.github.dfa1.vortex.core.model; + +import io.github.dfa1.vortex.core.error.VortexException; /// Physical primitive type — the wire-level numeric kind for a column. /// diff --git a/core/src/main/java/io/github/dfa1/vortex/extension/TimeDtype.java b/core/src/main/java/io/github/dfa1/vortex/core/model/TimeDtype.java similarity index 90% rename from core/src/main/java/io/github/dfa1/vortex/extension/TimeDtype.java rename to core/src/main/java/io/github/dfa1/vortex/core/model/TimeDtype.java index bc42219c..2d92c7d8 100644 --- a/core/src/main/java/io/github/dfa1/vortex/extension/TimeDtype.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/model/TimeDtype.java @@ -1,9 +1,6 @@ -package io.github.dfa1.vortex.extension; +package io.github.dfa1.vortex.core.model; -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.TimeUnit; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/TimeUnit.java b/core/src/main/java/io/github/dfa1/vortex/core/model/TimeUnit.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/encoding/TimeUnit.java rename to core/src/main/java/io/github/dfa1/vortex/core/model/TimeUnit.java index 258a92a9..a59a0b2f 100644 --- a/core/src/main/java/io/github/dfa1/vortex/encoding/TimeUnit.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/model/TimeUnit.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.encoding; +package io.github.dfa1.vortex.core.model; /// Time unit for timestamp values. Ordinals match Rust's `TimeUnit` enum. public enum TimeUnit { diff --git a/core/src/main/java/io/github/dfa1/vortex/extension/TimestampDtype.java b/core/src/main/java/io/github/dfa1/vortex/core/model/TimestampDtype.java similarity index 92% rename from core/src/main/java/io/github/dfa1/vortex/extension/TimestampDtype.java rename to core/src/main/java/io/github/dfa1/vortex/core/model/TimestampDtype.java index 47489c16..054f5177 100644 --- a/core/src/main/java/io/github/dfa1/vortex/extension/TimestampDtype.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/model/TimestampDtype.java @@ -1,11 +1,8 @@ -package io.github.dfa1.vortex.extension; +package io.github.dfa1.vortex.core.model; -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.TimeUnit; +import io.github.dfa1.vortex.core.error.VortexException; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_SHORT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_SHORT; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoALPMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoALPMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoALPMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoALPMetadata.java index 3fdcbf58..42830737 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoALPMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoALPMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoALPRDMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoALPRDMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoALPRDMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoALPRDMetadata.java index 68591da6..83a09686 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoALPRDMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoALPRDMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoBinary.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoBinary.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoBinary.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoBinary.java index d905fd1b..4dc5b303 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoBinary.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoBinary.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoBitPackedMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoBitPackedMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoBitPackedMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoBitPackedMetadata.java index 1af965d4..95b042cc 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoBitPackedMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoBitPackedMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoBool.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoBool.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoBool.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoBool.java index 65be8db3..49a5e897 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoBool.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoBool.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDType.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDType.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoDType.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDType.java index cd87206c..d0d52f75 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDType.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDType.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDateTimePartsMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDateTimePartsMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoDateTimePartsMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDateTimePartsMetadata.java index e756dca0..8139562c 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDateTimePartsMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDateTimePartsMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDecimal.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDecimal.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoDecimal.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDecimal.java index e171d8f3..7634b7b8 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDecimal.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDecimal.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDecimalBytePartsMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDecimalBytePartsMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoDecimalBytePartsMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDecimalBytePartsMetadata.java index d8357684..a9a1f822 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDecimalBytePartsMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDecimalBytePartsMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDecimalMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDecimalMetadata.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoDecimalMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDecimalMetadata.java index dce8e84b..1f78bdbf 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDecimalMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDecimalMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDeltaMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDeltaMetadata.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoDeltaMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDeltaMetadata.java index 0c55012e..b693ceba 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDeltaMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDeltaMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDictMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDictMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoDictMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDictMetadata.java index 5df00536..a3cf6340 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoDictMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoDictMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoExtension.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoExtension.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoExtension.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoExtension.java index 2226917f..80d7715a 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoExtension.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoExtension.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoFSSTMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoFSSTMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoFSSTMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoFSSTMetadata.java index 57f4be3e..909424f0 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoFSSTMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoFSSTMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoField.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoField.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoField.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoField.java index ac257936..08c6e741 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoField.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoField.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoFieldPath.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoFieldPath.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoFieldPath.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoFieldPath.java index 5589cb2c..60f246f4 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoFieldPath.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoFieldPath.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoFixedSizeList.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoFixedSizeList.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoFixedSizeList.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoFixedSizeList.java index 420b0425..be3e866b 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoFixedSizeList.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoFixedSizeList.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoList.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoList.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoList.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoList.java index 803b3391..730b0744 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoList.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoList.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoListMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoListMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoListMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoListMetadata.java index d84aac43..4dde84c6 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoListMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoListMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoListValue.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoListValue.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoListValue.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoListValue.java index c5fdbea6..3f562cab 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoListValue.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoListValue.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoListViewMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoListViewMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoListViewMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoListViewMetadata.java index d0a33833..9e1d87e4 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoListViewMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoListViewMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoNull.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoNull.java similarity index 96% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoNull.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoNull.java index 6d00c19d..48c471a7 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoNull.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoNull.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoNullValue.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoNullValue.java similarity index 96% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoNullValue.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoNullValue.java index 81c41e64..adbfa8a2 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoNullValue.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoNullValue.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPType.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPType.java similarity index 96% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoPType.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPType.java index cd5d639f..17ac2c9f 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPType.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPType.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import javax.annotation.processing.Generated; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPatchedMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPatchedMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoPatchedMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPatchedMetadata.java index 4141e6d8..2fe880f9 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPatchedMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPatchedMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPatchesMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPatchesMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoPatchesMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPatchesMetadata.java index 9a8ab969..6bdb6154 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPatchesMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPatchesMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPcoChunkInfo.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPcoChunkInfo.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoPcoChunkInfo.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPcoChunkInfo.java index 6ab1f15c..91dd6c71 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPcoChunkInfo.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPcoChunkInfo.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPcoMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPcoMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoPcoMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPcoMetadata.java index 5e8b3bf0..73b8790e 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPcoMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPcoMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPcoPageInfo.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPcoPageInfo.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoPcoPageInfo.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPcoPageInfo.java index 497a69fa..53c86011 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPcoPageInfo.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPcoPageInfo.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPrimitive.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPrimitive.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoPrimitive.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPrimitive.java index 83049542..9ad261b7 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoPrimitive.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoPrimitive.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoRLEMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoRLEMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoRLEMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoRLEMetadata.java index 80b3b190..6cdb4266 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoRLEMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoRLEMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoReader.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoReader.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoReader.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoReader.java index 8885dd10..2cfd6129 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoReader.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoReader.java @@ -1,7 +1,7 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_LONG; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_LONG; import java.io.IOException; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoRunEndMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoRunEndMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoRunEndMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoRunEndMetadata.java index 775cc9dd..3f4dd4d1 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoRunEndMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoRunEndMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoScalar.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoScalar.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoScalar.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoScalar.java index d2aa6aae..a10f776d 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoScalar.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoScalar.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoScalarValue.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoScalarValue.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoScalarValue.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoScalarValue.java index 4b51b622..98a0134f 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoScalarValue.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoScalarValue.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoSequenceMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoSequenceMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoSequenceMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoSequenceMetadata.java index fd21c430..f746c65c 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoSequenceMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoSequenceMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoSparseMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoSparseMetadata.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoSparseMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoSparseMetadata.java index 6db30bab..aca7592a 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoSparseMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoSparseMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoStruct.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoStruct.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoStruct.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoStruct.java index f8b5deae..3e34c88e 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoStruct.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoStruct.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoUnion.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoUnion.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoUnion.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoUnion.java index 736fe491..e20454e2 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoUnion.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoUnion.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoUtf8.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoUtf8.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoUtf8.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoUtf8.java index 2ce34c0e..6fe1a9ce 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoUtf8.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoUtf8.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoVarBinMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoVarBinMetadata.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoVarBinMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoVarBinMetadata.java index ce5c7dce..225f5022 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoVarBinMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoVarBinMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoVariant.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoVariant.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoVariant.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoVariant.java index 11f23520..adf9bb0f 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoVariant.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoVariant.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoVariantMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoVariantMetadata.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoVariantMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoVariantMetadata.java index 7ae7c940..f470aacb 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoVariantMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoVariantMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoWriter.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoWriter.java similarity index 99% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoWriter.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoWriter.java index 5a3c36d1..43d8a04c 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoWriter.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoWriter.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoZstdFrameMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoZstdFrameMetadata.java similarity index 97% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoZstdFrameMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoZstdFrameMetadata.java index 9ed04ba7..4f33e732 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoZstdFrameMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoZstdFrameMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoZstdMetadata.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoZstdMetadata.java similarity index 98% rename from core/src/main/java/io/github/dfa1/vortex/proto/ProtoZstdMetadata.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoZstdMetadata.java index dd31325a..a58693ab 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/ProtoZstdMetadata.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/ProtoZstdMetadata.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/core/src/main/java/io/github/dfa1/vortex/proto/WireType.java b/core/src/main/java/io/github/dfa1/vortex/core/proto/WireType.java similarity index 90% rename from core/src/main/java/io/github/dfa1/vortex/proto/WireType.java rename to core/src/main/java/io/github/dfa1/vortex/core/proto/WireType.java index 020ae263..768e99b5 100644 --- a/core/src/main/java/io/github/dfa1/vortex/proto/WireType.java +++ b/core/src/main/java/io/github/dfa1/vortex/core/proto/WireType.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; /// Proto3 wire-type constants. /// Each field on the wire is preceded by a tag varint encoding `(fieldNumber << 3) | wireType`. diff --git a/core/src/main/proto/dtype.proto b/core/src/main/proto/dtype.proto index 2017c9fb..b6ebcd56 100644 --- a/core/src/main/proto/dtype.proto +++ b/core/src/main/proto/dtype.proto @@ -5,7 +5,7 @@ syntax = "proto3"; package vortex.dtype; -option java_package = "io.github.dfa1.vortex.proto"; +option java_package = "io.github.dfa1.vortex.core.proto"; option java_outer_classname = "DTypeProtos"; enum PType { diff --git a/core/src/main/proto/encodings.proto b/core/src/main/proto/encodings.proto index 0c1fa98c..cce06054 100644 --- a/core/src/main/proto/encodings.proto +++ b/core/src/main/proto/encodings.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package vortex.encodings; -option java_package = "io.github.dfa1.vortex.proto"; +option java_package = "io.github.dfa1.vortex.core.proto"; option java_outer_classname = "EncodingProtos"; import "scalar.proto"; diff --git a/core/src/main/proto/scalar.proto b/core/src/main/proto/scalar.proto index 2d3924ec..62893649 100644 --- a/core/src/main/proto/scalar.proto +++ b/core/src/main/proto/scalar.proto @@ -5,7 +5,7 @@ syntax = "proto3"; package vortex.scalar; -option java_package = "io.github.dfa1.vortex.proto"; +option java_package = "io.github.dfa1.vortex.core.proto"; option java_outer_classname = "ScalarProtos"; import "dtype.proto"; diff --git a/core/src/test/java/io/github/dfa1/vortex/encoding/PrimitiveArraysTest.java b/core/src/test/java/io/github/dfa1/vortex/core/compute/PrimitiveArraysTest.java similarity index 96% rename from core/src/test/java/io/github/dfa1/vortex/encoding/PrimitiveArraysTest.java rename to core/src/test/java/io/github/dfa1/vortex/core/compute/PrimitiveArraysTest.java index c2f3ccea..26fd260b 100644 --- a/core/src/test/java/io/github/dfa1/vortex/encoding/PrimitiveArraysTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/core/compute/PrimitiveArraysTest.java @@ -1,7 +1,10 @@ -package io.github.dfa1.vortex.encoding; +package io.github.dfa1.vortex.core.compute; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; + +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; diff --git a/core/src/test/java/io/github/dfa1/vortex/core/IoBoundsTest.java b/core/src/test/java/io/github/dfa1/vortex/core/io/IoBoundsTest.java similarity index 97% rename from core/src/test/java/io/github/dfa1/vortex/core/IoBoundsTest.java rename to core/src/test/java/io/github/dfa1/vortex/core/io/IoBoundsTest.java index eef254f7..aa78c72b 100644 --- a/core/src/test/java/io/github/dfa1/vortex/core/IoBoundsTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/core/io/IoBoundsTest.java @@ -1,4 +1,6 @@ -package io.github.dfa1.vortex.core; +package io.github.dfa1.vortex.core.io; + +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/io/github/dfa1/vortex/encoding/PTypeIOTest.java b/core/src/test/java/io/github/dfa1/vortex/core/io/PTypeIOTest.java similarity index 94% rename from core/src/test/java/io/github/dfa1/vortex/encoding/PTypeIOTest.java rename to core/src/test/java/io/github/dfa1/vortex/core/io/PTypeIOTest.java index adeca72a..c21f584f 100644 --- a/core/src/test/java/io/github/dfa1/vortex/encoding/PTypeIOTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/core/io/PTypeIOTest.java @@ -1,15 +1,15 @@ -package io.github.dfa1.vortex.encoding; +package io.github.dfa1.vortex.core.io; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.PType; import org.junit.jupiter.api.Test; import java.lang.foreign.MemorySegment; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_DOUBLE; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_FLOAT; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_LONG; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_SHORT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_DOUBLE; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_FLOAT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_LONG; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_SHORT; import static java.lang.foreign.ValueLayout.JAVA_BYTE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/core/src/test/java/io/github/dfa1/vortex/core/DTypeExtensionTest.java b/core/src/test/java/io/github/dfa1/vortex/core/model/DTypeExtensionTest.java similarity index 93% rename from core/src/test/java/io/github/dfa1/vortex/core/DTypeExtensionTest.java rename to core/src/test/java/io/github/dfa1/vortex/core/model/DTypeExtensionTest.java index b0c67519..6a57cbac 100644 --- a/core/src/test/java/io/github/dfa1/vortex/core/DTypeExtensionTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/core/model/DTypeExtensionTest.java @@ -1,4 +1,6 @@ -package io.github.dfa1.vortex.core; +package io.github.dfa1.vortex.core.model; + +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/io/github/dfa1/vortex/core/DTypeFactoriesTest.java b/core/src/test/java/io/github/dfa1/vortex/core/model/DTypeFactoriesTest.java similarity index 98% rename from core/src/test/java/io/github/dfa1/vortex/core/DTypeFactoriesTest.java rename to core/src/test/java/io/github/dfa1/vortex/core/model/DTypeFactoriesTest.java index 5b4e87de..dcf4f3b9 100644 --- a/core/src/test/java/io/github/dfa1/vortex/core/DTypeFactoriesTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/core/model/DTypeFactoriesTest.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.core; +package io.github.dfa1.vortex.core.model; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/io/github/dfa1/vortex/core/DTypeStructBuilderTest.java b/core/src/test/java/io/github/dfa1/vortex/core/model/DTypeStructBuilderTest.java similarity index 98% rename from core/src/test/java/io/github/dfa1/vortex/core/DTypeStructBuilderTest.java rename to core/src/test/java/io/github/dfa1/vortex/core/model/DTypeStructBuilderTest.java index 2c07fd0b..1ee3b38c 100644 --- a/core/src/test/java/io/github/dfa1/vortex/core/DTypeStructBuilderTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/core/model/DTypeStructBuilderTest.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.core; +package io.github.dfa1.vortex.core.model; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/io/github/dfa1/vortex/core/DTypeWithNullableTest.java b/core/src/test/java/io/github/dfa1/vortex/core/model/DTypeWithNullableTest.java similarity index 99% rename from core/src/test/java/io/github/dfa1/vortex/core/DTypeWithNullableTest.java rename to core/src/test/java/io/github/dfa1/vortex/core/model/DTypeWithNullableTest.java index 7b0341f8..48cd84a6 100644 --- a/core/src/test/java/io/github/dfa1/vortex/core/DTypeWithNullableTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/core/model/DTypeWithNullableTest.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.core; +package io.github.dfa1.vortex.core.model; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/io/github/dfa1/vortex/encoding/EncodingIdTest.java b/core/src/test/java/io/github/dfa1/vortex/core/model/EncodingIdTest.java similarity index 96% rename from core/src/test/java/io/github/dfa1/vortex/encoding/EncodingIdTest.java rename to core/src/test/java/io/github/dfa1/vortex/core/model/EncodingIdTest.java index 740ae417..43baebf3 100644 --- a/core/src/test/java/io/github/dfa1/vortex/encoding/EncodingIdTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/core/model/EncodingIdTest.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.encoding; +package io.github.dfa1.vortex.core.model; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/io/github/dfa1/vortex/extension/ExtensionIdTest.java b/core/src/test/java/io/github/dfa1/vortex/core/model/ExtensionIdTest.java similarity index 96% rename from core/src/test/java/io/github/dfa1/vortex/extension/ExtensionIdTest.java rename to core/src/test/java/io/github/dfa1/vortex/core/model/ExtensionIdTest.java index 2d65ba4e..cabb214c 100644 --- a/core/src/test/java/io/github/dfa1/vortex/extension/ExtensionIdTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/core/model/ExtensionIdTest.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.extension; +package io.github.dfa1.vortex.core.model; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/io/github/dfa1/vortex/core/PTypeTest.java b/core/src/test/java/io/github/dfa1/vortex/core/model/PTypeTest.java similarity index 97% rename from core/src/test/java/io/github/dfa1/vortex/core/PTypeTest.java rename to core/src/test/java/io/github/dfa1/vortex/core/model/PTypeTest.java index 8ed1338c..48025834 100644 --- a/core/src/test/java/io/github/dfa1/vortex/core/PTypeTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/core/model/PTypeTest.java @@ -1,4 +1,6 @@ -package io.github.dfa1.vortex.core; +package io.github.dfa1.vortex.core.model; + +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/io/github/dfa1/vortex/encoding/TimeUnitTest.java b/core/src/test/java/io/github/dfa1/vortex/core/model/TimeUnitTest.java similarity index 98% rename from core/src/test/java/io/github/dfa1/vortex/encoding/TimeUnitTest.java rename to core/src/test/java/io/github/dfa1/vortex/core/model/TimeUnitTest.java index 7829237b..2d5be529 100644 --- a/core/src/test/java/io/github/dfa1/vortex/encoding/TimeUnitTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/core/model/TimeUnitTest.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.encoding; +package io.github.dfa1.vortex.core.model; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/core/src/test/java/io/github/dfa1/vortex/encoding/DTypes.java b/core/src/test/java/io/github/dfa1/vortex/encoding/DTypes.java index 21966464..d80f1044 100644 --- a/core/src/test/java/io/github/dfa1/vortex/encoding/DTypes.java +++ b/core/src/test/java/io/github/dfa1/vortex/encoding/DTypes.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.encoding; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; /// Shared DType constants for encoding tests. /// diff --git a/core/src/test/java/io/github/dfa1/vortex/encoding/TestSegments.java b/core/src/test/java/io/github/dfa1/vortex/encoding/TestSegments.java index a0c50fb1..5e64f08d 100644 --- a/core/src/test/java/io/github/dfa1/vortex/encoding/TestSegments.java +++ b/core/src/test/java/io/github/dfa1/vortex/encoding/TestSegments.java @@ -1,5 +1,7 @@ package io.github.dfa1.vortex.encoding; +import io.github.dfa1.vortex.core.io.PTypeIO; + import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; diff --git a/core/src/test/java/io/github/dfa1/vortex/proto/ProtoRuntimeTest.java b/core/src/test/java/io/github/dfa1/vortex/proto/ProtoRuntimeTest.java index a1526264..3b9c7024 100644 --- a/core/src/test/java/io/github/dfa1/vortex/proto/ProtoRuntimeTest.java +++ b/core/src/test/java/io/github/dfa1/vortex/proto/ProtoRuntimeTest.java @@ -1,4 +1,4 @@ -package io.github.dfa1.vortex.proto; +package io.github.dfa1.vortex.core.proto; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/csv/src/main/java/io/github/dfa1/vortex/csv/CsvExporter.java b/csv/src/main/java/io/github/dfa1/vortex/csv/CsvExporter.java index 28024c35..611f955c 100644 --- a/csv/src/main/java/io/github/dfa1/vortex/csv/CsvExporter.java +++ b/csv/src/main/java/io/github/dfa1/vortex/csv/CsvExporter.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.csv; import de.siegmar.fastcsv.writer.CsvWriter; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.ByteArray; diff --git a/csv/src/main/java/io/github/dfa1/vortex/csv/CsvImporter.java b/csv/src/main/java/io/github/dfa1/vortex/csv/CsvImporter.java index e99e8eae..c04a06cb 100644 --- a/csv/src/main/java/io/github/dfa1/vortex/csv/CsvImporter.java +++ b/csv/src/main/java/io/github/dfa1/vortex/csv/CsvImporter.java @@ -2,8 +2,8 @@ import de.siegmar.fastcsv.reader.CsvReader; import de.siegmar.fastcsv.reader.CsvRecord; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.writer.VortexWriter; import java.io.IOException; diff --git a/csv/src/main/java/io/github/dfa1/vortex/csv/ImportOptions.java b/csv/src/main/java/io/github/dfa1/vortex/csv/ImportOptions.java index df49c97e..b53b4f99 100644 --- a/csv/src/main/java/io/github/dfa1/vortex/csv/ImportOptions.java +++ b/csv/src/main/java/io/github/dfa1/vortex/csv/ImportOptions.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.csv; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.writer.WriteOptions; /// Options controlling CSV → Vortex import. diff --git a/csv/src/test/java/io/github/dfa1/vortex/csv/CsvExporterTest.java b/csv/src/test/java/io/github/dfa1/vortex/csv/CsvExporterTest.java index 7c6bf6cc..59d7e6c6 100644 --- a/csv/src/test/java/io/github/dfa1/vortex/csv/CsvExporterTest.java +++ b/csv/src/test/java/io/github/dfa1/vortex/csv/CsvExporterTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.csv; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.writer.VortexWriter; import io.github.dfa1.vortex.writer.WriteOptions; import org.junit.jupiter.api.Test; diff --git a/csv/src/test/java/io/github/dfa1/vortex/csv/CsvImporterTest.java b/csv/src/test/java/io/github/dfa1/vortex/csv/CsvImporterTest.java index 42342b07..ef3cc563 100644 --- a/csv/src/test/java/io/github/dfa1/vortex/csv/CsvImporterTest.java +++ b/csv/src/test/java/io/github/dfa1/vortex/csv/CsvImporterTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.csv; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.array.VarBinArray; import io.github.dfa1.vortex.reader.VortexReader; diff --git a/docs/adr/0001-split-read-and-write-runtimes.md b/docs/adr/0001-split-read-and-write-runtimes.md index e663e433..6dcc0888 100644 --- a/docs/adr/0001-split-read-and-write-runtimes.md +++ b/docs/adr/0001-split-read-and-write-runtimes.md @@ -26,8 +26,8 @@ io.github.dfa1.vortex.encoding — Encoding (encode + decode on one type), 30+ concrete *Encoding.java classes io.github.dfa1.vortex.extension — Extension interface, ExtensionId, 4 spec extension impls -io.github.dfa1.vortex.proto — generated proto records (in-tree codec) -io.github.dfa1.vortex.fbs — generated flatbuffer types +io.github.dfa1.vortex.core.proto — generated proto records (in-tree codec) +io.github.dfa1.vortex.core.fbs — generated flatbuffer types ``` ### The smell diff --git a/docs/adr/0002-pluggable-dtype-layout-compute.md b/docs/adr/0002-pluggable-dtype-layout-compute.md index 5d363ebf..f5030da8 100644 --- a/docs/adr/0002-pluggable-dtype-layout-compute.md +++ b/docs/adr/0002-pluggable-dtype-layout-compute.md @@ -119,7 +119,7 @@ public interface DType { // no longer sealed public final class DTypeRegistry { public static DTypeRegistry builder() { ... } public DTypeRegistry register(DTypeSpec spec) { ... } - public DType resolve(io.github.dfa1.vortex.proto.DType proto) { ... } + public DType resolve(io.github.dfa1.vortex.core.proto.DType proto) { ... } } ``` diff --git a/docs/reference.md b/docs/reference.md index 422e4281..7d1d81c5 100644 --- a/docs/reference.md +++ b/docs/reference.md @@ -16,7 +16,7 @@ For task-oriented usage see [how-to.md](how-to.md); for design rationale see [ex ## Core types -### `PType` (`io.github.dfa1.vortex.core.PType`) +### `PType` (`io.github.dfa1.vortex.core.model.PType`) Physical primitive type — wire-level numeric kind for a column. @@ -29,7 +29,7 @@ Physical primitive type — wire-level numeric kind for a column. Methods: `byteSize()`, `isFloating()`, `isSigned()`. -### `DType` (`io.github.dfa1.vortex.core.DType`) +### `DType` (`io.github.dfa1.vortex.core.model.DType`) Sealed logical type. All variants take a trailing `boolean nullable`. diff --git a/docs/tutorial.md b/docs/tutorial.md index 70195aa3..a96a1fa3 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -45,7 +45,7 @@ Set the compiler to Java 25: A Vortex file is a typed struct — every column has a declared type before any data is written. ```java -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; DType.Struct schema = DType.structBuilder() .field("timestamp", DType.I64) // unix epoch millis diff --git a/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/ParserTest.java b/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/ParserTest.java index 9741ef10..e041d757 100644 --- a/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/ParserTest.java +++ b/fbs-gen/src/test/java/io/github/dfa1/vortex/fbsgen/ParserTest.java @@ -31,7 +31,7 @@ void parsesEveryVortexSchema(String relPath) throws IOException { Ast.SchemaFile sut = parse(repoRoot().resolve(relPath)); // Then — every schema shares this namespace and declares at least one type. - assertThat(sut.namespace()).isEqualTo("io.github.dfa1.vortex.fbs"); + assertThat(sut.namespace()).isEqualTo("io.github.dfa1.vortex.core.fbs"); assertThat(sut.decls()).isNotEmpty(); } diff --git a/inspector/src/main/java/io/github/dfa1/vortex/inspect/InspectorTree.java b/inspector/src/main/java/io/github/dfa1/vortex/inspect/InspectorTree.java index 3c9bb5ea..ed28436d 100644 --- a/inspector/src/main/java/io/github/dfa1/vortex/inspect/InspectorTree.java +++ b/inspector/src/main/java/io/github/dfa1/vortex/inspect/InspectorTree.java @@ -1,14 +1,14 @@ package io.github.dfa1.vortex.inspect; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; import io.github.dfa1.vortex.reader.ArrayStats; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.Footer; import io.github.dfa1.vortex.reader.Layout; import io.github.dfa1.vortex.reader.SegmentSpec; -import io.github.dfa1.vortex.fbs.FbsArray; -import io.github.dfa1.vortex.fbs.FbsArrayNode; +import io.github.dfa1.vortex.core.fbs.FbsArray; +import io.github.dfa1.vortex.core.fbs.FbsArrayNode; import io.github.dfa1.vortex.reader.VortexHandle; import java.lang.foreign.MemorySegment; diff --git a/inspector/src/main/java/io/github/dfa1/vortex/inspect/VortexInspector.java b/inspector/src/main/java/io/github/dfa1/vortex/inspect/VortexInspector.java index f67ece3e..c61cc707 100644 --- a/inspector/src/main/java/io/github/dfa1/vortex/inspect/VortexInspector.java +++ b/inspector/src/main/java/io/github/dfa1/vortex/inspect/VortexInspector.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.inspect; import io.github.dfa1.vortex.reader.ArrayStats; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.Layout; import io.github.dfa1.vortex.reader.SegmentSpec; import io.github.dfa1.vortex.reader.VortexHandle; diff --git a/inspector/src/main/java/io/github/dfa1/vortex/inspect/ZonedStatsSchema.java b/inspector/src/main/java/io/github/dfa1/vortex/inspect/ZonedStatsSchema.java index 8ec63cd2..0983525a 100644 --- a/inspector/src/main/java/io/github/dfa1/vortex/inspect/ZonedStatsSchema.java +++ b/inspector/src/main/java/io/github/dfa1/vortex/inspect/ZonedStatsSchema.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.inspect; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; @@ -119,7 +119,7 @@ public static List presentStats(MemorySegment metadata) { /// Reconstructs the per-zone stats-table dtype for the given column dtype /// and metadata. /// - /// The result is a [io.github.dfa1.vortex.core.DType.Struct] mirroring + /// The result is a [io.github.dfa1.vortex.core.model.DType.Struct] mirroring /// the order produced by Rust's `stats_table_dtype`: for every present stat /// in ordinal order, append a `(name, nullable dtype)` field; Max/Min each /// add a trailing `_is_truncated` Bool (non-nullable) flag. diff --git a/inspector/src/test/java/io/github/dfa1/vortex/inspect/InspectorTreeTest.java b/inspector/src/test/java/io/github/dfa1/vortex/inspect/InspectorTreeTest.java index 84ab4c55..476a68b5 100644 --- a/inspector/src/test/java/io/github/dfa1/vortex/inspect/InspectorTreeTest.java +++ b/inspector/src/test/java/io/github/dfa1/vortex/inspect/InspectorTreeTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.inspect; import io.github.dfa1.vortex.reader.CompressionScheme; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.Footer; import io.github.dfa1.vortex.reader.Layout; import io.github.dfa1.vortex.reader.SegmentSpec; diff --git a/inspector/src/test/java/io/github/dfa1/vortex/inspect/VortexInspectorTest.java b/inspector/src/test/java/io/github/dfa1/vortex/inspect/VortexInspectorTest.java index fd78086a..1d00463b 100644 --- a/inspector/src/test/java/io/github/dfa1/vortex/inspect/VortexInspectorTest.java +++ b/inspector/src/test/java/io/github/dfa1/vortex/inspect/VortexInspectorTest.java @@ -2,7 +2,7 @@ import io.github.dfa1.vortex.reader.ArrayStats; import io.github.dfa1.vortex.reader.CompressionScheme; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.Layout; import io.github.dfa1.vortex.reader.SegmentSpec; import org.junit.jupiter.api.Test; diff --git a/inspector/src/test/java/io/github/dfa1/vortex/inspect/ZonedStatsSchemaTest.java b/inspector/src/test/java/io/github/dfa1/vortex/inspect/ZonedStatsSchemaTest.java index 7742a47d..026e57e8 100644 --- a/inspector/src/test/java/io/github/dfa1/vortex/inspect/ZonedStatsSchemaTest.java +++ b/inspector/src/test/java/io/github/dfa1/vortex/inspect/ZonedStatsSchemaTest.java @@ -2,8 +2,8 @@ import java.lang.foreign.MemorySegment; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -20,7 +20,7 @@ class ZoneLength { void readsLittleEndianU32() { // Given — 8192 = 0x2000 stored as LE u32 MemorySegment meta = MemorySegment.ofArray(new byte[4]); - meta.set(io.github.dfa1.vortex.encoding.PTypeIO.LE_INT, 0, 8192); + meta.set(io.github.dfa1.vortex.core.io.PTypeIO.LE_INT, 0, 8192); // When long result = ZonedStatsSchema.zoneLength(meta); @@ -71,7 +71,7 @@ void decodesMultiByteBitset() { // byte 0: 0b0101_1000 = 0x58 (bits 3,4,6) // byte 1: 0b0000_0001 = 0x01 (bit 8 → bit 0 of second byte) MemorySegment meta = MemorySegment.ofArray(new byte[4 + 2]); - meta.set(io.github.dfa1.vortex.encoding.PTypeIO.LE_INT, 0, 8192); + meta.set(io.github.dfa1.vortex.core.io.PTypeIO.LE_INT, 0, 8192); meta.set(java.lang.foreign.ValueLayout.JAVA_BYTE, 4, (byte) 0x58); meta.set(java.lang.foreign.ValueLayout.JAVA_BYTE, 5, (byte) 0x01); @@ -103,7 +103,7 @@ void ignoresFutureStatBits() { // Given — bit 31 set (beyond any known stat) plus MAX/MIN // byte 0: 0x18 (MAX|MIN), bytes 1-2: 0, byte 3: 0x80 (bit 31) MemorySegment meta = MemorySegment.ofArray(new byte[4 + 4]); - meta.set(io.github.dfa1.vortex.encoding.PTypeIO.LE_INT, 0, 8192); + meta.set(io.github.dfa1.vortex.core.io.PTypeIO.LE_INT, 0, 8192); meta.set(java.lang.foreign.ValueLayout.JAVA_BYTE, 4, (byte) 0x18); meta.set(java.lang.foreign.ValueLayout.JAVA_BYTE, 7, (byte) 0x80); @@ -246,7 +246,7 @@ void allStatsTogetherForI32() { private static MemorySegment metaWithBitset(int zoneLen, int firstByte) { MemorySegment meta = MemorySegment.ofArray(new byte[4 + 1]); - meta.set(io.github.dfa1.vortex.encoding.PTypeIO.LE_INT, 0, zoneLen); + meta.set(io.github.dfa1.vortex.core.io.PTypeIO.LE_INT, 0, zoneLen); meta.set(java.lang.foreign.ValueLayout.JAVA_BYTE, 4, (byte) firstByte); return meta; } diff --git a/integration/src/test/java/io/github/dfa1/vortex/integration/AllowUnknownIntegrationTest.java b/integration/src/test/java/io/github/dfa1/vortex/integration/AllowUnknownIntegrationTest.java index 48fac065..489215e3 100644 --- a/integration/src/test/java/io/github/dfa1/vortex/integration/AllowUnknownIntegrationTest.java +++ b/integration/src/test/java/io/github/dfa1/vortex/integration/AllowUnknownIntegrationTest.java @@ -4,7 +4,7 @@ import dev.vortex.api.VortexWriter; import dev.vortex.arrow.ArrowAllocation; import dev.vortex.jni.NativeLoader; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.UnknownArray; import io.github.dfa1.vortex.reader.ReadRegistry; diff --git a/integration/src/test/java/io/github/dfa1/vortex/integration/ConstantEncodingSelectionIntegrationTest.java b/integration/src/test/java/io/github/dfa1/vortex/integration/ConstantEncodingSelectionIntegrationTest.java index 73296e0f..21bc89f6 100644 --- a/integration/src/test/java/io/github/dfa1/vortex/integration/ConstantEncodingSelectionIntegrationTest.java +++ b/integration/src/test/java/io/github/dfa1/vortex/integration/ConstantEncodingSelectionIntegrationTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.integration; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.inspect.VortexInspector; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.VortexReader; diff --git a/integration/src/test/java/io/github/dfa1/vortex/integration/FileSizeComparisonIntegrationTest.java b/integration/src/test/java/io/github/dfa1/vortex/integration/FileSizeComparisonIntegrationTest.java index cb6ee3f3..931fc92f 100644 --- a/integration/src/test/java/io/github/dfa1/vortex/integration/FileSizeComparisonIntegrationTest.java +++ b/integration/src/test/java/io/github/dfa1/vortex/integration/FileSizeComparisonIntegrationTest.java @@ -3,7 +3,7 @@ import dev.vortex.api.Session; import dev.vortex.arrow.ArrowAllocation; import dev.vortex.jni.NativeLoader; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.VortexReader; diff --git a/integration/src/test/java/io/github/dfa1/vortex/integration/JavaRoundTripIntegrationTest.java b/integration/src/test/java/io/github/dfa1/vortex/integration/JavaRoundTripIntegrationTest.java index df456c08..9c253dd0 100644 --- a/integration/src/test/java/io/github/dfa1/vortex/integration/JavaRoundTripIntegrationTest.java +++ b/integration/src/test/java/io/github/dfa1/vortex/integration/JavaRoundTripIntegrationTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.integration; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.ScanOptions; import io.github.dfa1.vortex.reader.VortexReader; diff --git a/integration/src/test/java/io/github/dfa1/vortex/integration/JavaWritesRustReadsIntegrationTest.java b/integration/src/test/java/io/github/dfa1/vortex/integration/JavaWritesRustReadsIntegrationTest.java index 10963940..9f958efc 100644 --- a/integration/src/test/java/io/github/dfa1/vortex/integration/JavaWritesRustReadsIntegrationTest.java +++ b/integration/src/test/java/io/github/dfa1/vortex/integration/JavaWritesRustReadsIntegrationTest.java @@ -8,8 +8,8 @@ import dev.vortex.api.Session; import dev.vortex.arrow.ArrowAllocation; import dev.vortex.jni.NativeLoader; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.writer.encode.BoolEncodingEncoder; import io.github.dfa1.vortex.writer.encode.PcoEncodingEncoder; import io.github.dfa1.vortex.writer.encode.ByteBoolEncodingEncoder; diff --git a/integration/src/test/java/io/github/dfa1/vortex/integration/ParquetImportIntegrationTest.java b/integration/src/test/java/io/github/dfa1/vortex/integration/ParquetImportIntegrationTest.java index 3b46c815..25747e0f 100644 --- a/integration/src/test/java/io/github/dfa1/vortex/integration/ParquetImportIntegrationTest.java +++ b/integration/src/test/java/io/github/dfa1/vortex/integration/ParquetImportIntegrationTest.java @@ -3,7 +3,7 @@ import dev.hardwood.InputFile; import dev.hardwood.reader.ParquetFileReader; import dev.hardwood.reader.RowReader; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.array.VarBinArray; import io.github.dfa1.vortex.reader.VortexReader; diff --git a/integration/src/test/java/io/github/dfa1/vortex/integration/PcoFixtureInspectionIntegrationTest.java b/integration/src/test/java/io/github/dfa1/vortex/integration/PcoFixtureInspectionIntegrationTest.java index 55940836..d085081e 100644 --- a/integration/src/test/java/io/github/dfa1/vortex/integration/PcoFixtureInspectionIntegrationTest.java +++ b/integration/src/test/java/io/github/dfa1/vortex/integration/PcoFixtureInspectionIntegrationTest.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.integration; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.Layout; import io.github.dfa1.vortex.reader.SegmentSpec; import io.github.dfa1.vortex.reader.ReadRegistry; -import io.github.dfa1.vortex.fbs.FbsArray; -import io.github.dfa1.vortex.fbs.FbsArrayNode; -import io.github.dfa1.vortex.fbs.FbsBuffer; +import io.github.dfa1.vortex.core.fbs.FbsArray; +import io.github.dfa1.vortex.core.fbs.FbsArrayNode; +import io.github.dfa1.vortex.core.fbs.FbsBuffer; import io.github.dfa1.vortex.reader.VortexReader; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/integration/src/test/java/io/github/dfa1/vortex/integration/RustJavaReaderComparisonIntegrationTest.java b/integration/src/test/java/io/github/dfa1/vortex/integration/RustJavaReaderComparisonIntegrationTest.java index 72e9e54a..59f79dae 100644 --- a/integration/src/test/java/io/github/dfa1/vortex/integration/RustJavaReaderComparisonIntegrationTest.java +++ b/integration/src/test/java/io/github/dfa1/vortex/integration/RustJavaReaderComparisonIntegrationTest.java @@ -7,8 +7,8 @@ import dev.vortex.api.Session; import dev.vortex.arrow.ArrowAllocation; import dev.vortex.jni.NativeLoader; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.ByteArray; import io.github.dfa1.vortex.reader.array.DoubleArray; diff --git a/integration/src/test/java/io/github/dfa1/vortex/integration/RustWritesJavaReadsIntegrationTest.java b/integration/src/test/java/io/github/dfa1/vortex/integration/RustWritesJavaReadsIntegrationTest.java index 70748e63..41ff2591 100644 --- a/integration/src/test/java/io/github/dfa1/vortex/integration/RustWritesJavaReadsIntegrationTest.java +++ b/integration/src/test/java/io/github/dfa1/vortex/integration/RustWritesJavaReadsIntegrationTest.java @@ -9,8 +9,8 @@ import dev.vortex.api.VortexWriter; import dev.vortex.arrow.ArrowAllocation; import dev.vortex.jni.NativeLoader; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.DoubleArray; import io.github.dfa1.vortex.reader.array.LongArray; diff --git a/integration/src/test/java/io/github/dfa1/vortex/integration/VariantJavaWritesRustReadsIntegrationTest.java b/integration/src/test/java/io/github/dfa1/vortex/integration/VariantJavaWritesRustReadsIntegrationTest.java index a6cfcb5f..0d76874b 100644 --- a/integration/src/test/java/io/github/dfa1/vortex/integration/VariantJavaWritesRustReadsIntegrationTest.java +++ b/integration/src/test/java/io/github/dfa1/vortex/integration/VariantJavaWritesRustReadsIntegrationTest.java @@ -4,10 +4,10 @@ import dev.vortex.api.Session; import dev.vortex.arrow.ArrowAllocation; import dev.vortex.jni.NativeLoader; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.proto.ProtoPrimitive; -import io.github.dfa1.vortex.proto.ProtoScalar; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.proto.ProtoPrimitive; +import io.github.dfa1.vortex.core.proto.ProtoScalar; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import io.github.dfa1.vortex.writer.VortexWriter; import io.github.dfa1.vortex.writer.WriteOptions; import io.github.dfa1.vortex.writer.encode.VariantData; @@ -115,8 +115,8 @@ private static ProtoScalar i32Variant(long value) { // Inner typed scalar carrying its own i32 dtype, wrapped as a variant value // (mirrors Rust ProtoScalar::variant(ProtoScalar::primitive(value))). return new ProtoScalar( - io.github.dfa1.vortex.proto.ProtoDType.ofPrimitive( - new ProtoPrimitive(io.github.dfa1.vortex.proto.ProtoPType.I32, false)), + io.github.dfa1.vortex.core.proto.ProtoDType.ofPrimitive( + new ProtoPrimitive(io.github.dfa1.vortex.core.proto.ProtoPType.I32, false)), ProtoScalarValue.ofInt64Value(value)); } } diff --git a/integration/src/test/java/io/github/dfa1/vortex/integration/load/LargeCsvRoundTripLoadIntegrationTest.java b/integration/src/test/java/io/github/dfa1/vortex/integration/load/LargeCsvRoundTripLoadIntegrationTest.java index 762788b9..4bfcb01f 100644 --- a/integration/src/test/java/io/github/dfa1/vortex/integration/load/LargeCsvRoundTripLoadIntegrationTest.java +++ b/integration/src/test/java/io/github/dfa1/vortex/integration/load/LargeCsvRoundTripLoadIntegrationTest.java @@ -5,7 +5,7 @@ import de.siegmar.fastcsv.reader.CsvReader; import de.siegmar.fastcsv.reader.CsvRecord; import de.siegmar.fastcsv.writer.CsvWriter; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.csv.CsvExporter; import io.github.dfa1.vortex.csv.CsvImporter; import io.github.dfa1.vortex.csv.ExportOptions; diff --git a/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/JdbcImporter.java b/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/JdbcImporter.java index ed60eb13..4abc8a0f 100644 --- a/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/JdbcImporter.java +++ b/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/JdbcImporter.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.jdbc; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.writer.VortexWriter; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.ExtensionId; import java.io.IOException; import java.nio.channels.FileChannel; diff --git a/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/SqlTypeToDType.java b/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/SqlTypeToDType.java index 131e9b2a..9af73abc 100644 --- a/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/SqlTypeToDType.java +++ b/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/SqlTypeToDType.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.jdbc; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.writer.encode.DateExtensionEncoder; import io.github.dfa1.vortex.writer.encode.TimeExtensionEncoder; import io.github.dfa1.vortex.writer.encode.TimestampExtensionEncoder; diff --git a/jdbc/src/test/java/io/github/dfa1/vortex/jdbc/JdbcImporterTest.java b/jdbc/src/test/java/io/github/dfa1/vortex/jdbc/JdbcImporterTest.java index 75982e3e..b3f5882d 100644 --- a/jdbc/src/test/java/io/github/dfa1/vortex/jdbc/JdbcImporterTest.java +++ b/jdbc/src/test/java/io/github/dfa1/vortex/jdbc/JdbcImporterTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.jdbc; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.DoubleArray; import io.github.dfa1.vortex.reader.array.LongArray; diff --git a/parquet/src/main/java/io/github/dfa1/vortex/parquet/ParquetImporter.java b/parquet/src/main/java/io/github/dfa1/vortex/parquet/ParquetImporter.java index 52f8c3f7..0637849f 100644 --- a/parquet/src/main/java/io/github/dfa1/vortex/parquet/ParquetImporter.java +++ b/parquet/src/main/java/io/github/dfa1/vortex/parquet/ParquetImporter.java @@ -8,11 +8,11 @@ import dev.hardwood.schema.ColumnProjection; import dev.hardwood.schema.ColumnSchema; import dev.hardwood.schema.FileSchema; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.writer.encode.DateTimePartsData; -import io.github.dfa1.vortex.encoding.TimeUnit; -import io.github.dfa1.vortex.extension.TimestampDtype; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.model.TimestampDtype; import io.github.dfa1.vortex.writer.VortexWriter; import java.io.IOException; diff --git a/parquet/src/test/java/io/github/dfa1/vortex/parquet/ParquetImporterTest.java b/parquet/src/test/java/io/github/dfa1/vortex/parquet/ParquetImporterTest.java index bb2126ba..b4c19f33 100644 --- a/parquet/src/test/java/io/github/dfa1/vortex/parquet/ParquetImporterTest.java +++ b/parquet/src/test/java/io/github/dfa1/vortex/parquet/ParquetImporterTest.java @@ -5,8 +5,8 @@ import dev.hardwood.metadata.PhysicalType; import dev.hardwood.metadata.RepetitionType; import dev.hardwood.schema.ColumnSchema; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.Chunk; import io.github.dfa1.vortex.reader.ScanIterator; import io.github.dfa1.vortex.reader.ScanOptions; diff --git a/performance/src/main/java/io/github/dfa1/vortex/performance/JavaVsJniReadBenchmark.java b/performance/src/main/java/io/github/dfa1/vortex/performance/JavaVsJniReadBenchmark.java index 963a712c..70d71990 100644 --- a/performance/src/main/java/io/github/dfa1/vortex/performance/JavaVsJniReadBenchmark.java +++ b/performance/src/main/java/io/github/dfa1/vortex/performance/JavaVsJniReadBenchmark.java @@ -8,7 +8,7 @@ import dev.vortex.api.Session; import dev.vortex.arrow.ArrowAllocation; import dev.vortex.jni.NativeLoader; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.DoubleArray; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.array.VarBinArray; diff --git a/performance/src/main/java/io/github/dfa1/vortex/performance/JavaVsJniWriteBenchmark.java b/performance/src/main/java/io/github/dfa1/vortex/performance/JavaVsJniWriteBenchmark.java index 726124f3..e2c82b8c 100644 --- a/performance/src/main/java/io/github/dfa1/vortex/performance/JavaVsJniWriteBenchmark.java +++ b/performance/src/main/java/io/github/dfa1/vortex/performance/JavaVsJniWriteBenchmark.java @@ -3,7 +3,7 @@ import dev.vortex.api.Session; import dev.vortex.arrow.ArrowAllocation; import dev.vortex.jni.NativeLoader; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.writer.VortexWriter; import io.github.dfa1.vortex.writer.WriteOptions; import org.apache.arrow.c.ArrowArray; diff --git a/performance/src/main/java/io/github/dfa1/vortex/performance/LazyArrayWalkBenchmark.java b/performance/src/main/java/io/github/dfa1/vortex/performance/LazyArrayWalkBenchmark.java index 14370c60..cde41a9b 100644 --- a/performance/src/main/java/io/github/dfa1/vortex/performance/LazyArrayWalkBenchmark.java +++ b/performance/src/main/java/io/github/dfa1/vortex/performance/LazyArrayWalkBenchmark.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.performance; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.DoubleArray; import io.github.dfa1.vortex.reader.array.FloatArray; diff --git a/performance/src/main/java/io/github/dfa1/vortex/performance/TaxiColumnByteDiff.java b/performance/src/main/java/io/github/dfa1/vortex/performance/TaxiColumnByteDiff.java index 0dc919fc..5e335d4e 100644 --- a/performance/src/main/java/io/github/dfa1/vortex/performance/TaxiColumnByteDiff.java +++ b/performance/src/main/java/io/github/dfa1/vortex/performance/TaxiColumnByteDiff.java @@ -2,7 +2,7 @@ import dev.vortex.api.Session; import dev.vortex.jni.NativeLoader; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.Layout; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.SegmentSpec; diff --git a/performance/src/main/java/io/github/dfa1/vortex/performance/TaxiColumnTreeDiff.java b/performance/src/main/java/io/github/dfa1/vortex/performance/TaxiColumnTreeDiff.java index 6e0bc893..5294f001 100644 --- a/performance/src/main/java/io/github/dfa1/vortex/performance/TaxiColumnTreeDiff.java +++ b/performance/src/main/java/io/github/dfa1/vortex/performance/TaxiColumnTreeDiff.java @@ -1,18 +1,18 @@ package io.github.dfa1.vortex.performance; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; import dev.vortex.api.Session; import dev.vortex.jni.NativeLoader; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.fbs.FbsArray; -import io.github.dfa1.vortex.fbs.FbsArrayNode; -import io.github.dfa1.vortex.fbs.FbsBuffer; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.fbs.FbsArray; +import io.github.dfa1.vortex.core.fbs.FbsArrayNode; +import io.github.dfa1.vortex.core.fbs.FbsBuffer; import io.github.dfa1.vortex.parquet.ParquetImporter; -import io.github.dfa1.vortex.proto.ProtoALPMetadata; -import io.github.dfa1.vortex.proto.ProtoBitPackedMetadata; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.proto.ProtoALPMetadata; +import io.github.dfa1.vortex.core.proto.ProtoBitPackedMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; import io.github.dfa1.vortex.reader.Footer; import io.github.dfa1.vortex.reader.Layout; import io.github.dfa1.vortex.reader.ReadRegistry; diff --git a/pom.xml b/pom.xml index 0dab7776..f4b461d8 100644 --- a/pom.xml +++ b/pom.xml @@ -365,7 +365,7 @@ maven-javadoc-plugin ${maven-javadoc-plugin.version} - io.github.dfa1.vortex.fbs:io.github.dfa1.vortex.proto + io.github.dfa1.vortex.core.fbs:io.github.dfa1.vortex.core.proto diff --git a/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/TypeRegistry.java b/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/TypeRegistry.java index 8a93607c..75b36c0c 100644 --- a/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/TypeRegistry.java +++ b/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/TypeRegistry.java @@ -25,7 +25,7 @@ public TypeRegistry(List files) { .map(Ast.ProtoFile::javaPackage) .filter(s -> !s.isEmpty()) .findFirst() - .orElse("io.github.dfa1.vortex.proto"); + .orElse("io.github.dfa1.vortex.core.proto"); Ast.EnumDecl nullValueDecl = new Ast.EnumDecl( "NullValue", List.of(new Ast.EnumValue("NULL_VALUE", 0))); ResolvedType.Enum nullValue = new ResolvedType.Enum(nullValueDecl, "google.protobuf.NullValue", wellKnownJavaPkg); diff --git a/proto-gen/src/test/java/io/github/dfa1/vortex/protogen/ParserTest.java b/proto-gen/src/test/java/io/github/dfa1/vortex/protogen/ParserTest.java index ac6426e0..796a04ac 100644 --- a/proto-gen/src/test/java/io/github/dfa1/vortex/protogen/ParserTest.java +++ b/proto-gen/src/test/java/io/github/dfa1/vortex/protogen/ParserTest.java @@ -20,7 +20,7 @@ void parsesMinimalMessage() { String src = """ syntax = "proto3"; package vortex.test; - option java_package = "io.github.dfa1.vortex.proto"; + option java_package = "io.github.dfa1.vortex.core.proto"; message Foo { uint32 bit_width = 1; optional bytes meta = 2; @@ -33,7 +33,7 @@ void parsesMinimalMessage() { // Then assertThat(sut.protoPackage()).isEqualTo("vortex.test"); - assertThat(sut.javaPackage()).isEqualTo("io.github.dfa1.vortex.proto"); + assertThat(sut.javaPackage()).isEqualTo("io.github.dfa1.vortex.core.proto"); assertThat(sut.decls()).hasSize(1); Ast.MessageDecl foo = (Ast.MessageDecl) sut.decls().get(0); assertThat(foo.name()).isEqualTo("Foo"); @@ -127,7 +127,7 @@ void parsesDtypeProto() throws Exception { // Then assertThat(sut.protoPackage()).isEqualTo("vortex.dtype"); - assertThat(sut.javaPackage()).isEqualTo("io.github.dfa1.vortex.proto"); + assertThat(sut.javaPackage()).isEqualTo("io.github.dfa1.vortex.core.proto"); assertThat(sut.decls()).extracting(d -> switch (d) { case Ast.MessageDecl m -> m.name(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/ArrayStats.java b/reader/src/main/java/io/github/dfa1/vortex/reader/ArrayStats.java index 53b3ad79..f553c802 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/ArrayStats.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/ArrayStats.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import java.io.IOException; import java.lang.foreign.MemorySegment; @@ -32,12 +32,12 @@ public static ArrayStats empty() { return EMPTY; } - /// Parses stats from a FlatBuffers [io.github.dfa1.vortex.fbs.FbsArrayStats] table. + /// Parses stats from a FlatBuffers [io.github.dfa1.vortex.core.fbs.FbsArrayStats] table. /// Returns an empty instance when `fbs` is `null` or carries no min/max and no null count. /// /// @param fbs the FlatBuffers stats table, or `null` /// @return parsed stats, or an empty instance if no usable data is present - public static ArrayStats fromFbs(io.github.dfa1.vortex.fbs.FbsArrayStats fbs) { + public static ArrayStats fromFbs(io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs) { if (fbs == null) { return EMPTY; } diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/Chunk.java b/reader/src/main/java/io/github/dfa1/vortex/reader/Chunk.java index 982aef03..96a224e2 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/Chunk.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/Chunk.java @@ -1,9 +1,9 @@ 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.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.reader.extension.DateExtensionDecoder; import io.github.dfa1.vortex.reader.extension.TimeExtensionDecoder; import io.github.dfa1.vortex.reader.extension.TimestampExtensionDecoder; @@ -76,7 +76,7 @@ public Map columns() { /// Looks up a column by name with a checked cast to the caller's expected /// [Array] subtype. /// - /// @param name column name as declared in the file's [io.github.dfa1.vortex.core.DType] schema + /// @param name column name as declared in the file's [io.github.dfa1.vortex.core.model.DType] schema /// @param expected concrete [Array] subtype /// @return the column array /// @throws VortexException if no column with the given name is present in this chunk diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/ExtensionDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/ExtensionDecoder.java index 7d32c15d..3f4a94ce 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/ExtensionDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/ExtensionDecoder.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.ExtensionId; /// Read-side contract for a Vortex extension type. /// diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/FlatSegmentDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/FlatSegmentDecoder.java index fbdabd8d..3972942f 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/FlatSegmentDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/FlatSegmentDecoder.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.reader; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.IoBounds; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.IoBounds; import io.github.dfa1.vortex.reader.array.Array; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.fbs.FbsBuffer; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.fbs.FbsBuffer; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.reader.decode.DecodeContext; import io.github.dfa1.vortex.reader.decode.KnownArrayNode; @@ -52,7 +52,7 @@ public Array decode(MemorySegment seg, List encodingSpecs, int fbLen = seg.get(LE_INT, segLen - 4L); long fbStart = segLen - 4L - fbLen; IoBounds.checkRange(fbStart, fbLen, segLen); - var fbArray = io.github.dfa1.vortex.fbs.FbsArray.getRootAsFbsArray(seg.asSlice(fbStart, fbLen)); + var fbArray = io.github.dfa1.vortex.core.fbs.FbsArray.getRootAsFbsArray(seg.asSlice(fbStart, fbLen)); int numBuffers = IoBounds.checkCount(fbArray.buffersLength()); MemorySegment[] bufs = new MemorySegment[numBuffers]; @@ -70,7 +70,7 @@ public Array decode(MemorySegment seg, List encodingSpecs, } private static ArrayNode convertArrayNode( - io.github.dfa1.vortex.fbs.FbsArrayNode fbs, + io.github.dfa1.vortex.core.fbs.FbsArrayNode fbs, List encodingSpecs ) { String rawEncodingId = encodingSpecs.get(fbs.encoding()); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/PostscriptParser.java b/reader/src/main/java/io/github/dfa1/vortex/reader/PostscriptParser.java index 99117898..9c0f053d 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/PostscriptParser.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/PostscriptParser.java @@ -1,20 +1,20 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.IoBounds; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.fbs.FbsBinary; -import io.github.dfa1.vortex.fbs.FbsBool; -import io.github.dfa1.vortex.fbs.FbsDecimal; -import io.github.dfa1.vortex.fbs.FbsExtension; -import io.github.dfa1.vortex.fbs.FbsFixedSizeList; -import io.github.dfa1.vortex.fbs.FbsPostscript; -import io.github.dfa1.vortex.fbs.FbsPrimitive; -import io.github.dfa1.vortex.fbs.FbsStruct_; -import io.github.dfa1.vortex.fbs.FbsType; -import io.github.dfa1.vortex.fbs.FbsUtf8; -import io.github.dfa1.vortex.fbs.FbsVariant; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.IoBounds; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.fbs.FbsBinary; +import io.github.dfa1.vortex.core.fbs.FbsBool; +import io.github.dfa1.vortex.core.fbs.FbsDecimal; +import io.github.dfa1.vortex.core.fbs.FbsExtension; +import io.github.dfa1.vortex.core.fbs.FbsFixedSizeList; +import io.github.dfa1.vortex.core.fbs.FbsPostscript; +import io.github.dfa1.vortex.core.fbs.FbsPrimitive; +import io.github.dfa1.vortex.core.fbs.FbsStruct_; +import io.github.dfa1.vortex.core.fbs.FbsType; +import io.github.dfa1.vortex.core.fbs.FbsUtf8; +import io.github.dfa1.vortex.core.fbs.FbsVariant; import java.lang.foreign.MemorySegment; import java.util.ArrayList; @@ -25,7 +25,7 @@ final class PostscriptParser { /// Hard cap on layout-tree recursion depth. Real-world layouts are typically four levels /// (Struct → Zoned → Chunked → Flat); 64 is well past any expected schema and prevents /// adversarial inputs — deeply nested trees or self-referential FlatBuffer cycles — from - /// blowing the JVM stack during [#convertLayout(io.github.dfa1.vortex.fbs.FbsLayout, List, int)]. + /// blowing the JVM stack during [#convertLayout(io.github.dfa1.vortex.core.fbs.FbsLayout, List, int)]. static final int MAX_LAYOUT_DEPTH = 64; /// Hard cap on per-layout metadata size. The FlatBuffer runtime returns an unbounded slice @@ -102,15 +102,15 @@ private static void checkBlobBounds(String name, long offset, long length, long static ParsedFile parseBlobs(MemorySegment footerBuf, MemorySegment layoutBuf, MemorySegment dtypeBuf) { try { - var fbsFooter = io.github.dfa1.vortex.fbs.FbsFooter.getRootAsFbsFooter(footerBuf); - var fbsLayout = io.github.dfa1.vortex.fbs.FbsLayout.getRootAsFbsLayout(layoutBuf); + var fbsFooter = io.github.dfa1.vortex.core.fbs.FbsFooter.getRootAsFbsFooter(footerBuf); + var fbsLayout = io.github.dfa1.vortex.core.fbs.FbsLayout.getRootAsFbsLayout(layoutBuf); Footer footer = convertFooter(fbsFooter); Layout layout = convertLayout(fbsLayout, footer.layoutSpecs(), 0); DType dtype = null; if (dtypeBuf != null && dtypeBuf.byteSize() > 0) { - dtype = convertDType(io.github.dfa1.vortex.fbs.FbsDType.getRootAsFbsDType(dtypeBuf)); + dtype = convertDType(io.github.dfa1.vortex.core.fbs.FbsDType.getRootAsFbsDType(dtypeBuf)); } return new ParsedFile(footer, dtype, layout); @@ -125,7 +125,7 @@ private static MemorySegment slice(MemorySegment seg, long offset, long length) return IoBounds.slice(seg, offset, length); } - static Footer convertFooter(io.github.dfa1.vortex.fbs.FbsFooter f) { + static Footer convertFooter(io.github.dfa1.vortex.core.fbs.FbsFooter f) { var arraySpecs = new ArrayList(f.arraySpecsLength()); for (int i = 0; i < f.arraySpecsLength(); i++) { arraySpecs.add(f.arraySpecs(i).id()); @@ -155,7 +155,7 @@ static Footer convertFooter(io.github.dfa1.vortex.fbs.FbsFooter f) { List.copyOf(segmentSpecs), List.copyOf(compressionSpecs)); } - private static Layout convertLayout(io.github.dfa1.vortex.fbs.FbsLayout l, List layoutSpecs, int depth) { + private static Layout convertLayout(io.github.dfa1.vortex.core.fbs.FbsLayout l, List layoutSpecs, int depth) { if (depth > MAX_LAYOUT_DEPTH) { throw new VortexException( "layout tree depth exceeds limit (" + MAX_LAYOUT_DEPTH + ")"); @@ -188,7 +188,7 @@ private static Layout convertLayout(io.github.dfa1.vortex.fbs.FbsLayout l, List< return new Layout(encodingId, l.rowCount(), metadata, List.copyOf(children), List.copyOf(segments)); } - private static DType convertDType(io.github.dfa1.vortex.fbs.FbsDType fbs) { + private static DType convertDType(io.github.dfa1.vortex.core.fbs.FbsDType fbs) { int typeType = fbs.typeType(); return switch (typeType) { case FbsType.FbsNull -> new DType.Null(true); @@ -229,7 +229,7 @@ private static DType convertDType(io.github.dfa1.vortex.fbs.FbsDType fbs) { yield new DType.Struct(List.copyOf(names), List.copyOf(types), s.nullable()); } case FbsType.FbsList -> { - var l = fbs.type(new io.github.dfa1.vortex.fbs.FbsList()); + var l = fbs.type(new io.github.dfa1.vortex.core.fbs.FbsList()); yield new DType.List(convertDType(l.elementType()), l.nullable()); } case FbsType.FbsFixedSizeList -> { @@ -252,17 +252,17 @@ private static DType convertDType(io.github.dfa1.vortex.fbs.FbsDType fbs) { private static PType convertPType(int fbsPType) { return switch (fbsPType) { - case io.github.dfa1.vortex.fbs.FbsPType.U8 -> PType.U8; - case io.github.dfa1.vortex.fbs.FbsPType.U16 -> PType.U16; - case io.github.dfa1.vortex.fbs.FbsPType.U32 -> PType.U32; - case io.github.dfa1.vortex.fbs.FbsPType.U64 -> PType.U64; - case io.github.dfa1.vortex.fbs.FbsPType.I8 -> PType.I8; - case io.github.dfa1.vortex.fbs.FbsPType.I16 -> PType.I16; - case io.github.dfa1.vortex.fbs.FbsPType.I32 -> PType.I32; - case io.github.dfa1.vortex.fbs.FbsPType.I64 -> PType.I64; - case io.github.dfa1.vortex.fbs.FbsPType.F16 -> PType.F16; - case io.github.dfa1.vortex.fbs.FbsPType.F32 -> PType.F32; - case io.github.dfa1.vortex.fbs.FbsPType.F64 -> PType.F64; + case io.github.dfa1.vortex.core.fbs.FbsPType.U8 -> PType.U8; + case io.github.dfa1.vortex.core.fbs.FbsPType.U16 -> PType.U16; + case io.github.dfa1.vortex.core.fbs.FbsPType.U32 -> PType.U32; + case io.github.dfa1.vortex.core.fbs.FbsPType.U64 -> PType.U64; + case io.github.dfa1.vortex.core.fbs.FbsPType.I8 -> PType.I8; + case io.github.dfa1.vortex.core.fbs.FbsPType.I16 -> PType.I16; + case io.github.dfa1.vortex.core.fbs.FbsPType.I32 -> PType.I32; + case io.github.dfa1.vortex.core.fbs.FbsPType.I64 -> PType.I64; + case io.github.dfa1.vortex.core.fbs.FbsPType.F16 -> PType.F16; + case io.github.dfa1.vortex.core.fbs.FbsPType.F32 -> PType.F32; + case io.github.dfa1.vortex.core.fbs.FbsPType.F64 -> PType.F64; default -> throw new VortexException("unrecognized PType=" + fbsPType); }; } diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/ReadRegistry.java b/reader/src/main/java/io/github/dfa1/vortex/reader/ReadRegistry.java index b7f28ed9..9faa572d 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/ReadRegistry.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/ReadRegistry.java @@ -1,9 +1,9 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.UnknownArray; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.reader.decode.DecodeContext; import io.github.dfa1.vortex.reader.decode.EncodingDecoder; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/ScanIterator.java b/reader/src/main/java/io/github/dfa1/vortex/reader/ScanIterator.java index 0c768a5b..10eed37c 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/ScanIterator.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/ScanIterator.java @@ -1,13 +1,13 @@ package io.github.dfa1.vortex.reader; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_SHORT; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_LONG; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.IoBounds; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.EncodingId; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_SHORT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_LONG; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.IoBounds; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.ByteArray; @@ -817,9 +817,9 @@ private ArrayStats readFlatStats(Layout flat) { return ArrayStats.empty(); } long fbStart = segLen - 4L - fbLen; - var fbArray = io.github.dfa1.vortex.fbs.FbsArray.getRootAsFbsArray(IoBounds.slice(seg, fbStart, fbLen)); + var fbArray = io.github.dfa1.vortex.core.fbs.FbsArray.getRootAsFbsArray(IoBounds.slice(seg, fbStart, fbLen)); - io.github.dfa1.vortex.fbs.FbsArrayNode root = fbArray.root(); + io.github.dfa1.vortex.core.fbs.FbsArrayNode root = fbArray.root(); if (root == null) { return ArrayStats.empty(); } diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/Trailer.java b/reader/src/main/java/io/github/dfa1/vortex/reader/Trailer.java index 562c74d1..8d95658d 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/Trailer.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/Trailer.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.IoBounds; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.core.VortexFormat; +import io.github.dfa1.vortex.core.io.IoBounds; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.VortexFormat; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/VortexHandle.java b/reader/src/main/java/io/github/dfa1/vortex/reader/VortexHandle.java index 07d94f20..3205c9f9 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/VortexHandle.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/VortexHandle.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import java.io.Closeable; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/VortexHttpReader.java b/reader/src/main/java/io/github/dfa1/vortex/reader/VortexHttpReader.java index 33483972..4fdc05c4 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/VortexHttpReader.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/VortexHttpReader.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.IoBounds; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.core.VortexFormat; -import io.github.dfa1.vortex.fbs.FbsPostscript; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.IoBounds; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.VortexFormat; +import io.github.dfa1.vortex.core.fbs.FbsPostscript; import java.io.IOException; import java.lang.foreign.Arena; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/VortexReader.java b/reader/src/main/java/io/github/dfa1/vortex/reader/VortexReader.java index 76490dd5..022e60bb 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/VortexReader.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/VortexReader.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.reader; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.IoBounds; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.core.VortexFormat; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.IoBounds; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.VortexFormat; import java.io.IOException; import java.lang.foreign.Arena; @@ -227,7 +227,7 @@ private ArrayStats readFlatStats(Layout flat) { return ArrayStats.empty(); } long fbStart = segLen - 4L - fbLen; - var fbArray = io.github.dfa1.vortex.fbs.FbsArray.getRootAsFbsArray(IoBounds.slice(seg, fbStart, fbLen)); + var fbArray = io.github.dfa1.vortex.core.fbs.FbsArray.getRootAsFbsArray(IoBounds.slice(seg, fbStart, fbLen)); var root = fbArray.root(); if (root == null) { return ArrayStats.empty(); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/AbstractMaterializedArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/AbstractMaterializedArray.java index 8beb6861..e3d47e92 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/AbstractMaterializedArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/AbstractMaterializedArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/Array.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/Array.java index ac3bb8e7..5ffc4e29 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/Array.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/Array.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; @@ -57,7 +57,7 @@ public sealed interface Array /// [io.github.dfa1.vortex.reader.decode.DecodeContext#materialize(Array)]. /// /// Array families with no row-addressable primary segment (struct, list, variant, - /// the byte-parts decimal layout) throw [io.github.dfa1.vortex.core.VortexException]. + /// the byte-parts decimal layout) throw [io.github.dfa1.vortex.core.error.VortexException]. /// /// @param arena allocator used to materialise lazy variants /// @return the primary [MemorySegment] diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ByteArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ByteArray.java index aaa261af..86ae210f 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ByteArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ByteArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedBoolArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedBoolArray.java index 36fa0073..a407d835 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedBoolArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedBoolArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.util.ArrayList; import java.util.Collections; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedByteArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedByteArray.java index 17762adf..0ab3c278 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedByteArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedByteArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedDoubleArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedDoubleArray.java index 3d5853d2..448b4f2b 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedDoubleArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedDoubleArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedFloatArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedFloatArray.java index 8a135eb8..67e39cdc 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedFloatArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedFloatArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedIntArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedIntArray.java index ebc3ec0d..0a96c795 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedIntArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedIntArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedLongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedLongArray.java index 90900e71..d6af7e00 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedLongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedLongArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedShortArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedShortArray.java index 8a48f7cc..0fa37090 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedShortArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ChunkedShortArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DateTimePartsArrays.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DateTimePartsArrays.java index 5e27ff61..8d2e009f 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DateTimePartsArrays.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DateTimePartsArrays.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; /// Package-private helper for the [LazyDateTimePartsLongArray] record. /// diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DecimalArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DecimalArray.java index 328d7ecd..0f78bdad 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DecimalArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DecimalArray.java @@ -2,7 +2,7 @@ import java.math.BigDecimal; -/// [Array] for [io.github.dfa1.vortex.core.DType.Decimal] columns. +/// [Array] for [io.github.dfa1.vortex.core.model.DType.Decimal] columns. /// /// Concrete subtypes include [LazyDecimalArray] (direct LE-byte buffer), /// [LazyDecimalBytePartsArray] (byte-parts reassembly), and diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DecimalBytePartsArrays.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DecimalBytePartsArrays.java index 754d1e10..5c19f5eb 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DecimalBytePartsArrays.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DecimalBytePartsArrays.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import java.math.BigInteger; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictArrays.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictArrays.java index d1b97a12..67091c3f 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictArrays.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictArrays.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; /// Package-private helpers shared by the `DictXxxArray` records. /// diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictDoubleArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictDoubleArray.java index a91fe7d9..a428427b 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictDoubleArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictDoubleArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictFloatArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictFloatArray.java index 733870b4..18d91fd9 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictFloatArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictFloatArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictIntArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictIntArray.java index 862e91a7..55cc1111 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictIntArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictIntArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictLongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictLongArray.java index 2bc699b5..4f24fda3 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictLongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DictLongArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DoubleArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DoubleArray.java index 9faa87e1..5d4b95a6 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/DoubleArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/DoubleArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/FixedSizeListArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/FixedSizeListArray.java index ab0953d2..d293139b 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/FixedSizeListArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/FixedSizeListArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/FloatArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/FloatArray.java index 96e274b4..a53f892d 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/FloatArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/FloatArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/GenericArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/GenericArray.java index af787270..488b48dc 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/GenericArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/GenericArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/IntArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/IntArray.java index abdfc6f7..f5a4bd79 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/IntArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/IntArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpDoubleArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpDoubleArray.java index a76b128b..5806210b 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpDoubleArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpDoubleArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpFloatArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpFloatArray.java index 6e81bfca..b4f9f37d 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpFloatArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpFloatArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpRdDoubleArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpRdDoubleArray.java index 9dfe8256..a50a3ae6 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpRdDoubleArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpRdDoubleArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.DoubleBinaryOperator; import java.util.function.DoubleConsumer; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpRdFloatArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpRdFloatArray.java index c534d651..e1612bd1 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpRdFloatArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyAlpRdFloatArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.DoubleBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantBoolArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantBoolArray.java index e5ce8c1d..64918aac 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantBoolArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantBoolArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.Objects; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantByteArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantByteArray.java index 48900789..3f1f58ce 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantByteArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantByteArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import java.util.Objects; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantDecimalArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantDecimalArray.java index e530acad..40dd68ba 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantDecimalArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantDecimalArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantDoubleArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantDoubleArray.java index 97b5f4ac..245c42b6 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantDoubleArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantDoubleArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.Objects; import java.util.function.DoubleBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantFloatArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantFloatArray.java index fd2c5503..d19781f1 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantFloatArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantFloatArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.Objects; import java.util.function.DoubleBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantIntArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantIntArray.java index 369bc9c5..167daa9e 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantIntArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantIntArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.Objects; import java.util.function.IntBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantLongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantLongArray.java index 6cf6ef07..d5378ab0 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantLongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantLongArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.Objects; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantShortArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantShortArray.java index 0c6e08f4..4bb289d1 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantShortArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyConstantShortArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import java.util.Objects; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDateTimePartsLongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDateTimePartsLongArray.java index 78c3923d..ef44a71b 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDateTimePartsLongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDateTimePartsLongArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; import java.util.function.LongConsumer; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDecimalArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDecimalArray.java index 74f04eaa..678259ef 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDecimalArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDecimalArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDecimalBytePartsArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDecimalBytePartsArray.java index 0c479249..92e38310 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDecimalBytePartsArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyDecimalBytePartsArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForByteArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForByteArray.java index cbdc2783..08f1f5ee 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForByteArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForByteArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForIntArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForIntArray.java index 750af6e8..3fe6b4fa 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForIntArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForIntArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForLongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForLongArray.java index 422918a7..05658f0e 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForLongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForLongArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForShortArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForShortArray.java index 7c2d7da9..4f5b41e7 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForShortArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyForShortArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleByteArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleByteArray.java index 6fc81b70..d190ee5c 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleByteArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleByteArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleIntArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleIntArray.java index 1d6d0c76..d7af20da 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleIntArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleIntArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.IntBinaryOperator; import java.util.function.IntConsumer; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleLongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleLongArray.java index 5dfd4870..c8035ce0 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleLongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleLongArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; import java.util.function.LongConsumer; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleShortArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleShortArray.java index 254a0bae..bec568e2 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleShortArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRleShortArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndBoolArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndBoolArray.java index 6c1f0bc3..08fa9679 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndBoolArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndBoolArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; /// Lazy RunEnd-encoded [BoolArray]. `getBoolean(i) = values.getBoolean(findRun(i + offset))`. /// `forEachBoolean` walks runs (one binary search at start, then per-run loops) diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndByteArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndByteArray.java index da867e90..d9a84694 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndByteArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndByteArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndIntArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndIntArray.java index 8212685d..674ae599 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndIntArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndIntArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.IntBinaryOperator; import java.util.function.IntConsumer; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndLongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndLongArray.java index efafeaef..79307de9 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndLongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndLongArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; import java.util.function.LongConsumer; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndShortArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndShortArray.java index 0a3e8add..03be3247 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndShortArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyRunEndShortArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseBoolArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseBoolArray.java index 9e9caa96..aaab774a 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseBoolArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseBoolArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; /// Lazy Sparse-encoded [BoolArray]. See [LazySparseLongArray] for semantics. /// diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseByteArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseByteArray.java index d65dca9d..29993c70 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseByteArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseByteArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseDoubleArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseDoubleArray.java index 628ec4e2..325e7d33 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseDoubleArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseDoubleArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.DoubleBinaryOperator; import java.util.function.DoubleConsumer; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseFloatArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseFloatArray.java index 40b9e24f..9314a2e1 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseFloatArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseFloatArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.DoubleBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseIntArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseIntArray.java index e4e39857..d33683ba 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseIntArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseIntArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.IntBinaryOperator; import java.util.function.IntConsumer; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseLongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseLongArray.java index 1725925b..90f7d049 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseLongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseLongArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; import java.util.function.LongConsumer; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseShortArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseShortArray.java index 1f6ad98e..a2cc8b6d 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseShortArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazySparseShortArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagByteArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagByteArray.java index bdb7c8f6..9ee62bc9 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagByteArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagByteArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagIntArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagIntArray.java index 614d7574..2ee45fbe 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagIntArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagIntArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagLongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagLongArray.java index 4a65eb5e..ec5a7ab5 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagLongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagLongArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagShortArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagShortArray.java index 02249100..d76fb919 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagShortArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LazyZigZagShortArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ListArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ListArray.java index 8d27076c..99383a48 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ListArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ListArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ListViewArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ListViewArray.java index 51d03a19..97e28230 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ListViewArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ListViewArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LongArray.java index 31c752e7..b612aff8 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/LongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/LongArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaskedArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaskedArray.java index e040ccbd..4f6036bf 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaskedArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaskedArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedBoolArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedBoolArray.java index 675b7060..647c2fe7 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedBoolArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedBoolArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; @@ -12,7 +12,7 @@ public final class MaterializedBoolArray extends AbstractMaterializedArray imple /// Constructs a `MaterializedBoolArray` backed by the given bit-packed buffer. /// - /// @param dtype logical type, must be [io.github.dfa1.vortex.core.DType.Bool] + /// @param dtype logical type, must be [io.github.dfa1.vortex.core.model.DType.Bool] /// @param length number of logical boolean elements /// @param buffer bit-packed boolean data (LSB-first, one byte per 8 elements) public MaterializedBoolArray(DType dtype, long length, MemorySegment buffer) { diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedByteArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedByteArray.java index a767ecf8..ef44be37 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedByteArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedByteArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; @@ -14,7 +14,7 @@ public final class MaterializedByteArray extends AbstractMaterializedArray imple /// Constructs a `MaterializedByteArray` backed by the given buffer. /// - /// @param dtype logical type, must be a [io.github.dfa1.vortex.core.DType.Primitive] with ptype I8 or U8 + /// @param dtype logical type, must be a [io.github.dfa1.vortex.core.model.DType.Primitive] with ptype I8 or U8 /// @param length number of logical elements /// @param buffer raw byte data (one byte per element) public MaterializedByteArray(DType dtype, long length, MemorySegment buffer) { diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedDoubleArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedDoubleArray.java index e501f0ed..90d5c3ce 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedDoubleArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedDoubleArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.util.function.DoubleBinaryOperator; @@ -13,7 +13,7 @@ public final class MaterializedDoubleArray extends AbstractMaterializedArray imp /// Constructs a `MaterializedDoubleArray` backed by the given buffer. /// - /// @param dtype logical type, must be a [io.github.dfa1.vortex.core.DType.Primitive] with ptype F64 + /// @param dtype logical type, must be a [io.github.dfa1.vortex.core.model.DType.Primitive] with ptype F64 /// @param length number of logical elements /// @param buffer raw double data (8 bytes per element, little-endian) public MaterializedDoubleArray(DType dtype, long length, MemorySegment buffer) { diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedFloat16Array.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedFloat16Array.java index 6922fbc6..57cc3a90 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedFloat16Array.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedFloat16Array.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedFloatArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedFloatArray.java index 2964d574..22485a32 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedFloatArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedFloatArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.util.function.DoubleBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedIntArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedIntArray.java index 209c0087..d7827b9a 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedIntArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedIntArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.util.function.IntBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedLongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedLongArray.java index 79c95d5a..0eae8c0d 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedLongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedLongArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedShortArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedShortArray.java index bc7a75da..7e04037a 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedShortArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/MaterializedShortArray.java @@ -1,9 +1,9 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/NullArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/NullArray.java index 1078055b..407a3462 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/NullArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/NullArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetBoolArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetBoolArray.java index 02195265..b24af277 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetBoolArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetBoolArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; /// Sliced view over a [BoolArray]: `getBoolean(i) = inner.getBoolean(i + offset)`. /// diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetByteArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetByteArray.java index d2148266..ded3f11b 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetByteArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetByteArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetDoubleArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetDoubleArray.java index ff33feb0..d8f0f4dd 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetDoubleArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetDoubleArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; /// Sliced view over a [DoubleArray]: `getDouble(i) = inner.getDouble(i + offset)`. /// diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetFloatArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetFloatArray.java index 52e08655..ab25118c 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetFloatArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetFloatArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; /// Sliced view over a [FloatArray]: `getFloat(i) = inner.getFloat(i + offset)`. /// diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetIntArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetIntArray.java index dece9286..71475537 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetIntArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetIntArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; /// Sliced view over an [IntArray]: `getInt(i) = inner.getInt(i + offset)`. /// diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetLongArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetLongArray.java index 6f502573..7046f996 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetLongArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetLongArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; /// Sliced view over a [LongArray]: `getLong(i) = inner.getLong(i + offset)`. /// diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetShortArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetShortArray.java index 9cb92851..eea475cb 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetShortArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/OffsetShortArray.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/RunEndArrays.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/RunEndArrays.java index 1d7d3bef..9676ee35 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/RunEndArrays.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/RunEndArrays.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import java.util.function.LongBinaryOperator; import java.util.function.LongToIntFunction; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ShortArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ShortArray.java index aa0a294f..fe2babfc 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/ShortArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/ShortArray.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/SparseArrays.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/SparseArrays.java index f27e730b..9a533e3c 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/SparseArrays.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/SparseArrays.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import java.util.function.IntConsumer; import java.util.function.LongBinaryOperator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/StructArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/StructArray.java index 35fd501b..9762207e 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/StructArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/StructArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/UnknownArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/UnknownArray.java index ddd1deb2..21c79dda 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/UnknownArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/UnknownArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/VarBinArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/VarBinArray.java index db2e1661..6352f00a 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/VarBinArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/VarBinArray.java @@ -1,9 +1,9 @@ package io.github.dfa1.vortex.reader.array; -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.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/array/VariantArray.java b/reader/src/main/java/io/github/dfa1/vortex/reader/array/VariantArray.java index 854d5097..4a89f334 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/array/VariantArray.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/array/VariantArray.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; 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 f940b9ee..5345b39b 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 @@ -1,12 +1,12 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoALPMetadata; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoALPMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LazyAlpDoubleArray; import io.github.dfa1.vortex.reader.array.LazyAlpFloatArray; 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 7dfc4651..55a83e3a 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 @@ -1,12 +1,12 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoALPRDMetadata; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoALPRDMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.array.LazyAlpRdDoubleArray; @@ -111,7 +111,7 @@ private static ProtoALPRDMetadata parseMeta(DecodeContext ctx) { MemorySegment rawMeta = ctx.metadata(); if (rawMeta == null || rawMeta.byteSize() == 0) { return new ProtoALPRDMetadata(0, 0, java.util.List.of(), - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.U16.ordinal()), null); + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.U16.ordinal()), null); } try { MemorySegment metaSeg = rawMeta; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ArrayNode.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ArrayNode.java index 3726b3cd..15cd857c 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ArrayNode.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/ArrayNode.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import java.lang.foreign.MemorySegment; 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 15807892..10cb18e0 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 @@ -1,12 +1,12 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoBitPackedMetadata; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoBitPackedMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaterializedByteArray; import io.github.dfa1.vortex.reader.array.MaterializedIntArray; @@ -496,7 +496,7 @@ private static long readUnsignedIdx(MemorySegment seg, long off, PType ptype) { }; } - private static PType ptypeFromProto(io.github.dfa1.vortex.proto.ProtoPType proto) { + private static PType ptypeFromProto(io.github.dfa1.vortex.core.proto.ProtoPType proto) { return PType.fromOrdinal(proto.value()); } } 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 62ec3121..338d0cc2 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,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaterializedBoolArray; 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 a28a05f5..da5c3ecc 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,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaterializedBoolArray; 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 ad4e9277..47171628 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 @@ -1,9 +1,9 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.ChunkedBoolArray; import io.github.dfa1.vortex.reader.array.ChunkedByteArray; 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 d2cce624..bfdc911c 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 @@ -1,11 +1,11 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LazyConstantBoolArray; import io.github.dfa1.vortex.reader.array.LazyConstantByteArray; @@ -58,7 +58,7 @@ private static Array arrayFromScalar(DecodeContext ctx, ProtoScalarValue scalar, // A constant variant wraps a typed inner scalar (Scalar::variant(inner)); the // physical storage is the inner-typed constant array. The VariantArray wrapper // re-applies the logical Variant dtype. - io.github.dfa1.vortex.proto.ProtoScalar inner = scalar.variant_value(); + io.github.dfa1.vortex.core.proto.ProtoScalar inner = scalar.variant_value(); if (inner == null || inner.value() == null) { throw new VortexException(EncodingId.VORTEX_CONSTANT, "constant variant missing variant_value"); } 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 a7ae5b55..7cba397e 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 @@ -1,11 +1,11 @@ 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.encoding.TimeUnit; -import io.github.dfa1.vortex.proto.ProtoDateTimePartsMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.proto.ProtoDateTimePartsMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LazyDateTimePartsLongArray; 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 8dabbf40..eac9f3bb 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 @@ -1,12 +1,12 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LazyDecimalBytePartsArray; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoDecimalBytePartsMetadata; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoDecimalBytePartsMetadata; import java.io.IOException; import java.lang.foreign.MemorySegment; 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 73721c4f..885ad389 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,10 +1,10 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LazyDecimalArray; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoDecimalMetadata; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoDecimalMetadata; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecodeContext.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecodeContext.java index 4c02a117..6adf1234 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecodeContext.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/DecodeContext.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.ReadRegistry; 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 5f4f1f55..6a6f26f9 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 @@ -1,13 +1,13 @@ 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.encoding.FastLanes; -import io.github.dfa1.vortex.encoding.PrimitiveArrays; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoDeltaMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.compute.FastLanes; +import io.github.dfa1.vortex.core.compute.PrimitiveArrays; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoDeltaMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaterializedByteArray; import io.github.dfa1.vortex.reader.array.MaterializedIntArray; 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 55deab3d..b78c84f4 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 @@ -1,11 +1,11 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoDictMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoDictMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaterializedByteArray; import io.github.dfa1.vortex.reader.array.MaterializedDoubleArray; 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 dd1343c0..91846286 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,7 +1,7 @@ package io.github.dfa1.vortex.reader.decode; import io.github.dfa1.vortex.reader.array.Array; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; /// Read-side decoding interface. Implementations live in the `reader` module and /// are discovered via [java.util.ServiceLoader]. 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 3618c75c..50bc32f8 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 @@ -1,9 +1,9 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; /// Read-only decoder for `vortex.ext` — unwraps the storage-array child. public final class ExtEncodingDecoder implements EncodingDecoder { 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 012edacd..75655e65 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 @@ -1,10 +1,10 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.FixedSizeListArray; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; /// Read-only decoder for `vortex.fixed_size_list`. public final class FixedSizeListEncodingDecoder implements EncodingDecoder { 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 78b75025..462376b8 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 @@ -1,9 +1,9 @@ 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.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.LazyForByteArray; 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 68d75a5d..6e37fa9c 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 @@ -1,13 +1,13 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.VarBinArray; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoFSSTMetadata; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoFSSTMetadata; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/KnownArrayNode.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/KnownArrayNode.java index b8678910..bcc5f58d 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/KnownArrayNode.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/KnownArrayNode.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import java.lang.foreign.MemorySegment; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/LeBitReader.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/LeBitReader.java index f5431056..a903e613 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/LeBitReader.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/LeBitReader.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; 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 4d0b3c94..765fdfd2 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 @@ -1,12 +1,12 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.ListArray; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoListMetadata; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoListMetadata; import java.io.IOException; import java.lang.foreign.MemorySegment; 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 6c0b7705..31f9c613 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 @@ -1,12 +1,12 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.ListViewArray; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoListViewMetadata; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoListViewMetadata; import java.io.IOException; import java.lang.foreign.MemorySegment; 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 bf026b4c..0221c482 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 @@ -1,11 +1,11 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.MaskedArray; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; /// Read-only decoder for `vortex.masked` — payload child + optional validity bitmap child. public final class MaskedEncodingDecoder implements EncodingDecoder { 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 1db69b51..6b52c632 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 @@ -2,7 +2,7 @@ import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.NullArray; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; /// Read-only decoder for `vortex.null` (all-null arrays). public final class NullEncodingDecoder implements EncodingDecoder { 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 c85cce9d..d1f16d29 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 @@ -1,11 +1,11 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoPatchedMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoPatchedMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaterializedByteArray; import io.github.dfa1.vortex.reader.array.MaterializedDoubleArray; 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 adc8fc50..d4f6594e 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 @@ -1,12 +1,12 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoPcoChunkInfo; -import io.github.dfa1.vortex.proto.ProtoPcoMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoPcoChunkInfo; +import io.github.dfa1.vortex.core.proto.ProtoPcoMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.MaskedArray; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PcoTansDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PcoTansDecoder.java index 2a9cead0..3adecf70 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PcoTansDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/PcoTansDecoder.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; 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 49773c4d..c10f56c8 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 @@ -1,9 +1,9 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.MaskedArray; 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 518a3263..f8fd3aa0 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 @@ -1,11 +1,11 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoRLEMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoRLEMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.LazyConstantByteArray; 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 433a2891..2efe4925 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 @@ -1,11 +1,11 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoRunEndMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoRunEndMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.ByteArray; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SegmentBroadcast.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SegmentBroadcast.java index 6201fa63..c7e040bb 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SegmentBroadcast.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/SegmentBroadcast.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import java.lang.foreign.MemorySegment; 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 bdb4a455..63b00bf4 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 @@ -1,12 +1,12 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoScalarValue; -import io.github.dfa1.vortex.proto.ProtoSequenceMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoSequenceMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaterializedByteArray; import io.github.dfa1.vortex.reader.array.MaterializedDoubleArray; 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 fc173a1d..c530def2 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 @@ -1,13 +1,13 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; -import io.github.dfa1.vortex.proto.ProtoScalarValue; -import io.github.dfa1.vortex.proto.ProtoSparseMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoSparseMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.ByteArray; 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 ea88586c..f6ce8599 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 @@ -1,12 +1,12 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.MaskedArray; import io.github.dfa1.vortex.reader.array.StructArray; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import java.util.ArrayList; import java.util.List; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/UnknownArrayNode.java b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/UnknownArrayNode.java index da46cb3d..f1c6f447 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/decode/UnknownArrayNode.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/decode/UnknownArrayNode.java @@ -2,7 +2,7 @@ import java.lang.foreign.MemorySegment; -/// Array node whose encoding id is not a recognised [io.github.dfa1.vortex.encoding.EncodingId]. +/// Array node whose encoding id is not a recognised [io.github.dfa1.vortex.core.model.EncodingId]. /// Produced when a file uses an encoding this build does not know about. Decoded as /// [io.github.dfa1.vortex.reader.array.UnknownArray] when /// [io.github.dfa1.vortex.reader.ReadRegistry#isAllowUnknown()] is set; otherwise the decode call throws. 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 73f4ee5a..5a7c0fed 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 @@ -1,12 +1,12 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.VarBinArray; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoVarBinMetadata; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoVarBinMetadata; import java.io.IOException; import java.lang.foreign.MemorySegment; 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 ffe8c1ee..0bdecb15 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 @@ -1,10 +1,10 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.VarBinArray; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import java.lang.foreign.MemorySegment; 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 65226ec5..e46e0345 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 @@ -1,12 +1,12 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.VariantArray; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoVariantMetadata; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoVariantMetadata; import java.io.IOException; import java.lang.foreign.MemorySegment; @@ -61,7 +61,7 @@ private static DType parseShreddedDtype(MemorySegment rawMeta) { } } - static DType dtypeFromProto(io.github.dfa1.vortex.proto.ProtoDType proto) { + static DType dtypeFromProto(io.github.dfa1.vortex.core.proto.ProtoDType proto) { if (proto.null_() != null) { return new DType.Null(true); } @@ -90,7 +90,7 @@ static DType dtypeFromProto(io.github.dfa1.vortex.proto.ProtoDType proto) { var names = new ArrayList(s.names().size()); var types = new ArrayList(s.dtypes().size()); names.addAll(s.names()); - for (io.github.dfa1.vortex.proto.ProtoDType child : s.dtypes()) { + for (io.github.dfa1.vortex.core.proto.ProtoDType child : s.dtypes()) { types.add(dtypeFromProto(child)); } return new DType.Struct(List.copyOf(names), List.copyOf(types), s.nullable()); 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 ed23daaa..2e6f2d61 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 @@ -1,10 +1,10 @@ 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.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LazyConstantByteArray; import io.github.dfa1.vortex.reader.array.LazyConstantIntArray; 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 61ea0000..79ca0faa 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 @@ -1,11 +1,11 @@ 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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoZstdMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoZstdMetadata; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.MaskedArray; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/extension/DateExtensionDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/extension/DateExtensionDecoder.java index 61c7b439..eb4c40cc 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/extension/DateExtensionDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/extension/DateExtensionDecoder.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.reader.extension; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.IoBounds; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.TimeUnit; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.IoBounds; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.model.TimeUnit; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaskedArray; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.reader.ExtensionDecoder; @@ -47,7 +47,7 @@ public DType.Extension dtype(boolean nullable) { /// @param storage signed-integer storage (Byte/Short/Int/Long, possibly Masked) /// @param i row index, `0 <= i < storage.length()` /// @return decoded date - /// @throws io.github.dfa1.vortex.core.VortexException if storage isn't an integer primitive + /// @throws io.github.dfa1.vortex.core.error.VortexException if storage isn't an integer primitive public LocalDate decode(Array storage, long i) { ExtensionStorage.checkBounds(i, storage.length()); return LocalDate.ofEpochDay(ExtensionStorage.epochInteger(storage, i)); diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/extension/ExtensionStorage.java b/reader/src/main/java/io/github/dfa1/vortex/reader/extension/ExtensionStorage.java index 86e1c7f3..3bf63bac 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/extension/ExtensionStorage.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/extension/ExtensionStorage.java @@ -1,14 +1,14 @@ package io.github.dfa1.vortex.reader.extension; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.ByteArray; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.array.MaskedArray; import io.github.dfa1.vortex.reader.array.ShortArray; -import io.github.dfa1.vortex.encoding.TimeUnit; +import io.github.dfa1.vortex.core.model.TimeUnit; import java.time.Instant; import java.util.Objects; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/extension/TimeExtensionDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/extension/TimeExtensionDecoder.java index b42209ce..6857a4c1 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/extension/TimeExtensionDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/extension/TimeExtensionDecoder.java @@ -1,13 +1,13 @@ package io.github.dfa1.vortex.reader.extension; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.IoBounds; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.IoBounds; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaskedArray; -import io.github.dfa1.vortex.encoding.TimeUnit; -import io.github.dfa1.vortex.extension.ExtensionId; -import io.github.dfa1.vortex.extension.TimeDtype; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.model.ExtensionId; +import io.github.dfa1.vortex.core.model.TimeDtype; import io.github.dfa1.vortex.reader.ExtensionDecoder; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/extension/TimestampExtensionDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/extension/TimestampExtensionDecoder.java index d9153ffb..fe5a0be6 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/extension/TimestampExtensionDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/extension/TimestampExtensionDecoder.java @@ -1,13 +1,13 @@ package io.github.dfa1.vortex.reader.extension; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.IoBounds; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.IoBounds; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.MaskedArray; -import io.github.dfa1.vortex.encoding.TimeUnit; -import io.github.dfa1.vortex.extension.ExtensionId; -import io.github.dfa1.vortex.extension.TimestampDtype; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.model.ExtensionId; +import io.github.dfa1.vortex.core.model.TimestampDtype; import io.github.dfa1.vortex.reader.ExtensionDecoder; diff --git a/reader/src/main/java/io/github/dfa1/vortex/reader/extension/UuidExtensionDecoder.java b/reader/src/main/java/io/github/dfa1/vortex/reader/extension/UuidExtensionDecoder.java index 6828f70b..f82b7bd4 100644 --- a/reader/src/main/java/io/github/dfa1/vortex/reader/extension/UuidExtensionDecoder.java +++ b/reader/src/main/java/io/github/dfa1/vortex/reader/extension/UuidExtensionDecoder.java @@ -1,13 +1,13 @@ package io.github.dfa1.vortex.reader.extension; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.IoBounds; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.IoBounds; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.ByteArray; import io.github.dfa1.vortex.reader.array.FixedSizeListArray; import io.github.dfa1.vortex.reader.array.MaskedArray; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.reader.ExtensionDecoder; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/ArrayStatsTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/ArrayStatsTest.java index cc4f27a9..57e33611 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/ArrayStatsTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/ArrayStatsTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.fbs.FbsBuilder; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.fbs.FbsBuilder; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -51,7 +51,7 @@ void nullFbs_returnsEmpty() { @Test void fbsWithNoMinOrMax_returnsEmpty() { // Given — ArrayStats table with no min/max byte vectors set - io.github.dfa1.vortex.fbs.FbsArrayStats fbs = buildFbs(null, null); + io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs = buildFbs(null, null); // When ArrayStats sut = ArrayStats.fromFbs(fbs); @@ -63,7 +63,7 @@ void fbsWithNoMinOrMax_returnsEmpty() { @Test void int64Scalar_decodes() { // Given - io.github.dfa1.vortex.fbs.FbsArrayStats fbs = buildFbs( + io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs = buildFbs( ProtoScalarValue.ofInt64Value(-7L).encode(), ProtoScalarValue.ofInt64Value(42L).encode()); @@ -78,7 +78,7 @@ void int64Scalar_decodes() { @Test void uint64Scalar_decodes() { // Given - io.github.dfa1.vortex.fbs.FbsArrayStats fbs = buildFbs( + io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs = buildFbs( ProtoScalarValue.ofUint64Value(0L).encode(), ProtoScalarValue.ofUint64Value(Long.MAX_VALUE).encode()); @@ -93,7 +93,7 @@ void uint64Scalar_decodes() { @Test void f32Scalar_decodes() { // Given - io.github.dfa1.vortex.fbs.FbsArrayStats fbs = buildFbs( + io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs = buildFbs( ProtoScalarValue.ofF32Value(1.5f).encode(), ProtoScalarValue.ofF32Value(3.25f).encode()); @@ -108,7 +108,7 @@ void f32Scalar_decodes() { @Test void f64Scalar_decodes() { // Given - io.github.dfa1.vortex.fbs.FbsArrayStats fbs = buildFbs( + io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs = buildFbs( ProtoScalarValue.ofF64Value(-0.5).encode(), ProtoScalarValue.ofF64Value(99.875).encode()); @@ -123,7 +123,7 @@ void f64Scalar_decodes() { @Test void boolScalar_decodes() { // Given - io.github.dfa1.vortex.fbs.FbsArrayStats fbs = buildFbs( + io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs = buildFbs( ProtoScalarValue.ofBoolValue(false).encode(), ProtoScalarValue.ofBoolValue(true).encode()); @@ -138,7 +138,7 @@ void boolScalar_decodes() { @Test void stringScalar_decodes() { // Given - io.github.dfa1.vortex.fbs.FbsArrayStats fbs = buildFbs( + io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs = buildFbs( ProtoScalarValue.ofStringValue("alpha").encode(), ProtoScalarValue.ofStringValue("omega").encode()); @@ -154,7 +154,7 @@ void stringScalar_decodes() { void bytesScalar_decodesAsUtf8String() { // Given — bytes scalar surfaces as UTF-8 String for stat display purposes. // This is the contract zone-map pruning relies on (string compare across bytes/utf8). - io.github.dfa1.vortex.fbs.FbsArrayStats fbs = buildFbs( + io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs = buildFbs( ProtoScalarValue.ofBytesValue("aa".getBytes()).encode(), ProtoScalarValue.ofBytesValue("zz".getBytes()).encode()); @@ -169,7 +169,7 @@ void bytesScalar_decodesAsUtf8String() { @Test void minOnly_setsMaxToNull() { // Given - io.github.dfa1.vortex.fbs.FbsArrayStats fbs = buildFbs( + io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs = buildFbs( ProtoScalarValue.ofInt64Value(1L).encode(), null); // When @@ -183,7 +183,7 @@ void minOnly_setsMaxToNull() { @Test void emptyByteVector_treatedAsAbsent() { // Given — zero-length min vector is structurally present but carries no scalar - io.github.dfa1.vortex.fbs.FbsArrayStats fbs = buildFbs(new byte[0], new byte[0]); + io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs = buildFbs(new byte[0], new byte[0]); // When ArrayStats sut = ArrayStats.fromFbs(fbs); @@ -195,7 +195,7 @@ void emptyByteVector_treatedAsAbsent() { @Test void malformedScalarBytes_throwsVortexException() { // Given — varint tag with no continuation byte: ProtoReader hits EOF inside readVarint - io.github.dfa1.vortex.fbs.FbsArrayStats fbs = buildFbs(new byte[]{(byte) 0x80}, null); + io.github.dfa1.vortex.core.fbs.FbsArrayStats fbs = buildFbs(new byte[]{(byte) 0x80}, null); // When / Then assertThatThrownBy(() -> ArrayStats.fromFbs(fbs)) @@ -204,19 +204,19 @@ void malformedScalarBytes_throwsVortexException() { } } - private static io.github.dfa1.vortex.fbs.FbsArrayStats buildFbs(byte[] minBytes, byte[] maxBytes) { + private static io.github.dfa1.vortex.core.fbs.FbsArrayStats buildFbs(byte[] minBytes, byte[] maxBytes) { FbsBuilder b = new FbsBuilder(64); - int minOff = minBytes == null ? 0 : io.github.dfa1.vortex.fbs.FbsArrayStats.createMinVector(b, minBytes); - int maxOff = maxBytes == null ? 0 : io.github.dfa1.vortex.fbs.FbsArrayStats.createMaxVector(b, maxBytes); - io.github.dfa1.vortex.fbs.FbsArrayStats.startFbsArrayStats(b); + int minOff = minBytes == null ? 0 : io.github.dfa1.vortex.core.fbs.FbsArrayStats.createMinVector(b, minBytes); + int maxOff = maxBytes == null ? 0 : io.github.dfa1.vortex.core.fbs.FbsArrayStats.createMaxVector(b, maxBytes); + io.github.dfa1.vortex.core.fbs.FbsArrayStats.startFbsArrayStats(b); if (minBytes != null) { - io.github.dfa1.vortex.fbs.FbsArrayStats.addMin(b, minOff); + io.github.dfa1.vortex.core.fbs.FbsArrayStats.addMin(b, minOff); } if (maxBytes != null) { - io.github.dfa1.vortex.fbs.FbsArrayStats.addMax(b, maxOff); + io.github.dfa1.vortex.core.fbs.FbsArrayStats.addMax(b, maxOff); } - int root = io.github.dfa1.vortex.fbs.FbsArrayStats.endFbsArrayStats(b); + int root = io.github.dfa1.vortex.core.fbs.FbsArrayStats.endFbsArrayStats(b); b.finish(root); - return io.github.dfa1.vortex.fbs.FbsArrayStats.getRootAsFbsArrayStats(b.dataSegment()); + return io.github.dfa1.vortex.core.fbs.FbsArrayStats.getRootAsFbsArrayStats(b.dataSegment()); } } diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/FlatSegmentBoundsSecurityTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/FlatSegmentBoundsSecurityTest.java index aa87cb95..9eeb49cf 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/FlatSegmentBoundsSecurityTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/FlatSegmentBoundsSecurityTest.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.fbs.FbsBuilder; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.fbs.FbsArray; -import io.github.dfa1.vortex.fbs.FbsArrayNode; -import io.github.dfa1.vortex.fbs.FbsBuffer; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.fbs.FbsBuilder; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.fbs.FbsArray; +import io.github.dfa1.vortex.core.fbs.FbsArrayNode; +import io.github.dfa1.vortex.core.fbs.FbsBuffer; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/FlatSegmentDecoderDecodeTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/FlatSegmentDecoderDecodeTest.java index 7bc67b6c..126f79f2 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/FlatSegmentDecoderDecodeTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/FlatSegmentDecoderDecodeTest.java @@ -1,9 +1,9 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.fbs.FbsArrayNode; -import io.github.dfa1.vortex.fbs.FbsBuffer; -import io.github.dfa1.vortex.fbs.FbsBuilder; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.fbs.FbsArrayNode; +import io.github.dfa1.vortex.core.fbs.FbsBuffer; +import io.github.dfa1.vortex.core.fbs.FbsBuilder; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.UnknownArray; import org.junit.jupiter.api.Test; @@ -12,7 +12,7 @@ import java.lang.foreign.MemorySegment; import java.util.List; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; import static org.assertj.core.api.Assertions.assertThat; /// Successful flat-segment decode path — complements [FlatSegmentBoundsSecurityTest] (which only @@ -59,12 +59,12 @@ private static byte[] arrayFlatBufferOneBuffer(int padding, long length) { int rootBuffers = FbsArrayNode.createBuffersVector(b, new int[]{0}); int root = FbsArrayNode.createFbsArrayNode(b, 0, 0, rootChildren, rootBuffers, 0); - io.github.dfa1.vortex.fbs.FbsArray.startBuffersVector(b, 1); + io.github.dfa1.vortex.core.fbs.FbsArray.startBuffersVector(b, 1); FbsBuffer.createFbsBuffer(b, padding, 0, 0, length); int buffers = b.endVector(); - int array = io.github.dfa1.vortex.fbs.FbsArray.createFbsArray(b, root, buffers); - io.github.dfa1.vortex.fbs.FbsArray.finishFbsArrayBuffer(b, array); + int array = io.github.dfa1.vortex.core.fbs.FbsArray.createFbsArray(b, root, buffers); + io.github.dfa1.vortex.core.fbs.FbsArray.finishFbsArrayBuffer(b, array); return b.sizedByteArray(); } } diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/LayoutDepthBombSecurityTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/LayoutDepthBombSecurityTest.java index 15f5984f..1773c453 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/LayoutDepthBombSecurityTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/LayoutDepthBombSecurityTest.java @@ -1,14 +1,14 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.fbs.FbsBuilder; +import io.github.dfa1.vortex.core.fbs.FbsBuilder; import static io.github.dfa1.vortex.reader.MalformedFiles.buildFooter; import static io.github.dfa1.vortex.reader.MalformedFiles.buildI64Dtype; import static io.github.dfa1.vortex.reader.MalformedFiles.buildPostscript; import static io.github.dfa1.vortex.reader.MalformedFiles.slice; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.core.VortexFormat; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.VortexFormat; -import io.github.dfa1.vortex.fbs.FbsLayout; +import io.github.dfa1.vortex.core.fbs.FbsLayout; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedFiles.java b/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedFiles.java index 8dd7e466..3f14eed2 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedFiles.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedFiles.java @@ -1,15 +1,15 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.fbs.FbsBuilder; -import io.github.dfa1.vortex.fbs.FbsArraySpec; -import io.github.dfa1.vortex.fbs.FbsFooter; -import io.github.dfa1.vortex.fbs.FbsLayout; -import io.github.dfa1.vortex.fbs.FbsLayoutSpec; -import io.github.dfa1.vortex.fbs.FbsPostscript; -import io.github.dfa1.vortex.fbs.FbsPostscriptSegment; -import io.github.dfa1.vortex.fbs.FbsPrimitive; -import io.github.dfa1.vortex.fbs.FbsSegmentSpec; -import io.github.dfa1.vortex.fbs.FbsType; +import io.github.dfa1.vortex.core.fbs.FbsBuilder; +import io.github.dfa1.vortex.core.fbs.FbsArraySpec; +import io.github.dfa1.vortex.core.fbs.FbsFooter; +import io.github.dfa1.vortex.core.fbs.FbsLayout; +import io.github.dfa1.vortex.core.fbs.FbsLayoutSpec; +import io.github.dfa1.vortex.core.fbs.FbsPostscript; +import io.github.dfa1.vortex.core.fbs.FbsPostscriptSegment; +import io.github.dfa1.vortex.core.fbs.FbsPrimitive; +import io.github.dfa1.vortex.core.fbs.FbsSegmentSpec; +import io.github.dfa1.vortex.core.fbs.FbsType; import java.nio.ByteBuffer; @@ -28,9 +28,9 @@ private MalformedFiles() { /// @return the finished DType FlatBuffer static ByteBuffer buildI64Dtype() { var fbb = new FbsBuilder(64); - int prim = FbsPrimitive.createFbsPrimitive(fbb, io.github.dfa1.vortex.fbs.FbsPType.I64, false); - int off = io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsPrimitive, prim); - io.github.dfa1.vortex.fbs.FbsDType.finishFbsDTypeBuffer(fbb, off); + int prim = FbsPrimitive.createFbsPrimitive(fbb, io.github.dfa1.vortex.core.fbs.FbsPType.I64, false); + int off = io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsPrimitive, prim); + io.github.dfa1.vortex.core.fbs.FbsDType.finishFbsDTypeBuffer(fbb, off); return slice(fbb); } diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedFooterSecurityTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedFooterSecurityTest.java index 9fbb1638..25978dc3 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedFooterSecurityTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedFooterSecurityTest.java @@ -4,8 +4,8 @@ import static io.github.dfa1.vortex.reader.MalformedFiles.buildI64Dtype; import static io.github.dfa1.vortex.reader.MalformedFiles.buildFlatLayout; import static io.github.dfa1.vortex.reader.MalformedFiles.buildPostscript; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.core.VortexFormat; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.VortexFormat; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedHttpResponseTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedHttpResponseTest.java index 78b8600f..8e50a6a5 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedHttpResponseTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedHttpResponseTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedTrailerSecurityTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedTrailerSecurityTest.java index 9f7f9128..3148302d 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedTrailerSecurityTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/MalformedTrailerSecurityTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.core.VortexFormat; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.VortexFormat; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserBigSegmentTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserBigSegmentTest.java index c90f2a53..2c6006b3 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserBigSegmentTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserBigSegmentTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.fbs.FbsBuilder; -import io.github.dfa1.vortex.fbs.FbsArraySpec; -import io.github.dfa1.vortex.fbs.FbsLayoutSpec; +import io.github.dfa1.vortex.core.fbs.FbsBuilder; +import io.github.dfa1.vortex.core.fbs.FbsArraySpec; +import io.github.dfa1.vortex.core.fbs.FbsLayoutSpec; import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; @@ -15,19 +15,19 @@ private static ByteBuffer buildMinimalFooter(long segOffset, long segLength) { var fbb = new FbsBuilder(256); // Empty array_specs + layout_specs vectors (required tables, no entries). - int asv = io.github.dfa1.vortex.fbs.FbsFooter.createArraySpecsVector(fbb, new int[]{ + int asv = io.github.dfa1.vortex.core.fbs.FbsFooter.createArraySpecsVector(fbb, new int[]{ FbsArraySpec.createFbsArraySpec(fbb, fbb.createString("vortex.flat")) }); - int lsv = io.github.dfa1.vortex.fbs.FbsFooter.createLayoutSpecsVector(fbb, new int[]{ + int lsv = io.github.dfa1.vortex.core.fbs.FbsFooter.createLayoutSpecsVector(fbb, new int[]{ FbsLayoutSpec.createFbsLayoutSpec(fbb, fbb.createString("vortex.flat")) }); // One segment_spec with the big length. - io.github.dfa1.vortex.fbs.FbsFooter.startSegmentSpecsVector(fbb, 1); - io.github.dfa1.vortex.fbs.FbsSegmentSpec.createFbsSegmentSpec(fbb, segOffset, segLength, 6, 0, 0); + io.github.dfa1.vortex.core.fbs.FbsFooter.startSegmentSpecsVector(fbb, 1); + io.github.dfa1.vortex.core.fbs.FbsSegmentSpec.createFbsSegmentSpec(fbb, segOffset, segLength, 6, 0, 0); int ssv = fbb.endVector(); - int off = io.github.dfa1.vortex.fbs.FbsFooter.createFbsFooter(fbb, asv, lsv, ssv, 0, 0); + int off = io.github.dfa1.vortex.core.fbs.FbsFooter.createFbsFooter(fbb, asv, lsv, ssv, 0, 0); fbb.finish(off); return fbb.dataSegment().asByteBuffer().order(java.nio.ByteOrder.LITTLE_ENDIAN); } @@ -40,8 +40,8 @@ void convertFooter_preservesSegmentLengthAbove2GB() { long bigLength = 0xC000_0000L; long bigOffset = 0x1_0000_0000L; // 4 GB into the file ByteBuffer fbsFooterBytes = buildMinimalFooter(bigOffset, bigLength); - io.github.dfa1.vortex.fbs.FbsFooter fbsFooter = - io.github.dfa1.vortex.fbs.FbsFooter.getRootAsFbsFooter(java.lang.foreign.MemorySegment.ofBuffer(fbsFooterBytes)); + io.github.dfa1.vortex.core.fbs.FbsFooter fbsFooter = + io.github.dfa1.vortex.core.fbs.FbsFooter.getRootAsFbsFooter(java.lang.foreign.MemorySegment.ofBuffer(fbsFooterBytes)); // When Footer footer = PostscriptParser.convertFooter(fbsFooter); diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserBlobBoundsTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserBlobBoundsTest.java index 519acb5c..88463d0b 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserBlobBoundsTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserBlobBoundsTest.java @@ -1,15 +1,15 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.fbs.FbsBuilder; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.fbs.FbsArraySpec; -import io.github.dfa1.vortex.fbs.FbsFooter; -import io.github.dfa1.vortex.fbs.FbsLayout; -import io.github.dfa1.vortex.fbs.FbsLayoutSpec; -import io.github.dfa1.vortex.fbs.FbsPostscript; -import io.github.dfa1.vortex.fbs.FbsPostscriptSegment; -import io.github.dfa1.vortex.fbs.FbsPrimitive; -import io.github.dfa1.vortex.fbs.FbsType; +import io.github.dfa1.vortex.core.fbs.FbsBuilder; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.fbs.FbsArraySpec; +import io.github.dfa1.vortex.core.fbs.FbsFooter; +import io.github.dfa1.vortex.core.fbs.FbsLayout; +import io.github.dfa1.vortex.core.fbs.FbsLayoutSpec; +import io.github.dfa1.vortex.core.fbs.FbsPostscript; +import io.github.dfa1.vortex.core.fbs.FbsPostscriptSegment; +import io.github.dfa1.vortex.core.fbs.FbsPrimitive; +import io.github.dfa1.vortex.core.fbs.FbsType; import org.junit.jupiter.api.Test; import java.lang.foreign.MemorySegment; @@ -167,9 +167,9 @@ private static MemorySegment buildFooter() { private static MemorySegment buildI64Dtype() { var fbb = new FbsBuilder(64); - int prim = FbsPrimitive.createFbsPrimitive(fbb, io.github.dfa1.vortex.fbs.FbsPType.I64, false); - int off = io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsPrimitive, prim); - io.github.dfa1.vortex.fbs.FbsDType.finishFbsDTypeBuffer(fbb, off); + int prim = FbsPrimitive.createFbsPrimitive(fbb, io.github.dfa1.vortex.core.fbs.FbsPType.I64, false); + int off = io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsPrimitive, prim); + io.github.dfa1.vortex.core.fbs.FbsDType.finishFbsDTypeBuffer(fbb, off); return slice(fbb); } diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserParseBlobsBoundsTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserParseBlobsBoundsTest.java index 8a975e6d..16bd9dd7 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserParseBlobsBoundsTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserParseBlobsBoundsTest.java @@ -2,15 +2,15 @@ import java.lang.foreign.MemorySegment; -import io.github.dfa1.vortex.fbs.FbsBuilder; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.fbs.FbsArraySpec; -import io.github.dfa1.vortex.fbs.FbsDecimal; -import io.github.dfa1.vortex.fbs.FbsFooter; -import io.github.dfa1.vortex.fbs.FbsLayout; -import io.github.dfa1.vortex.fbs.FbsLayoutSpec; -import io.github.dfa1.vortex.fbs.FbsType; +import io.github.dfa1.vortex.core.fbs.FbsBuilder; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.fbs.FbsArraySpec; +import io.github.dfa1.vortex.core.fbs.FbsDecimal; +import io.github.dfa1.vortex.core.fbs.FbsFooter; +import io.github.dfa1.vortex.core.fbs.FbsLayout; +import io.github.dfa1.vortex.core.fbs.FbsLayoutSpec; +import io.github.dfa1.vortex.core.fbs.FbsType; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -217,8 +217,8 @@ private static MemorySegment nestedLayout(int depth) { private static MemorySegment decimalDtype(int precision, byte scale) { var fbb = new FbsBuilder(64); int dec = FbsDecimal.createFbsDecimal(fbb, precision, scale, false); - int off = io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsDecimal, dec); - io.github.dfa1.vortex.fbs.FbsDType.finishFbsDTypeBuffer(fbb, off); + int off = io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsDecimal, dec); + io.github.dfa1.vortex.core.fbs.FbsDType.finishFbsDTypeBuffer(fbb, off); return slice(fbb); } diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserSegmentSpecBoundsTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserSegmentSpecBoundsTest.java index d1d86281..4d18b41e 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserSegmentSpecBoundsTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/PostscriptParserSegmentSpecBoundsTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/ReadRegistryTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/ReadRegistryTest.java index bf0bdadd..f82b91cd 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/ReadRegistryTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/ReadRegistryTest.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.UnknownArray; import io.github.dfa1.vortex.encoding.DTypes; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.reader.decode.DecodeContext; import io.github.dfa1.vortex.reader.decode.EncodingDecoder; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/TrailerLengthBoundaryTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/TrailerLengthBoundaryTest.java index 9bef76cc..a0502804 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/TrailerLengthBoundaryTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/TrailerLengthBoundaryTest.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.core.VortexFormat; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.VortexFormat; import org.junit.jupiter.api.Test; import java.lang.foreign.MemorySegment; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_SHORT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_SHORT; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderIT.java b/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderIT.java index 4424634b..fd0a06f3 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderIT.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderIT.java @@ -1,8 +1,8 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.VortexFormat; import io.github.dfa1.vortex.reader.array.ListArray; import io.github.dfa1.vortex.reader.array.ListViewArray; import org.junit.jupiter.api.Disabled; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderOpenOverloadTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderOpenOverloadTest.java index 113e21b8..37166d1f 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderOpenOverloadTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderOpenOverloadTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.VortexFormat; +import io.github.dfa1.vortex.core.io.VortexFormat; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderTailFetchTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderTailFetchTest.java index cc59346a..f09ab7e7 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderTailFetchTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/VortexHttpReaderTailFetchTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.VortexFormat; +import io.github.dfa1.vortex.core.io.VortexFormat; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; 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 e332cf34..cf331e94 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,12 +1,12 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.core.VortexFormat; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.VortexFormat; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.UnknownArray; import io.github.dfa1.vortex.reader.decode.DecodeContext; import io.github.dfa1.vortex.reader.decode.EncodingDecoder; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/ZipBombSecurityTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/ZipBombSecurityTest.java index 26462d38..3be93449 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/ZipBombSecurityTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/ZipBombSecurityTest.java @@ -1,22 +1,22 @@ package io.github.dfa1.vortex.reader; -import io.github.dfa1.vortex.fbs.FbsBuilder; +import io.github.dfa1.vortex.core.fbs.FbsBuilder; import static io.github.dfa1.vortex.reader.MalformedFiles.buildFooter; import static io.github.dfa1.vortex.reader.MalformedFiles.buildI64Dtype; import static io.github.dfa1.vortex.reader.MalformedFiles.buildFlatLayout; import static io.github.dfa1.vortex.reader.MalformedFiles.buildPostscript; import static io.github.dfa1.vortex.reader.MalformedFiles.slice; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LazyConstantLongArray; import io.github.dfa1.vortex.reader.decode.ConstantEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; -import io.github.dfa1.vortex.fbs.FbsArrayNode; -import io.github.dfa1.vortex.fbs.FbsLayout; +import io.github.dfa1.vortex.core.fbs.FbsArrayNode; +import io.github.dfa1.vortex.core.fbs.FbsLayout; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import java.io.OutputStream; import java.nio.ByteBuffer; @@ -35,7 +35,7 @@ * and trigger an 8 GB allocation on the first `iter.hasNext()` call. * *

Both attacks are fixed: tests use small row counts safe for CI and assert the - * expected post-fix behavior (no OOM; either completes or throws [io.github.dfa1.vortex.core.VortexException]). + * expected post-fix behavior (no OOM; either completes or throws [io.github.dfa1.vortex.core.error.VortexException]). */ class ZipBombSecurityTest { @@ -182,7 +182,7 @@ private static byte[] buildOneBufferSegment(byte[] rawData) { int nodeOff = FbsArrayNode.createFbsArrayNode(fbb, 0, 0, 0, bufIdxVec, 0); // Array.buffers: one Buffer struct describing rawData - io.github.dfa1.vortex.fbs.FbsArray.startBuffersVector(fbb, 1); + io.github.dfa1.vortex.core.fbs.FbsArray.startBuffersVector(fbb, 1); // FlatBuffers builds inline structs in reverse; struct layout (LE): // padding(u16) | alignmentExponent(u8) | compression(u8) | length(u32) fbb.prep(4, 8); @@ -192,8 +192,8 @@ private static byte[] buildOneBufferSegment(byte[] rawData) { fbb.putShort((short) 0); // padding = 0 int bufsVec = fbb.endVector(); - int arrOff = io.github.dfa1.vortex.fbs.FbsArray.createFbsArray(fbb, nodeOff, bufsVec); - io.github.dfa1.vortex.fbs.FbsArray.finishFbsArrayBuffer(fbb, arrOff); + int arrOff = io.github.dfa1.vortex.core.fbs.FbsArray.createFbsArray(fbb, nodeOff, bufsVec); + io.github.dfa1.vortex.core.fbs.FbsArray.finishFbsArrayBuffer(fbb, arrOff); // Segment = rawData + FlatBuffer bytes + 4-byte LE fbLen byte[] fbBytes = fbb.sizedByteArray(); diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/ArrayLimitedTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/ArrayLimitedTest.java index 943799ec..89f020c5 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/ArrayLimitedTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/ArrayLimitedTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/ArrayMaterializeTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/ArrayMaterializeTest.java index a9fa6d09..2dd3be3d 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/ArrayMaterializeTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/ArrayMaterializeTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.PTypeIO; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/ChunkedRecordSmokeTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/ChunkedRecordSmokeTest.java index 087d6c50..5d3420b5 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/ChunkedRecordSmokeTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/ChunkedRecordSmokeTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.PTypeIO; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/DateTimePartsArraysTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/DateTimePartsArraysTest.java index 591e62a9..4025f9dc 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/DateTimePartsArraysTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/DateTimePartsArraysTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Test; import static io.github.dfa1.vortex.reader.array.TestArrays.bools; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/DictRecordSmokeTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/DictRecordSmokeTest.java index ef977927..1756871e 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/DictRecordSmokeTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/DictRecordSmokeTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.PTypeIO; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/DoubleArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/DoubleArrayTest.java index 2377f9df..166bed65 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/DoubleArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/DoubleArrayTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/GenericArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/GenericArrayTest.java index 9da982ad..5d388e03 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/GenericArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/GenericArrayTest.java @@ -2,8 +2,8 @@ -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; @@ -195,7 +195,7 @@ void getDecimal_unalignedBufferSize_throws() { // When / Then assertThatThrownBy(() -> sut.getDecimal(0)) - .isInstanceOf(io.github.dfa1.vortex.core.VortexException.class) + .isInstanceOf(io.github.dfa1.vortex.core.error.VortexException.class) .hasMessageContaining("not a multiple"); } } diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/IntArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/IntArrayTest.java index 3307aaa8..f9c27e49 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/IntArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/IntArrayTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpDoubleArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpDoubleArrayTest.java index cfebe422..fc90ef9d 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpDoubleArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpDoubleArrayTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpFloatArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpFloatArrayTest.java index 31168b75..043c9546 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpFloatArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpFloatArrayTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpRdArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpRdArrayTest.java index 3c12009b..6ce383d4 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpRdArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyAlpRdArrayTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyConstantArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyConstantArrayTest.java index c6d65e85..847be99d 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyConstantArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyConstantArrayTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.io.PTypeIO; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyDecimalArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyDecimalArrayTest.java index fdd73548..6bfe53b4 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyDecimalArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyDecimalArrayTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyDecimalBytePartsArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyDecimalBytePartsArrayTest.java index bd767ca1..f8763681 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyDecimalBytePartsArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyDecimalBytePartsArrayTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForByteArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForByteArrayTest.java index ff3845f9..847c8f2e 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForByteArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForByteArrayTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForIntArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForIntArrayTest.java index d1172e0f..17a6679d 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForIntArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForIntArrayTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForLongArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForLongArrayTest.java index ed370c76..1b38d2f3 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForLongArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForLongArrayTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForShortArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForShortArrayTest.java index 1c4b492a..6194d3db 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForShortArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyForShortArrayTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyRleArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyRleArrayTest.java index 44eb96ff..94954160 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyRleArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyRleArrayTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagByteArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagByteArrayTest.java index 8b686b7a..8920df25 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagByteArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagByteArrayTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagIntArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagIntArrayTest.java index 9ee670a5..7dd692c2 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagIntArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagIntArrayTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagLongArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagLongArrayTest.java index e75e2098..730e5d56 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagLongArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagLongArrayTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagShortArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagShortArrayTest.java index 649e1e0a..5a76b4a6 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagShortArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LazyZigZagShortArrayTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/ListArraysTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/ListArraysTest.java index 8def088a..dd7285b3 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/ListArraysTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/ListArraysTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LongArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LongArrayTest.java index 1dc57c7e..de3bd89c 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/LongArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/LongArrayTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/OffsetArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/OffsetArrayTest.java index 0a1809c4..109317b1 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/OffsetArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/OffsetArrayTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinArrayTest.java index 2de1acfb..c883166c 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinArrayTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinChunkedModeTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinChunkedModeTest.java index 6b4369fb..71e2ba83 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinChunkedModeTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinChunkedModeTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.array; -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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinViewModeTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinViewModeTest.java index fbe211d5..8593eee2 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinViewModeTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/array/VarBinViewModeTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.array; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; 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 84c26557..07d310d5 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 @@ -1,9 +1,9 @@ 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.proto.ProtoALPMetadata; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoALPMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.array.DoubleArray; import io.github.dfa1.vortex.reader.array.FloatArray; @@ -121,7 +121,7 @@ void decode_f32_broadcastNoPatches_returnsConstant() { void decode_f64_patches_withU8Indices() { // Given patches whose index child uses U8 storage — exercises the U8 arm of // readUnsigned (the encoder always emits U32 indices) - ProtoPatchesMetadata pm = new ProtoPatchesMetadata(1L, 0L, io.github.dfa1.vortex.proto.ProtoPType.U8, null, null, null); + ProtoPatchesMetadata pm = new ProtoPatchesMetadata(1L, 0L, io.github.dfa1.vortex.core.proto.ProtoPType.U8, null, null, null); byte[] meta = new ProtoALPMetadata(2, 0, pm).encode(); // *0.01 ArrayNode enc = ArrayNode.of(EncodingId.VORTEX_PRIMITIVE, null, new ArrayNode[0], new int[]{0}); @@ -146,7 +146,7 @@ void decode_f64_patches_withU8Indices() { @Test void decode_patches_nonUnsignedIndexPtype_throws() { // Given a signed (I32) patch-index ptype — readUnsigned rejects it - ProtoPatchesMetadata pm = new ProtoPatchesMetadata(1L, 0L, io.github.dfa1.vortex.proto.ProtoPType.I32, null, null, null); + ProtoPatchesMetadata pm = new ProtoPatchesMetadata(1L, 0L, io.github.dfa1.vortex.core.proto.ProtoPType.I32, null, null, null); byte[] meta = new ProtoALPMetadata(2, 0, pm).encode(); ArrayNode enc = ArrayNode.of(EncodingId.VORTEX_PRIMITIVE, null, new ArrayNode[0], new int[]{0}); diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/ByteBoolEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/ByteBoolEncodingDecoderTest.java index f8008fb2..0e5f86dd 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/ByteBoolEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/ByteBoolEncodingDecoderTest.java @@ -4,7 +4,7 @@ import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.encoding.DTypes; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DateTimePartsEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DateTimePartsEncodingDecoderTest.java index 6a51314a..43bbff41 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DateTimePartsEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DateTimePartsEncodingDecoderTest.java @@ -1,11 +1,11 @@ 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.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.encoding.TestSegments; -import io.github.dfa1.vortex.encoding.TimeUnit; -import io.github.dfa1.vortex.proto.ProtoDateTimePartsMetadata; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.proto.ProtoDateTimePartsMetadata; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.array.LongArray; import org.junit.jupiter.api.Test; @@ -25,9 +25,9 @@ class DateTimePartsEncodingDecoderTest { private static MemorySegment i64Meta() { return MemorySegment.ofArray(new ProtoDateTimePartsMetadata( - io.github.dfa1.vortex.proto.ProtoPType.I64, - io.github.dfa1.vortex.proto.ProtoPType.I64, - io.github.dfa1.vortex.proto.ProtoPType.I64).encode()); + io.github.dfa1.vortex.core.proto.ProtoPType.I64, + io.github.dfa1.vortex.core.proto.ProtoPType.I64, + io.github.dfa1.vortex.core.proto.ProtoPType.I64).encode()); } private static DType timestampDType(TimeUnit unit, boolean nullable) { 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 e71dc5fc..6e55fe4f 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,8 +1,8 @@ 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.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LazyDecimalArray; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DeltaEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DeltaEncodingDecoderTest.java index a6634772..59616f33 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DeltaEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/DeltaEncodingDecoderTest.java @@ -1,11 +1,11 @@ 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.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.encoding.TestSegments; -import io.github.dfa1.vortex.proto.ProtoDeltaMetadata; +import io.github.dfa1.vortex.core.proto.ProtoDeltaMetadata; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LongArray; 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 a752d700..bc9ee3e4 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 @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.reader.decode; import io.github.dfa1.vortex.encoding.TestSegments; -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.proto.ProtoDictMetadata; -import io.github.dfa1.vortex.proto.ProtoVarBinMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoDictMetadata; +import io.github.dfa1.vortex.core.proto.ProtoVarBinMetadata; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.ByteArray; @@ -462,8 +462,8 @@ private static ArrayNode primitiveNode(int bufferIndex) { return ArrayNode.of(EncodingId.VORTEX_PRIMITIVE, null, new ArrayNode[0], new int[]{bufferIndex}); } - private static io.github.dfa1.vortex.proto.ProtoPType protoPType(PType core) { - return io.github.dfa1.vortex.proto.ProtoPType.valueOf(core.name()); + private static io.github.dfa1.vortex.core.proto.ProtoPType protoPType(PType core) { + return io.github.dfa1.vortex.core.proto.ProtoPType.valueOf(core.name()); } // ── segment builders (little-endian) ─────────────────────────────────────── diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/LazyRunEndArrayTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/LazyRunEndArrayTest.java index a41f8a5f..eb6a51ad 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/LazyRunEndArrayTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/LazyRunEndArrayTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.ByteArray; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/LeBitReaderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/LeBitReaderTest.java index 4f2aa03b..ca717da6 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/LeBitReaderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/LeBitReaderTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/NullEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/NullEncodingDecoderTest.java index 325c0e57..ade733ec 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/NullEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/NullEncodingDecoderTest.java @@ -4,7 +4,7 @@ import io.github.dfa1.vortex.reader.array.NullArray; import io.github.dfa1.vortex.encoding.DTypes; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PatchedEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PatchedEncodingDecoderTest.java index 00459fa8..bd3d4b7c 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PatchedEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PatchedEncodingDecoderTest.java @@ -3,12 +3,12 @@ import io.github.dfa1.vortex.encoding.TestSegments; import io.github.dfa1.vortex.reader.ReadRegistry; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.array.LongArray; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoPatchedMetadata; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoPatchedMetadata; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PcoEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PcoEncodingDecoderTest.java index 082ab656..fe79f709 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PcoEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PcoEncodingDecoderTest.java @@ -2,16 +2,16 @@ import io.github.dfa1.vortex.reader.ReadRegistry; -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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.array.MaskedArray; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; -import io.github.dfa1.vortex.proto.ProtoPcoChunkInfo; -import io.github.dfa1.vortex.proto.ProtoPcoMetadata; -import io.github.dfa1.vortex.proto.ProtoPcoPageInfo; +import io.github.dfa1.vortex.core.proto.ProtoPcoChunkInfo; +import io.github.dfa1.vortex.core.proto.ProtoPcoMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPcoPageInfo; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PcoTansDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PcoTansDecoderTest.java index e266690c..4eac89a8 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PcoTansDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/PcoTansDecoderTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/SegmentBroadcastTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/SegmentBroadcastTest.java index e1b866fb..5ee33dd3 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/SegmentBroadcastTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/SegmentBroadcastTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; import org.junit.jupiter.api.Test; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/TestDecodeContexts.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/TestDecodeContexts.java index e6b2c8df..f902c394 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/TestDecodeContexts.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/TestDecodeContexts.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.reader.decode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.ReadRegistry; import java.lang.foreign.Arena; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VarBinEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VarBinEncodingDecoderTest.java index 36f0c77d..edd6e99e 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VarBinEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VarBinEncodingDecoderTest.java @@ -1,9 +1,9 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.encoding.TestSegments; -import io.github.dfa1.vortex.proto.ProtoVarBinMetadata; +import io.github.dfa1.vortex.core.proto.ProtoVarBinMetadata; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.VarBinArray; @@ -21,7 +21,7 @@ class VarBinEncodingDecoderTest { private static final ReadRegistry REGISTRY = TestRegistry.ofDecoders(SUT, new PrimitiveEncodingDecoder()); private static MemorySegment i32OffsetsMeta() { - return MemorySegment.ofArray(new ProtoVarBinMetadata(io.github.dfa1.vortex.proto.ProtoPType.I32).encode()); + return MemorySegment.ofArray(new ProtoVarBinMetadata(io.github.dfa1.vortex.core.proto.ProtoPType.I32).encode()); } private static DecodeContext ctx(MemorySegment meta, MemorySegment bytes, MemorySegment offsets, long n) { 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 2cf9b37d..a944b680 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 @@ -1,8 +1,8 @@ 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.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.VarBinArray; @@ -54,7 +54,7 @@ void decode_binaryDtype_inlineViews() { void decode_wrongDtype_throws() { // Given a primitive dtype ArrayNode node = ArrayNode.of(EncodingId.VORTEX_VARBINVIEW, null, new ArrayNode[0], new int[]{0}); - DecodeContext ctx = new DecodeContext(node, new DType.Primitive(io.github.dfa1.vortex.core.PType.I32, false), + DecodeContext ctx = new DecodeContext(node, new DType.Primitive(io.github.dfa1.vortex.core.model.PType.I32, false), 0, new MemorySegment[]{Arena.ofAuto().allocate(16)}, ReadRegistry.empty(), Arena.ofAuto()); // When / Then diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VariantEncodingDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VariantEncodingDecoderTest.java index 4e9e1895..8a3b0ffa 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VariantEncodingDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/decode/VariantEncodingDecoderTest.java @@ -3,14 +3,14 @@ import io.github.dfa1.vortex.encoding.TestSegments; import io.github.dfa1.vortex.reader.ReadRegistry; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.NullArray; import io.github.dfa1.vortex.reader.array.VariantArray; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; -import io.github.dfa1.vortex.proto.ProtoPrimitive; -import io.github.dfa1.vortex.proto.ProtoVariantMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPrimitive; +import io.github.dfa1.vortex.core.proto.ProtoVariantMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -28,7 +28,7 @@ class VariantEncodingDecoderTest { private static final VariantEncodingDecoder SUT = new VariantEncodingDecoder(); - private static MemorySegment variantMetaWithShredded(io.github.dfa1.vortex.proto.ProtoDType shredded) { + private static MemorySegment variantMetaWithShredded(io.github.dfa1.vortex.core.proto.ProtoDType shredded) { return MemorySegment.ofArray(new ProtoVariantMetadata(shredded).encode()); } @@ -67,8 +67,8 @@ void decode_withoutShredded_returnsCoreStorageOnly() { @Test void decode_withShredded_decodesSecondChild() { // Given - io.github.dfa1.vortex.proto.ProtoDType shreddedProto = io.github.dfa1.vortex.proto.ProtoDType.ofPrimitive( - new ProtoPrimitive(io.github.dfa1.vortex.proto.ProtoPType.I32, false)); + io.github.dfa1.vortex.core.proto.ProtoDType shreddedProto = io.github.dfa1.vortex.core.proto.ProtoDType.ofPrimitive( + new ProtoPrimitive(io.github.dfa1.vortex.core.proto.ProtoPType.I32, false)); MemorySegment meta = variantMetaWithShredded(shreddedProto); ArrayNode coreNode = nullChildNode(); @@ -151,15 +151,15 @@ void decode_wrongChildCount_throws() { @Nested class DtypeFromProto { - private static io.github.dfa1.vortex.proto.ProtoDType prim(io.github.dfa1.vortex.proto.ProtoPType pt, boolean nullable) { - return io.github.dfa1.vortex.proto.ProtoDType.ofPrimitive(new ProtoPrimitive(pt, nullable)); + private static io.github.dfa1.vortex.core.proto.ProtoDType prim(io.github.dfa1.vortex.core.proto.ProtoPType pt, boolean nullable) { + return io.github.dfa1.vortex.core.proto.ProtoDType.ofPrimitive(new ProtoPrimitive(pt, nullable)); } @Test void nullType() { // Given / When DType result = VariantEncodingDecoder.dtypeFromProto( - io.github.dfa1.vortex.proto.ProtoDType.ofNull(new io.github.dfa1.vortex.proto.ProtoNull())); + io.github.dfa1.vortex.core.proto.ProtoDType.ofNull(new io.github.dfa1.vortex.core.proto.ProtoNull())); // Then null is always nullable assertThat(result).isEqualTo(new DType.Null(true)); @@ -169,7 +169,7 @@ void nullType() { void bool() { // Given / When DType result = VariantEncodingDecoder.dtypeFromProto( - io.github.dfa1.vortex.proto.ProtoDType.ofBool(new io.github.dfa1.vortex.proto.ProtoBool(true))); + io.github.dfa1.vortex.core.proto.ProtoDType.ofBool(new io.github.dfa1.vortex.core.proto.ProtoBool(true))); // Then assertThat(result).isEqualTo(new DType.Bool(true)); @@ -178,7 +178,7 @@ void bool() { @Test void primitive() { // Given / When - DType result = VariantEncodingDecoder.dtypeFromProto(prim(io.github.dfa1.vortex.proto.ProtoPType.I64, false)); + DType result = VariantEncodingDecoder.dtypeFromProto(prim(io.github.dfa1.vortex.core.proto.ProtoPType.I64, false)); // Then assertThat(result).isEqualTo(DType.I64); @@ -188,7 +188,7 @@ void primitive() { void decimal() { // Given / When DType result = VariantEncodingDecoder.dtypeFromProto( - io.github.dfa1.vortex.proto.ProtoDType.ofDecimal(new io.github.dfa1.vortex.proto.ProtoDecimal(10, 2, false))); + io.github.dfa1.vortex.core.proto.ProtoDType.ofDecimal(new io.github.dfa1.vortex.core.proto.ProtoDecimal(10, 2, false))); // Then precision/scale narrow to byte assertThat(result).isEqualTo(new DType.Decimal((byte) 10, (byte) 2, false)); @@ -198,7 +198,7 @@ void decimal() { void utf8() { // Given / When DType result = VariantEncodingDecoder.dtypeFromProto( - io.github.dfa1.vortex.proto.ProtoDType.ofUtf8(new io.github.dfa1.vortex.proto.ProtoUtf8(true))); + io.github.dfa1.vortex.core.proto.ProtoDType.ofUtf8(new io.github.dfa1.vortex.core.proto.ProtoUtf8(true))); // Then assertThat(result).isEqualTo(new DType.Utf8(true)); @@ -208,7 +208,7 @@ void utf8() { void binary() { // Given / When DType result = VariantEncodingDecoder.dtypeFromProto( - io.github.dfa1.vortex.proto.ProtoDType.ofBinary(new io.github.dfa1.vortex.proto.ProtoBinary(false))); + io.github.dfa1.vortex.core.proto.ProtoDType.ofBinary(new io.github.dfa1.vortex.core.proto.ProtoBinary(false))); // Then assertThat(result).isEqualTo(DType.BINARY); @@ -217,10 +217,10 @@ void binary() { @Test void struct() { // Given a two-field struct with mixed child types - var proto = io.github.dfa1.vortex.proto.ProtoDType.ofStruct(new io.github.dfa1.vortex.proto.ProtoStruct( + var proto = io.github.dfa1.vortex.core.proto.ProtoDType.ofStruct(new io.github.dfa1.vortex.core.proto.ProtoStruct( List.of("a", "b"), - List.of(prim(io.github.dfa1.vortex.proto.ProtoPType.I32, false), - io.github.dfa1.vortex.proto.ProtoDType.ofUtf8(new io.github.dfa1.vortex.proto.ProtoUtf8(true))), + List.of(prim(io.github.dfa1.vortex.core.proto.ProtoPType.I32, false), + io.github.dfa1.vortex.core.proto.ProtoDType.ofUtf8(new io.github.dfa1.vortex.core.proto.ProtoUtf8(true))), false)); // When children are translated recursively @@ -237,8 +237,8 @@ void struct() { void list() { // Given / When element type is translated recursively DType result = VariantEncodingDecoder.dtypeFromProto( - io.github.dfa1.vortex.proto.ProtoDType.ofList(new io.github.dfa1.vortex.proto.ProtoList( - prim(io.github.dfa1.vortex.proto.ProtoPType.I32, false), true))); + io.github.dfa1.vortex.core.proto.ProtoDType.ofList(new io.github.dfa1.vortex.core.proto.ProtoList( + prim(io.github.dfa1.vortex.core.proto.ProtoPType.I32, false), true))); // Then assertThat(result).isEqualTo(new DType.List(DType.I32, true)); @@ -248,8 +248,8 @@ void list() { void fixedSizeList() { // Given / When DType result = VariantEncodingDecoder.dtypeFromProto( - io.github.dfa1.vortex.proto.ProtoDType.ofFixedSizeList(new io.github.dfa1.vortex.proto.ProtoFixedSizeList( - prim(io.github.dfa1.vortex.proto.ProtoPType.F64, false), 4, false))); + io.github.dfa1.vortex.core.proto.ProtoDType.ofFixedSizeList(new io.github.dfa1.vortex.core.proto.ProtoFixedSizeList( + prim(io.github.dfa1.vortex.core.proto.ProtoPType.F64, false), 4, false))); // Then size is carried through assertThat(result).isEqualTo( @@ -259,8 +259,8 @@ void fixedSizeList() { @Test void extension_withMetadata() { // Given an extension with non-null metadata bytes - var proto = io.github.dfa1.vortex.proto.ProtoDType.ofExtension(new io.github.dfa1.vortex.proto.ProtoExtension( - "ip.address", prim(io.github.dfa1.vortex.proto.ProtoPType.I32, false), new byte[]{1, 2, 3})); + var proto = io.github.dfa1.vortex.core.proto.ProtoDType.ofExtension(new io.github.dfa1.vortex.core.proto.ProtoExtension( + "ip.address", prim(io.github.dfa1.vortex.core.proto.ProtoPType.I32, false), new byte[]{1, 2, 3})); // When DType result = VariantEncodingDecoder.dtypeFromProto(proto); @@ -276,8 +276,8 @@ void extension_withMetadata() { @Test void extension_nullMetadata_becomesEmptyBuffer() { // Given null metadata — must not NPE, maps to an empty read-only buffer - var proto = io.github.dfa1.vortex.proto.ProtoDType.ofExtension(new io.github.dfa1.vortex.proto.ProtoExtension( - "uuid", prim(io.github.dfa1.vortex.proto.ProtoPType.I64, false), null)); + var proto = io.github.dfa1.vortex.core.proto.ProtoDType.ofExtension(new io.github.dfa1.vortex.core.proto.ProtoExtension( + "uuid", prim(io.github.dfa1.vortex.core.proto.ProtoPType.I64, false), null)); // When DType.Extension result = (DType.Extension) VariantEncodingDecoder.dtypeFromProto(proto); @@ -290,7 +290,7 @@ void extension_nullMetadata_becomesEmptyBuffer() { void variant() { // Given / When DType result = VariantEncodingDecoder.dtypeFromProto( - io.github.dfa1.vortex.proto.ProtoDType.ofVariant(new io.github.dfa1.vortex.proto.ProtoVariant(false))); + io.github.dfa1.vortex.core.proto.ProtoDType.ofVariant(new io.github.dfa1.vortex.core.proto.ProtoVariant(false))); // Then assertThat(result).isEqualTo(DType.VARIANT); @@ -299,7 +299,7 @@ void variant() { @Test void noFieldSet_throws() { // Given a proto DType with no oneof arm populated - var empty = new io.github.dfa1.vortex.proto.ProtoDType( + var empty = new io.github.dfa1.vortex.core.proto.ProtoDType( null, null, null, null, null, null, null, null, null, null, null, null); // When / Then 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 5f305ff2..8519ad72 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 @@ -1,9 +1,9 @@ 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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.encoding.TestSegments; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.array.Array; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/DateExtensionDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/DateExtensionDecoderTest.java index 67ba31ec..458a1208 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/DateExtensionDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/DateExtensionDecoderTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.reader.extension; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.array.MaskedArray; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/ExtensionStorageTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/ExtensionStorageTest.java index 38cb5ff2..b0650446 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/ExtensionStorageTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/ExtensionStorageTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.extension; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.TimeUnit; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.TimeUnit; import io.github.dfa1.vortex.reader.array.DoubleArray; import io.github.dfa1.vortex.reader.array.MaskedArray; import org.junit.jupiter.api.Nested; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/ExtensionTestSupport.java b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/ExtensionTestSupport.java index e1e8cf22..d6776e76 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/ExtensionTestSupport.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/ExtensionTestSupport.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.reader.extension; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.array.MaterializedIntArray; import io.github.dfa1.vortex.reader.array.MaterializedLongArray; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_SHORT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_SHORT; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/TimeExtensionDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/TimeExtensionDecoderTest.java index c30a9b67..6dbdabbd 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/TimeExtensionDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/TimeExtensionDecoderTest.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.reader.extension; -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.TimeUnit; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.array.MaskedArray; diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/TimestampExtensionDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/TimestampExtensionDecoderTest.java index 28856790..3b75e912 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/TimestampExtensionDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/TimestampExtensionDecoderTest.java @@ -1,9 +1,9 @@ package io.github.dfa1.vortex.reader.extension; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.TimeUnit; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.array.MaskedArray; @@ -46,7 +46,7 @@ void dtype_defaultIsMsUtcless() { // Then — byte 0 = ms ordinal, bytes 1..3 = 0 (tz_len = 0) assertThat(dtype.storageDType()).isEqualTo(DType.I64); assertThat(dtype.metadata().get(java.lang.foreign.ValueLayout.JAVA_BYTE, 0)).isEqualTo((byte) TimeUnit.Milliseconds.ordinal()); - assertThat(dtype.metadata().get(io.github.dfa1.vortex.encoding.PTypeIO.LE_SHORT, 1)).isEqualTo((short) 0); + assertThat(dtype.metadata().get(io.github.dfa1.vortex.core.io.PTypeIO.LE_SHORT, 1)).isEqualTo((short) 0); } @Test @@ -55,7 +55,7 @@ void dtype_withTimezoneEncodesIanaName() { DType.Extension dtype = sut.dtype(TimeUnit.Microseconds, ZoneId.of("Europe/Paris"), false); // Then — header tz_len matches the UTF-8 length; the actual bytes follow - int tzLen = Short.toUnsignedInt(dtype.metadata().get(io.github.dfa1.vortex.encoding.PTypeIO.LE_SHORT, 1)); + int tzLen = Short.toUnsignedInt(dtype.metadata().get(io.github.dfa1.vortex.core.io.PTypeIO.LE_SHORT, 1)); assertThat(tzLen).isEqualTo("Europe/Paris".getBytes().length); assertThat(sut.timezone(dtype)).contains(ZoneId.of("Europe/Paris")); } diff --git a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/UuidExtensionDecoderTest.java b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/UuidExtensionDecoderTest.java index 15f373c9..0be863ec 100644 --- a/reader/src/test/java/io/github/dfa1/vortex/reader/extension/UuidExtensionDecoderTest.java +++ b/reader/src/test/java/io/github/dfa1/vortex/reader/extension/UuidExtensionDecoderTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.reader.extension; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.ByteArray; import io.github.dfa1.vortex.reader.array.FixedSizeListArray; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/ChunkImpl.java b/writer/src/main/java/io/github/dfa1/vortex/writer/ChunkImpl.java index 188f4d3e..40978d0c 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/ChunkImpl.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/ChunkImpl.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.writer.encode.NullableData; import java.util.LinkedHashMap; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/ExtensionEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/ExtensionEncoder.java index 9c45fe61..f38e6298 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/ExtensionEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/ExtensionEncoder.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.ExtensionId; import java.util.Collection; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/VortexWriter.java b/writer/src/main/java/io/github/dfa1/vortex/writer/VortexWriter.java index 73844e98..f116c112 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/VortexWriter.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/VortexWriter.java @@ -1,17 +1,17 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.fbs.FbsBuilder; +import io.github.dfa1.vortex.core.fbs.FbsBuilder; import io.github.dfa1.vortex.writer.encode.DateTimePartsData; import io.github.dfa1.vortex.writer.encode.FixedSizeListData; import io.github.dfa1.vortex.writer.encode.ListData; import io.github.dfa1.vortex.writer.encode.ListViewData; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.core.VortexFormat; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.io.VortexFormat; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.writer.encode.EncodeContext; import io.github.dfa1.vortex.writer.encode.EncodeNode; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import io.github.dfa1.vortex.writer.encode.EncodeResult; import io.github.dfa1.vortex.writer.encode.NullableData; import io.github.dfa1.vortex.writer.encode.StructData; @@ -35,15 +35,15 @@ import io.github.dfa1.vortex.writer.encode.SparseEncodingEncoder; import io.github.dfa1.vortex.writer.encode.VarBinEncodingEncoder; import io.github.dfa1.vortex.writer.encode.ZstdEncodingEncoder; -import io.github.dfa1.vortex.fbs.FbsArraySpec; -import io.github.dfa1.vortex.fbs.FbsExtension; -import io.github.dfa1.vortex.fbs.FbsFooter; -import io.github.dfa1.vortex.fbs.FbsLayout; -import io.github.dfa1.vortex.fbs.FbsLayoutSpec; -import io.github.dfa1.vortex.fbs.FbsPostscript; -import io.github.dfa1.vortex.fbs.FbsPostscriptSegment; -import io.github.dfa1.vortex.fbs.FbsSegmentSpec; -import io.github.dfa1.vortex.fbs.FbsType; +import io.github.dfa1.vortex.core.fbs.FbsArraySpec; +import io.github.dfa1.vortex.core.fbs.FbsExtension; +import io.github.dfa1.vortex.core.fbs.FbsFooter; +import io.github.dfa1.vortex.core.fbs.FbsLayout; +import io.github.dfa1.vortex.core.fbs.FbsLayoutSpec; +import io.github.dfa1.vortex.core.fbs.FbsPostscript; +import io.github.dfa1.vortex.core.fbs.FbsPostscriptSegment; +import io.github.dfa1.vortex.core.fbs.FbsSegmentSpec; +import io.github.dfa1.vortex.core.fbs.FbsType; import java.io.Closeable; import java.io.IOException; @@ -274,25 +274,25 @@ private static long arrayLength(Object data) { private static ByteBuffer buildDType(DType dtype) { var fbb = new FbsBuilder(128); int off = serializeDType(fbb, dtype); - io.github.dfa1.vortex.fbs.FbsDType.finishFbsDTypeBuffer(fbb, off); + io.github.dfa1.vortex.core.fbs.FbsDType.finishFbsDTypeBuffer(fbb, off); return fbb.dataSegment().asByteBuffer().order(ByteOrder.LITTLE_ENDIAN); } private static int serializeDType(FbsBuilder fbb, DType dtype) { return switch (dtype) { case DType.Null _ -> { - io.github.dfa1.vortex.fbs.FbsNull.startFbsNull(fbb); - int inner = io.github.dfa1.vortex.fbs.FbsNull.endFbsNull(fbb); - yield io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsNull, inner); + io.github.dfa1.vortex.core.fbs.FbsNull.startFbsNull(fbb); + int inner = io.github.dfa1.vortex.core.fbs.FbsNull.endFbsNull(fbb); + yield io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsNull, inner); } case DType.Bool b -> { - int inner = io.github.dfa1.vortex.fbs.FbsBool.createFbsBool(fbb, b.nullable()); - yield io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsBool, inner); + int inner = io.github.dfa1.vortex.core.fbs.FbsBool.createFbsBool(fbb, b.nullable()); + yield io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsBool, inner); } case DType.Primitive p -> { - int inner = io.github.dfa1.vortex.fbs.FbsPrimitive.createFbsPrimitive( + int inner = io.github.dfa1.vortex.core.fbs.FbsPrimitive.createFbsPrimitive( fbb, p.ptype().ordinal(), p.nullable()); - yield io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsPrimitive, inner); + yield io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsPrimitive, inner); } case DType.Struct s -> { // Build child DType tables first (FlatBuffers bottom-up requirement) @@ -304,26 +304,26 @@ private static int serializeDType(FbsBuilder fbb, DType dtype) { for (int i = 0; i < nameOffsets.length; i++) { nameOffsets[i] = fbb.createString(s.fieldNames().get(i)); } - int namesVec = io.github.dfa1.vortex.fbs.FbsStruct_.createNamesVector(fbb, nameOffsets); - int dtypesVec = io.github.dfa1.vortex.fbs.FbsStruct_.createDtypesVector(fbb, fieldOffsets); - int inner = io.github.dfa1.vortex.fbs.FbsStruct_.createFbsStruct_( + int namesVec = io.github.dfa1.vortex.core.fbs.FbsStruct_.createNamesVector(fbb, nameOffsets); + int dtypesVec = io.github.dfa1.vortex.core.fbs.FbsStruct_.createDtypesVector(fbb, fieldOffsets); + int inner = io.github.dfa1.vortex.core.fbs.FbsStruct_.createFbsStruct_( fbb, namesVec, dtypesVec, s.nullable()); - yield io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsStruct_, inner); + yield io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsStruct_, inner); } case DType.Utf8 u -> { - int inner = io.github.dfa1.vortex.fbs.FbsUtf8.createFbsUtf8(fbb, u.nullable()); - yield io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsUtf8, inner); + int inner = io.github.dfa1.vortex.core.fbs.FbsUtf8.createFbsUtf8(fbb, u.nullable()); + yield io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsUtf8, inner); } case DType.List l -> { int elemTypeOff = serializeDType(fbb, l.elementType()); - int inner = io.github.dfa1.vortex.fbs.FbsList.createFbsList(fbb, elemTypeOff, l.nullable()); - yield io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsList, inner); + int inner = io.github.dfa1.vortex.core.fbs.FbsList.createFbsList(fbb, elemTypeOff, l.nullable()); + yield io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsList, inner); } case DType.FixedSizeList fsl -> { int elemTypeOff = serializeDType(fbb, fsl.elementType()); - int inner = io.github.dfa1.vortex.fbs.FbsFixedSizeList.createFbsFixedSizeList( + int inner = io.github.dfa1.vortex.core.fbs.FbsFixedSizeList.createFbsFixedSizeList( fbb, elemTypeOff, fsl.fixedSize(), fsl.nullable()); - yield io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsFixedSizeList, inner); + yield io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsFixedSizeList, inner); } case DType.Extension e -> { int idOff = fbb.createString(e.extensionId()); @@ -334,11 +334,11 @@ private static int serializeDType(FbsBuilder fbb, DType dtype) { metaOff = FbsExtension.createMetadataVector(fbb, metaBytes); } int inner = FbsExtension.createFbsExtension(fbb, idOff, storageDtypeOff, metaOff); - yield io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsExtension, inner); + yield io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsExtension, inner); } case DType.Variant v -> { - int inner = io.github.dfa1.vortex.fbs.FbsVariant.createFbsVariant(fbb, v.nullable()); - yield io.github.dfa1.vortex.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsVariant, inner); + int inner = io.github.dfa1.vortex.core.fbs.FbsVariant.createFbsVariant(fbb, v.nullable()); + yield io.github.dfa1.vortex.core.fbs.FbsDType.createFbsDType(fbb, FbsType.FbsVariant, inner); } default -> throw new UnsupportedOperationException("unsupported DType: " + dtype); }; @@ -442,7 +442,7 @@ public void writeChunk(Map columns) throws IOException { // (ExtEncoding → PrimitiveEncoding) and lets Registry skip its unwrap path. if (colDtype instanceof DType.Extension extDtype && data instanceof java.util.Collection coll) { ExtensionEncoder impl = - io.github.dfa1.vortex.extension.ExtensionId.parse(extDtype.extensionId()) + io.github.dfa1.vortex.core.model.ExtensionId.parse(extDtype.extensionId()) .map(defaultRegistry::lookup) .orElse(null); if (impl != null) { @@ -625,21 +625,21 @@ private ByteBuffer buildArrayFlatBuffer(EncodeResult result, long nullCount) { // Stats for the root node only (build vectors before the ArrayStats table). null_count is // always recorded; min/max only when the encoder produced them. int minVec = result.hasStats() - ? io.github.dfa1.vortex.fbs.FbsArrayStats.createMinVector(fbb, result.statsMin()) : 0; + ? io.github.dfa1.vortex.core.fbs.FbsArrayStats.createMinVector(fbb, result.statsMin()) : 0; int maxVec = result.hasStats() - ? io.github.dfa1.vortex.fbs.FbsArrayStats.createMaxVector(fbb, result.statsMax()) : 0; + ? io.github.dfa1.vortex.core.fbs.FbsArrayStats.createMaxVector(fbb, result.statsMax()) : 0; // forceDefaults only while building ArrayStats, so null_count = 0 is serialised (flatbuffers // omits a scalar equal to its default otherwise) — matching the Rust writer and letting the // reader prune IS NULL on zero-null chunks. Reset immediately so the Array/ArrayNode tables // keep their normal (offset-default-omitting) layout. fbb.forceDefaults(true); - io.github.dfa1.vortex.fbs.FbsArrayStats.startFbsArrayStats(fbb); + io.github.dfa1.vortex.core.fbs.FbsArrayStats.startFbsArrayStats(fbb); if (result.hasStats()) { - io.github.dfa1.vortex.fbs.FbsArrayStats.addMin(fbb, minVec); - io.github.dfa1.vortex.fbs.FbsArrayStats.addMax(fbb, maxVec); + io.github.dfa1.vortex.core.fbs.FbsArrayStats.addMin(fbb, minVec); + io.github.dfa1.vortex.core.fbs.FbsArrayStats.addMax(fbb, maxVec); } - io.github.dfa1.vortex.fbs.FbsArrayStats.addNullCount(fbb, nullCount); - int statsOff = io.github.dfa1.vortex.fbs.FbsArrayStats.endFbsArrayStats(fbb); + io.github.dfa1.vortex.core.fbs.FbsArrayStats.addNullCount(fbb, nullCount); + int statsOff = io.github.dfa1.vortex.core.fbs.FbsArrayStats.endFbsArrayStats(fbb); fbb.forceDefaults(false); int rootNodeOff = buildArrayNodeFlatBuffer(fbb, result.rootNode(), statsOff); @@ -648,7 +648,7 @@ private ByteBuffer buildArrayFlatBuffer(EncodeResult result, long nullCount) { // FbsLayout (LE): padding(u16) | alignment_exponent(u8) | compression(u8) | length(u32) // FlatBuffers builds backward: iterate in reverse. var bufs = result.buffers(); - io.github.dfa1.vortex.fbs.FbsArray.startBuffersVector(fbb, bufs.size()); + io.github.dfa1.vortex.core.fbs.FbsArray.startBuffersVector(fbb, bufs.size()); for (int i = bufs.size() - 1; i >= 0; i--) { fbb.prep(4, 8); fbb.putInt((int) bufs.get(i).byteSize()); @@ -658,8 +658,8 @@ private ByteBuffer buildArrayFlatBuffer(EncodeResult result, long nullCount) { } int bufVec = fbb.endVector(); - int arrayOff = io.github.dfa1.vortex.fbs.FbsArray.createFbsArray(fbb, rootNodeOff, bufVec); - io.github.dfa1.vortex.fbs.FbsArray.finishFbsArrayBuffer(fbb, arrayOff); + int arrayOff = io.github.dfa1.vortex.core.fbs.FbsArray.createFbsArray(fbb, rootNodeOff, bufVec); + io.github.dfa1.vortex.core.fbs.FbsArray.finishFbsArrayBuffer(fbb, arrayOff); return fbb.dataSegment().asByteBuffer().order(ByteOrder.LITTLE_ENDIAN); } @@ -675,17 +675,17 @@ private int buildArrayNodeFlatBuffer(FbsBuilder fbb, EncodeNode node, int statsO int metaOff = 0; if (node.metadata() != null && node.metadata().byteSize() > 0) { byte[] metaBytes = node.metadata().toArray(java.lang.foreign.ValueLayout.JAVA_BYTE); - metaOff = io.github.dfa1.vortex.fbs.FbsArrayNode.createMetadataVector(fbb, metaBytes); + metaOff = io.github.dfa1.vortex.core.fbs.FbsArrayNode.createMetadataVector(fbb, metaBytes); } int childVec = 0; if (childOffsets.length > 0) { - childVec = io.github.dfa1.vortex.fbs.FbsArrayNode.createChildrenVector(fbb, childOffsets); + childVec = io.github.dfa1.vortex.core.fbs.FbsArrayNode.createChildrenVector(fbb, childOffsets); } - int bufIdxVec = io.github.dfa1.vortex.fbs.FbsArrayNode.createBuffersVector(fbb, node.bufferIndices()); + int bufIdxVec = io.github.dfa1.vortex.core.fbs.FbsArrayNode.createBuffersVector(fbb, node.bufferIndices()); int encIdx = encodingIdx.get(node.encodingId()); - return io.github.dfa1.vortex.fbs.FbsArrayNode.createFbsArrayNode( + return io.github.dfa1.vortex.core.fbs.FbsArrayNode.createFbsArrayNode( fbb, encIdx, metaOff, childVec, bufIdxVec, statsOff); } diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/WriteRegistry.java b/writer/src/main/java/io/github/dfa1/vortex/writer/WriteRegistry.java index ce29796f..847fd6f8 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/WriteRegistry.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/WriteRegistry.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.writer.encode.EncodingEncoder; import java.util.Collections; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/AlpEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/AlpEncodingEncoder.java index ce9306e5..d535b63b 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/AlpEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/AlpEncodingEncoder.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoALPMetadata; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoALPMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import java.lang.foreign.MemorySegment; import java.util.ArrayList; @@ -388,7 +388,7 @@ private static EncodeResult encodeF32(float[] values, EncodeContext ctx) { ProtoPatchesMetadata patches = new ProtoPatchesMetadata( numPatches, 0L, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.U32.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.U32.ordinal()), null, null, null); byte[] metaBytes = new ProtoALPMetadata(expE, expF, patches).encode(); @@ -405,7 +405,7 @@ private static ProtoPatchesMetadata buildPatchesMeta(int numPatches) { return new ProtoPatchesMetadata( numPatches, 0L, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.U32.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.U32.ordinal()), null, null, null); } diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/AlpRdEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/AlpRdEncodingEncoder.java index 24d4ce21..7ae3921a 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/AlpRdEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/AlpRdEncodingEncoder.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoALPRDMetadata; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoALPRDMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; import java.lang.foreign.MemorySegment; import java.util.ArrayList; @@ -269,7 +269,7 @@ private static EncodeResult buildEncodeResult( patchesMeta = new ProtoPatchesMetadata( excPos.size(), 0L, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.U64.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.U64.ordinal()), null, null, null); children = new EncodeNode[]{leftNode, rightNode, idxNode, valNode}; } @@ -278,7 +278,7 @@ private static EncodeResult buildEncodeResult( rightBitWidth, dict.length, dictList, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.U16.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.U16.ordinal()), patchesMeta ).encode(); EncodeNode root = new EncodeNode( @@ -303,7 +303,7 @@ private static EncodeResult emptyResult(DType rightDtype, EncodeContext ctx) { 48, 0, List.of(), - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.U16.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.U16.ordinal()), null).encode(); EncodeNode root = new EncodeNode( diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ArrayStats.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ArrayStats.java index 306cee07..416db985 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ArrayStats.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ArrayStats.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.writer.encode; -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.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; import java.util.HashMap; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingEncoder.java index ff88df93..35fcbe35 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingEncoder.java @@ -1,15 +1,15 @@ package io.github.dfa1.vortex.writer.encode; -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.encoding.FastLanes; -import io.github.dfa1.vortex.encoding.PrimitiveArrays; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoBitPackedMetadata; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.compute.FastLanes; +import io.github.dfa1.vortex.core.compute.PrimitiveArrays; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoBitPackedMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; @@ -128,7 +128,7 @@ public EncodeResult encode(DType dtype, Object data, EncodeContext ctx) { ProtoPatchesMetadata patches = new ProtoPatchesMetadata( numPatches, 0L, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(idxPtype.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(idxPtype.ordinal()), null, null, null); byte[] metaBytes = new ProtoBitPackedMetadata(bitWidth, 0, patches).encode(); diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/BoolEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/BoolEncodingEncoder.java index de510b2a..78c11209 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/BoolEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/BoolEncodingEncoder.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ByteBoolEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ByteBoolEncodingEncoder.java index 08133a0b..75c6b63e 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ByteBoolEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ByteBoolEncodingEncoder.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.EncodingId; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/CascadingCompressor.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/CascadingCompressor.java index bb406249..a7b493c0 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/CascadingCompressor.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/CascadingCompressor.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.EncodingId; import java.lang.foreign.MemorySegment; import java.util.ArrayList; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ChildSlot.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ChildSlot.java index f8270823..4d292eb4 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ChildSlot.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ChildSlot.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; /// An open slot in a partially-assembled encoding tree. /// The cascading compressor fills each slot recursively, then splices the result diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ChunkedEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ChunkedEncodingEncoder.java index 0763ab83..975061c4 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ChunkedEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ChunkedEncodingEncoder.java @@ -1,11 +1,11 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ConstantEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ConstantEncodingEncoder.java index 1e2f8ce8..3fed04df 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ConstantEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ConstantEncodingEncoder.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -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.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import java.lang.foreign.MemorySegment; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DateExtensionEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DateExtensionEncoder.java index 09b0c202..4c042509 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DateExtensionEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DateExtensionEncoder.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -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.TimeUnit; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.writer.ExtensionEncoder; import java.lang.foreign.MemorySegment; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DateTimePartsEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DateTimePartsEncodingEncoder.java index 5e65a5f8..7cdfd00b 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DateTimePartsEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DateTimePartsEncodingEncoder.java @@ -1,11 +1,11 @@ package io.github.dfa1.vortex.writer.encode; -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.encoding.TimeUnit; -import io.github.dfa1.vortex.proto.ProtoDateTimePartsMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.proto.ProtoDateTimePartsMetadata; import java.lang.foreign.MemorySegment; import java.util.ArrayList; @@ -15,8 +15,8 @@ public final class DateTimePartsEncodingEncoder implements EncodingEncoder { private static final long SECONDS_PER_DAY = 86_400L; - private static final io.github.dfa1.vortex.proto.ProtoPType I64_PROTO = - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I64.ordinal()); + private static final io.github.dfa1.vortex.core.proto.ProtoPType I64_PROTO = + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I64.ordinal()); /// Public no-arg constructor required by [java.util.ServiceLoader]. public DateTimePartsEncodingEncoder() { diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DecimalBytePartsEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DecimalBytePartsEncodingEncoder.java index 8fa40902..d35eea59 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DecimalBytePartsEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DecimalBytePartsEncodingEncoder.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.model.EncodingId; import java.lang.foreign.MemorySegment; -import io.github.dfa1.vortex.proto.ProtoDecimalBytePartsMetadata; +import io.github.dfa1.vortex.core.proto.ProtoDecimalBytePartsMetadata; import java.util.List; @@ -33,7 +33,7 @@ public EncodeResult encode(DType dtype, Object data, EncodeContext ctx) { EncodeResult mspResult = ctx.lookupEncoder(EncodingId.VORTEX_PRIMITIVE).encode(mspDtype, longs, ctx); ProtoDecimalBytePartsMetadata proto = new ProtoDecimalBytePartsMetadata( - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I64.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I64.ordinal()), 0); MemorySegment metaBuf = MemorySegment.ofArray(proto.encode()); diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DecimalEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DecimalEncodingEncoder.java index 3cc772d6..440c6921 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DecimalEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DecimalEncodingEncoder.java @@ -1,9 +1,9 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoDecimalMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoDecimalMetadata; import java.lang.foreign.MemorySegment; import java.util.List; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DeltaEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DeltaEncodingEncoder.java index 207d49ef..bea74c82 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DeltaEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DeltaEncodingEncoder.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.FastLanes; -import io.github.dfa1.vortex.encoding.PrimitiveArrays; -import io.github.dfa1.vortex.proto.ProtoDeltaMetadata; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.compute.FastLanes; +import io.github.dfa1.vortex.core.compute.PrimitiveArrays; +import io.github.dfa1.vortex.core.proto.ProtoDeltaMetadata; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import java.lang.foreign.MemorySegment; import java.util.List; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DictEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DictEncodingEncoder.java index d482ffa2..205645f5 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DictEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/DictEncodingEncoder.java @@ -1,13 +1,13 @@ package io.github.dfa1.vortex.writer.encode; -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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoDictMetadata; -import io.github.dfa1.vortex.proto.ProtoScalarValue; -import io.github.dfa1.vortex.proto.ProtoVarBinMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoDictMetadata; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoVarBinMetadata; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; @@ -144,13 +144,13 @@ private static EncodeResult encodeUtf8(String[] strings, EncodeContext ctx) { byte[] metaBytes = new ProtoDictMetadata( dictSize, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(codePType.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(codePType.ordinal()), null, null ).encode(); byte[] varBinMetaBytes = new ProtoVarBinMetadata( - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I64.ordinal()) + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I64.ordinal()) ).encode(); EncodeNode offsetsNode = EncodeNode.leaf(EncodingId.VORTEX_PRIMITIVE, 1); diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeContext.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeContext.java index b9f0adbc..719d2bd6 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeContext.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeContext.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.writer.WriteRegistry; import java.lang.foreign.Arena; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeNode.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeNode.java index 6a508f4f..be4af6f2 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeNode.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeNode.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import java.lang.foreign.MemorySegment; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeResult.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeResult.java index a8fe1374..5949508c 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeResult.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodeResult.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import java.lang.foreign.MemorySegment; import java.util.List; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodingEncoder.java index 48035beb..434707ef 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/EncodingEncoder.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; /// Write-side surface of an encoding. Exposes only the metadata required to pick an /// encoder for a dtype and the [#encode(DType, Object, EncodeContext)] entry diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ExtEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ExtEncodingEncoder.java index 013e2daa..40e9117c 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ExtEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ExtEncodingEncoder.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; import java.util.List; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FixedSizeListEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FixedSizeListEncodingEncoder.java index 5628ac31..240c4972 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FixedSizeListEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FixedSizeListEncodingEncoder.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FrameOfReferenceEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FrameOfReferenceEncodingEncoder.java index f2e918c8..600a6f8e 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FrameOfReferenceEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FrameOfReferenceEncodingEncoder.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.writer.encode; -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.encoding.PrimitiveArrays; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.compute.PrimitiveArrays; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import java.lang.foreign.MemorySegment; import java.util.List; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FsstEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FsstEncodingEncoder.java index 52a85e09..3468fe7f 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FsstEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/FsstEncodingEncoder.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoFSSTMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoFSSTMetadata; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; @@ -113,8 +113,8 @@ public EncodeResult encode(DType dtype, Object data, EncodeContext ctx) { } byte[] metaBytes = new ProtoFSSTMetadata( - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I32.ordinal()), - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I32.ordinal()) + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I32.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I32.ordinal()) ).encode(); EncodeNode uncompLensNode = EncodeNode.leaf(EncodingId.VORTEX_PRIMITIVE, 3); diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ListEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ListEncodingEncoder.java index 880f8554..33a8992f 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ListEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ListEncodingEncoder.java @@ -1,16 +1,16 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoListMetadata; +import io.github.dfa1.vortex.core.proto.ProtoListMetadata; import java.lang.foreign.MemorySegment; import java.util.ArrayList; @@ -60,7 +60,7 @@ public EncodeResult encode(DType dtype, Object data, EncodeContext ctx) { long elementsLen = ld.offsets()[(int) ld.outerLen()]; byte[] metaBytes = new ProtoListMetadata( elementsLen, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I64.ordinal()) + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I64.ordinal()) ).encode(); EncodeNode root = new EncodeNode( diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ListViewEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ListViewEncodingEncoder.java index 23f679b7..b36f7937 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ListViewEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ListViewEncodingEncoder.java @@ -1,16 +1,16 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoListViewMetadata; +import io.github.dfa1.vortex.core.proto.ProtoListViewMetadata; import java.lang.foreign.MemorySegment; import java.util.ArrayList; @@ -68,8 +68,8 @@ public EncodeResult encode(DType dtype, Object data, EncodeContext ctx) { long elementsLen = java.lang.reflect.Array.getLength(lvd.elements()); byte[] metaBytes = new ProtoListViewMetadata( elementsLen, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I32.ordinal()), - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I32.ordinal()) + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I32.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I32.ordinal()) ).encode(); EncodeNode root = new EncodeNode( diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/MaskedEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/MaskedEncodingEncoder.java index 62758601..a0c4cb63 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/MaskedEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/MaskedEncodingEncoder.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/NullEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/NullEncodingEncoder.java index f5a69344..8b97307d 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/NullEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/NullEncodingEncoder.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.EncodingId; import java.util.List; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PatchedEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PatchedEncodingEncoder.java index 099bf95c..021b20fa 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PatchedEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PatchedEncodingEncoder.java @@ -1,13 +1,13 @@ package io.github.dfa1.vortex.writer.encode; -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.encoding.FastLanes; -import io.github.dfa1.vortex.encoding.PrimitiveArrays; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoPatchedMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.compute.FastLanes; +import io.github.dfa1.vortex.core.compute.PrimitiveArrays; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoPatchedMetadata; import java.lang.foreign.MemorySegment; import java.util.List; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PcoEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PcoEncodingEncoder.java index 9a1f4569..7f164ec1 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PcoEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PcoEncodingEncoder.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.writer.encode; -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.proto.ProtoPcoChunkInfo; -import io.github.dfa1.vortex.proto.ProtoPcoMetadata; -import io.github.dfa1.vortex.proto.ProtoPcoPageInfo; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoPcoChunkInfo; +import io.github.dfa1.vortex.core.proto.ProtoPcoMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPcoPageInfo; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PrimitiveEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PrimitiveEncodingEncoder.java index 825cda7e..55d7abd7 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PrimitiveEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/PrimitiveEncodingEncoder.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; @@ -86,7 +86,7 @@ private static MemorySegment encodePrimitive(PType ptype, Object data, Arena are }; } - /// Computes the serialised min/max [io.github.dfa1.vortex.proto.ProtoScalarValue] pair for a raw + /// Computes the serialised min/max [io.github.dfa1.vortex.core.proto.ProtoScalarValue] pair for a raw /// primitive array, in the same signed/unsigned/float shape the per-segment stats use. Returns /// `null` for an empty array. Shared so the dictionary zone-map path computes per-chunk min/max /// identically to the flat path. @@ -290,7 +290,7 @@ public static byte[][] minMaxStats(PType ptype, Object data) { }; } - /// Computes the serialised SUM [io.github.dfa1.vortex.proto.ProtoScalarValue] for a raw primitive + /// Computes the serialised SUM [io.github.dfa1.vortex.core.proto.ProtoScalarValue] for a raw primitive /// array, in the widened shape Rust uses for zone-map sums: signed ints → `i64`, unsigned ints /// → `u64`, floats → `f64`. Returns `null` on integer overflow (Rust drops the zone's sum) and /// for an empty array. Floats never overflow to `null` (they saturate to infinity). diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/RleEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/RleEncodingEncoder.java index a9478147..40a9025f 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/RleEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/RleEncodingEncoder.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.writer.encode; -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.encoding.PrimitiveArrays; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoRLEMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.compute.PrimitiveArrays; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoRLEMetadata; import java.lang.foreign.MemorySegment; import java.lang.foreign.SegmentAllocator; @@ -87,9 +87,9 @@ public EncodeResult encode(DType dtype, Object data, EncodeContext ctx) { byte[] metaBytes = new ProtoRLEMetadata( globalValuesCount, paddedLen, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(indicesPtype.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(indicesPtype.ordinal()), numChunks, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(offsetsPtype.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(offsetsPtype.ordinal()), 0L ).encode(); @@ -131,9 +131,9 @@ private static EncodeResult encodeEmpty(EncodeContext ctx) { byte[] metaBytes = new ProtoRLEMetadata( 0L, 0L, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(indicesPtype.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(indicesPtype.ordinal()), 0L, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(offsetsPtype.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(offsetsPtype.ordinal()), 0L ).encode(); EncodeNode valuesNode = EncodeNode.leaf(EncodingId.VORTEX_PRIMITIVE, 0); diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/RunEndEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/RunEndEncodingEncoder.java index 9b71328d..0d1c7b6c 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/RunEndEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/RunEndEncodingEncoder.java @@ -1,11 +1,11 @@ package io.github.dfa1.vortex.writer.encode; -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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoRunEndMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoRunEndMetadata; import java.lang.foreign.MemorySegment; import java.util.ArrayList; @@ -90,7 +90,7 @@ public EncodeResult encode(DType dtype, Object data, EncodeContext ctx) { } byte[] metaBytes = new ProtoRunEndMetadata( - io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.U32.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.U32.ordinal()), numRuns, 0L ).encode(); diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/SequenceEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/SequenceEncodingEncoder.java index d5e41a49..75202fb1 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/SequenceEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/SequenceEncodingEncoder.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.writer.encode; -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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; import java.lang.foreign.MemorySegment; -import io.github.dfa1.vortex.proto.ProtoScalarValue; -import io.github.dfa1.vortex.proto.ProtoSequenceMetadata; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoSequenceMetadata; import java.util.List; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/SparseEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/SparseEncodingEncoder.java index 1241ff68..0a79d9ef 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/SparseEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/SparseEncodingEncoder.java @@ -1,13 +1,13 @@ package io.github.dfa1.vortex.writer.encode; -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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; -import io.github.dfa1.vortex.proto.ProtoScalarValue; -import io.github.dfa1.vortex.proto.ProtoSparseMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoSparseMetadata; import java.lang.foreign.MemorySegment; import java.util.ArrayList; @@ -97,7 +97,7 @@ public CascadeStep encodeCascade(DType dtype, Object data, EncodeContext ctx) { ProtoPatchesMetadata patchesMeta = new ProtoPatchesMetadata( numPatches, 0L, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(idxPtype.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(idxPtype.ordinal()), null, null, null @@ -221,7 +221,7 @@ public EncodeResult encode(DType dtype, Object data, EncodeContext ctx) { ProtoPatchesMetadata patchesMeta = new ProtoPatchesMetadata( numPatches, 0L, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(idxPtype.ordinal()), + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(idxPtype.ordinal()), null, null, null diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/StructData.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/StructData.java index 99c86fa3..52a25539 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/StructData.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/StructData.java @@ -3,7 +3,7 @@ import java.util.List; /// Input data for encoding a struct-typed column. -/// `fieldArrays` is parallel to [io.github.dfa1.vortex.core.DType.Struct#fieldTypes()]. +/// `fieldArrays` is parallel to [io.github.dfa1.vortex.core.model.DType.Struct#fieldTypes()]. /// /// @param fieldArrays per-field data arrays in the same order as the struct's field types public record StructData(List fieldArrays) { diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/StructEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/StructEncodingEncoder.java index a13b54f5..f14cbafc 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/StructEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/StructEncodingEncoder.java @@ -1,11 +1,11 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/TimeExtensionEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/TimeExtensionEncoder.java index a60c4ed4..c571ff0e 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/TimeExtensionEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/TimeExtensionEncoder.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.TimeUnit; -import io.github.dfa1.vortex.extension.ExtensionId; -import io.github.dfa1.vortex.extension.TimeDtype; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.model.ExtensionId; +import io.github.dfa1.vortex.core.model.TimeDtype; import io.github.dfa1.vortex.writer.ExtensionEncoder; import java.time.LocalTime; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/TimestampExtensionEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/TimestampExtensionEncoder.java index 9103dbdf..6afd78e3 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/TimestampExtensionEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/TimestampExtensionEncoder.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.TimeUnit; -import io.github.dfa1.vortex.extension.ExtensionId; -import io.github.dfa1.vortex.extension.TimestampDtype; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.model.ExtensionId; +import io.github.dfa1.vortex.core.model.TimestampDtype; import io.github.dfa1.vortex.writer.ExtensionEncoder; import java.time.Instant; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/UuidExtensionEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/UuidExtensionEncoder.java index 2452b24a..5e23a294 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/UuidExtensionEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/UuidExtensionEncoder.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.writer.ExtensionEncoder; import java.lang.foreign.MemorySegment; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VarBinEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VarBinEncodingEncoder.java index 9ed7ea68..72a2c74e 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VarBinEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VarBinEncodingEncoder.java @@ -1,11 +1,11 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoScalarValue; -import io.github.dfa1.vortex.proto.ProtoVarBinMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoVarBinMetadata; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; @@ -53,7 +53,7 @@ public EncodeResult encode(DType dtype, Object data, EncodeContext ctx) { offsetsBuf.setAtIndex(PTypeIO.LE_LONG, (long) i + 1, pos); } - byte[] metaBytes = new ProtoVarBinMetadata(io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I64.ordinal())).encode(); + byte[] metaBytes = new ProtoVarBinMetadata(io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I64.ordinal())).encode(); byte[][] stats = minMaxStats(strings); byte[] statsMin = stats != null ? stats[0] : null; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VarBinViewEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VarBinViewEncodingEncoder.java index 345b4070..dd09b6d2 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VarBinViewEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VarBinViewEncodingEncoder.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VariantData.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VariantData.java index 5bc53a1c..86920f26 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VariantData.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VariantData.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.proto.ProtoScalar; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.proto.ProtoScalar; import java.util.Collections; import java.util.List; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VariantEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VariantEncodingEncoder.java index 72822a9a..1461761a 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VariantEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/VariantEncodingEncoder.java @@ -1,11 +1,11 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoScalar; -import io.github.dfa1.vortex.proto.ProtoScalarValue; -import io.github.dfa1.vortex.proto.ProtoVariantMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoScalar; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoVariantMetadata; import java.lang.foreign.MemorySegment; import java.util.ArrayList; @@ -62,7 +62,7 @@ public EncodeResult encode(DType dtype, Object data, EncodeContext ctx) { : chunkedConstants(runValues, runLengths, ctx, buffers); EncodeNode[] children; - io.github.dfa1.vortex.proto.ProtoDType shreddedProto = null; + io.github.dfa1.vortex.core.proto.ProtoDType shreddedProto = null; if (variantData.shreddedData() != null) { children = new EncodeNode[]{coreStorage, encodeShredded(variantData, ctx, buffers)}; shreddedProto = toProtoDtype(variantData.shreddedDtype()); @@ -101,17 +101,17 @@ private static EncodeNode encodeShredded(VariantData data, EncodeContext ctx, Li } /// Converts a shreddable scalar dtype to its protobuf form for `ProtoVariantMetadata`. - private static io.github.dfa1.vortex.proto.ProtoDType toProtoDtype(DType dtype) { + private static io.github.dfa1.vortex.core.proto.ProtoDType toProtoDtype(DType dtype) { return switch (dtype) { - case DType.Primitive p -> io.github.dfa1.vortex.proto.ProtoDType.ofPrimitive( - new io.github.dfa1.vortex.proto.ProtoPrimitive( - io.github.dfa1.vortex.proto.ProtoPType.fromValue(p.ptype().ordinal()), p.nullable())); - case DType.Bool b -> io.github.dfa1.vortex.proto.ProtoDType.ofBool( - new io.github.dfa1.vortex.proto.ProtoBool(b.nullable())); - case DType.Utf8 u -> io.github.dfa1.vortex.proto.ProtoDType.ofUtf8( - new io.github.dfa1.vortex.proto.ProtoUtf8(u.nullable())); - case DType.Binary bin -> io.github.dfa1.vortex.proto.ProtoDType.ofBinary( - new io.github.dfa1.vortex.proto.ProtoBinary(bin.nullable())); + case DType.Primitive p -> io.github.dfa1.vortex.core.proto.ProtoDType.ofPrimitive( + new io.github.dfa1.vortex.core.proto.ProtoPrimitive( + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(p.ptype().ordinal()), p.nullable())); + case DType.Bool b -> io.github.dfa1.vortex.core.proto.ProtoDType.ofBool( + new io.github.dfa1.vortex.core.proto.ProtoBool(b.nullable())); + case DType.Utf8 u -> io.github.dfa1.vortex.core.proto.ProtoDType.ofUtf8( + new io.github.dfa1.vortex.core.proto.ProtoUtf8(u.nullable())); + case DType.Binary bin -> io.github.dfa1.vortex.core.proto.ProtoDType.ofBinary( + new io.github.dfa1.vortex.core.proto.ProtoBinary(bin.nullable())); default -> throw new VortexException(EncodingId.VORTEX_VARIANT, "shredded dtype not supported: " + dtype); }; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ZigZagEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ZigZagEncodingEncoder.java index 4ef7db43..c9be756a 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ZigZagEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ZigZagEncodingEncoder.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -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.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ZstdEncodingEncoder.java b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ZstdEncodingEncoder.java index 61c6fa73..8065b376 100644 --- a/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ZstdEncodingEncoder.java +++ b/writer/src/main/java/io/github/dfa1/vortex/writer/encode/ZstdEncodingEncoder.java @@ -2,13 +2,13 @@ import io.airlift.compress.v3.zstd.ZstdCompressor; import io.airlift.compress.v3.zstd.ZstdJavaCompressor; -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.encoding.PTypeIO; -import io.github.dfa1.vortex.proto.ProtoZstdFrameMetadata; -import io.github.dfa1.vortex.proto.ProtoZstdMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.proto.ProtoZstdFrameMetadata; +import io.github.dfa1.vortex.core.proto.ProtoZstdMetadata; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/BitpackedEncodingTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/BitpackedEncodingTest.java index d61d34be..d8846576 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/BitpackedEncodingTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/BitpackedEncodingTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.writer.encode.BitpackedEncodingEncoder; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.BitpackedEncodingDecoder; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/ChunkImplTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/ChunkImplTest.java index 84f9f389..97d4fe94 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/ChunkImplTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/ChunkImplTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.writer.encode.NullableData; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/DeltaEncodingTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/DeltaEncodingTest.java index 0864ae41..6d0ca85b 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/DeltaEncodingTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/DeltaEncodingTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.writer.encode.DeltaEncodingEncoder; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.VortexReader; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/DictEncodingTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/DictEncodingTest.java index c242e0c8..b161d1a4 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/DictEncodingTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/DictEncodingTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.encoding.PTypeIO; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.writer.encode.DictEncodingEncoder; import io.github.dfa1.vortex.reader.ReadRegistry; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictF64Test.java b/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictF64Test.java index 033cc3cc..68cc3c1e 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictF64Test.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictF64Test.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.VortexReader; import org.junit.jupiter.api.Test; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictPrimitiveTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictPrimitiveTest.java index 096f256f..199bc91f 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictPrimitiveTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictPrimitiveTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.VortexReader; import org.junit.jupiter.api.Test; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictUtf8Test.java b/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictUtf8Test.java index 75563ae5..1fb94d34 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictUtf8Test.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/GlobalDictUtf8Test.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.VortexReader; import org.junit.jupiter.api.Test; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/MultiChunkUtf8RoundTripTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/MultiChunkUtf8RoundTripTest.java index ffc9f6e7..eff37234 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/MultiChunkUtf8RoundTripTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/MultiChunkUtf8RoundTripTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.Chunk; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.ScanOptions; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/NullCountPruningTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/NullCountPruningTest.java index 23522a31..5d6707b9 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/NullCountPruningTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/NullCountPruningTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.RowFilter; import io.github.dfa1.vortex.reader.ScanOptions; import io.github.dfa1.vortex.reader.VortexReader; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/TypedChunkBuilderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/TypedChunkBuilderTest.java index 305ad629..bb01b886 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/TypedChunkBuilderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/TypedChunkBuilderTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.VortexReader; import org.junit.jupiter.api.Test; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/VortexWriterDictDecisionTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/VortexWriterDictDecisionTest.java index c49519b9..dbee7e16 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/VortexWriterDictDecisionTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/VortexWriterDictDecisionTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.PType; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/VortexWriterTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/VortexWriterTest.java index e0d39986..5dc6c8ec 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/VortexWriterTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/VortexWriterTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.VortexReader; @@ -162,7 +162,7 @@ void writeChunk_roundTripsTimeExtension(@TempDir Path tmp) throws IOException { // TimeExtension.encodeAll; ns / μs branches go through I64 (not asserted here // to keep the test focused — TimeExtension tests cover both). DType.Extension timeDtype = io.github.dfa1.vortex.writer.encode.TimeExtensionEncoder.INSTANCE.dtype( - io.github.dfa1.vortex.encoding.TimeUnit.Milliseconds, false); + io.github.dfa1.vortex.core.model.TimeUnit.Milliseconds, false); var schema = new DType.Struct(List.of("clock"), List.of(timeDtype), false); List times = List.of( java.time.LocalTime.of(0, 0, 0, 0), @@ -191,7 +191,7 @@ void writeChunk_roundTripsTimeExtension(@TempDir Path tmp) throws IOException { void writeChunk_roundTripsTimestampExtension(@TempDir Path tmp) throws IOException { // Given — pre-epoch + epoch + future to exercise sign + boundary; ms resolution DType.Extension tsDtype = io.github.dfa1.vortex.writer.encode.TimestampExtensionEncoder.INSTANCE.dtype( - io.github.dfa1.vortex.encoding.TimeUnit.Milliseconds, null, false); + io.github.dfa1.vortex.core.model.TimeUnit.Milliseconds, null, false); var schema = new DType.Struct(List.of("events"), List.of(tsDtype), false); List instants = List.of( java.time.Instant.ofEpochMilli(-1_500L), @@ -235,7 +235,7 @@ void chunkAs_mismatchedDomainType_throws(@TempDir Path tmp) throws IOException { try (Chunk chunk = iter.next()) { // When / Then — the accessor must fail-fast, not return a wrongly-cast list assertThatThrownBy(() -> chunk.as("birthdays", java.time.Instant.class)) - .isInstanceOf(io.github.dfa1.vortex.core.VortexException.class) + .isInstanceOf(io.github.dfa1.vortex.core.error.VortexException.class) .hasMessageContaining("decodes to LocalDate, not Instant"); } } @@ -274,7 +274,7 @@ void writeChunk_cascadeCompressesTimestampExtensionStorage(@TempDir Path tmp) th // Given — monotonically increasing timestamps that cascade should reduce via // FrameOfReference + Bitpacked. Without cascade, storage stays as flat U64. DType.Extension tsDtype = io.github.dfa1.vortex.writer.encode.TimestampExtensionEncoder.INSTANCE.dtype( - io.github.dfa1.vortex.encoding.TimeUnit.Milliseconds, null, false); + io.github.dfa1.vortex.core.model.TimeUnit.Milliseconds, null, false); var schema = new DType.Struct(List.of("events"), List.of(tsDtype), false); long base = 1_733_000_000_000L; List instants = new ArrayList<>(4096); diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/WriteRegistryTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/WriteRegistryTest.java index 1e1defe5..17e5dd0a 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/WriteRegistryTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/WriteRegistryTest.java @@ -1,8 +1,8 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.extension.ExtensionId; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.model.ExtensionId; import io.github.dfa1.vortex.writer.encode.EncodingEncoder; import org.junit.jupiter.api.Test; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/WriterZoneMapTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/WriterZoneMapTest.java index e722841b..d662ea41 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/WriterZoneMapTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/WriterZoneMapTest.java @@ -1,11 +1,11 @@ package io.github.dfa1.vortex.writer; -import static io.github.dfa1.vortex.encoding.PTypeIO.LE_INT; +import static io.github.dfa1.vortex.core.io.PTypeIO.LE_INT; import java.lang.foreign.MemorySegment; import java.lang.foreign.ValueLayout; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.Layout; import io.github.dfa1.vortex.reader.SegmentSpec; import io.github.dfa1.vortex.reader.VortexReader; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/ZoneMapPruningTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/ZoneMapPruningTest.java index 9d147ed1..911e0810 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/ZoneMapPruningTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/ZoneMapPruningTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.Chunk; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.RowFilter; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/AlpEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/AlpEncodingEncoderTest.java index a70f4e9d..57a0d58d 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/AlpEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/AlpEncodingEncoderTest.java @@ -7,11 +7,11 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoALPMetadata; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.proto.ProtoALPMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; import io.github.dfa1.vortex.reader.decode.AlpEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import org.junit.jupiter.api.Nested; @@ -44,7 +44,7 @@ private static DecodeContext buildAlpCtxF64( ) { ProtoPatchesMetadata pm = patchIndices != null ? new ProtoPatchesMetadata((long) patchIndices.length, 0L, - io.github.dfa1.vortex.proto.ProtoPType.U32, null, null, null) + io.github.dfa1.vortex.core.proto.ProtoPType.U32, null, null, null) : null; byte[] metaBytes = new ProtoALPMetadata(expE, expF, pm).encode(); 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 d5c23571..1de1fc5c 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 @@ -7,7 +7,7 @@ import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoALPRDMetadata; +import io.github.dfa1.vortex.core.proto.ProtoALPRDMetadata; import io.github.dfa1.vortex.reader.decode.AlpRdEncodingDecoder; import io.github.dfa1.vortex.reader.decode.BitpackedEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedConstantPatchesBroadcastTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedConstantPatchesBroadcastTest.java index 72b0f113..18eb4afa 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedConstantPatchesBroadcastTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedConstantPatchesBroadcastTest.java @@ -1,15 +1,15 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; -import io.github.dfa1.vortex.proto.ProtoBitPackedMetadata; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoBitPackedMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import io.github.dfa1.vortex.reader.decode.BitpackedEncodingDecoder; import org.junit.jupiter.api.Test; @@ -39,7 +39,7 @@ void bitpackedDecode_withConstantPatchesValues_broadcastsValueAcrossPatches() { byte[] valScalarBytes = valScalar.encode(); ProtoPatchesMetadata patches = new ProtoPatchesMetadata(numPatches, 0, - io.github.dfa1.vortex.proto.ProtoPType.U32, null, null, null); + io.github.dfa1.vortex.core.proto.ProtoPType.U32, null, null, null); ProtoBitPackedMetadata meta = new ProtoBitPackedMetadata(1, 0, patches); MemorySegment metaBuf = MemorySegment.ofArray(meta.encode()); diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingEncoderTest.java index 4fa451f9..dec4d11f 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingEncoderTest.java @@ -4,10 +4,10 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoBitPackedMetadata; +import io.github.dfa1.vortex.core.proto.ProtoBitPackedMetadata; import io.github.dfa1.vortex.reader.decode.BitpackedEncodingDecoder; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingPatchesTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingPatchesTest.java index d3eb3bed..3c643ca5 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingPatchesTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/BitpackedEncodingPatchesTest.java @@ -5,12 +5,12 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoBitPackedMetadata; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.proto.ProtoBitPackedMetadata; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; import io.github.dfa1.vortex.reader.decode.BitpackedEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import org.junit.jupiter.api.Nested; @@ -42,7 +42,7 @@ void decode_appliesPatches_overridingBitPackedValues() { byte[] packedBytes = packedSeg.toArray(java.lang.foreign.ValueLayout.JAVA_BYTE); ProtoPatchesMetadata patches = new ProtoPatchesMetadata(2L, 0L, - io.github.dfa1.vortex.proto.ProtoPType.U32, null, null, null); + io.github.dfa1.vortex.core.proto.ProtoPType.U32, null, null, null); byte[] metaBytes = new ProtoBitPackedMetadata(6, 0, patches).encode(); byte[] idxBuf = new byte[2 * 4]; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/CascadingCompressorTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/CascadingCompressorTest.java index aaa173e3..8809a9be 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/CascadingCompressorTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/CascadingCompressorTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.DoubleArray; import io.github.dfa1.vortex.reader.array.FloatArray; @@ -8,7 +8,7 @@ import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.decode.DecodeContext; import io.github.dfa1.vortex.encoding.DTypes; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ChunkedEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ChunkedEncodingEncoderTest.java index 2f2da420..20eb253a 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ChunkedEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ChunkedEncodingEncoderTest.java @@ -1,13 +1,13 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; import io.github.dfa1.vortex.reader.decode.ChunkedEncodingDecoder; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DateTimePartsEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DateTimePartsEncodingEncoderTest.java index 03fb8b65..f6ac5ffa 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DateTimePartsEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DateTimePartsEncodingEncoderTest.java @@ -1,16 +1,16 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.encoding.TimeUnit; -import io.github.dfa1.vortex.proto.ProtoDateTimePartsMetadata; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.proto.ProtoDateTimePartsMetadata; import io.github.dfa1.vortex.reader.decode.DateTimePartsEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import org.junit.jupiter.api.Nested; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecimalBytePartsEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecimalBytePartsEncodingEncoderTest.java index 12cfba71..0e373733 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecimalBytePartsEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecimalBytePartsEncodingEncoderTest.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.LazyDecimalBytePartsArray; import io.github.dfa1.vortex.reader.decode.DecodeContext; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoDecimalBytePartsMetadata; +import io.github.dfa1.vortex.core.proto.ProtoDecimalBytePartsMetadata; import io.github.dfa1.vortex.reader.decode.DecimalBytePartsEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import org.junit.jupiter.api.Test; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecimalEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecimalEncodingEncoderTest.java index 4224703d..6e3306db 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecimalEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecimalEncodingEncoderTest.java @@ -1,15 +1,15 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; import io.github.dfa1.vortex.encoding.TestSegments; -import io.github.dfa1.vortex.proto.ProtoDecimalMetadata; +import io.github.dfa1.vortex.core.proto.ProtoDecimalMetadata; import io.github.dfa1.vortex.reader.decode.DecimalEncodingDecoder; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecodeTestHelper.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecodeTestHelper.java index 5c9ab806..d1afde8d 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecodeTestHelper.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DecodeTestHelper.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.reader.decode.DecodeContext; 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 f6d35732..05e88c82 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 @@ -1,16 +1,16 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoDeltaMetadata; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoDeltaMetadata; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import io.github.dfa1.vortex.reader.decode.DeltaEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import org.junit.jupiter.api.Test; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DictEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DictEncodingEncoderTest.java index adaacb68..817a36c5 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DictEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/DictEncodingEncoderTest.java @@ -5,10 +5,10 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoDictMetadata; +import io.github.dfa1.vortex.core.proto.ProtoDictMetadata; import io.github.dfa1.vortex.reader.decode.DictEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import io.github.dfa1.vortex.reader.decode.VarBinEncodingDecoder; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ExtEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ExtEncodingEncoderTest.java index 37868156..99a11cdf 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ExtEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ExtEncodingEncoderTest.java @@ -1,11 +1,11 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; import io.github.dfa1.vortex.encoding.TestSegments; @@ -113,7 +113,7 @@ void encodeCascade_rejectsNonExtensionDtype() { org.assertj.core.api.Assertions.assertThatThrownBy(() -> ENCODER.encodeCascade(DType.I64, new long[]{1L}, EncodeTestHelper.testCtx())) - .isInstanceOf(io.github.dfa1.vortex.core.VortexException.class) + .isInstanceOf(io.github.dfa1.vortex.core.error.VortexException.class) .hasMessageContaining("expected extension dtype"); } } diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FixedSizeListEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FixedSizeListEncodingEncoderTest.java index 144f2f85..7eb4066a 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FixedSizeListEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FixedSizeListEncodingEncoderTest.java @@ -1,13 +1,13 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.FixedSizeListArray; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; import io.github.dfa1.vortex.reader.decode.FixedSizeListEncodingDecoder; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FrameOfReferenceEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FrameOfReferenceEncodingEncoderTest.java index 0e078014..c9f62c0b 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FrameOfReferenceEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FrameOfReferenceEncodingEncoderTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.array.LongArray; @@ -10,10 +10,10 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; import io.github.dfa1.vortex.reader.decode.BoolEncodingDecoder; import io.github.dfa1.vortex.reader.decode.FrameOfReferenceEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FsstEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FsstEncodingEncoderTest.java index 73d43711..1246e1cd 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FsstEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/FsstEncodingEncoderTest.java @@ -1,17 +1,17 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.PType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.VarBinArray; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoFSSTMetadata; +import io.github.dfa1.vortex.core.proto.ProtoFSSTMetadata; import io.github.dfa1.vortex.reader.decode.FsstEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import org.junit.jupiter.api.Nested; @@ -154,7 +154,7 @@ private static DecodeContext buildCtx( MemorySegment[] segs = {symBuf, symLenBuf, compBuf, uncompLenBuf, codesOffBuf}; - byte[] metaBytes = new ProtoFSSTMetadata(io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I32.ordinal()), io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I32.ordinal())).encode(); + byte[] metaBytes = new ProtoFSSTMetadata(io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I32.ordinal()), io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I32.ordinal())).encode(); ArrayNode uncompLensNode = ArrayNode.of( EncodingId.VORTEX_PRIMITIVE, null, new ArrayNode[0], new int[]{3}); diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ListEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ListEncodingEncoderTest.java index 33a1378d..67de3277 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ListEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ListEncodingEncoderTest.java @@ -7,10 +7,10 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoListMetadata; +import io.github.dfa1.vortex.core.proto.ProtoListMetadata; import io.github.dfa1.vortex.reader.decode.ListEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import org.junit.jupiter.api.Nested; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ListViewEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ListViewEncodingEncoderTest.java index f4c93a21..a304da71 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ListViewEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ListViewEncodingEncoderTest.java @@ -6,11 +6,11 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestDecodeContexts; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoListViewMetadata; +import io.github.dfa1.vortex.core.proto.ProtoListViewMetadata; import io.github.dfa1.vortex.reader.decode.ListViewEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import org.junit.jupiter.api.Nested; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/MaskedEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/MaskedEncodingEncoderTest.java index e1bd409a..b0f158d7 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/MaskedEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/MaskedEncodingEncoderTest.java @@ -1,14 +1,14 @@ package io.github.dfa1.vortex.writer.encode; -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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.array.MaskedArray; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; import io.github.dfa1.vortex.reader.decode.BoolEncodingDecoder; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/NullEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/NullEncodingEncoderTest.java index 1ccc6153..a35a508e 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/NullEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/NullEncodingEncoderTest.java @@ -5,7 +5,7 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.NullEncodingDecoder; import org.junit.jupiter.api.Nested; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PatchedEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PatchedEncodingEncoderTest.java index 04af8ae2..0a6326b0 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PatchedEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PatchedEncodingEncoderTest.java @@ -1,10 +1,10 @@ package io.github.dfa1.vortex.writer.encode; -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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.encoding.DTypes; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.ByteArray; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PcoEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PcoEncodingEncoderTest.java index 4cbae3cb..3fc43875 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PcoEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PcoEncodingEncoderTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.decode.DecodeContext; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PrimitiveEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PrimitiveEncodingEncoderTest.java index f72a3e56..a053a3a2 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PrimitiveEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/PrimitiveEncodingEncoderTest.java @@ -1,14 +1,14 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.array.MaskedArray; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; import io.github.dfa1.vortex.encoding.TestSegments; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RandomAccessTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RandomAccessTest.java index ae7dda42..3f809079 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RandomAccessTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RandomAccessTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.encoding.DTypes; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RleEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RleEncodingEncoderTest.java index 78035d94..60eeff12 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RleEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RleEncodingEncoderTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.array.MaskedArray; @@ -8,11 +8,11 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.decode.KnownArrayNode; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoRLEMetadata; +import io.github.dfa1.vortex.core.proto.ProtoRLEMetadata; import io.github.dfa1.vortex.reader.decode.BoolEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import io.github.dfa1.vortex.reader.decode.RleEncodingDecoder; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RoundTripPropertyTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RoundTripPropertyTest.java index 7a20f26c..680f705b 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RoundTripPropertyTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RoundTripPropertyTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.array.Array; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RunEndEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RunEndEncodingEncoderTest.java index d3ce1829..d0566e11 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RunEndEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/RunEndEncodingEncoderTest.java @@ -1,16 +1,16 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoRunEndMetadata; +import io.github.dfa1.vortex.core.proto.ProtoRunEndMetadata; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import io.github.dfa1.vortex.reader.decode.RunEndEncodingDecoder; import org.junit.jupiter.api.Nested; @@ -39,7 +39,7 @@ private static DecodeContext buildCtx( long[] ends, long[] values, PType endsPtype, long offset ) { byte[] metaBytes = new ProtoRunEndMetadata( - io.github.dfa1.vortex.proto.ProtoPType.fromValue(endsPtype.ordinal()), ends.length, offset).encode(); + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(endsPtype.ordinal()), ends.length, offset).encode(); byte[] endsBuf = toLEBytes(ends, endsPtype); byte[] valBuf = toLEBytes(values, PType.I64); diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/SequenceEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/SequenceEncodingEncoderTest.java index 46c2503e..e8d1f348 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/SequenceEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/SequenceEncodingEncoderTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.ByteArray; import io.github.dfa1.vortex.reader.array.DoubleArray; @@ -14,10 +14,10 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; -import io.github.dfa1.vortex.proto.ProtoScalarValue; -import io.github.dfa1.vortex.proto.ProtoSequenceMetadata; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoSequenceMetadata; import io.github.dfa1.vortex.reader.decode.SequenceEncodingDecoder; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/SparseEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/SparseEncodingEncoderTest.java index 44d32e94..7baff9f3 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/SparseEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/SparseEncodingEncoderTest.java @@ -1,7 +1,7 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.PType; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.BoolArray; import io.github.dfa1.vortex.reader.array.DoubleArray; @@ -11,14 +11,14 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoNullValue; -import io.github.dfa1.vortex.proto.ProtoPatchesMetadata; -import io.github.dfa1.vortex.proto.ProtoScalarValue; -import io.github.dfa1.vortex.proto.ProtoSparseMetadata; -import io.github.dfa1.vortex.proto.ProtoVarBinMetadata; +import io.github.dfa1.vortex.core.proto.ProtoNullValue; +import io.github.dfa1.vortex.core.proto.ProtoPatchesMetadata; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoSparseMetadata; +import io.github.dfa1.vortex.core.proto.ProtoVarBinMetadata; import io.github.dfa1.vortex.reader.decode.BoolEncodingDecoder; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import io.github.dfa1.vortex.reader.decode.SparseEncodingDecoder; @@ -194,7 +194,7 @@ private static DecodeContext buildCtx(DType dtype, long rowCount, private static byte[] buildSparseMetaBytes(long numPatches, long offset, PType idxPtype) { ProtoPatchesMetadata patchesMeta = new ProtoPatchesMetadata(numPatches, offset, - io.github.dfa1.vortex.proto.ProtoPType.fromValue(idxPtype.ordinal()), null, null, null); + io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(idxPtype.ordinal()), null, null, null); return new ProtoSparseMetadata(patchesMeta).encode(); } @@ -346,7 +346,7 @@ void decode_utf8_withPatches_writesStringsAtIndices() { byte[] idxBuf = toLEBytes(new long[]{1L, 3L}, PType.U32); byte[] strBytes = "hibye".getBytes(StandardCharsets.UTF_8); byte[] offsets = intLEBytes(new int[]{0, 2, 5}); - byte[] varBinMeta = new ProtoVarBinMetadata(io.github.dfa1.vortex.proto.ProtoPType.fromValue(PType.I32.ordinal())).encode(); + byte[] varBinMeta = new ProtoVarBinMetadata(io.github.dfa1.vortex.core.proto.ProtoPType.fromValue(PType.I32.ordinal())).encode(); ArrayNode offsetsNode = ArrayNode.of(EncodingId.VORTEX_PRIMITIVE, null, new ArrayNode[0], new int[]{3}); diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/StructEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/StructEncodingEncoderTest.java index 69c00f33..9f9ab1f3 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/StructEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/StructEncodingEncoderTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.array.MaskedArray; @@ -9,8 +9,8 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; import io.github.dfa1.vortex.encoding.TestSegments; @@ -106,7 +106,7 @@ void fieldCountMismatch_throwsVortexException() { // When // Then org.junit.jupiter.api.Assertions.assertThrows( - io.github.dfa1.vortex.core.VortexException.class, + io.github.dfa1.vortex.core.error.VortexException.class, () -> ENCODER.encode(dtype, data, EncodeTestHelper.testCtx())); } } diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/TimeExtensionEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/TimeExtensionEncoderTest.java index bf8420be..ed6687c1 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/TimeExtensionEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/TimeExtensionEncoderTest.java @@ -1,11 +1,11 @@ package io.github.dfa1.vortex.writer.encode; -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.TimeUnit; -import io.github.dfa1.vortex.extension.ExtensionId; -import io.github.dfa1.vortex.extension.TimeDtype; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.TimeUnit; +import io.github.dfa1.vortex.core.model.ExtensionId; +import io.github.dfa1.vortex.core.model.TimeDtype; import org.junit.jupiter.api.Test; import java.lang.foreign.MemorySegment; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VarBinEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VarBinEncodingEncoderTest.java index 712b3f41..66811f87 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VarBinEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VarBinEncodingEncoderTest.java @@ -1,16 +1,16 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.VarBinArray; import io.github.dfa1.vortex.reader.decode.ArrayNode; import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoVarBinMetadata; +import io.github.dfa1.vortex.core.proto.ProtoVarBinMetadata; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; import io.github.dfa1.vortex.reader.decode.VarBinEncodingDecoder; import org.junit.jupiter.api.Nested; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VarBinViewEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VarBinViewEncodingEncoderTest.java index d02b47ae..9a99a453 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VarBinViewEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VarBinViewEncodingEncoderTest.java @@ -5,8 +5,8 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.encoding.PTypeIO; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.io.PTypeIO; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; import io.github.dfa1.vortex.reader.decode.VarBinViewEncodingDecoder; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VariantEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VariantEncodingEncoderTest.java index 6dccc2ea..c378dee5 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VariantEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/VariantEncodingEncoderTest.java @@ -1,12 +1,12 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; -import io.github.dfa1.vortex.core.VortexException; -import io.github.dfa1.vortex.encoding.EncodingId; -import io.github.dfa1.vortex.proto.ProtoPrimitive; -import io.github.dfa1.vortex.proto.ProtoScalar; -import io.github.dfa1.vortex.proto.ProtoScalarValue; -import io.github.dfa1.vortex.proto.ProtoVariantMetadata; +import io.github.dfa1.vortex.core.model.DType; +import io.github.dfa1.vortex.core.error.VortexException; +import io.github.dfa1.vortex.core.model.EncodingId; +import io.github.dfa1.vortex.core.proto.ProtoPrimitive; +import io.github.dfa1.vortex.core.proto.ProtoScalar; +import io.github.dfa1.vortex.core.proto.ProtoScalarValue; +import io.github.dfa1.vortex.core.proto.ProtoVariantMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -26,8 +26,8 @@ private static ProtoScalar i32Scalar(long value) { // Inner typed scalar carrying its own i32 dtype, wrapped as a variant value // (mirrors Rust ProtoScalar::variant(ProtoScalar::primitive(value))). return new ProtoScalar( - io.github.dfa1.vortex.proto.ProtoDType.ofPrimitive( - new ProtoPrimitive(io.github.dfa1.vortex.proto.ProtoPType.I32, false)), + io.github.dfa1.vortex.core.proto.ProtoDType.ofPrimitive( + new ProtoPrimitive(io.github.dfa1.vortex.core.proto.ProtoPType.I32, false)), ProtoScalarValue.ofInt64Value(value)); } @@ -43,7 +43,7 @@ class Accepts { @Test void trueForVariant_falseForPrimitive() { assertThat(SUT.accepts(VARIANT)).isTrue(); - assertThat(SUT.accepts(new DType.Primitive(io.github.dfa1.vortex.core.PType.I64, false))).isFalse(); + assertThat(SUT.accepts(new DType.Primitive(io.github.dfa1.vortex.core.model.PType.I64, false))).isFalse(); } } @@ -178,7 +178,7 @@ void constantColumn_decodesToBroadcastInnerValues() { assertThat(variant.length()).isEqualTo(4); assertThat(variant.shredded()).isNull(); var core = (io.github.dfa1.vortex.reader.array.IntArray) variant.coreStorage(); - assertThat(core.dtype()).isEqualTo(new DType.Primitive(io.github.dfa1.vortex.core.PType.I32, false)); + assertThat(core.dtype()).isEqualTo(new DType.Primitive(io.github.dfa1.vortex.core.model.PType.I32, false)); for (long i = 0; i < 4; i++) { assertThat(core.getInt(i)).isEqualTo(7); } @@ -200,7 +200,7 @@ void varyingColumn_decodesPerRowValuesInOrder() { @Test void shreddedColumn_decodesShreddedTypedChild() { // Given/When a column with a shredded i32 projection is encoded then decoded - DType i32 = new DType.Primitive(io.github.dfa1.vortex.core.PType.I32, false); + DType i32 = new DType.Primitive(io.github.dfa1.vortex.core.model.PType.I32, false); var data = VariantData.shredded( List.of(i32Scalar(10L), i32Scalar(20L), i32Scalar(30L)), new int[]{10, 20, 30}, i32); var variant = decode(SUT.encode(VARIANT, data, EncodeTestHelper.testCtx()), 3); @@ -221,7 +221,7 @@ class Shredded { @Test void emitsSecondChildAndRecordsShreddedDtype() throws Exception { // Given a column with a shredded i32 projection - DType i32 = new DType.Primitive(io.github.dfa1.vortex.core.PType.I32, false); + DType i32 = new DType.Primitive(io.github.dfa1.vortex.core.model.PType.I32, false); var data = VariantData.shredded( List.of(i32Scalar(10L), i32Scalar(20L), i32Scalar(30L)), new int[]{10, 20, 30}, i32); @@ -238,7 +238,7 @@ void emitsSecondChildAndRecordsShreddedDtype() throws Exception { ProtoVariantMetadata vm = ProtoVariantMetadata.decode(meta, 0, meta.byteSize()); assertThat(vm.shredded_dtype()).isNotNull(); assertThat(vm.shredded_dtype().primitive()).isNotNull(); - assertThat(vm.shredded_dtype().primitive().type()).isEqualTo(io.github.dfa1.vortex.proto.ProtoPType.I32); + assertThat(vm.shredded_dtype().primitive().type()).isEqualTo(io.github.dfa1.vortex.core.proto.ProtoPType.I32); } @Test @@ -258,7 +258,7 @@ class Errors { void wrongDtype_throws() { VariantData data = VariantData.constant(1, i32Scalar(1L)); assertThatThrownBy(() -> SUT.encode( - new DType.Primitive(io.github.dfa1.vortex.core.PType.I64, false), data, EncodeTestHelper.testCtx())) + new DType.Primitive(io.github.dfa1.vortex.core.model.PType.I64, false), data, EncodeTestHelper.testCtx())) .isInstanceOf(VortexException.class) .hasMessageContaining("Variant dtype"); } diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ZigZagEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ZigZagEncodingEncoderTest.java index b9f31755..d87a4b0a 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ZigZagEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ZigZagEncodingEncoderTest.java @@ -1,6 +1,6 @@ package io.github.dfa1.vortex.writer.encode; -import io.github.dfa1.vortex.core.DType; +import io.github.dfa1.vortex.core.model.DType; import io.github.dfa1.vortex.reader.array.Array; import io.github.dfa1.vortex.reader.array.ByteArray; import io.github.dfa1.vortex.reader.array.IntArray; @@ -10,7 +10,7 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; import io.github.dfa1.vortex.reader.decode.PrimitiveEncodingDecoder; diff --git a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ZstdEncodingEncoderTest.java b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ZstdEncodingEncoderTest.java index d12aa3f6..0b06499d 100644 --- a/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ZstdEncodingEncoderTest.java +++ b/writer/src/test/java/io/github/dfa1/vortex/writer/encode/ZstdEncodingEncoderTest.java @@ -2,9 +2,9 @@ import io.airlift.compress.v3.zstd.ZstdCompressor; import io.airlift.compress.v3.zstd.ZstdJavaCompressor; -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.core.model.DType; +import io.github.dfa1.vortex.core.model.PType; +import io.github.dfa1.vortex.core.error.VortexException; import io.github.dfa1.vortex.reader.array.IntArray; import io.github.dfa1.vortex.reader.array.LongArray; import io.github.dfa1.vortex.reader.array.MaskedArray; @@ -13,11 +13,11 @@ import io.github.dfa1.vortex.encoding.DTypes; import io.github.dfa1.vortex.reader.decode.DecodeContext; -import io.github.dfa1.vortex.encoding.EncodingId; +import io.github.dfa1.vortex.core.model.EncodingId; import io.github.dfa1.vortex.reader.ReadRegistry; import io.github.dfa1.vortex.reader.decode.TestRegistry; -import io.github.dfa1.vortex.proto.ProtoZstdFrameMetadata; -import io.github.dfa1.vortex.proto.ProtoZstdMetadata; +import io.github.dfa1.vortex.core.proto.ProtoZstdFrameMetadata; +import io.github.dfa1.vortex.core.proto.ProtoZstdMetadata; import io.github.dfa1.vortex.reader.decode.BoolEncodingDecoder; import io.github.dfa1.vortex.reader.decode.ZstdEncodingDecoder; import org.junit.jupiter.api.Nested;