Skip to content

Commit 060e1db

Browse files
dfa1claude
dfa1
and
claude
committed
refactor(reader): merge io + scan into single reader package
io.github.dfa1.vortex.io -> io.github.dfa1.vortex.reader io.github.dfa1.vortex.scan -> io.github.dfa1.vortex.reader Moves 9 main + 10 test files via git mv (history preserved); rewrites package decls + imports across all modules; drops self-imports the merge made redundant. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent ceb93f8 commit 060e1db

53 files changed

Lines changed: 109 additions & 121 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cli/src/main/java/io/github/dfa1/vortex/cli/CountCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.dfa1.vortex.cli;
22

3-
import io.github.dfa1.vortex.io.VortexReader;
3+
import io.github.dfa1.vortex.reader.VortexReader;
44

55
import java.io.IOException;
66
import java.nio.file.Files;

‎cli/src/main/java/io/github/dfa1/vortex/cli/FilterCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import io.github.dfa1.vortex.csv.CsvExporter;
1313
import io.github.dfa1.vortex.csv.ExportOptions;
1414
import io.github.dfa1.vortex.csv.RowPredicate;
15-
import io.github.dfa1.vortex.scan.RowFilter;
16-
import io.github.dfa1.vortex.scan.ScanOptions;
15+
import io.github.dfa1.vortex.reader.RowFilter;
16+
import io.github.dfa1.vortex.reader.ScanOptions;
1717

1818
import java.io.IOException;
1919
import java.io.OutputStreamWriter;

‎cli/src/main/java/io/github/dfa1/vortex/cli/InspectCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.dfa1.vortex.cli;
22

33
import io.github.dfa1.vortex.inspect.VortexInspector;
4-
import io.github.dfa1.vortex.io.VortexHandle;
5-
import io.github.dfa1.vortex.io.VortexHttpReader;
6-
import io.github.dfa1.vortex.io.VortexReader;
4+
import io.github.dfa1.vortex.reader.VortexHandle;
5+
import io.github.dfa1.vortex.reader.VortexHttpReader;
6+
import io.github.dfa1.vortex.reader.VortexReader;
77

88
import java.io.IOException;
99
import java.net.URI;

‎cli/src/main/java/io/github/dfa1/vortex/cli/SchemaCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.dfa1.vortex.cli;
22

33
import io.github.dfa1.vortex.core.DType;
4-
import io.github.dfa1.vortex.io.VortexReader;
4+
import io.github.dfa1.vortex.reader.VortexReader;
55

66
import java.io.IOException;
77
import java.nio.file.Files;

‎cli/src/main/java/io/github/dfa1/vortex/cli/StatsCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import io.github.dfa1.vortex.core.ArrayStats;
44
import io.github.dfa1.vortex.core.DType;
5-
import io.github.dfa1.vortex.io.VortexReader;
5+
import io.github.dfa1.vortex.reader.VortexReader;
66

77
import java.io.IOException;
88
import java.nio.file.Files;

‎cli/src/main/java/io/github/dfa1/vortex/cli/TuiCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import io.github.dfa1.vortex.cli.tui.IoWorker;
44
import io.github.dfa1.vortex.cli.tui.VortexInspectorTui;
55
import io.github.dfa1.vortex.inspect.InspectorTree;
6-
import io.github.dfa1.vortex.io.VortexHandle;
7-
import io.github.dfa1.vortex.io.VortexHttpReader;
8-
import io.github.dfa1.vortex.io.VortexReader;
6+
import io.github.dfa1.vortex.reader.VortexHandle;
7+
import io.github.dfa1.vortex.reader.VortexHttpReader;
8+
import io.github.dfa1.vortex.reader.VortexReader;
99

1010
import java.io.IOException;
1111
import java.io.PrintStream;

‎cli/src/main/java/io/github/dfa1/vortex/cli/tui/IoWorker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.concurrent.LinkedBlockingQueue;
55
import java.util.concurrent.atomic.AtomicInteger;
66

7-
/// Single-threaded I/O executor that owns one {@link io.github.dfa1.vortex.io.VortexHandle}.
7+
/// Single-threaded I/O executor that owns one {@link io.github.dfa1.vortex.reader.VortexHandle}.
88
///
99
/// Vortex readers use a confined {@link java.lang.foreign.Arena}, so every
1010
/// {@code slice()} / {@code scan()} call must happen on the same thread that

‎cli/src/main/java/io/github/dfa1/vortex/cli/tui/VortexInspectorTui.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import io.github.dfa1.vortex.cli.tui.term.Key;
1818
import io.github.dfa1.vortex.cli.tui.term.Terminal;
1919
import io.github.dfa1.vortex.inspect.InspectorTree;
20-
import io.github.dfa1.vortex.io.VortexHandle;
21-
import io.github.dfa1.vortex.scan.Chunk;
22-
import io.github.dfa1.vortex.scan.ScanIterator;
23-
import io.github.dfa1.vortex.scan.ScanOptions;
20+
import io.github.dfa1.vortex.reader.VortexHandle;
21+
import io.github.dfa1.vortex.reader.Chunk;
22+
import io.github.dfa1.vortex.reader.ScanIterator;
23+
import io.github.dfa1.vortex.reader.ScanOptions;
2424

2525
import java.io.IOException;
2626
import java.lang.foreign.MemorySegment;

‎csv/src/main/java/io/github/dfa1/vortex/csv/CsvExporter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
import io.github.dfa1.vortex.core.array.LongArray;
1313
import io.github.dfa1.vortex.core.array.ShortArray;
1414
import io.github.dfa1.vortex.core.array.VarBinArray;
15-
import io.github.dfa1.vortex.io.VortexReader;
16-
import io.github.dfa1.vortex.scan.ScanIterator;
17-
import io.github.dfa1.vortex.scan.ScanOptions;
18-
import io.github.dfa1.vortex.scan.Chunk;
15+
import io.github.dfa1.vortex.reader.VortexReader;
16+
import io.github.dfa1.vortex.reader.ScanIterator;
17+
import io.github.dfa1.vortex.reader.ScanOptions;
18+
import io.github.dfa1.vortex.reader.Chunk;
1919

2020
import java.io.FilterWriter;
2121
import java.io.IOException;

‎csv/src/main/java/io/github/dfa1/vortex/csv/RowPredicate.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.dfa1.vortex.csv;
22

3-
import io.github.dfa1.vortex.scan.Chunk;
3+
import io.github.dfa1.vortex.reader.Chunk;
44

55
/// Row-level predicate evaluated against decoded chunk data.
66
/// Used in conjunction with zone-map pruning: zone-maps skip whole chunks,

0 commit comments

Comments
 (0)