Commit ef33c36
authored
Do not inline vortex_array into vortex:: namespace (#5584)
Sadly this is a large break to the Rust API, but we kept conflicting the
modules names within vortex_array with the crate names within the vortex
workspace.
## Breaking Change
Many types exposed on `vortex::*` will now be exposed on
`vortex::array::*`.
This script should do it:
```bash
#!/bin/bash
# Script to migrate from vortex::* to vortex::array::*
#
# Usage: ./migrate_vortex.sh [directory]
DIR="${1:-.}"
# Modules that stay at vortex:: root level
EXCLUDED="array|buffer|compute|compressor|dtype|encodings|error|expr|file|flatbuffers|io|ipc|layout|mask|metrics|proto|scalar|scan|session|utils"
find "$DIR" -name "*.rs" -type f | while read file; do
# Step 1: Replace all vortex::X with vortex::array::X
sed -i.bak -E "s/vortex::([a-zA-Z_][a-zA-Z0-9_]*)/vortex::array::\1/g" "$file"
# Step 2: Revert excluded modules back to vortex::
sed -i.bak -E "s/vortex::array::(${EXCLUDED})/vortex::\1/g" "$file"
# Step 3: Fix any double array:: that got created
sed -i.bak -E "s/vortex::array::array::/vortex::array::/g" "$file"
rm -f "${file}.bak"
done
echo "Migration complete!"
```
---------
Signed-off-by: Nicholas Gates <[email protected]>1 parent 4f1306b commit ef33c36
File tree
125 files changed
+433
-434
lines changed- bench-vortex/src
- bin
- compress
- datasets
- random_access
- statpopgen
- tpch
- encodings
- datetime-parts/src/compute
- fastlanes/src/for/array
- java/testfiles/src
- vortex-array/src
- arrays
- bool/vtable
- constant/vtable
- decimal/vtable
- expr/vtable
- primitive/vtable
- struct_/vtable
- varbin/compute
- array
- compute
- display
- expr/stats
- session
- stats
- transform
- vortex-cxx/src
- vortex-datafusion
- examples
- src
- persistent
- vortex-duckdb/src
- convert
- duckdb
- e2e_test
- exporter
- vortex-ffi
- examples
- src
- vortex-file/src
- vortex-jni/src
- vortex-layout/src/layouts
- flat
- zoned
- vortex-python/src
- arrays
- builtins
- py
- iter
- serde
- vortex-tui/src
- browse
- ui
- vortex
- benches
- examples
- src
- wasm-test/src
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
125 files changed
+433
-434
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | | - | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
30 | | - | |
31 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | | - | |
| 17 | + | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
| 6 | + | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
11 | 14 | | |
12 | 15 | | |
13 | 16 | | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
15 | 16 | | |
16 | | - | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | | - | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
0 commit comments