mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sstables: entry_descriptor::make_descriptor(): add overload with provided ks/cf

Browse Source 
Not necessitating these to be extracted from the sstable dir path. This
practically allows for la/mx sstables at non-standard paths to be
opened. This will be used by the `scylla-sstable` tool which wants to be
flexible about where the sstables it opens are located.
This commit is contained in:
Botond Dénes
2021-10-12 11:41:21 +03:00
parent 235c38e78f
commit 1b7b3a81e6
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sstables/open_info.hh
View File

@@ -44,6 +44,10 @@ struct entry_descriptor {
static entry_descriptor make_descriptor(sstring sstdir, sstring fname);
// Use the given ks and cf and don't attempt to extract it from the dir path.
// This allows loading sstables from any path, but the filename still has to be valid.
static entry_descriptor make_descriptor(sstring sstdir, sstring fname, sstring ks, sstring cf);
entry_descriptor(sstring sstdir, sstring ks, sstring cf, int64_t generation,
sstable_version_types version, sstable_format_types format,
component_type component)

34
sstables/sstables.cc
View File

@@ -2196,7 +2196,7 @@ sstable::make_crawling_reader_v1(
return kl::make_crawling_reader(shared_from_this(), std::move(schema), std::move(permit), pc, std::move(trace_state), monitor);
}
entry_descriptor entry_descriptor::make_descriptor(sstring sstdir, sstring fname) {
static entry_descriptor make_entry_descriptor(sstring sstdir, sstring fname, sstring* const provided_ks, sstring* const provided_cf) {
static std::regex la_mx("(la|m[cd])-(\\d+)-(\\w+)-(.*)");
static std::regex ka("(\\w+)-(\\w+)-ka-(\\d+)-(.*)");
@@ -2206,30 +2206,40 @@ entry_descriptor entry_descriptor::make_descriptor(sstring sstdir, sstring fname
sstable::version_types version;
const auto ks_cf_provided = provided_ks && provided_cf;
sstring generation;
sstring format;
sstring component;
sstring ks;
sstring cf;
if (ks_cf_provided) {
ks = std::move(*provided_ks);
cf = std::move(*provided_cf);
}
sstlog.debug("Make descriptor sstdir: {}; fname: {}", sstdir, fname);
std::string s(fname);
if (std::regex_match(s, match, la_mx)) {
std::string sdir(sstdir);
std::smatch dirmatch;
if (std::regex_match(sdir, dirmatch, dir)) {
ks = dirmatch[1].str();
cf = dirmatch[2].str();
} else {
throw malformed_sstable_exception(seastar::format("invalid path for file {}: {}. Path doesn't match known pattern.", fname, sstdir));
if (!ks_cf_provided) {
if (std::regex_match(sdir, dirmatch, dir)) {
ks = dirmatch[1].str();
cf = dirmatch[2].str();
} else {
throw malformed_sstable_exception(seastar::format("invalid path for file {}: {}. Path doesn't match known pattern.", fname, sstdir));
}
}
version = from_string(match[1].str());
generation = match[2].str();
format = sstring(match[3].str());
component = sstring(match[4].str());
} else if (std::regex_match(s, match, ka)) {
ks = match[1].str();
cf = match[2].str();
if (!ks_cf_provided) {
ks = match[1].str();
cf = match[2].str();
}
version = sstable::version_types::ka;
format = sstring("big");
generation = match[3].str();
@@ -2240,6 +2250,14 @@ entry_descriptor entry_descriptor::make_descriptor(sstring sstdir, sstring fname
return entry_descriptor(sstdir, ks, cf, boost::lexical_cast<unsigned long>(generation), version, sstable::format_from_sstring(format), sstable::component_from_sstring(version, component));
}
entry_descriptor entry_descriptor::make_descriptor(sstring sstdir, sstring fname) {
return make_entry_descriptor(std::move(sstdir), std::move(fname), nullptr, nullptr);
}
entry_descriptor entry_descriptor::make_descriptor(sstring sstdir, sstring fname, sstring ks, sstring cf) {
return make_entry_descriptor(std::move(sstdir), std::move(fname), &ks, &cf);
}
sstable::version_types sstable::version_from_sstring(sstring &s) {
try {
return reverse_map(s, _version_string);