Skip to content

Commit 9957bd5

Browse files
committed
Reintegrate changes with columnar builder PR
Signed-off-by: Moritz Hoffmann <[email protected]>
1 parent 6816e0e commit 9957bd5

File tree

5 files changed

+492
-378
lines changed

5 files changed

+492
-378
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- windows
1616
toolchain:
1717
- stable
18-
- 1.78
18+
- 1.79
1919
name: cargo test on ${{ matrix.os }}, rust ${{ matrix.toolchain }}
2020
runs-on: ${{ matrix.os }}-latest
2121
steps:

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ resolver = "2"
1717

1818
[workspace.dependencies]
1919
differential-dataflow = { path = "differential-dataflow", default-features = false, version = "0.15.2" }
20-
timely = { version = "0.21", default-features = false }
20+
# timely = { version = "0.21", default-features = false }
21+
timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", branch = "master" }
2122
#timely = { path = "../timely-dataflow/timely/", default-features = false }
2223

2324
[profile.release]

differential-dataflow/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ graph_map = "0.1"
2323
bytemuck = "1.18.0"
2424

2525
[dependencies]
26-
columnar = "0.5"
26+
#columnar = "0.5"
27+
columnar = { git = "https://github.com/antiguru/columnar", branch = "reborrow" }
2728
columnation = "0.1.0"
2829
fnv="1.0.2"
2930
paste = "1.0"

0 commit comments

Comments
 (0)