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

sstables: fix probe with Unknown component

Browse Source 
Commit 53b7b7def3 ("sstables: handle unrecognized sstable component")
ignores unrecognized components, but misses one code path during probe_file().

Ignore unrecognized components there too.

Fixes #1922.
Message-Id: <20161208131027.28939-1-avi@scylladb.com>
This commit is contained in:
Avi Kivity
2016-12-08 15:10:27 +02:00
committed by Tomasz Grabiec
parent 733d87fcc6
commit 872b5ef5f0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sstables/sstables.cc
View File

@@ -2201,7 +2201,11 @@ sstable::format_types sstable::format_from_sstring(sstring &s) {
}
sstable::component_type sstable::component_from_sstring(sstring &s) {
return reverse_map(s, _component_map);
try {
return reverse_map(s, _component_map);
} catch (std::out_of_range&) {
return component_type::Unknown;
}
}
input_stream<char> sstable::data_stream(uint64_t pos, size_t len, const io_priority_class& pc, lw_shared_ptr<file_input_stream_history> history) {