Skip to content

Correctly set field names for nodes. #297

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

Merged
badmonster0 merged 1 commit into from
Apr 12, 2025
Merged

Correctly set field names for nodes. #297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 52 additions & 18 deletions src/ops/storages/neo4j.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ pub struct FieldMapping {
node_field_name: Option<FieldName>,
}

impl FieldMapping {
fn get_node_field_name(&self) -> &FieldName {
self.node_field_name.as_ref().unwrap_or(&self.field_name)
}
}

#[derive(Debug, Deserialize)]
pub struct RelationshipEndSpec {
label: String,
Expand Down Expand Up @@ -133,7 +139,8 @@ impl GraphPool {
#[derive(Debug, Clone)]
struct AnalyzedGraphFieldMapping {
field_idx: usize,
field_schema: FieldSchema,
field_name: String,
value_type: schema::ValueType,
}

struct AnalyzedGraphFields {
Expand Down Expand Up @@ -203,6 +210,23 @@ fn field_values_to_bolt<'a>(
Ok(bolt_value)
}

fn mapped_field_values_to_bolt<'a>(
field_values: impl IntoIterator<Item = &'a value::Value>,
field_mappings: impl IntoIterator<Item = &'a AnalyzedGraphFieldMapping>,
) -> Result<BoltType> {
let bolt_value = BoltType::Map(neo4rs::BoltMap {
value: std::iter::zip(field_mappings, field_values)
.map(|(mapping, value)| {
Ok((
neo4rs::BoltString::new(&mapping.field_name),
value_to_bolt(value, &mapping.value_type)?,
))
})
.collect::<Result<_>>()?,
});
Ok(bolt_value)
}

fn basic_value_to_bolt(value: &BasicValue, schema: &BasicValueType) -> Result<BoltType> {
let bolt_value = match value {
BasicValue::Bytes(v) => {
Expand Down Expand Up @@ -390,46 +414,46 @@ FINISH
SRC_ID_PARAM,
value_to_bolt(
&value.fields[self.src_fields.key_field.field_idx],
&self.src_fields.key_field.field_schema.value_type.typ,
&self.src_fields.key_field.value_type,
)?,
)
.param(
TGT_ID_PARAM,
value_to_bolt(
&value.fields[self.tgt_fields.key_field.field_idx],
&self.tgt_fields.key_field.field_schema.value_type.typ,
&self.tgt_fields.key_field.value_type,
)?,
);
if !self.src_fields.value_fields.is_empty() {
insert_cypher = insert_cypher.param(
SRC_PROPS_PARAM,
field_values_to_bolt(
mapped_field_values_to_bolt(
self.src_fields
.value_fields
.iter()
.map(|f| &value.fields[f.field_idx]),
self.src_fields.value_fields.iter().map(|f| &f.field_schema),
self.src_fields.value_fields.iter(),
)?,
);
}
if !self.tgt_fields.value_fields.is_empty() {
insert_cypher = insert_cypher.param(
TGT_PROPS_PARAM,
field_values_to_bolt(
mapped_field_values_to_bolt(
self.tgt_fields
.value_fields
.iter()
.map(|f| &value.fields[f.field_idx]),
self.tgt_fields.value_fields.iter().map(|f| &f.field_schema),
self.tgt_fields.value_fields.iter(),
)?,
);
}
if !self.value_fields.is_empty() {
insert_cypher = insert_cypher.param(
REL_PROPS_PARAM,
field_values_to_bolt(
mapped_field_values_to_bolt(
self.value_fields.iter().map(|f| &value.fields[f.field_idx]),
self.value_fields.iter().map(|f| &f.field_schema),
self.value_fields.iter(),
)?,
);
}
Expand Down Expand Up @@ -819,34 +843,44 @@ impl StorageFactoryBase for RelationshipFactory {
for (field_idx, field_schema) in value_fields_schema.into_iter().enumerate() {
let src_field_info = field_name_to_src_field_info.remove(field_schema.name.as_str());
let tgt_field_info = field_name_to_tgt_field_info.remove(field_schema.name.as_str());
let field_mapping = AnalyzedGraphFieldMapping {
field_idx,
field_schema,
};
if let Some(src_field_info) = src_field_info {
let field_mapping = AnalyzedGraphFieldMapping {
field_idx,
field_name: src_field_info.get_node_field_name().clone(),
value_type: field_schema.value_type.typ.clone(),
};
let node_field_name = src_field_info
.node_field_name
.as_ref()
.unwrap_or(&src_field_info.field_name);
if &src_label_info.key_field_name == node_field_name {
src_key_field_info = Some(field_mapping.clone());
src_key_field_info = Some(field_mapping);
} else {
src_value_fields_info.push(field_mapping.clone());
src_value_fields_info.push(field_mapping);
}
}
if let Some(tgt_field_info) = tgt_field_info {
let field_mapping = AnalyzedGraphFieldMapping {
field_idx,
field_name: tgt_field_info.get_node_field_name().clone(),
value_type: field_schema.value_type.typ.clone(),
};
let node_field_name = tgt_field_info
.node_field_name
.as_ref()
.unwrap_or(&tgt_field_info.field_name);
if &tgt_label_info.key_field_name == node_field_name {
tgt_key_field_info = Some(field_mapping.clone());
tgt_key_field_info = Some(field_mapping);
} else {
tgt_value_fields_info.push(field_mapping.clone());
tgt_value_fields_info.push(field_mapping);
}
}
if src_field_info.is_none() && tgt_field_info.is_none() {
rel_value_fields_info.push(field_mapping);
rel_value_fields_info.push(AnalyzedGraphFieldMapping {
field_idx,
field_name: field_schema.name.clone(),
value_type: field_schema.value_type.typ.clone(),
});
}
}
if !field_name_to_src_field_info.is_empty() {
Expand Down