Skip to content

Commit db50423

Browse files
committed
More frontend
Signed-off-by: Nicholas Gates <nick@nickgates.com>
1 parent 7a333cb commit db50423

27 files changed

Lines changed: 459 additions & 320 deletions

vortex-web/crate/Cargo.toml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,27 @@ publish = false
1111
crate-type = ["cdylib", "rlib"]
1212

1313
[dependencies]
14-
vortex = { path = "../../vortex", default-features = false, features = [
15-
"files",
16-
] }
1714
arrow-array = { workspace = true }
1815
arrow-ipc = { workspace = true }
1916
arrow-schema = { workspace = true }
2017
serde = { workspace = true, features = ["derive"] }
2118
serde_json = { workspace = true }
19+
vortex = { path = "../../vortex", default-features = false, features = [
20+
"files",
21+
] }
2222

2323
[target.'cfg(target_arch = "wasm32")'.dependencies]
2424
futures = { workspace = true }
2525
wasm-bindgen = "0.2.104"
2626
wasm-bindgen-futures = { workspace = true }
2727
console_error_panic_hook = "0.1.7"
2828
js-sys = "0.3.81"
29-
web-sys = { version = "0.3.81", features = ["Blob", "console", "File", "FileReader"] }
29+
web-sys = { version = "0.3.81", features = [
30+
"Blob",
31+
"console",
32+
"File",
33+
"FileReader",
34+
] }
3035

3136
[lints]
3237
workspace = true

vortex-web/crate/src/wasm.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ impl VortexFileHandle {
308308
.await
309309
.map_err(|e| JsValue::from_str(&e.to_string()))?;
310310

311-
let schema = dtype_to_schema(&dtype, "value")
312-
.map_err(|e| JsValue::from_str(&e.to_string()))?;
311+
let schema =
312+
dtype_to_schema(&dtype, "value").map_err(|e| JsValue::from_str(&e.to_string()))?;
313313
let arrow_schema = Arc::new(schema);
314314

315315
let mut buf = Vec::new();
@@ -361,8 +361,7 @@ impl VortexFileHandle {
361361
.await
362362
.map_err(|e| JsValue::from_str(&e.to_string()))?;
363363

364-
let parts = ArrayParts::try_from(buf)
365-
.map_err(|e| JsValue::from_str(&e.to_string()))?;
364+
let parts = ArrayParts::try_from(buf).map_err(|e| JsValue::from_str(&e.to_string()))?;
366365

367366
let array = parts
368367
.decode(&dtype, row_count, ctx, &self.session)
@@ -391,8 +390,8 @@ impl VortexFileHandle {
391390
.as_ref()
392391
.ok_or_else(|| JsValue::from_str("No array ReadContext available"))?;
393392

394-
let layout = find_layout_by_id(self.vxf.footer().layout(), &layout_node_id)
395-
.ok_or_else(|| {
393+
let layout =
394+
find_layout_by_id(self.vxf.footer().layout(), &layout_node_id).ok_or_else(|| {
396395
JsValue::from_str(&format!("Layout node not found: {layout_node_id}"))
397396
})?;
398397

@@ -411,8 +410,7 @@ impl VortexFileHandle {
411410
.await
412411
.map_err(|e| JsValue::from_str(&e.to_string()))?;
413412

414-
let parts = ArrayParts::try_from(buf)
415-
.map_err(|e| JsValue::from_str(&e.to_string()))?;
413+
let parts = ArrayParts::try_from(buf).map_err(|e| JsValue::from_str(&e.to_string()))?;
416414

417415
let root_array = parts
418416
.decode(&dtype, row_count, ctx, &self.session)
@@ -460,8 +458,8 @@ impl VortexFileHandle {
460458
.as_ref()
461459
.ok_or_else(|| JsValue::from_str("No array ReadContext available"))?;
462460

463-
let layout = find_layout_by_id(self.vxf.footer().layout(), &layout_node_id)
464-
.ok_or_else(|| {
461+
let layout =
462+
find_layout_by_id(self.vxf.footer().layout(), &layout_node_id).ok_or_else(|| {
465463
JsValue::from_str(&format!("Layout node not found: {layout_node_id}"))
466464
})?;
467465

@@ -480,8 +478,7 @@ impl VortexFileHandle {
480478
.await
481479
.map_err(|e| JsValue::from_str(&e.to_string()))?;
482480

483-
let parts = ArrayParts::try_from(buf)
484-
.map_err(|e| JsValue::from_str(&e.to_string()))?;
481+
let parts = ArrayParts::try_from(buf).map_err(|e| JsValue::from_str(&e.to_string()))?;
485482

486483
let root_array = parts
487484
.decode(&dtype, row_count, ctx, &self.session)
@@ -656,7 +653,10 @@ fn build_array_encoding_tree_from_array(array: &ArrayRef) -> ArrayEncodingNodeJs
656653
.unwrap_or(0);
657654

658655
let named_children = array.named_children();
659-
let child_names: Vec<String> = named_children.iter().map(|(name, _)| name.clone()).collect();
656+
let child_names: Vec<String> = named_children
657+
.iter()
658+
.map(|(name, _)| name.clone())
659+
.collect();
660660
let children: Vec<ArrayEncodingNodeJson> = named_children
661661
.iter()
662662
.map(|(_, child)| build_array_encoding_tree_from_array(child))

0 commit comments

Comments
 (0)