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

migration_manager: add prepare_column_family_drop_announcement() function

Browse Source 
The function only generates mutations for the announcement, but does not
send them out. Will be used by the later patches.
This commit is contained in:
Gleb Natapov
2021-11-22 12:27:39 +02:00
parent 68cf743554
commit 471d48d277
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
service/migration_manager.cc
View File

@@ -850,16 +850,14 @@ future<> migration_manager::announce_keyspace_drop(const sstring& ks_name) {
return announce(prepare_keyspace_drop_announcement(ks_name));
}
future<> migration_manager::announce_column_family_drop(const sstring& ks_name,
const sstring& cf_name,
drop_views drop_views)
{
future<std::vector<mutation>> migration_manager::prepare_column_family_drop_announcement(const sstring& ks_name,
const sstring& cf_name, drop_views drop_views) {
try {
auto& db = get_local_storage_proxy().get_db().local();
auto& old_cfm = db.find_column_family(ks_name, cf_name);
auto& schema = old_cfm.schema();
if (schema->is_view()) {
throw exceptions::invalid_request_exception("Cannot use DROP TABLE on Materialized View");
co_return coroutine::make_exception(exceptions::invalid_request_exception("Cannot use DROP TABLE on Materialized View"));
}
auto keyspace = db.find_keyspace(ks_name).metadata();
@@ -871,8 +869,8 @@ future<> migration_manager::announce_column_family_drop(const sstring& ks_name,
auto explicit_view_names = views
| boost::adaptors::filtered([&old_cfm](const view_ptr& v) { return !old_cfm.get_index_manager().is_index(v); })
| boost::adaptors::transformed([](const view_ptr& v) { return v->cf_name(); });
throw exceptions::invalid_request_exception(format("Cannot drop table when materialized views still depend on it ({}.{{{}}})",
schema->ks_name(), ::join(", ", explicit_view_names)));
co_return coroutine::make_exception(exceptions::invalid_request_exception(format("Cannot drop table when materialized views still depend on it ({}.{{{}}})",
schema->ks_name(), ::join(", ", explicit_view_names))));
}
mlogger.info("Drop table '{}.{}'", schema->ks_name(), schema->cf_name());
@@ -896,12 +894,18 @@ future<> migration_manager::announce_column_family_drop(const sstring& ks_name,
co_await seastar::async([&] {
get_notifier().before_drop_column_family(*schema, mutations, ts);
});
co_return co_await include_keyspace_and_announce(*keyspace, std::move(mutations));
co_return co_await include_keyspace(*keyspace, std::move(mutations));
} catch (const no_such_column_family& e) {
throw exceptions::configuration_exception(format("Cannot drop non existing table '{}' in keyspace '{}'.", cf_name, ks_name));
co_return coroutine::make_exception(exceptions::configuration_exception(format("Cannot drop non existing table '{}' in keyspace '{}'.", cf_name, ks_name)));
}
}
future<> migration_manager::announce_column_family_drop(const sstring& ks_name,
const sstring& cf_name,
drop_views drop_views) {
co_return co_await announce(co_await prepare_column_family_drop_announcement(ks_name, cf_name, drop_views));
}
future<> migration_manager::announce_type_drop(user_type dropped_type)
{
auto& db = get_local_storage_proxy().get_db().local();

1
service/migration_manager.hh
View File

@@ -166,6 +166,7 @@ public:
class drop_views_tag;
using drop_views = bool_class<drop_views_tag>;
future<> announce_column_family_drop(const sstring& ks_name, const sstring& cf_name, drop_views drop_views = drop_views::no);
future<std::vector<mutation>> prepare_column_family_drop_announcement(const sstring& ks_name, const sstring& cf_name, drop_views drop_views = drop_views::no);
future<> announce_type_drop(user_type dropped_type);