Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove panics from planning logic #399

Merged
merged 2 commits into from
Sep 27, 2023
Merged

Remove panics from planning logic #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e52e041
remove panics in planning
jonmmease Sep 27, 2023
8495e09
pin polars due to https://github.com/pola-rs/polars/issues/11355
jonmmease Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ jobs:
ls -la
python -m pip install vegafusion-*.whl
python -m pip install vegafusion_python_embed-*manylinux_2_17_x86_64*.whl
python -m pip install pytest vega-datasets polars duckdb vl-convert-python scikit-image pandas==2.0
python -m pip install pytest vega-datasets polars==0.19.3 duckdb vl-convert-python scikit-image pandas==2.0
- name: Test vegafusion
working-directory: python/vegafusion/
run: pytest
Expand Down Expand Up @@ -342,7 +342,7 @@ jobs:
ls -la
python -m pip install vegafusion-*.whl
python -m pip install vegafusion_python_embed-*macosx_10_7_x86_64.whl
python -m pip install pytest vega-datasets polars duckdb altair vl-convert-python scikit-image pandas==2.0
python -m pip install pytest vega-datasets polars==0.19.3 duckdb altair vl-convert-python scikit-image pandas==2.0

# Downgrade pyarrow to 10.0.1
python -m pip install pyarrow==10.0.1
Expand Down Expand Up @@ -380,7 +380,7 @@ jobs:

python -m pip install $vegafusion
python -m pip install $vegafusion_python_embed
python -m pip install pytest vega-datasets polars duckdb vl-convert-python scikit-image
python -m pip install pytest vega-datasets polars==0.19.3 duckdb vl-convert-python scikit-image
- name: Test vegafusion
working-directory: python/vegafusion/
run: pytest
Expand Down
12 changes: 4 additions & 8 deletions vegafusion-core/src/planning/split_domain_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,7 @@ impl<'a> SplitScaleDomainVisitor<'a> {
}
]
}
))
.unwrap();
))?;

// Create new domain specification that uses the new dataset
let new_domain: ScaleDomainSpec = serde_json::from_value(serde_json::json!([
Expand All @@ -267,8 +266,7 @@ impl<'a> SplitScaleDomainVisitor<'a> {
escape_field(&new_data_name)
)
}
]))
.unwrap();
]))?;

(new_data, new_domain)
} else {
Expand Down Expand Up @@ -324,8 +322,7 @@ impl<'a> SplitScaleDomainVisitor<'a> {
}
]
}
))
.unwrap()
))?
} else {
// Will sort by the grouped field values
serde_json::from_value(serde_json::json!(
Expand All @@ -346,8 +343,7 @@ impl<'a> SplitScaleDomainVisitor<'a> {
}
]
}
))
.unwrap()
))?
})
}
}
28 changes: 6 additions & 22 deletions vegafusion-core/src/planning/stitch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,14 @@ pub fn stitch_specs(
keep_variables: &[ScopedVariable],
) -> Result<CommPlan> {
// Get client spec variable types
let client_defs: HashSet<_> = client_spec.definition_vars().unwrap().into_iter().collect();
let client_inputs: HashSet<_> = client_spec
.input_vars(task_scope)
.unwrap()
.into_iter()
.collect();
let client_updates: HashSet<_> = client_spec
.update_vars(task_scope)
.unwrap()
.into_iter()
.collect();
let client_defs: HashSet<_> = client_spec.definition_vars()?.into_iter().collect();
let client_inputs: HashSet<_> = client_spec.input_vars(task_scope)?.into_iter().collect();
let client_updates: HashSet<_> = client_spec.update_vars(task_scope)?.into_iter().collect();

// Get server spec variable types
let server_defs: HashSet<_> = server_spec.definition_vars().unwrap().into_iter().collect();
let server_inputs: HashSet<_> = server_spec
.input_vars(task_scope)
.unwrap()
.into_iter()
.collect();
let server_updates: HashSet<_> = server_spec
.update_vars(task_scope)
.unwrap()
.into_iter()
.collect();
let server_defs: HashSet<_> = server_spec.definition_vars()?.into_iter().collect();
let server_inputs: HashSet<_> = server_spec.input_vars(task_scope)?.into_iter().collect();
let server_updates: HashSet<_> = server_spec.update_vars(task_scope)?.into_iter().collect();

// Determine communication requirements
let mut server_to_client: HashSet<_> = client_inputs
Expand Down
Loading