Skip to content

Commit 18e388b

Browse files
committed
Upgraded to arrow2 v0.14
1 parent 6eed255 commit 18e388b

File tree

6 files changed

+66
-116
lines changed

6 files changed

+66
-116
lines changed

Cargo.lock

Lines changed: 52 additions & 102 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

necsim/plugins/species/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fnv = "1.0"
2222
base32 = "0.4"
2323
hex = "0.4"
2424
bincode = "1.3"
25-
arrow2 = { version = "0.12", features = ["io_ipc"] }
25+
arrow2 = { version = "0.14", features = ["io_ipc"] }
2626

2727
[dev-dependencies]
2828
rand = "0.8"

necsim/plugins/species/src/individual/feather/dataframe.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@ impl IndividualSpeciesFeatherReporter {
174174
)?;
175175

176176
let chunk = Chunk::try_new(vec![
177-
ids.arced(),
178-
xs.arced(),
179-
ys.arced(),
180-
is.arced(),
181-
parents.arced(),
182-
species.arced(),
177+
ids.boxed(),
178+
xs.boxed(),
179+
ys.boxed(),
180+
is.boxed(),
181+
parents.boxed(),
182+
species.boxed(),
183183
])?;
184184
writer.write(&chunk, None)?;
185185

necsim/plugins/species/src/individual/feather/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ impl<'de> Deserialize<'de> for IndividualSpeciesFeatherReporter {
117117
self_last_speciation_event = last_event.last_speciation_event;
118118
self_last_dispersal_event = last_event.last_dispersal_event;
119119

120-
for chunk in arrow2::io::ipc::read::FileReader::new(reader, metadata, None) {
120+
for chunk in arrow2::io::ipc::read::FileReader::new(reader, metadata, None, None) {
121121
let chunk = chunk.map_err(serde::de::Error::custom)?;
122122

123123
let (ids, xs, ys, is, parents, species) = match chunk.columns() {

necsim/plugins/species/src/location/feather/dataframe.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,10 @@ impl LocationSpeciesFeatherReporter {
244244
let counts = PrimitiveArray::from_vec(counts);
245245

246246
let chunk = Chunk::try_new(vec![
247-
xs.arced(),
248-
ys.arced(),
249-
species.arced(),
250-
counts.arced(),
247+
xs.boxed(),
248+
ys.boxed(),
249+
species.boxed(),
250+
counts.boxed(),
251251
])?;
252252
writer.write(&chunk, None)?;
253253

0 commit comments

Comments
 (0)