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

chore: Fix typos #4551

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

chore: Fix typos #4551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f39c0cd
Fix typos
co63oc Mar 6, 2025
09a0b30
ci
co63oc Mar 6, 2025
1abc3ae
Fix format
co63oc Mar 6, 2025
458c3c1
Fix format
co63oc Mar 6, 2025
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
18 changes: 9 additions & 9 deletions flex/codegen/src/hqps/hqps_case_when_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ class CaseWhenBuilder : public ExprBuilder {

auto expr_code = build_sub_expr(else_oprs, true);

boost::format formater(ELSE_EXPR_TEMPLATE_STR);
formater % expr_code;
else_code_ = formater.str();
boost::format formatter(ELSE_EXPR_TEMPLATE_STR);
formatter % expr_code;
else_code_ = formatter.str();
}
VLOG(10) << "Finish else expr: " << else_code_;
return *this;
Expand Down Expand Up @@ -109,14 +109,14 @@ class CaseWhenBuilder : public ExprBuilder {
func_call_impl_str = get_func_call_impl_str();
private_filed_str = get_private_filed_str();

boost::format formater(EXPR_BUILDER_TEMPLATE_STR);
boost::format formatter(EXPR_BUILDER_TEMPLATE_STR);
auto ret_type_str = common_data_type_pb_2_str(res_data_type_);
formater % class_name_ % ret_type_str % constructor_param_str %
formatter % class_name_ % ret_type_str % constructor_param_str %
field_init_code_str % func_call_template_typename_str % "auto" %
func_call_params_str % func_call_impl_str % private_filed_str %
get_filter_null_str();

std::string str = formater.str();
std::string str = formatter.str();

return std::make_tuple(class_name_, construct_params_, tag_selectors_, str,
std::vector{common::DataType()});
Expand Down Expand Up @@ -158,9 +158,9 @@ class CaseWhenBuilder : public ExprBuilder {

// concatenate case when into a if else.
{
boost::format formater(CASE_WHEN_EXPR_TEMPLATE_STR);
formater % when_key_code % then_result_expr_code;
auto tmp_res = formater.str();
boost::format formatter(CASE_WHEN_EXPR_TEMPLATE_STR);
formatter % when_key_code % then_result_expr_code;
auto tmp_res = formatter.str();
VLOG(10) << "WhenThen expr: " << tmp_res;
when_then_codes_.emplace_back(std::move(tmp_res));
}
Expand Down
6 changes: 3 additions & 3 deletions flex/codegen/src/hqps/hqps_dedup_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ class DedupOpBuilder {
}
dedup_tag_ids_str = ss.str();
}
boost::format formater(DEDUP_OP_TEMPLATE_STR);
boost::format formatter(DEDUP_OP_TEMPLATE_STR);
auto dedup_prop_str = join_string(dedup_props_, ",");
formater % next_ctx_name % dedup_tag_ids_str % ctx_.GraphVar() %
formatter % next_ctx_name % dedup_tag_ids_str % ctx_.GraphVar() %
prev_ctx_name % dedup_prop_str;
return formater.str();
return formatter.str();
}

private:
Expand Down
58 changes: 29 additions & 29 deletions flex/codegen/src/hqps/hqps_edge_expand_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ std::string make_prop_tuple_array(const std::vector<std::string>& prop_names,
}
prop_types_str = ss.str();
}
boost::format formater(PROP_TUPLE_ARRAY_TEMPLATE);
formater % prop_types_str % prop_names_str;
return formater.str();
boost::format formatter(PROP_TUPLE_ARRAY_TEMPLATE);
formatter % prop_types_str % prop_names_str;
return formatter.str();
}

