From b6443e44b96deecb6c5d4d59161de98a2eea5d45 Mon Sep 17 00:00:00 2001 From: Calle Wilund Date: Mon, 2 Mar 2020 14:42:31 +0000 Subject: [PATCH] set: Make set_type_impl::serialize_partially_deserialized_form static Conform with map + does not require any instance info. --- cql3/sets.cc | 2 +- types.cc | 2 +- types/set.hh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cql3/sets.cc b/cql3/sets.cc index 41e1d99763..1a1517e9fa 100644 --- a/cql3/sets.cc +++ b/cql3/sets.cc @@ -300,7 +300,7 @@ sets::adder::do_add(mutation& m, const clustering_key_prefix& row_key, const upd m.set_cell(row_key, column, mut.serialize(*set_type)); } else if (set_value != nullptr) { // for frozen sets, we're overwriting the whole cell - auto v = set_type->serialize_partially_deserialized_form( + auto v = set_type_impl::serialize_partially_deserialized_form( {set_value->_elements.begin(), set_value->_elements.end()}, cql_serialization_format::internal()); m.set_cell(row_key, column, params.make_cell(*column.type, fragmented_temporary_buffer::view(v))); diff --git a/types.cc b/types.cc index 380627f3f2..5206908a4c 100644 --- a/types.cc +++ b/types.cc @@ -1196,7 +1196,7 @@ set_type_impl::deserialize(bytes_view in, cql_serialization_format sf) const { bytes set_type_impl::serialize_partially_deserialized_form( - const std::vector& v, cql_serialization_format sf) const { + const std::vector& v, cql_serialization_format sf) { return pack(v.begin(), v.end(), v.size(), sf); } diff --git a/types/set.hh b/types/set.hh index a606613560..c7d0e016b9 100644 --- a/types/set.hh +++ b/types/set.hh @@ -48,8 +48,8 @@ public: virtual bool is_value_compatible_with_frozen(const collection_type_impl& previous) const override; using abstract_type::deserialize; virtual data_value deserialize(bytes_view v, cql_serialization_format sf) const override; - bytes serialize_partially_deserialized_form( - const std::vector& v, cql_serialization_format sf) const; + static bytes serialize_partially_deserialized_form( + const std::vector& v, cql_serialization_format sf); }; data_value make_set_value(data_type tuple_type, set_type_impl::native_type value);