Skip to content

Commit

Permalink
Merge branch 'main' into ir_runtime_extract
Browse files Browse the repository at this point in the history
  • Loading branch information
@shirly121
shirly121 committed Sep 25, 2023
2 parents 7540dde + b468da4 commit c319e82
Show file tree
Hide file tree
Showing 29 changed files with 379 additions and 54 deletions.
1 change: 1 addition & 0 deletions interactive_engine/compiler/src/test/resources/case_when.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"extra": {}
},
"idx_predicate": null,
"is_count_only": false,
"meta_data": {
"type": {
"type": {
Expand Down
1 change: 1 addition & 0 deletions interactive_engine/compiler/src/test/resources/ffi_logical_plan_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"extra": {}
},
"idx_predicate": null,
"is_count_only": false,
"meta_data": {
"type": {
"type": {
Expand Down
1 change: 1 addition & 0 deletions interactive_engine/compiler/src/test/resources/ffi_logical_plan_2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
"extra": {}
},
"idx_predicate": null,
"is_count_only": false,
"meta_data": {
"type": {
"type": {
Expand Down
1 change: 1 addition & 0 deletions interactive_engine/compiler/src/test/resources/ffi_logical_plan_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"extra": {}
},
"idx_predicate": null,
"is_count_only": false,
"meta_data": {
"type": {
"type": {
Expand Down
2 changes: 2 additions & 0 deletions interactive_engine/executor/ir/clients/rust/client/src/physical_builder.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ mod test {
alias: None,
params: None,
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
let sink_pb = algebra_pb::Sink { tags: vec![], sink_target: None };
Expand All @@ -587,6 +588,7 @@ mod test {
alias: None,
params: None,
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
let scan2_pb = scan1_pb.clone();
Expand Down
1 change: 1 addition & 0 deletions interactive_engine/executor/ir/common/src/utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ impl From<pb::Scan> for physical_pb::Scan {
alias: scan.alias.map(|tag| tag.try_into().unwrap()),
params: scan.params,
idx_predicate: scan.idx_predicate,
is_count_only: scan.is_count_only,
}
}
}
Expand Down
1 change: 1 addition & 0 deletions interactive_engine/executor/ir/core/src/glogue/pattern.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,7 @@ fn generate_source_operator(
alias: Some((source_vertex_id as KeyId).into()),
params: Some(source_vertex_param),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
Ok(source_scan.into())
Expand Down
1 change: 1 addition & 0 deletions interactive_engine/executor/ir/core/src/plan/ffi.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1740,6 +1740,7 @@ mod scan {
extra: HashMap::new(),
}),
idx_predicate: None,
is_count_only: false,
meta_data: None,
});
Box::into_raw(scan) as *const c_void
Expand Down
19 changes: 19 additions & 0 deletions interactive_engine/executor/ir/core/src/plan/logical.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2072,6 +2072,7 @@ mod test {
extra: HashMap::new(),
}),
idx_predicate: Some(vec!["software".to_string()].into()),
is_count_only: false,
meta_data: None,
};
scan.preprocess(&meta, &mut plan_meta).unwrap();
Expand Down Expand Up @@ -2151,6 +2152,7 @@ mod test {
extra: HashMap::new(),
}),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -2197,6 +2199,7 @@ mod test {
extra: HashMap::new(),
}),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -2229,6 +2232,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
plan.append_operator_as_node(scan.into(), vec![0])
Expand Down Expand Up @@ -2284,6 +2288,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
plan.append_operator_as_node(scan.into(), vec![0])
Expand Down Expand Up @@ -2361,6 +2366,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
plan.append_operator_as_node(scan.into(), vec![0])
Expand Down Expand Up @@ -2482,6 +2488,7 @@ mod test {
alias: None,
params: Some(query_params(vec!["person".into()], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
let mut opr_id = plan
Expand Down Expand Up @@ -2620,6 +2627,7 @@ mod test {
extra: Default::default(),
}),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -2648,6 +2656,7 @@ mod test {
extra: Default::default(),
}),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -2685,6 +2694,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
plan.append_operator_as_node(scan.into(), vec![0])
Expand Down Expand Up @@ -2762,6 +2772,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
plan.append_operator_as_node(scan.into(), vec![0])
Expand Down Expand Up @@ -2825,6 +2836,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
plan.append_operator_as_node(scan.into(), vec![0])
Expand Down Expand Up @@ -2883,6 +2895,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
plan.append_operator_as_node(scan.into(), vec![0])
Expand Down Expand Up @@ -2930,6 +2943,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
plan.append_operator_as_node(scan.into(), vec![0])
Expand Down Expand Up @@ -2989,6 +3003,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
plan.append_operator_as_node(scan.into(), vec![0])
Expand Down Expand Up @@ -3080,6 +3095,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
plan.append_operator_as_node(scan.into(), vec![0])
Expand Down Expand Up @@ -3126,6 +3142,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
plan.append_operator_as_node(scan.into(), vec![0])
Expand Down Expand Up @@ -3222,6 +3239,7 @@ mod test {
alias: Some("v".into()),
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -3301,6 +3319,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down
14 changes: 14 additions & 0 deletions interactive_engine/executor/ir/core/src/plan/physical.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], columns)),
idx_predicate: None,
is_count_only: false,
meta_data: None,
}
}
Expand Down Expand Up @@ -1636,6 +1637,7 @@ mod test {
alias: None,
params: Some(query_params(vec!["person".into()], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
let select_opr = pb::Select { predicate: str_to_expr_pb("@.id == 10".to_string()).ok() };
Expand Down Expand Up @@ -1692,6 +1694,7 @@ mod test {
alias: None,
params: Some(query_params(vec!["person".into()], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -1730,6 +1733,7 @@ mod test {
alias: None,
params: Some(query_params(vec!["person".into()], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -1793,6 +1797,7 @@ mod test {
alias: None,
params: Some(query_params(vec!["person".into()], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -1882,6 +1887,7 @@ mod test {
alias: None,
params: Some(query_params(vec!["person".into()], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -1994,6 +2000,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -2026,6 +2033,7 @@ mod test {
alias: Some(0.into()),
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -2115,6 +2123,7 @@ mod test {
alias: Some(0.into()),
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -2180,6 +2189,7 @@ mod test {
alias: Some(0.into()),
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -2250,6 +2260,7 @@ mod test {
alias: None,
params: Some(query_params(vec![], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};
let expand_opr = pb::EdgeExpand {
Expand Down Expand Up @@ -2309,6 +2320,7 @@ mod test {
alias: Some(0.into()),
params: None,
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -2426,6 +2438,7 @@ mod test {
alias: Some(0.into()),
params: None,
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down Expand Up @@ -3058,6 +3071,7 @@ mod test {
alias: None,
params: Some(query_params(vec!["person".into()], vec![])),
idx_predicate: None,
is_count_only: false,
meta_data: None,
};

Expand Down
Loading

0 comments on commit c319e82

Please sign in to comment.