// for properties of one label. construct a propTupleArray.
Expand Down Expand Up @@ -324,9 +324,9 @@ static std::pair<std::string, std::string> BuildOneLabelEdgeExpandOpt(
type_names = "\"\"";
}
}
boost::format formater(PROP_NAME_ARRAY);
formater % edge_expand_e_types_str % type_names;
edge_prop_selectors_str = formater.str();
boost::format formatter(PROP_NAME_ARRAY);
formatter % edge_expand_e_types_str % type_names;
edge_prop_selectors_str = formatter.str();
}
} else {
VLOG(10) << "No property found for edge expand";
Expand All @@ -353,40 +353,40 @@ static std::pair<std::string, std::string> BuildOneLabelEdgeExpandOpt(
dst_label_ids_str = label_ids_to_array_str(dst_vertex_labels);
}
}
boost::format formater("");
boost::format formatter("");
if (expand_opt ==
physical::EdgeExpand::ExpandOpt::EdgeExpand_ExpandOpt_EDGE) {
if (params.has_predicate()) {
VLOG(10) << "Building EdgeExpandE with predicate";
formater = boost::format(EDGE_EXPAND_E_OPT_FILTER_TEMPLATE_STR);
formater % expr_var_name % expr_func_name % func_construct_params_str %
formatter = boost::format(EDGE_EXPAND_E_OPT_FILTER_TEMPLATE_STR);
formatter % expr_var_name % expr_func_name % func_construct_params_str %
property_selectors_str % opt_var_name % edge_expand_e_types_str %
edge_prop_selectors_str % gs::direction_pb_to_str(direction) %
edge_label_id_str % dst_label_ids_str;
} else {
VLOG(10) << "Building EdgeExpandE without predicate";
formater = boost::format(EDGE_EXPAND_E_OPT_NO_FILTER_TEMPLATE_STR);
formater % opt_var_name % edge_expand_e_types_str %
formatter = boost::format(EDGE_EXPAND_E_OPT_NO_FILTER_TEMPLATE_STR);
formatter % opt_var_name % edge_expand_e_types_str %
edge_prop_selectors_str % gs::direction_pb_to_str(direction) %
edge_label_id_str % dst_label_ids_str;
}
} else {
if (params.has_predicate()) {
VLOG(10) << "Building EdgeExpandV with predicate";
formater = boost::format(EDGE_EXPAND_V_OPT_FILTER_TEMPLATE_STR);
formater % expr_var_name % expr_func_name % func_construct_params_str %
formatter = boost::format(EDGE_EXPAND_V_OPT_FILTER_TEMPLATE_STR);
formatter % expr_var_name % expr_func_name % func_construct_params_str %
property_selectors_str % opt_var_name %
gs::direction_pb_to_str(direction) % edge_label_id_str %
dst_label_ids_str;
} else {
VLOG(10) << "Building EdgeExpandV without predicate";
formater = boost::format(EDGE_EXPAND_V_OPT_NO_FILTER_TEMPLATE_STR);
formater % opt_var_name % gs::direction_pb_to_str(direction) %
formatter = boost::format(EDGE_EXPAND_V_OPT_NO_FILTER_TEMPLATE_STR);
formatter % opt_var_name % gs::direction_pb_to_str(direction) %
edge_label_id_str % dst_label_ids_str;
}
}

return std::make_pair(opt_var_name, formater.str());
return std::make_pair(opt_var_name, formatter.str());
}

// Building edge expand opt with multiple edge triplet, no expression are
Expand Down Expand Up @@ -423,22 +423,22 @@ static std::pair<std::string, std::string> BuildMultiLabelEdgeExpandOpt(
func_construct_params_str, property_selectors_str);
}

boost::format formater;
boost::format formatter;
if (expand_opt ==
physical::EdgeExpand::ExpandOpt::EdgeExpand_ExpandOpt_EDGE) {
auto edge_triplet_2d_array =
edge_label_triplet_to_array_str(edge_label_triplet);
if (params.has_predicate()) {
formater =
formatter =
boost::format(EDGE_EXPAND_E_OPT_MULTI_EDGE_FILTER_TEMPLATE_STR);
formater % expr_var_name % expr_func_name % func_construct_params_str %
formatter % expr_var_name % expr_func_name % func_construct_params_str %
property_selectors_str % opt_var_name % func_template_str %
gs::direction_pb_to_str(direction) % edge_triplet_2d_array %
edge_named_prop_array;
} else {
formater =
formatter =
boost::format(EDGE_EXPAND_E_OPT_MULTI_EDGE_NO_FILTER_TEMPLATE_STR);
formater % opt_var_name % func_template_str %
formatter % opt_var_name % func_template_str %
gs::direction_pb_to_str(direction) % edge_triplet_2d_array %
edge_named_prop_array;
}
Expand All @@ -449,15 +449,15 @@ static std::pair<std::string, std::string> BuildMultiLabelEdgeExpandOpt(
} else {
auto edge_triplet_2d_vector =
edge_label_triplet_to_vector_str(edge_label_triplet);
formater =
formatter =
boost::format(EDGE_EXPAND_V_OPT_MULTI_EDGE_NO_FILTER_TEMPLATE_STR);
formater % opt_var_name % gs::direction_pb_to_str(direction) %
formatter % opt_var_name % gs::direction_pb_to_str(direction) %
edge_triplet_2d_vector;
}
} else {
throw std::runtime_error("Unknown expand opt");
}
return std::make_pair(opt_var_name, formater.str());
return std::make_pair(opt_var_name, formatter.str());
}

