bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

everywhere: Be more explicit that we don't want std::make_shared

Browse Source 
If sstring is made an alias to std::string ADL causes std::make_shared
to be found. Explicitly ask for ::make_shared.

Signed-off-by: Rafael Ávila de Espíndola <espindola@scylladb.com>
This commit is contained in:
Rafael Ávila de Espíndola
2020-03-05 13:36:35 -08:00
parent ad9f17bd92
commit c0072eab30
31 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/collectd.cc
View File

@@ -64,7 +64,7 @@ static const char* str_to_regex(const sstring& v) {
void set_collectd(http_context& ctx, routes& r) {
cd::get_collectd.set(r, [&ctx](std::unique_ptr<request> req) {
auto id = make_shared<scollectd::type_instance_id>(req->param["pluginid"],
auto id = ::make_shared<scollectd::type_instance_id>(req->param["pluginid"],
req->get_query_param("instance"), req->get_query_param("type"),
req->get_query_param("type_instance"));

6
compress.cc
View File

@@ -103,9 +103,9 @@ shared_ptr<compressor> compressor::create(const std::map<sstring, sstring>& opti
return {};
}
thread_local const shared_ptr<compressor> compressor::lz4 = make_shared<lz4_processor>(namespace_prefix + "LZ4Compressor");
thread_local const shared_ptr<compressor> compressor::snappy = make_shared<snappy_processor>(namespace_prefix + "SnappyCompressor");
thread_local const shared_ptr<compressor> compressor::deflate = make_shared<deflate_processor>(namespace_prefix + "DeflateCompressor");
thread_local const shared_ptr<compressor> compressor::lz4 = ::make_shared<lz4_processor>(namespace_prefix + "LZ4Compressor");
thread_local const shared_ptr<compressor> compressor::snappy = ::make_shared<snappy_processor>(namespace_prefix + "SnappyCompressor");
thread_local const shared_ptr<compressor> compressor::deflate = ::make_shared<deflate_processor>(namespace_prefix + "DeflateCompressor");
const sstring compression_parameters::SSTABLE_COMPRESSION = "sstable_compression";
const sstring compression_parameters::CHUNK_LENGTH_KB = "chunk_length_in_kb";

16
cql3/Cql.g
View File

@@ -752,7 +752,7 @@ createKeyspaceStatement returns [shared_ptr<cql3::statements::create_keyspace_st
bool if_not_exists = false;
}
: K_CREATE K_KEYSPACE (K_IF K_NOT K_EXISTS { if_not_exists = true; } )? ks=keyspaceName
K_WITH properties[attrs] { $expr = make_shared<cql3::statements::create_keyspace_statement>(ks, attrs, if_not_exists); }
K_WITH properties[attrs] { $expr = ::make_shared<cql3::statements::create_keyspace_statement>(ks, attrs, if_not_exists); }
;
/**
@@ -914,7 +914,7 @@ alterKeyspaceStatement returns [shared_ptr<cql3::statements::alter_keyspace_stat
auto attrs = make_shared<cql3::statements::ks_prop_defs>();
}
: K_ALTER K_KEYSPACE ks=keyspaceName
K_WITH properties[attrs] { $expr = make_shared<cql3::statements::alter_keyspace_statement>(ks, attrs); }
K_WITH properties[attrs] { $expr = ::make_shared<cql3::statements::alter_keyspace_statement>(ks, attrs); }
;
/**
@@ -1243,16 +1243,16 @@ roleOption[cql3::role_options& opts]
// identifiers because the underlying comparator is not necessarily text. See
// CASSANDRA-8178 for details.
cident returns [shared_ptr<cql3::column_identifier::raw> id]
: t=IDENT { $id = make_shared<cql3::column_identifier::raw>(sstring{$t.text}, false); }
| t=QUOTED_NAME { $id = make_shared<cql3::column_identifier::raw>(sstring{$t.text}, true); }
| k=unreserved_keyword { $id = make_shared<cql3::column_identifier::raw>(k, false); }
: t=IDENT { $id = ::make_shared<cql3::column_identifier::raw>(sstring{$t.text}, false); }
| t=QUOTED_NAME { $id = ::make_shared<cql3::column_identifier::raw>(sstring{$t.text}, true); }
| k=unreserved_keyword { $id = ::make_shared<cql3::column_identifier::raw>(k, false); }
;
// Identifiers that do not refer to columns or where the comparator is known to be text
ident returns [shared_ptr<cql3::column_identifier> id]
: t=IDENT { $id = make_shared<cql3::column_identifier>(sstring{$t.text}, false); }
| t=QUOTED_NAME { $id = make_shared<cql3::column_identifier>(sstring{$t.text}, true); }
| k=unreserved_keyword { $id = make_shared<cql3::column_identifier>(k, false); }
: t=IDENT { $id = ::make_shared<cql3::column_identifier>(sstring{$t.text}, false); }
| t=QUOTED_NAME { $id = ::make_shared<cql3::column_identifier>(sstring{$t.text}, true); }
| k=unreserved_keyword { $id = ::make_shared<cql3::column_identifier>(k, false); }
;
// Keyspace & Column family names

6
cql3/lists.cc
View File

@@ -32,20 +32,20 @@ namespace cql3 {
shared_ptr<column_specification>
lists::index_spec_of(const column_specification& column) {
return make_shared<column_specification>(column.ks_name, column.cf_name,
return ::make_shared<column_specification>(column.ks_name, column.cf_name,
::make_shared<column_identifier>(format("idx({})", *column.name), true), int32_type);
}
shared_ptr<column_specification>
lists::value_spec_of(const column_specification& column) {
return make_shared<column_specification>(column.ks_name, column.cf_name,
return ::make_shared<column_specification>(column.ks_name, column.cf_name,
::make_shared<column_identifier>(format("value({})", *column.name), true),
dynamic_pointer_cast<const list_type_impl>(column.type)->get_elements_type());
}
shared_ptr<column_specification>
lists::uuid_index_spec_of(const column_specification& column) {
return make_shared<column_specification>(column.ks_name, column.cf_name,
return ::make_shared<column_specification>(column.ks_name, column.cf_name,
::make_shared<column_identifier>(format("uuid_idx({})", *column.name), true), uuid_type);
}

6
cql3/operation.cc
View File

@@ -216,12 +216,12 @@ operation::subtraction::prepare(database& db, const sstring& keyspace, const col
} else if (ctype->get_kind() == abstract_type::kind::map) {
auto&& mtype = dynamic_pointer_cast<const map_type_impl>(ctype);
// The value for a map subtraction is actually a set
auto&& vr = make_shared<column_specification>(
auto&& vr = ::make_shared<column_specification>(
receiver.column_specification->ks_name,
receiver.column_specification->cf_name,
receiver.column_specification->name,
set_type_impl::get_instance(mtype->get_keys_type(), false));
return make_shared<sets::discarder>(receiver, _value->prepare(db, keyspace, std::move(vr)));
return ::make_shared<sets::discarder>(receiver, _value->prepare(db, keyspace, std::move(vr)));
}
abort();
}
@@ -294,7 +294,7 @@ operation::set_counter_value_from_tuple_list::prepare(database& db, const sstrin
// We need to fake a column of list<tuple<...>> to prepare the value term
auto & os = receiver.column_specification;
auto spec = make_shared<cql3::column_specification>(os->ks_name, os->cf_name, os->name, counter_tuple_list_type);
auto spec = ::make_shared<cql3::column_specification>(os->ks_name, os->cf_name, os->name, counter_tuple_list_type);
auto v = _value->prepare(db, keyspace, spec);
// Will not be used elsewhere, so make it local.

4
cql3/selection/writetime_or_ttl_selector.hh
View File

@@ -72,7 +72,7 @@ public:
}
virtual shared_ptr<selector> new_instance() const override {
return make_shared<writetime_or_ttl_selector>(_column_name, _idx, _is_writetime);
return ::make_shared<writetime_or_ttl_selector>(_column_name, _idx, _is_writetime);
}
virtual bool is_write_time_selector_factory() const override {
@@ -83,7 +83,7 @@ public:
return !_is_writetime;
}
};
return make_shared<wtots_factory>(std::move(column_name), idx, is_writetime);
return ::make_shared<wtots_factory>(std::move(column_name), idx, is_writetime);
}
virtual void add_input(cql_serialization_format sf, result_set_builder& rs) override {

2
cql3/sets.cc
View File

@@ -29,7 +29,7 @@ namespace cql3 {
shared_ptr<column_specification>
sets::value_spec_of(const column_specification& column) {
return make_shared<column_specification>(column.ks_name, column.cf_name,
return ::make_shared<column_specification>(column.ks_name, column.cf_name,
::make_shared<column_identifier>(format("value({})", *column.name), true),
dynamic_pointer_cast<const set_type_impl>(column.type)->get_elements_type());
}

2
cql3/statements/alter_keyspace_statement.cc
View File

@@ -96,7 +96,7 @@ future<shared_ptr<cql_transport::event::schema_change>> cql3::statements::alter_
const auto& tm = proxy.get_token_metadata();
return service::get_local_migration_manager().announce_keyspace_update(_attrs->as_ks_metadata_update(old_ksm, tm), is_local_only).then([this] {
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::UPDATED,
event::schema_change::target_type::KEYSPACE,
keyspace());

2
cql3/statements/alter_table_statement.cc
View File

@@ -393,7 +393,7 @@ future<shared_ptr<cql_transport::event::schema_change>> alter_table_statement::a
return service::get_local_migration_manager().announce_column_family_update(cfm.build(), false, std::move(view_updates), is_local_only)
.then([this] {
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::UPDATED,
event::schema_change::target_type::TABLE,
keyspace(),

2
cql3/statements/alter_type_statement.cc
View File

@@ -122,7 +122,7 @@ future<shared_ptr<cql_transport::event::schema_change>> alter_type_statement::an
auto&& ks = db.find_keyspace(keyspace());
do_announce_migration(db, ks, is_local_only);
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::UPDATED,
event::schema_change::target_type::TYPE,
keyspace(),

2
cql3/statements/alter_view_statement.cc
View File

@@ -110,7 +110,7 @@ future<shared_ptr<cql_transport::event::schema_change>> alter_view_statement::an
return service::get_local_migration_manager().announce_view_update(view_ptr(builder.build()), is_local_only).then([this] {
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::UPDATED,
event::schema_change::target_type::TABLE,
keyspace(),

4
cql3/statements/batch_statement.cc
View File

@@ -402,8 +402,8 @@ void batch_statement::build_cas_result_set_metadata() {
// Add the mandatory [applied] column to result set metadata
std::vector<shared_ptr<column_specification>> columns;
auto applied = make_shared<cql3::column_specification>(schema.ks_name(), schema.cf_name(),
make_shared<cql3::column_identifier>("[applied]", false), boolean_type);
auto applied = ::make_shared<cql3::column_specification>(schema.ks_name(), schema.cf_name(),
::make_shared<cql3::column_identifier>("[applied]", false), boolean_type);
columns.push_back(applied);
for (const auto& def : boost::range::join(schema.partition_key_columns(), schema.clustering_key_columns())) {

2
cql3/statements/create_index_statement.cc
View File

@@ -315,7 +315,7 @@ create_index_statement::announce_migration(service::storage_proxy& proxy, bool i
return service::get_local_migration_manager().announce_column_family_update(
builder.build(), false, {}, is_local_only).then([this]() {
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::UPDATED,
event::schema_change::target_type::TABLE,
keyspace(),

2
cql3/statements/create_keyspace_statement.cc
View File

@@ -115,7 +115,7 @@ future<shared_ptr<cql_transport::event::schema_change>> create_keyspace_statemen
try {
f.get();
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::CREATED,
event::schema_change::target_type::KEYSPACE,
this->keyspace());

2
cql3/statements/create_table_statement.cc
View File

@@ -105,7 +105,7 @@ future<shared_ptr<cql_transport::event::schema_change>> create_table_statement::
try {
f.get();
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::CREATED,
event::schema_change::target_type::TABLE,
this->keyspace(),

2
cql3/statements/create_type_statement.cc
View File

@@ -155,7 +155,7 @@ future<shared_ptr<cql_transport::event::schema_change>> create_type_statement::a
return service::get_local_migration_manager().announce_new_type(type, is_local_only).then([this] {
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::CREATED,
event::schema_change::target_type::TYPE,
keyspace(),

2
cql3/statements/create_view_statement.cc
View File

@@ -358,7 +358,7 @@ future<shared_ptr<cql_transport::event::schema_change>> create_view_statement::a
try {
f.get();
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::CREATED,
event::schema_change::target_type::TABLE,
this->keyspace(),

2
cql3/statements/drop_index_statement.cc
View File

@@ -103,7 +103,7 @@ future<shared_ptr<cql_transport::event::schema_change>> drop_index_statement::an
// Note that we shouldn't call columnFamily() at this point because the index has been dropped and the call to lookupIndexedTable()
// in that method would now throw.
using namespace cql_transport;
return make_shared<event::schema_change>(event::schema_change::change_type::UPDATED,
return ::make_shared<event::schema_change>(event::schema_change::change_type::UPDATED,
event::schema_change::target_type::TABLE,
cfm->ks_name(),
cfm->cf_name());

2
cql3/statements/drop_keyspace_statement.cc
View File

@@ -82,7 +82,7 @@ future<shared_ptr<cql_transport::event::schema_change>> drop_keyspace_statement:
try {
f.get();
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::DROPPED,
event::schema_change::target_type::KEYSPACE,
this->keyspace());

2
cql3/statements/drop_table_statement.cc
View File

@@ -80,7 +80,7 @@ future<shared_ptr<cql_transport::event::schema_change>> drop_table_statement::an
try {
f.get();
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::DROPPED,
event::schema_change::target_type::TABLE,
this->keyspace(),

2
cql3/statements/drop_type_statement.cc
View File

@@ -160,7 +160,7 @@ future<shared_ptr<cql_transport::event::schema_change>> drop_type_statement::ann
return service::get_local_migration_manager().announce_type_drop(to_drop->second, is_local_only).then([this] {
using namespace cql_transport;
return make_shared<event::schema_change>(
return ::make_shared<event::schema_change>(
event::schema_change::change_type::DROPPED,
event::schema_change::target_type::TYPE,
keyspace(),

2
cql3/statements/drop_view_statement.cc
View File

@@ -82,7 +82,7 @@ future<shared_ptr<cql_transport::event::schema_change>> drop_view_statement::ann
f.get();
using namespace cql_transport;
return make_shared<event::schema_change>(event::schema_change::change_type::DROPPED,
return ::make_shared<event::schema_change>(event::schema_change::change_type::DROPPED,
event::schema_change::target_type::TABLE,
this->keyspace(),
this->column_family());

2
cql3/statements/select_statement.cc
View File

@@ -1250,7 +1250,7 @@ void select_statement::maybe_jsonize_select_clause(database& db, schema_ptr sche
_select_clause.reserve(schema->all_columns().size());
for (const column_definition& column_def : schema->all_columns_in_select_order()) {
_select_clause.push_back(make_shared<selection::raw_selector>(
make_shared<column_identifier::raw>(column_def.name_as_text(), true), nullptr));
::make_shared<column_identifier::raw>(column_def.name_as_text(), true), nullptr));
}
}

2
cql3/statements/use_statement.cc
View File

@@ -68,7 +68,7 @@ use_statement::use_statement(sstring keyspace)
std::unique_ptr<prepared_statement> use_statement::prepare(database& db, cql_stats& stats)
{
return std::make_unique<prepared_statement>(make_shared<cql3::statements::use_statement>(_keyspace));
return std::make_unique<prepared_statement>(::make_shared<cql3::statements::use_statement>(_keyspace));
}
}

4
cql3/tuples.cc
View File

@@ -121,9 +121,9 @@ tuples::in_raw::make_in_receiver(const std::vector<shared_ptr<column_specificati
}
in_name += ")";
auto identifier = make_shared<column_identifier>(in_name, true);
auto identifier = ::make_shared<column_identifier>(in_name, true);
auto type = tuple_type_impl::get_instance(types);
return make_shared<column_specification>(receivers.front()->ks_name, receivers.front()->cf_name, identifier, list_type_impl::get_instance(type, false));
return ::make_shared<column_specification>(receivers.front()->ks_name, receivers.front()->cf_name, identifier, list_type_impl::get_instance(type, false));
}
tuples::in_marker::in_marker(int32_t bind_index, ::shared_ptr<column_specification> receiver)

4
cql3/tuples.hh
View File

@@ -263,9 +263,9 @@ public:
}
in_name += ")";
auto identifier = make_shared<column_identifier>(in_name, true);
auto identifier = ::make_shared<column_identifier>(in_name, true);
auto type = tuple_type_impl::get_instance(types);
return make_shared<column_specification>(receivers.front()->ks_name, receivers.front()->cf_name, identifier, type);
return ::make_shared<column_specification>(receivers.front()->ks_name, receivers.front()->cf_name, identifier, type);
}
};

4
cql3/type_cast.hh
View File

@@ -63,8 +63,8 @@ public:
}
private:
shared_ptr<column_specification> casted_spec_of(database& db, const sstring& keyspace, const column_specification& receiver) const {
return make_shared<column_specification>(receiver.ks_name, receiver.cf_name,
make_shared<column_identifier>(to_string(), true), _type->prepare(db, keyspace).get_type());
return ::make_shared<column_specification>(receiver.ks_name, receiver.cf_name,
::make_shared<column_identifier>(to_string(), true), _type->prepare(db, keyspace).get_type());
}
public:
virtual assignment_testable::test_result test_assignment(database& db, const sstring& keyspace, shared_ptr<column_specification> receiver) const override {

4
cql3/user_types.cc
View File

@@ -55,10 +55,10 @@ shared_ptr<column_specification> user_types::field_spec_of(const column_specific
auto&& ut = static_pointer_cast<const user_type_impl>(column.type);
auto&& name = ut->field_name(field);
auto&& sname = sstring(reinterpret_cast<const char*>(name.data()), name.size());
return make_shared<column_specification>(
return ::make_shared<column_specification>(
column.ks_name,
column.cf_name,
make_shared<column_identifier>(column.name->to_string() + "." + sname, true),
::make_shared<column_identifier>(column.name->to_string() + "." + sname, true),
ut->field_type(field));
}

2
locator/ec2_multi_region_snitch.cc
View File

@@ -111,7 +111,7 @@ future<> ec2_multi_region_snitch::gossiper_starting() {
return g.add_local_application_state(application_state::INTERNAL_IP,
ss.value_factory.internal_ip(_local_private_address)).then([this] {
if (!_gossip_started) {
gms::get_local_gossiper().register_(make_shared<reconnectable_snitch_helper>(_my_dc));
gms::get_local_gossiper().register_(::make_shared<reconnectable_snitch_helper>(_my_dc));
_gossip_started = true;
}
});

2
locator/gossiping_property_file_snitch.cc
View File

@@ -333,7 +333,7 @@ future<> gossiping_property_file_snitch::reload_gossiper_state() {
}
return ret.then([this] {
_reconnectable_helper = make_shared<reconnectable_snitch_helper>(_my_dc);
_reconnectable_helper = ::make_shared<reconnectable_snitch_helper>(_my_dc);
gms::get_local_gossiper().register_(_reconnectable_helper);
});
}

4
streaming/stream_result_future.cc
View File

@@ -47,7 +47,7 @@ extern logging::logger sslog;
future<stream_state> stream_result_future::init_sending_side(UUID plan_id_, sstring description_,
std::vector<stream_event_handler*> listeners_, shared_ptr<stream_coordinator> coordinator_) {
auto sr = make_shared<stream_result_future>(plan_id_, description_, coordinator_);
auto sr = ::make_shared<stream_result_future>(plan_id_, description_, coordinator_);
get_local_stream_manager().register_sending(sr);
for (auto& listener : listeners_) {
@@ -76,7 +76,7 @@ shared_ptr<stream_result_future> stream_result_future::init_receiving_side(UUID
}
sslog.info("[Stream #{}] Executing streaming plan for {} with peers={}, slave", plan_id, description, from);
bool is_receiving = true;
sr = make_shared<stream_result_future>(plan_id, description, is_receiving);
sr = ::make_shared<stream_result_future>(plan_id, description, is_receiving);
sm.register_receiving(sr);
return sr;
}