test(integration): finish OHLC test-data dedup onto OhlcData.Batch

Drop the integration OhlcGenerator/OhlcBatch adapter and switch the JNI
round-trip callers (FileSizeComparisonIntegrationTest,
JavaWritesRustReadsIntegrationTest) to core.testing.OhlcData.Batch
directly, so the OHLC shape is single-sourced rather than mirrored.

Verified against the JNI integration suite (OHLC round-trips + file-size
comparison, native libs present).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: dfa1

TODO.md

@@ -6,16 +6,6 @@
 - [ ] Create website
    - build something like hardwood.dev but for vortex files
 
-## Testing
-
-- [ ] **Finish OHLC test-data dedup** — the random-walk generator is single-sourced in
-  `core.testing.OhlcData` (core test-jar). `integration`'s `OhlcGenerator` is now a thin adapter
-  that maps `OhlcData.Batch` to its own `OhlcBatch` (`symbols`/`dates` field names) only to avoid
-  churning the JNI/Arrow callers. Align fully: drop `OhlcGenerator`/`OhlcBatch`, switch the
-  integration callers (`FileSizeComparisonIntegrationTest`, `JavaWritesRustReadsIntegrationTest`)
-  to `OhlcData.Batch` directly so there is one shape, not two. Verify with the JNI integration
-  suite (needs vortex-jni native libs).
-
 ## Performance
 
 - [ ] **Benchmark publishing** — drop CI workflow, add `bench-publish` script; see [ADR-0006](docs/adr/0006-benchmark-publishing.md).

integration/src/test/java/io/github/dfa1/vortex/integration/FileSizeComparisonIntegrationTest.java

@@ -4,6 +4,7 @@
 import dev.vortex.arrow.ArrowAllocation;
 import dev.vortex.jni.NativeLoader;
 import io.github.dfa1.vortex.core.model.DType;
+import io.github.dfa1.vortex.core.testing.OhlcData;
 import io.github.dfa1.vortex.reader.array.LongArray;
 import io.github.dfa1.vortex.reader.ReadRegistry;
 import io.github.dfa1.vortex.reader.VortexReader;
