mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-07 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'treewide: adjust for missing aggregate template ...

Browse Source 
... type deduction and parenthesized aggregate construction' from Avi Kivity

Clang does not implement P0960R3 and P1816R0, so constructions
of aggregates (structs with no constructors) have to used braced initialization
and cannot use class template argument deduction. This series makes the
adjustments.

Closes #7456

* github.com:scylladb/scylla:
  reader_concurrency_semaphore: adjust permit_summary construction for clang
  schema_tables: adjust altered_schema construction for clang
  types: adjust validation_visitor construction for clang
This commit is contained in:
Piotr Sarna
2020-10-19 15:11:07 +02:00
committed by Avi Kivity
parent ef8815d39e cfada6e04d
commit e5edf30869
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/schema_tables.cc
View File

@@ -1182,7 +1182,7 @@ static schema_diff diff_table_or_view(distributed<service::storage_proxy>& proxy
auto s_before = create_schema(std::move(before.at(key)));
auto s = create_schema(std::move(after.at(key)));
slogger.info("Altering {}.{} id={} version={}", s->ks_name(), s->cf_name(), s->id(), s->version());
d.altered.emplace_back(s_before, s);
d.altered.emplace_back(schema_diff::altered_schema{s_before, s});
}
return d;
}

2
reader_concurrency_semaphore.cc
View File

@@ -261,7 +261,7 @@ static permit_stats do_dump_reader_permit_diagnostics(std::ostream& os, const pe
for (const auto& [k, v] : permits) {
const auto& [s, op_name, k_state] = k;
if (k_state == state) {
permit_summaries.emplace_back(s, op_name, v.memory, v.count);
permit_summaries.emplace_back(permit_summary{s, op_name, v.memory, v.count});
}
}

5
types.cc
View File

@@ -1403,6 +1403,7 @@ struct validate_visitor {
FragmentRangeView v;
cql_serialization_format sf;
void operator()(const reversed_type_impl& t) { return t.underlying_type()->validate(underlying, sf); }
void operator()(const abstract_type&) {}
template <typename T> void operator()(const integer_type_impl<T>& t) {
@@ -1572,11 +1573,11 @@ struct validate_visitor {
}
void abstract_type::validate(const fragmented_temporary_buffer::view& view, cql_serialization_format sf) const {
visit(*this, validate_visitor{view, view, sf});
visit(*this, validate_visitor<const fragmented_temporary_buffer::view&, const fragmented_temporary_buffer::view&>{view, view, sf});
}
void abstract_type::validate(bytes_view v, cql_serialization_format sf) const {
visit(*this, validate_visitor{v, single_fragment_range(v), sf});
visit(*this, validate_visitor<bytes_view, single_fragment_range<mutable_view::no>>{v, single_fragment_range(v), sf});
}
static void serialize_aux(const tuple_type_impl& type, const tuple_type_impl::native_type* val, bytes::iterator& out) {