Skip to content

Commit 43a239e

Browse files
committed
refactor(engine): replace long argument lists with params structs
1 parent 32ae9c0 commit 43a239e

9 files changed

Lines changed: 537 additions & 398 deletions

File tree

nodedb/src/data/executor/dispatch/graph.rs

Lines changed: 62 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,16 @@ impl CoreLoop {
5353
dst_surrogate,
5454
} => self.execute_edge_put(
5555
task,
56-
tid,
57-
collection,
58-
src_id,
59-
label,
60-
dst_id,
61-
properties,
62-
*src_surrogate,
63-
*dst_surrogate,
56+
crate::data::executor::handlers::graph::EdgePutParams {
57+
tid,
58+
collection,
59+
src_id,
60+
label,
61+
dst_id,
62+
properties,
63+
src_surrogate: *src_surrogate,
64+
dst_surrogate: *dst_surrogate,
65+
},
6466
),
6567

6668
GraphOp::EdgePutBatch { edges } => self.execute_edge_put_batch(task, tid, edges),
@@ -85,12 +87,14 @@ impl CoreLoop {
8587
frontier_bitmap,
8688
} => self.execute_graph_hop(
8789
task,
88-
tid,
89-
start_nodes,
90-
edge_label,
91-
*direction,
92-
*depth,
93-
frontier_bitmap.as_ref(),
90+
crate::data::executor::handlers::graph::GraphHopParams {
91+
tid,
92+
start_nodes,
93+
edge_label,
94+
direction: *direction,
95+
depth: *depth,
96+
frontier_bitmap: frontier_bitmap.as_ref(),
97+
},
9498
),
9599

96100
GraphOp::Neighbors {
@@ -125,12 +129,14 @@ impl CoreLoop {
125129
frontier_bitmap,
126130
} => self.execute_graph_path(
127131
task,
128-
tid,
129-
src,
130-
dst,
131-
edge_label,
132-
*max_depth,
133-
frontier_bitmap.as_ref(),
132+
crate::data::executor::handlers::graph::graph_traversal::GraphPathParams {
133+
tid,
134+
src,
135+
dst,
136+
edge_label,
137+
max_depth: *max_depth,
138+
frontier_bitmap: frontier_bitmap.as_ref(),
139+
},
134140
),
135141

136142
GraphOp::Subgraph {
@@ -161,34 +167,38 @@ impl CoreLoop {
161167
{
162168
self.execute_graph_rag_fusion_triple(
163169
task,
164-
tid,
165-
collection,
166-
query_vector,
167-
*vector_top_k,
168-
edge_label,
169-
*direction,
170-
*expansion_depth,
171-
*final_top_k,
172-
*triple_k,
173-
vector_field.as_str(),
174-
options.max_visited,
175-
bm25_q,
176-
bm25_f,
170+
crate::data::executor::handlers::graph_rag_triple::GraphRagFusionTripleParams {
171+
tenant_id: tid,
172+
collection,
173+
query_vector,
174+
vector_top_k: *vector_top_k,
175+
edge_label,
176+
direction: *direction,
177+
expansion_depth: *expansion_depth,
178+
final_top_k: *final_top_k,
179+
rrf_k: *triple_k,
180+
vector_field: vector_field.as_str(),
181+
max_visited: options.max_visited,
182+
bm25_query: bm25_q,
183+
bm25_field: bm25_f,
184+
},
177185
)
178186
} else {
179187
self.execute_graph_rag_fusion(
180188
task,
181-
tid,
182-
collection,
183-
query_vector,
184-
*vector_top_k,
185-
edge_label,
186-
*direction,
187-
*expansion_depth,
188-
*final_top_k,
189-
*rrf_k,
190-
vector_field.as_str(),
191-
options.max_visited,
189+
crate::data::executor::handlers::graph_rag::GraphRagFusionParams {
190+
tenant_id: tid,
191+
collection,
192+
query_vector,
193+
vector_top_k: *vector_top_k,
194+
edge_label,
195+
direction: *direction,
196+
expansion_depth: *expansion_depth,
197+
final_top_k: *final_top_k,
198+
rrf_k: *rrf_k,
199+
vector_field: vector_field.as_str(),
200+
max_visited: options.max_visited,
201+
},
192202
)
193203
}
194204
}
@@ -213,12 +223,14 @@ impl CoreLoop {
213223
source_binding,
214224
} => self.execute_graph_match_continuation(
215225
task,
216-
tid,
217-
query,
218-
*resume_triple_idx,
219-
partial_row,
220-
source_node,
221-
source_binding,
226+
crate::data::executor::handlers::graph_match::GraphMatchContinuationParams {
227+
tid,
228+
query_bytes: query,
229+
resume_triple_idx: *resume_triple_idx,
230+
partial_row_bytes: partial_row,
231+
source_node,
232+
source_binding,
233+
},
222234
),
223235

224236
GraphOp::MatchVarLenResume { query, resume } => {

0 commit comments

Comments
 (0)