template <typename LabelT>
Expand Down Expand Up @@ -584,19 +584,19 @@ class EdgeExpandOpBuilder {

std::string prev_ctx_name, next_ctx_name;
std::tie(prev_ctx_name, next_ctx_name) = ctx_.GetPrevAndNextCtxName();
boost::format formater("");
boost::format formatter("");
if (expand_opt_ ==
physical::EdgeExpand::ExpandOpt::EdgeExpand_ExpandOpt_EDGE) {
formater = boost::format(EDGE_EXPANDE_OP_TEMPLATE_STR);
formatter = boost::format(EDGE_EXPANDE_OP_TEMPLATE_STR);
} else {
formater = boost::format(EDGE_EXPANDV_OP_TEMPLATE_STR);
formatter = boost::format(EDGE_EXPANDV_OP_TEMPLATE_STR);
}

auto append_opt = res_alias_to_append_opt(res_alias_);
formater % next_ctx_name % append_opt % format_input_col(v_tag_) %
formatter % next_ctx_name % append_opt % format_input_col(v_tag_) %
ctx_.GraphVar() % make_move(prev_ctx_name) % make_move(opt_name);

return opt_code + formater.str();
return opt_code + formatter.str();
}

private:
Expand Down
24 changes: 12 additions & 12 deletions flex/codegen/src/hqps/hqps_expr_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ static std::pair<int32_t, std::string> variable_to_tag_id_property_selector(
LOG(FATAL) << "Unexpected property type: " << var.DebugString();
}

boost::format formater(PROPERTY_SELECTOR);
formater % prop_type % prop_name;
boost::format formatter(PROPERTY_SELECTOR);
formatter % prop_type % prop_name;

return std::make_pair(real_tag_ind, formater.str());
return std::make_pair(real_tag_ind, formatter.str());
} else {
// if variable has no property, we assume it means get the innerIdProperty
// there are two cases:
Expand All @@ -110,10 +110,10 @@ static std::pair<int32_t, std::string> variable_to_tag_id_property_selector(
} else {
prop_type = GRAPE_EMPTY_TYPE;
}
boost::format formater(PROPERTY_SELECTOR);
formater % prop_type % "None";
boost::format formatter(PROPERTY_SELECTOR);
formatter % prop_type % "None";

return std::make_pair(real_tag_ind, formater.str());
return std::make_pair(real_tag_ind, formatter.str());
}
}

