Repository navigation
Commit 1de4f39
committed
Add
Replaces `DType::Union(Nullability)` with `DType::Union(UnionVariants,
Nullability)`. `UnionVariants` carries a `FieldNames` list, per-variant
`FieldDType`s, and an `i8` type-id vector (supporting non-consecutive tags
like `[0, 5, 7]` so children can be removed without renumbering).
The flatbuffer and protobuf `Union` schemas are extended with the
`names`/`dtypes`/`type_ids` fields, and serde, flatbuffers, and protobuf paths
are filled in with round-trip tests and nullability-constraint checks. The
flatbuffer `Union` table uses explicit field ids so that `nullable` keeps the
id it had before this change, keeping the schema conformant with develop.
Existing `DType::Union(..)` match arms that reject or skip unions are left in
place; concrete implementations land alongside the array work.
Signed-off-by: Connor Tsui <[email protected]>UnionVariants type and embed it in DType::Union
1 parent a649d75 commit 1de4f39
17 files changed
Lines changed: 1311 additions & 38 deletions
File tree
- vortex-array/src
- aggregate_fn/fns
- is_sorted
- uncompressed_size_in_bytes
- dtype
- serde
- scalar_fn/fns/binary/compare
- vortex-datafusion/src/convert
- vortex-flatbuffers
- flatbuffers/vortex-dtype
- src/generated
- vortex-proto
- proto
- src/generated
- vortex-row/src
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
247 | 247 | | |
248 | 248 | | |
249 | 249 | | |
250 | | - | |
| 250 | + | |
251 | 251 | | |
252 | 252 | | |
253 | 253 | | |
| |||
264 | 264 | | |
265 | 265 | | |
266 | 266 | | |
267 | | - | |
| 267 | + | |
268 | 268 | | |
269 | 269 | | |
270 | 270 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
289 | 289 | | |
290 | 290 | | |
291 | 291 | | |
292 | | - | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
293 | 295 | | |
294 | 296 | | |
295 | 297 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| |||
63 | 64 | | |
64 | 65 | | |
65 | 66 | | |
66 | | - | |
| 67 | + | |
67 | 68 | | |
68 | 69 | | |
69 | 70 | | |
| |||
91 | 92 | | |
92 | 93 | | |
93 | 94 | | |
94 | | - | |
| 95 | + | |
95 | 96 | | |
96 | 97 | | |
97 | 98 | | |
| |||
123 | 124 | | |
124 | 125 | | |
125 | 126 | | |
126 | | - | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
127 | 136 | | |
128 | 137 | | |
129 | 138 | | |
| |||
425 | 434 | | |
426 | 435 | | |
427 | 436 | | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
428 | 455 | | |
429 | 456 | | |
430 | 457 | | |
| |||
476 | 503 | | |
477 | 504 | | |
478 | 505 | | |
479 | | - | |
| 506 | + | |
480 | 507 | | |
481 | 508 | | |
482 | 509 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| 34 | + | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
| |||
110 | 111 | | |
111 | 112 | | |
112 | 113 | | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
118 | 119 | | |
119 | 120 | | |
120 | 121 | | |
| |||
146 | 147 | | |
147 | 148 | | |
148 | 149 | | |
149 | | - | |
| 150 | + | |
| 151 | + | |
150 | 152 | | |
151 | 153 | | |
152 | 154 | | |
| |||
178 | 180 | | |
179 | 181 | | |
180 | 182 | | |
| 183 | + | |
181 | 184 | | |
182 | 185 | | |
183 | 186 | | |
| |||
0 commit comments