Commit 332b067
refactor(reader): add Array.materialize(), remove the ArraySegments switch
ArraySegments.of() re-stated each encoding's decode formula (FoR/ZigZag/ALP),
the chunked concat, and the dict gather in one large switch, separate from the
per-element accessor each lazy array already carries. Introduce
Array.materialize(SegmentAllocator) — a pure abstract method mirroring the
existing Array.limited() polymorphism — and push every case onto the type that
owns it:
- segment-backed arrays (Materialized*, VarBin, Generic, LazyDecimal) return
their existing buffer with no copy;
- the Lazy FoR/ZigZag/ALP variants bulk-decode through their own getX(i) in a
tight loop — the formula lives only in getX; the override exists purely to give
the JIT a monomorphic, inlinable (hence vectorisable) call site that the shared
megamorphic interface default cannot;
- chunked arrays concatenate children, dict arrays gather, constant-decimal fills;
- MaskedArray delegates to its inner data;
- primitive interfaces provide a scalar getX fallback, and BoolArray packs an
LSB-first bitmap (the lazy-bool path that previously had no materialisation);
- families with no primary segment (struct, list, list-view, fixed-size list,
variant, byte-parts decimal, null, unknown) implement it to throw explicitly.
ArraySegments.of() is removed; callers (ReadRegistry, ScanIterator, DecodeContext,
encoder/integration/performance code) invoke arr.materialize(arena) directly.
ArraySegments retains only the non-allocating trySegment() probe used by the scan
layer's dict zip-bomb guard, and is marked @deprecated(forRemoval = true) — it is
deleted once the decode-limits layer owns that bound. Behaviour is preserved,
including the broadcast edge where a constant column materialises to a single-element
buffer.
Adds ArrayMaterializeTest for direct coverage (zero-copy, scalar/bitmap fallbacks,
the Lazy formulas, chunked/dict, constant-decimal, masked delegation, and all
no-primary-segment throw cases). Updates ADR 0016 to document materialize() as the
shipped producer of the Arrow C-Data values buffer.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>1 parent fe98383 commit 332b067
65 files changed
Lines changed: 1267 additions & 492 deletions
File tree
- docs/adr
- integration/src/test/java/io/github/dfa1/vortex/integration
- performance/src/main/java/io/github/dfa1/vortex/performance
- reader/src
- main/java/io/github/dfa1/vortex/reader
- array
- decode
- test/java/io/github/dfa1/vortex/reader/array
- writer/src/test/java/io/github/dfa1/vortex/writer
- encode
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
118 | | - | |
119 | | - | |
| 118 | + | |
120 | 119 | | |
121 | 120 | | |
122 | 121 | | |
| |||
127 | 126 | | |
128 | 127 | | |
129 | 128 | | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
144 | 151 | | |
145 | 152 | | |
146 | 153 | | |
| |||
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | 15 | | |
17 | 16 | | |
18 | 17 | | |
| |||
130 | 129 | | |
131 | 130 | | |
132 | 131 | | |
133 | | - | |
| 132 | + | |
134 | 133 | | |
135 | 134 | | |
136 | 135 | | |
| |||
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
| |||
181 | 180 | | |
182 | 181 | | |
183 | 182 | | |
184 | | - | |
| 183 | + | |
185 | 184 | | |
186 | 185 | | |
187 | 186 | | |
| |||
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
| |||
101 | 100 | | |
102 | 101 | | |
103 | 102 | | |
104 | | - | |
| 103 | + | |
105 | 104 | | |
106 | 105 | | |
107 | 106 | | |
| |||
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
603 | 603 | | |
604 | 604 | | |
605 | 605 | | |
606 | | - | |
| 606 | + | |
607 | 607 | | |
608 | 608 | | |
609 | 609 | | |
| |||
624 | 624 | | |
625 | 625 | | |
626 | 626 | | |
627 | | - | |
| 627 | + | |
628 | 628 | | |
629 | 629 | | |
630 | 630 | | |
| |||
641 | 641 | | |
642 | 642 | | |
643 | 643 | | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
644 | 647 | | |
645 | 648 | | |
646 | 649 | | |
| |||
Lines changed: 21 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
5 | 8 | | |
6 | 9 | | |
7 | 10 | | |
| |||
41 | 44 | | |
42 | 45 | | |
43 | 46 | | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
44 | 65 | | |
45 | 66 | | |
46 | 67 | | |
| |||
0 commit comments