From 8d667e374bef038cdba4d3a5912c60e09cc4008d Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 24 May 2022 12:13:20 +0300 Subject: [PATCH] cql3: expressions: reindent get_value() Whitespace-only change. --- cql3/expr/expression.cc | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/cql3/expr/expression.cc b/cql3/expr/expression.cc index dd15fed992..c07a912ec4 100644 --- a/cql3/expr/expression.cc +++ b/cql3/expr/expression.cc @@ -221,28 +221,28 @@ static managed_bytes_opt get_value(const column_maybe_subscripted& col, const co format("Tried to evaluate expression with wrong type for subscript of {}", cdef->name_as_text())); } - if (col_type->is_map()) { - const auto& data_map = value_cast(deserialized); - const auto found = key.view().with_linearized([&] (bytes_view key_bv) { - using entry = std::pair; - return std::find_if(data_map.cbegin(), data_map.cend(), [&] (const entry& element) { - return key_type->compare(element.first.serialize_nonnull(), key_bv) == 0; + if (col_type->is_map()) { + const auto& data_map = value_cast(deserialized); + const auto found = key.view().with_linearized([&] (bytes_view key_bv) { + using entry = std::pair; + return std::find_if(data_map.cbegin(), data_map.cend(), [&] (const entry& element) { + return key_type->compare(element.first.serialize_nonnull(), key_bv) == 0; + }); }); - }); - return found == data_map.cend() ? std::nullopt : managed_bytes_opt(found->second.serialize_nonnull()); - } else if (col_type->is_list()) { - const auto& data_list = value_cast(deserialized); - auto key_deserialized = key.view().with_linearized([&] (bytes_view key_bv) { - return key_type->deserialize(key_bv); - }); - auto key_int = value_cast(key_deserialized); - if (key_int < 0 || size_t(key_int) >= data_list.size()) { - return std::nullopt; + return found == data_map.cend() ? std::nullopt : managed_bytes_opt(found->second.serialize_nonnull()); + } else if (col_type->is_list()) { + const auto& data_list = value_cast(deserialized); + auto key_deserialized = key.view().with_linearized([&] (bytes_view key_bv) { + return key_type->deserialize(key_bv); + }); + auto key_int = value_cast(key_deserialized); + if (key_int < 0 || size_t(key_int) >= data_list.size()) { + return std::nullopt; + } + return managed_bytes_opt(data_list[key_int].serialize_nonnull()); + } else { + throw exceptions::invalid_request_exception(format("subscripting non-map, non-list column {}", cdef->name_as_text())); } - return managed_bytes_opt(data_list[key_int].serialize_nonnull()); - } else { - throw exceptions::invalid_request_exception(format("subscripting non-map, non-list column {}", cdef->name_as_text())); - } } }, col); }