@ -3615,12 +3615,13 @@ VersionSet::VersionSet(const std::string& dbname,
const FileOptions & storage_options , Cache * table_cache , const FileOptions & storage_options , Cache * table_cache ,
WriteBufferManager * write_buffer_manager , WriteBufferManager * write_buffer_manager ,
WriteController * write_controller , WriteController * write_controller ,
BlockCacheTracer * const block_cache_tracer ) BlockCacheTracer * const block_cache_tracer ,
const std : : shared_ptr < IOTracer > & io_tracer )
: column_family_set_ ( new ColumnFamilySet ( : column_family_set_ ( new ColumnFamilySet (
dbname , _db_options , storage_options , table_cache , dbname , _db_options , storage_options , table_cache ,
write_buffer_manager , write_controller , block_cache_tracer ) ) , write_buffer_manager , write_controller , block_cache_tracer ) ) ,
env_ ( _db_options - > env ) , env_ ( _db_options - > env ) ,
fs_ ( _db_options - > fs . get ( ) ) , fs_ ( _db_options - > fs , io_tracer ) ,
dbname_ ( dbname ) , dbname_ ( dbname ) ,
db_options_ ( _db_options ) , db_options_ ( _db_options ) ,
next_file_number_ ( 2 ) , next_file_number_ ( 2 ) ,
@ -3634,7 +3635,8 @@ VersionSet::VersionSet(const std::string& dbname,
current_version_number_ ( 0 ) , current_version_number_ ( 0 ) ,
manifest_file_size_ ( 0 ) , manifest_file_size_ ( 0 ) ,
file_options_ ( storage_options ) , file_options_ ( storage_options ) ,
block_cache_tracer_ ( block_cache_tracer ) { } block_cache_tracer_ ( block_cache_tracer ) ,
io_tracer_ ( io_tracer ) { }
VersionSet : : ~ VersionSet ( ) { VersionSet : : ~ VersionSet ( ) {
// we need to delete column_family_set_ because its destructor depends on
// we need to delete column_family_set_ because its destructor depends on
@ -3937,7 +3939,7 @@ Status VersionSet::ProcessManifestWrites(
std : : string descriptor_fname = std : : string descriptor_fname =
DescriptorFileName ( dbname_ , pending_manifest_file_number_ ) ; DescriptorFileName ( dbname_ , pending_manifest_file_number_ ) ;
std : : unique_ptr < FSWritableFile > descriptor_file ; std : : unique_ptr < FSWritableFile > descriptor_file ;
io_s = NewWritableFile ( fs_ , descriptor_fname , & descriptor_file , io_s = NewWritableFile ( fs_ . get ( ) , descriptor_fname , & descriptor_file ,
opt_file_opts ) ; opt_file_opts ) ;
if ( io_s . ok ( ) ) { if ( io_s . ok ( ) ) {
descriptor_file - > SetPreallocationBlockSize ( descriptor_file - > SetPreallocationBlockSize (
@ -4006,7 +4008,7 @@ Status VersionSet::ProcessManifestWrites(
// If we just created a new descriptor file, install it by writing a
// If we just created a new descriptor file, install it by writing a
// new CURRENT file that points to it.
// new CURRENT file that points to it.
if ( s . ok ( ) & & new_descriptor_log ) { if ( s . ok ( ) & & new_descriptor_log ) {
io_s = SetCurrentFile ( fs_ , dbname_ , pending_manifest_file_number_ , io_s = SetCurrentFile ( fs_ . get ( ) , dbname_ , pending_manifest_file_number_ ,
db_directory ) ; db_directory ) ;
if ( ! io_s . ok ( ) ) { if ( ! io_s . ok ( ) ) {
s = io_s ; s = io_s ;
@ -4536,7 +4538,7 @@ Status VersionSet::Recover(
// Read "CURRENT" file, which contains a pointer to the current manifest file
// Read "CURRENT" file, which contains a pointer to the current manifest file
std : : string manifest_path ; std : : string manifest_path ;
Status s = GetCurrentManifestPath ( dbname_ , fs_ , & manifest_path , Status s = GetCurrentManifestPath ( dbname_ , fs_ . get ( ) , & manifest_path ,
& manifest_file_number_ ) ; & manifest_file_number_ ) ;
if ( ! s . ok ( ) ) { if ( ! s . ok ( ) ) {
return s ; return s ;
@ -4943,7 +4945,7 @@ Status VersionSet::ReduceNumberOfLevels(const std::string& dbname,
WriteController wc ( options - > delayed_write_rate ) ; WriteController wc ( options - > delayed_write_rate ) ;
WriteBufferManager wb ( options - > db_write_buffer_size ) ; WriteBufferManager wb ( options - > db_write_buffer_size ) ;
VersionSet versions ( dbname , & db_options , file_options , tc . get ( ) , & wb , & wc , VersionSet versions ( dbname , & db_options , file_options , tc . get ( ) , & wb , & wc ,
/*block_cache_tracer=*/ nullptr ) ; nullptr /*BlockCacheTracer*/ , nullptr /*IOTracer*/ ) ;
Status status ; Status status ;
std : : vector < ColumnFamilyDescriptor > dummy ; std : : vector < ColumnFamilyDescriptor > dummy ;
@ -5925,15 +5927,14 @@ Status VersionSet::VerifyFileMetadata(const std::string& fpath,
return status ; return status ;
} }
ReactiveVersionSet : : ReactiveVersionSet ( const std : : string & dbname , ReactiveVersionSet : : ReactiveVersionSet (
const ImmutableDBOptions * _db_options , const std : : string & dbname , const ImmutableDBOptions * _db_options ,
const FileOptions & _file_options , const FileOptions & _file_options , Cache * table_cache ,
Cache * table_cache , WriteBufferManager * write_buffer_manager , WriteController * write_controller ,
WriteBufferManager * write_buffer_manager , const std : : shared_ptr < IOTracer > & io_tracer )
WriteController * write_controller )
: VersionSet ( dbname , _db_options , _file_options , table_cache , : VersionSet ( dbname , _db_options , _file_options , table_cache ,
write_buffer_manager , write_controller , write_buffer_manager , write_controller ,
/*block_cache_tracer=*/ nullptr ) , /*block_cache_tracer=*/ nullptr , io_tracer ) ,
number_of_edits_to_skip_ ( 0 ) { } number_of_edits_to_skip_ ( 0 ) { }
ReactiveVersionSet : : ~ ReactiveVersionSet ( ) { } ReactiveVersionSet : : ~ ReactiveVersionSet ( ) { }
@ -6345,7 +6346,7 @@ Status ReactiveVersionSet::MaybeSwitchManifest(
Status s ; Status s ;
do { do {
std : : string manifest_path ; std : : string manifest_path ;
s = GetCurrentManifestPath ( dbname_ , fs_ , & manifest_path , s = GetCurrentManifestPath ( dbname_ , fs_ . get ( ) , & manifest_path ,
& manifest_file_number_ ) ; & manifest_file_number_ ) ;
std : : unique_ptr < FSSequentialFile > manifest_file ; std : : unique_ptr < FSSequentialFile > manifest_file ;
if ( s . ok ( ) ) { if ( s . ok ( ) ) {
Akanksha Mahajan
4 years ago
committed by