@@ -83,13 +84,13 @@ class FileSizeComparisonIntegrationTest {
 
     // ── Writers ───────────────────────────────────────────────────────────────
 
-    private static Path writeCsv(Path dir, List<OhlcGenerator.OhlcBatch> batches) throws IOException {
+    private static Path writeCsv(Path dir, List<OhlcData.Batch> batches) throws IOException {
         Path file = dir.resolve("ohlc.csv");
         try (BufferedWriter csv = Files.newBufferedWriter(file)) {
             csv.write("symbol,date,open,high,low,close,volume\n");
-            for (OhlcGenerator.OhlcBatch b : batches) {
-                for (int i = 0; i < b.dates().length; i++) {
-                    csv.write(b.symbols()[i] + "," + LocalDate.ofEpochDay(b.dates()[i]) + ","
+            for (OhlcData.Batch b : batches) {
+                for (int i = 0; i < b.date().length; i++) {
+                    csv.write(b.symbol()[i] + "," + LocalDate.ofEpochDay(b.date()[i]) + ","
                                       + b.open()[i] + "," + b.high()[i] + ","
                                       + b.low()[i] + "," + b.close()[i] + "," + b.volume()[i] + "\n");
                 }
@@ -98,41 +99,41 @@ private static Path writeCsv(Path dir, List<OhlcGenerator.OhlcBatch> batches) th
         return file;
     }
 
-    private static Path writeJava(Path dir, List<OhlcGenerator.OhlcBatch> batches) throws IOException {
+    private static Path writeJava(Path dir, List<OhlcData.Batch> batches) throws IOException {
         return writeJava(dir, "ohlc-java.vtx", WriteOptions.cascading(3), batches);
     }
 
-    private static Path writeJavaZstd(Path dir, List<OhlcGenerator.OhlcBatch> batches) throws IOException {
+    private static Path writeJavaZstd(Path dir, List<OhlcData.Batch> batches) throws IOException {
         return writeJava(dir, "ohlc-java-zstd.vtx", WriteOptions.cascading(3).withZstd(true), batches);
     }
 
     private static Path writeJavaGlobalDict(Path dir, boolean globalDict,
-            List<OhlcGenerator.OhlcBatch> batches) throws IOException {
+            List<OhlcData.Batch> batches) throws IOException {
         String name = globalDict ? "ohlc-java-globaldict.vtx" : "ohlc-java-perchunkdict.vtx";
         return writeJava(dir, name, WriteOptions.cascading(3).withGlobalDict(globalDict), batches);
     }
 
     private static Path writeJava(Path dir, String filename, WriteOptions opts,
-            List<OhlcGenerator.OhlcBatch> batches) throws IOException {
+            List<OhlcData.Batch> batches) throws IOException {
         Path file = dir.resolve(filename);
         try (FileChannel ch = FileChannel.open(file, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
              VortexWriter writer = VortexWriter.create(ch, JAVA_SCHEMA, opts)) {
-            for (OhlcGenerator.OhlcBatch b : batches) {
+            for (OhlcData.Batch b : batches) {
                 writer.writeChunk(Map.of(
-                        "symbol", b.symbols(), "date", b.dates(),
+                        "symbol", b.symbol(), "date", b.date(),
                         "open", b.open(), "high", b.high(),
                         "low", b.low(), "close", b.close(), "volume", b.volume()));
             }
         }
         return file;
     }
 
-    private static Path writeJni(Path dir, List<OhlcGenerator.OhlcBatch> batches) throws IOException {
+    private static Path writeJni(Path dir, List<OhlcData.Batch> batches) throws IOException {
         Path file = dir.resolve("ohlc-jni.vtx");
         String uri = file.toAbsolutePath().toUri().toString();
         try (dev.vortex.api.VortexWriter writer = dev.vortex.api.VortexWriter.create(
                 SESSION, uri, JNI_SCHEMA, new HashMap<>(), ALLOCATOR)) {
-            for (OhlcGenerator.OhlcBatch b : batches) {
+            for (OhlcData.Batch b : batches) {
                 try (VectorSchemaRoot root = VectorSchemaRoot.create(JNI_SCHEMA, ALLOCATOR)) {
                     VarCharVector symbolVec = (VarCharVector) root.getVector("symbol");
                     DateDayVector dateVec = (DateDayVector) root.getVector("date");
@@ -142,7 +143,7 @@ private static Path writeJni(Path dir, List<OhlcGenerator.OhlcBatch> batches) th
                     Float8Vector closeVec = (Float8Vector) root.getVector("close");
                     BigIntVector volVec = (BigIntVector) root.getVector("volume");
 
-                    int n = b.dates().length;
+                    int n = b.date().length;
                     symbolVec.allocateNew();
                     dateVec.allocateNew(n);
                     openVec.allocateNew(n);
@@ -152,8 +153,8 @@ private static Path writeJni(Path dir, List<OhlcGenerator.OhlcBatch> batches) th
                     volVec.allocateNew(n);
 
                     for (int i = 0; i < n; i++) {
-                        symbolVec.setSafe(i, b.symbols()[i].getBytes(StandardCharsets.UTF_8));
-                        dateVec.setSafe(i, b.dates()[i]);
+                        symbolVec.setSafe(i, b.symbol()[i].getBytes(StandardCharsets.UTF_8));
+                        dateVec.setSafe(i, b.date()[i]);
                         openVec.setSafe(i, b.open()[i]);
                         highVec.setSafe(i, b.high()[i]);
                         lowVec.setSafe(i, b.low()[i]);
@@ -178,7 +179,7 @@ private static Path writeJni(Path dir, List<OhlcGenerator.OhlcBatch> batches) th
     @Test
     void fileSizeComparison(@TempDir Path tmp) throws IOException {
         // Given
-        List<OhlcGenerator.OhlcBatch> batches = OhlcGenerator.generate(TOTAL_ROWS, BATCH_SIZE);
+        List<OhlcData.Batch> batches = OhlcData.generate(TOTAL_ROWS, BATCH_SIZE);
 
         // When
         Path csvFile = writeCsv(tmp, batches);
@@ -217,7 +218,7 @@ void fileSizeComparison(@TempDir Path tmp) throws IOException {
     @Test
     void withZstd_smallerFile_and_readable(@TempDir Path tmp) throws IOException {
         // Given
-        List<OhlcGenerator.OhlcBatch> batches = OhlcGenerator.generate(TOTAL_ROWS, BATCH_SIZE);
+        List<OhlcData.Batch> batches = OhlcData.generate(TOTAL_ROWS, BATCH_SIZE);
 
         // When
         Path noZstd = writeJava(tmp, batches);
@@ -246,12 +247,12 @@ void withZstd_smallerFile_and_readable(@TempDir Path tmp) throws IOException {
 
     @Test
     void globalDict_multiSymbol_smallerThanPerChunkDict(@TempDir Path tmp) throws IOException {
-        // Given — multi-symbol OHLC (30 tickers from OhlcGenerator) split across multiple chunks
+        // Given — multi-symbol OHLC (30 tickers from OhlcData) split across multiple chunks
         // so per-chunk-dict mode emits the same ticker dictionary in every chunk while global-dict
         // mode emits it once. Small chunkSize amplifies the saving.
         int rows = 200_000;
         int batch = 20_000;
-        List<OhlcGenerator.OhlcBatch> batches = OhlcGenerator.generate(rows, batch);
+        List<OhlcData.Batch> batches = OhlcData.generate(rows, batch);
 
         // When
         Path globalDictFile = writeJavaGlobalDict(tmp, true, batches);

integration/src/test/java/io/github/dfa1/vortex/integration/JavaWritesRustReadsIntegrationTest.java

@@ -10,6 +10,7 @@
 import dev.vortex.jni.NativeLoader;
 import io.github.dfa1.vortex.core.model.DType;
 import io.github.dfa1.vortex.core.model.PType;
+import io.github.dfa1.vortex.core.testing.OhlcData;
 import io.github.dfa1.vortex.writer.encode.BoolEncodingEncoder;
 import io.github.dfa1.vortex.writer.encode.PcoEncodingEncoder;
 import io.github.dfa1.vortex.writer.encode.ByteBoolEncodingEncoder;
@@ -428,14 +429,14 @@ private static void deleteDir(Path dir) throws IOException {
     void javaWriter_jniReader_cascading_ohlc(@TempDir Path tmp) throws IOException {
         // Given — OHLC data written with cascading(3): exercises ALP→FOR→bitpacked chain
         Path file = tmp.resolve("java_cascade_ohlc.vtx");
-        List<OhlcGenerator.OhlcBatch> batches = OhlcGenerator.generate(10_000, 1_000);
+        List<OhlcData.Batch> batches = OhlcData.generate(10_000, 1_000);
 
         try (var ch = FileChannel.open(file, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
              var sut = VortexWriter.create(ch, OHLC_SCHEMA, WriteOptions.cascading(3))) {
-            for (OhlcGenerator.OhlcBatch b : batches) {
+            for (OhlcData.Batch b : batches) {
                 sut.writeChunk(Map.of(
-                        "date", b.dates(),
-                        "symbol", b.symbols(),
+                        "date", b.date(),
+                        "symbol", b.symbol(),
                         "open", b.open(),
                         "high", b.high(),
                         "low", b.low(),
@@ -708,12 +709,12 @@ void javaWriter_jniReader_monotonic_i64_cascading(@TempDir Path tmp) throws IOEx
     void javaWriter_jniReader_cascading_ohlc_columnProjection(@TempDir Path tmp) throws IOException {
         // Given
         Path file = tmp.resolve("java_cascade_proj.vtx");
-        List<OhlcGenerator.OhlcBatch> batches = OhlcGenerator.generate(2_000, 1_000);
+        List<OhlcData.Batch> batches = OhlcData.generate(2_000, 1_000);
         try (var ch = FileChannel.open(file, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
              var sut = VortexWriter.create(ch, OHLC_SCHEMA, WriteOptions.cascading(3))) {
-            for (OhlcGenerator.OhlcBatch b : batches) {
+            for (OhlcData.Batch b : batches) {
                 sut.writeChunk(Map.of(
-                        "date", b.dates(), "symbol", b.symbols(),
+                        "date", b.date(), "symbol", b.symbol(),
                         "open", b.open(), "high", b.high(),
                         "low", b.low(), "close", b.close(), "volume", b.volume()));
             }