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

table: Make sstables with required state

Browse Source 
By default it's created with normal state, but there are some places
that need to put it into staging. Do it with new state enum

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2023-06-01 16:24:10 +03:00
parent 855f2b4b86
commit fdfec474ae
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
replica/database.hh
View File

@@ -92,6 +92,7 @@ class feature_service;
namespace sstables {
enum class sstable_state;
class sstable;
class compaction_descriptor;
class compaction_completion_desc;
@@ -499,7 +500,7 @@ private:
db_clock::time_point _truncated_at = db_clock::time_point::min();
bool _is_bootstrap_or_replace = false;
sstables::shared_sstable make_sstable(sstring dir);
sstables::shared_sstable make_sstable(sstables::sstable_state state);
public:
void deregister_metrics();

10
replica/table.cc
View File

@@ -279,13 +279,13 @@ table::make_reader_v2(schema_ptr s,
}
sstables::shared_sstable table::make_streaming_sstable_for_write() {
auto newtab = make_sstable(_config.datadir);
auto newtab = make_sstable(sstables::sstable_state::normal);
tlogger.debug("Created sstable for streaming: ks={}, cf={}", schema()->ks_name(), schema()->cf_name());
return newtab;
}
sstables::shared_sstable table::make_streaming_staging_sstable() {
auto newtab = make_sstable(_config.datadir + "/" + sstables::staging_dir);
auto newtab = make_sstable(sstables::sstable_state::staging);
tlogger.debug("Created staging sstable for streaming: ks={}, cf={}", schema()->ks_name(), schema()->cf_name());
return newtab;
}
@@ -434,13 +434,13 @@ static bool belongs_to_other_shard(const std::vector<shard_id>& shards) {
return shards.size() != size_t(belongs_to_current_shard(shards));
}
sstables::shared_sstable table::make_sstable(sstring dir) {
sstables::shared_sstable table::make_sstable(sstables::sstable_state state) {
auto& sstm = get_sstables_manager();
return sstm.make_sstable(_schema, *_storage_opts, dir, calculate_generation_for_new_table(), sstm.get_highest_supported_format(), sstables::sstable::format_types::big);
return sstm.make_sstable(_schema, _config.datadir, *_storage_opts, calculate_generation_for_new_table(), state, sstm.get_highest_supported_format(), sstables::sstable::format_types::big);
}
sstables::shared_sstable table::make_sstable() {
return make_sstable(_config.datadir);
return make_sstable(sstables::sstable_state::normal);
}
void table::notify_bootstrap_or_replace_start() {