mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-24 10:30:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: Unify ks_meta_data::new_keyspace() functions

Browse Source 
Use default argument to unify the two new_keyspace() function variants.

Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
This commit is contained in:
Pekka Enberg
2015-05-19 10:28:23 +03:00
parent b7ddd2c4b6
commit 491d5e648b
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/ks_meta_data.cc
View File

@@ -69,12 +69,12 @@ ks_meta_data::ks_meta_data(sstring name_,
}
}
// For new user created keyspaces (through CQL)
lw_shared_ptr<ks_meta_data> ks_meta_data::new_keyspace(sstring name, sstring strategy_name, std::unordered_map<sstring, sstring> options, bool durable_writes) {
return new_keyspace(name, strategy_name, options, durable_writes, std::vector<schema_ptr>{});
}
lw_shared_ptr<ks_meta_data> ks_meta_data::new_keyspace(sstring name, sstring strategy_name, std::unordered_map<sstring, sstring> options, bool durables_writes, std::vector<schema_ptr> cf_defs)
lw_shared_ptr<ks_meta_data>
ks_meta_data::new_keyspace(sstring name,
sstring strategy_name,
std::unordered_map<sstring, sstring> options,
bool durables_writes,
std::vector<schema_ptr> cf_defs)
{
return ::make_lw_shared<ks_meta_data>(name, strategy_name, options, durables_writes, cf_defs, ::make_shared<user_types_metadata>());
}

10
config/ks_meta_data.hh
View File

@@ -64,10 +64,12 @@ public:
std::vector<schema_ptr> cf_defs,
shared_ptr<user_types_metadata> user_types_);
// For new user created keyspaces (through CQL)
static lw_shared_ptr<ks_meta_data> new_keyspace(sstring name, sstring strategy_name, std::unordered_map<sstring, sstring> options, bool durable_writes);
static lw_shared_ptr<ks_meta_data> new_keyspace(sstring name, sstring strategy_name, std::unordered_map<sstring, sstring> options, bool durables_writes, std::vector<schema_ptr> cf_defs);
static lw_shared_ptr<ks_meta_data>
new_keyspace(sstring name,
sstring strategy_name,
std::unordered_map<sstring, sstring> options,
bool durables_writes,
std::vector<schema_ptr> cf_defs = std::vector<schema_ptr>{});
const std::unordered_map<sstring, schema_ptr>& cf_meta_data() const {
return _cf_meta_data;