tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GetProperty

Browse Source
This commit is contained in:
jbajic 2022-11-30 17:12:09 +01:00
parent 31f907cb53
commit d4bdedd9e8
2 changed files with 9 additions and 13 deletions

3
src/storage/v3/shard.hpp
View File

@ -308,9 +308,6 @@ class Shard final {
void Abort();
private:
/// @throw std::bad_alloc
VertexAccessor CreateVertex(Gid gid, LabelId primary_label);
Shard *shard_;
Transaction *transaction_;
Config::Items config_;

19
src/storage/v3/vertex_accessor.cpp
View File

@ -394,18 +394,13 @@ PropertyValue VertexAccessor::GetPropertyValue(PropertyId property, View view) c
return value;
}
// Find PropertyId index in keystore
size_t property_index{0};
for (; property_index < schema->second.size(); ++property_index) {
for (size_t property_index{0}; property_index < schema->second.size(); ++property_index) {
if (schema->second[property_index].property_id == property) {
break;
return vertex_->keys[property_index];
}
}
value = vertex_->keys[property_index];
if (value.IsNull()) {
value = vertex_->properties.GetProperty(property);
}
return value;
return value = vertex_->properties.GetProperty(property);
}
ShardResult<PropertyValue> VertexAccessor::GetProperty(PropertyId property, View view) const {
@ -443,8 +438,12 @@ ShardResult<PropertyValue> VertexAccessor::GetProperty(PropertyId property, View
break;
}
});
if (!exists) return SHARD_ERROR(ErrorCode::NONEXISTENT_OBJECT);
if (!for_deleted_ && deleted) return SHARD_ERROR(ErrorCode::DELETED_OBJECT);
if (!exists) {
return SHARD_ERROR(ErrorCode::NONEXISTENT_OBJECT);
}
if (!for_deleted_ && deleted) {
return SHARD_ERROR(ErrorCode::DELETED_OBJECT);
}
return std::move(value);
}