mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

expression: Shorten making raw_value from FragmetedView

Browse Source 
The read_field is std::optional<View>. The raw_value::make_value()
accepts managed_bytes_opt which is std::optional<manager_bytes>.
Finally, there's std::optional<T>::optional(std::optional<U>&&)
move constructor (and its copy-constructor peer).

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>

Closes scylladb/scylladb#18128
This commit is contained in:
Pavel Emelyanov
2024-04-01 13:42:57 +03:00
committed by Avi Kivity
parent 01fc1a9f66
commit 46bbfc0c53
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cql3/expr/expression.cc
View File

@@ -1723,11 +1723,7 @@ cql3::raw_value do_evaluate(const field_selection& field_select, const evaluatio
// std::optional<FragmentedView> read_field
auto read_field = read_nth_user_type_field(udt_serialized_bytes, field_select.field_idx);
if (read_field.has_value()) {
return cql3::raw_value::make_value(managed_bytes(*read_field));
} else {
return cql3::raw_value::make_null();
}
return cql3::raw_value::make_value(managed_bytes_opt(read_field));
});
return field_value;