@@ -4,18 +4,19 @@ use sqlbuild_host::entries::models::UserCodeHost;
44
55use crate :: bindings:: _helpers:: compiled_views:: model_reads;
66use crate :: bindings:: _helpers:: compiled_views:: project_reads;
7- use crate :: bindings:: _helpers:: graph:: node_set :: PyNodeSet ;
7+ use crate :: bindings:: _helpers:: graph:: keys :: native_key ;
88use crate :: bindings:: _helpers:: native_host:: host;
99use crate :: bindings:: _helpers:: planner_identity:: metadata:: build_function_local_hashes;
1010use crate :: bindings:: _helpers:: planner_identity:: metadata:: build_model_version_identity_metadata_json;
1111use crate :: bindings:: _helpers:: planner_phases:: objects:: object;
1212use crate :: bindings:: _helpers:: planner_phases:: runtime:: runtime_field;
13+ use crate :: bindings:: _helpers:: planner_scope:: retained:: scope_data;
1314use crate :: bindings:: _helpers:: records:: fields:: field as native_field;
1415use crate :: bindings:: _helpers:: records:: fields:: mapping_items;
1516use pyo3:: prelude:: { Bound , PyAny , PyAnyMethods , PyResult } ;
16- use pyo3:: types:: { PyDict , PyDictMethods , PySet , PySetMethods } ;
17+ use pyo3:: types:: { PyDict , PyDictMethods } ;
18+ use sqlbuild_analysis:: graph:: main:: reachable_keys:: reachable_keys;
1719use sqlbuild_analysis:: planner_migrations:: main:: discovery_order:: discovery_order;
18- use sqlbuild_core:: graph_walk:: main:: breadth_first_reach:: breadth_first_reach;
1920use std:: collections:: BTreeMap ;
2021
2122pub ( super ) fn ordered < ' py > ( runtime : & Bound < ' py , PyAny > ) -> PyResult < Vec < Bound < ' py , PyAny > > > {
@@ -48,22 +49,13 @@ pub(super) fn triggered(
4849 snapshot : & Bound < ' _ , PyAny > ,
4950 declared : & Bound < ' _ , PyDict > ,
5051) -> PyResult < bool > {
51- let py = scope. py ( ) ;
52- let selected: Vec < Bound < ' _ , PyAny > > = native_field ( scope, "selected_keys" ) ?
53- . try_iter ( ) ?
54- . collect :: < PyResult < _ > > ( ) ?;
55- let mut relevant = PyNodeSet ( PySet :: new ( py, & selected) ?) ;
56- breadth_first_reach ( selected, None , & mut relevant, |key| {
57- native_field ( scope, "upstream_deps" ) ?
58- . call_method1 ( "get" , ( key, pyo3:: types:: PyTuple :: empty ( py) ) ) ?
59- . try_iter ( ) ?
60- . collect :: < PyResult < Vec < Bound < ' _ , PyAny > > > > ( )
61- } ) ?;
62- let relevant = relevant. 0 ;
52+ let scope = scope_data ( scope) ?;
53+ let selected: Vec < _ > = scope. selected . iter ( ) . cloned ( ) . collect ( ) ;
54+ let relevant = reachable_keys ( & selected, & scope. upstream ) ;
6355 let fingerprints = native_field ( & native_field ( snapshot, "fingerprints" ) ?, "models" ) ?;
6456 for item in models {
6557 let name = model_reads:: name_object ( item) ?;
66- if relevant. contains ( model_reads:: model_key ( item) ?) ?
58+ if relevant. contains ( & native_key ( & model_reads:: model_key ( item) ?) ?)
6759 && !fingerprints. contains ( & name) ?
6860 && !declared. contains ( & name) ?
6961 {
0 commit comments