Expand Down Expand Up @@ -446,9 +446,9 @@ class ExprBuilder {
make_var_name_unique(param_const);
func_call_vars_.push_back(param_const);

boost::format formater(EXTRACT_TEMPLATE_STR);
formater % interval_to_str(interval) % param_const.var_name;
auto extract_node_str = formater.str();
boost::format formatter(EXTRACT_TEMPLATE_STR);
formatter % interval_to_str(interval) % param_const.var_name;
auto extract_node_str = formatter.str();
expr_nodes_.emplace_back(extract_node_str);

tag_selectors_.emplace_back(
Expand Down Expand Up @@ -499,13 +499,13 @@ class ExprBuilder {
private_filed_str = get_private_filed_str();
VLOG(10) << "Finish preparing code blocks";

boost::format formater(EXPR_BUILDER_TEMPLATE_STR);
formater % class_name_ % common_data_type_pb_2_str(res_data_type_) %
boost::format formatter(EXPR_BUILDER_TEMPLATE_STR);
formatter % class_name_ % common_data_type_pb_2_str(res_data_type_) %
constructor_param_str % field_init_code_str %
func_call_template_typename_str % "auto" % func_call_params_str %
func_call_impl_str % private_filed_str % get_filter_null_str();

std::string str = formater.str();
std::string str = formatter.str();

return std::make_tuple(class_name_, construct_params_, tag_selectors_, str,
res_data_type_);
Expand Down
18 changes: 9 additions & 9 deletions flex/codegen/src/hqps/hqps_fold_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ std::pair<std::string, std::string> gen_agg_var_and_code_for_fold(
{
std::stringstream ss;
for (size_t i = 0; i < in_prop_types.size(); ++i) {
boost::format selector_formater(PROPERTY_SELECTOR);
selector_formater % in_prop_types[i] % in_prop_names[i];
ss << selector_formater.str();
boost::format selector_formatter(PROPERTY_SELECTOR);
selector_formatter % in_prop_types[i] % in_prop_names[i];
ss << selector_formatter.str();
if (i != in_prop_types.size() - 1) {
ss << ", ";
}
Expand All @@ -115,9 +115,9 @@ std::pair<std::string, std::string> gen_agg_var_and_code_for_fold(
in_tags_str = ss.str();
}

boost::format formater(AGG_FUNC_TEMPLATE_STR);
formater % cur_var_name % agg_func_name % selectors_str % in_tags_str;
return std::make_pair(cur_var_name, formater.str());
boost::format formatter(AGG_FUNC_TEMPLATE_STR);
formatter % cur_var_name % agg_func_name % selectors_str % in_tags_str;
return std::make_pair(cur_var_name, formatter.str());
}

// i.e. group without key.
Expand Down Expand Up @@ -160,10 +160,10 @@ class FoldOpBuilder {
agg_func_code_con = ss.str();
}

boost::format formater(FOLD_OP_TEMPLATE_STR);
formater % fold_ops_code % next_ctx_name % ctx_.GraphVar() % prev_ctx_name;
boost::format formatter(FOLD_OP_TEMPLATE_STR);
formatter % fold_ops_code % next_ctx_name % ctx_.GraphVar() % prev_ctx_name;
ctx_.UpdateTagIdAndIndMapping(new_tag_id_mapping_);
return agg_func_code_con + formater.str();
return agg_func_code_con + formatter.str();
}

private:
Expand Down
18 changes: 9 additions & 9 deletions flex/codegen/src/hqps/hqps_get_v_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ std::pair<std::string, std::string> make_getv_opt_call_code(
std::string var_name = ctx.GetNextGetVOptName();
std::stringstream ss;

boost::format formater(GET_V_OPT_NO_FILTER_TEMPLATE_STR);
formater % var_name % internal::get_v_type_2_str(get_v_type) %
boost::format formatter(GET_V_OPT_NO_FILTER_TEMPLATE_STR);
formatter % var_name % internal::get_v_type_2_str(get_v_type) %
label_ids_to_array_str(vertex_labels);
return std::make_pair(var_name, formater.str());
return std::make_pair(var_name, formatter.str());
}

internal::GetVType vopt_pb_to_internal(const physical::GetV::VOpt& v_opt) {
Expand Down Expand Up @@ -164,14 +164,14 @@ class GetVOpBuilder {
VLOG(10) << "Before deduplicate: " << gs::to_string(vertex_labels_)
<< ", after dedup: " << gs::to_string(tmp);
if (expr_name_.empty()) {
boost::format formater(GET_V_NO_FILTER_TEMPLATE_STR);
formater % get_v_opt_var % internal::get_v_type_2_str(v_opt_) %
boost::format formatter(GET_V_NO_FILTER_TEMPLATE_STR);
formatter % get_v_opt_var % internal::get_v_type_2_str(v_opt_) %
label_ids_to_array_str(tmp) % next_ctx_name % append_opt %
input_col_str % ctx_.GraphVar() % prev_ctx_name;
get_v_code = formater.str();
get_v_code = formatter.str();
// no filter
} else {
boost::format formater(GET_V_FILTER_TEMPLATE_STR);
boost::format formatter(GET_V_FILTER_TEMPLATE_STR);
// with filter
std::string expr_var_name = ctx_.GetNextExprVarName();
std::string expr_call_str;
Expand Down Expand Up @@ -199,11 +199,11 @@ class GetVOpBuilder {
}
selectors_str = ss.str();
}
formater % expr_var_name % expr_name_ % expr_call_str % selectors_str %
formatter % expr_var_name % expr_name_ % expr_call_str % selectors_str %
get_v_opt_var % internal::get_v_type_2_str(v_opt_) %
label_ids_to_array_str(tmp) % next_ctx_name % append_opt %
input_col_str % ctx_.GraphVar() % prev_ctx_name;
get_v_code = formater.str();
get_v_code = formatter.str();
}
VLOG(10) << "Finish building getv code";

Expand Down
Loading
Loading