NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move RegisterOptions into the Configurable API (#8223)

Browse Source 
Summary:
As previously coded, a Configurable extension would need access to code not in the public API.  This change moves RegisterOptions into the Configurable class and therefore available to public extensions.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/8223

Reviewed By: anand1976

Differential Revision: D27960188

Pulled By: mrambacher

fbshipit-source-id: ac88b19397183df633902def5b5701b9b65fbf40
main
mrambacher 4 years ago committed by Facebook GitHub Bot
parent cc1c3ee54e
commit 6bab3a34e9
12 changed files with 65 additions and 86 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 29
      include/rocksdb/configurable.h
  2. 8
      options/cf_options.cc
  3. 8
      options/configurable.cc
  4. 29
      options/configurable_helper.h
  5. 27
      options/configurable_test.cc
  6. 5
      options/configurable_test.h
  7. 1
      options/customizable_helper.h
  8. 25
      options/customizable_test.cc
  9. 10
      options/db_options.cc
  10. 3
      table/block_based/block_based_table_factory.cc
  11. 3
      table/cuckoo/cuckoo_table_factory.cc
  12. 3
      table/plain/plain_table_factory.cc

29
include/rocksdb/configurable.h
Unescape View File

@ -350,6 +350,35 @@ class Configurable {
// Given a name (e.g. rocksdb.my.type.opt), returns the short name (opt) // Given a name (e.g. rocksdb.my.type.opt), returns the short name (opt)
virtual std::string GetOptionName(const std::string& long_name) const; virtual std::string GetOptionName(const std::string& long_name) const;
// Registers the input name with the options and associated map.
// When classes register their options in this manner, most of the
// functionality (excluding unknown options and validate/prepare) is
// implemented by the base class.
//
// This method should be called in the class constructor to register the
// option set for this object. For example, to register the options
// associated with the BlockBasedTableFactory, the constructor calls this
// method passing in:
// - the name of the options ("BlockBasedTableOptions");
// - the options object (the BlockBasedTableOptions object for this object;
// - the options type map for the BlockBasedTableOptions.
// This registration allows the Configurable class to process the option
// values associated with the BlockBasedTableOptions without further code in
// the derived class.
//
// @param name The name of this set of options (@see GetOptionsPtr)
// @param opt_ptr Pointer to the options to associate with this name
// @param opt_map Options map that controls how this option is configured.
template <typename T>
void RegisterOptions(
T* opt_ptr,
const std::unordered_map<std::string, OptionTypeInfo>* opt_map) {
RegisterOptions(T::kName(), opt_ptr, opt_map);
}
void RegisterOptions(
const std::string& name, void* opt_ptr,
const std::unordered_map<std::string, OptionTypeInfo>* opt_map);
private: private:
// Contains the collection of options (name, opt_ptr, opt_map) associated with // Contains the collection of options (name, opt_ptr, opt_map) associated with
// this object. This collection is typically set in the constructor of the // this object. This collection is typically set in the constructor of the

8
options/cf_options.cc
Unescape View File

@ -687,10 +687,9 @@ const std::string OptionsHelper::kCFOptionsName = "ColumnFamilyOptions";
class ConfigurableMutableCFOptions : public Configurable { class ConfigurableMutableCFOptions : public Configurable {
public: public:
ConfigurableMutableCFOptions(const MutableCFOptions& mcf) { explicit ConfigurableMutableCFOptions(const MutableCFOptions& mcf) {
mutable_ = mcf; mutable_ = mcf;
ConfigurableHelper::RegisterOptions(*this, &mutable_, RegisterOptions(&mutable_, &cf_mutable_options_type_info);
&cf_mutable_options_type_info);
} }
protected: protected:
@ -705,8 +704,7 @@ class ConfigurableCFOptions : public ConfigurableMutableCFOptions {
immutable_(ImmutableDBOptions(), opts), immutable_(ImmutableDBOptions(), opts),
cf_options_(opts), cf_options_(opts),
opt_map_(map) { opt_map_(map) {
ConfigurableHelper::RegisterOptions(*this, &immutable_, RegisterOptions(&immutable_, &cf_immutable_options_type_info);
&cf_immutable_options_type_info);
} }
protected: protected:

8
options/configurable.cc
Unescape View File

@ -17,10 +17,10 @@
namespace ROCKSDB_NAMESPACE { namespace ROCKSDB_NAMESPACE {
void ConfigurableHelper::RegisterOptions( void Configurable::RegisterOptions(
Configurable& configurable, const std::string& name, void* opt_ptr, const std::string& name, void* opt_ptr,
const std::unordered_map<std::string, OptionTypeInfo>* type_map) { const std::unordered_map<std::string, OptionTypeInfo>* type_map) {
Configurable::RegisteredOptions opts; RegisteredOptions opts;
opts.name = name; opts.name = name;
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
opts.type_map = type_map; opts.type_map = type_map;
@ -28,7 +28,7 @@ void ConfigurableHelper::RegisterOptions(
(void)type_map; (void)type_map;
#endif // ROCKSDB_LITE #endif // ROCKSDB_LITE
opts.opt_ptr = opt_ptr; opts.opt_ptr = opt_ptr;
configurable.options_.emplace_back(opts); options_.emplace_back(opts);
} }
//************************************************************************* //*************************************************************************

29
options/configurable_helper.h
Unescape View File

@ -22,35 +22,6 @@ class ConfigurableHelper {
public: public:
constexpr static const char* kIdPropName = "id"; constexpr static const char* kIdPropName = "id";
constexpr static const char* kIdPropSuffix = ".id"; constexpr static const char* kIdPropSuffix = ".id";
// Registers the input name with the options and associated map.
// When classes register their options in this manner, most of the
// functionality (excluding unknown options and validate/prepare) is
// implemented by the base class.
//
// This method should be called in the class constructor to register the
// option set for this object. For example, to register the options
// associated with the BlockBasedTableFactory, the constructor calls this
// method passing in:
// - the name of the options ("BlockBasedTableOptions");
// - the options object (the BlockBasedTableOptions object for this object;
// - the options type map for the BlockBasedTableOptions.
// This registration allows the Configurable class to process the option
// values associated with the BlockBasedTableOptions without further code in
// the derived class.
//
// @param name The name of this set of options (@see GetOptionsPtr)
// @param opt_ptr Pointer to the options to associate with this name
// @param opt_map Options map that controls how this option is configured.
template <typename T>
static void RegisterOptions(
Configurable& configurable, T* opt_ptr,
const std::unordered_map<std::string, OptionTypeInfo>* opt_map) {
RegisterOptions(configurable, T::kName(), opt_ptr, opt_map);
}
static void RegisterOptions(
Configurable& configurable, const std::string& name, void* opt_ptr,
const std::unordered_map<std::string, OptionTypeInfo>* opt_map);
// Configures the input Configurable object based on the parameters. // Configures the input Configurable object based on the parameters.
// On successful completion, the Configurable is updated with the settings // On successful completion, the Configurable is updated with the settings
// from the opt_map. // from the opt_map.

27
options/configurable_test.cc
Unescape View File

@ -78,18 +78,15 @@ class SimpleConfigurable : public TestConfigurable<Configurable> {
: TestConfigurable(name, mode, map) { : TestConfigurable(name, mode, map) {
if ((mode & TestConfigMode::kUniqueMode) != 0) { if ((mode & TestConfigMode::kUniqueMode) != 0) {
unique_.reset(SimpleConfigurable::Create("Unique" + name_)); unique_.reset(SimpleConfigurable::Create("Unique" + name_));
ConfigurableHelper::RegisterOptions(*this, name_ + "Unique", &unique_, RegisterOptions(name_ + "Unique", &unique_, &unique_option_info);
&unique_option_info);
} }
if ((mode & TestConfigMode::kSharedMode) != 0) { if ((mode & TestConfigMode::kSharedMode) != 0) {
shared_.reset(SimpleConfigurable::Create("Shared" + name_)); shared_.reset(SimpleConfigurable::Create("Shared" + name_));
ConfigurableHelper::RegisterOptions(*this, name_ + "Shared", &shared_, RegisterOptions(name_ + "Shared", &shared_, &shared_option_info);
&shared_option_info);
} }
if ((mode & TestConfigMode::kRawPtrMode) != 0) { if ((mode & TestConfigMode::kRawPtrMode) != 0) {
pointer_ = SimpleConfigurable::Create("Pointer" + name_); pointer_ = SimpleConfigurable::Create("Pointer" + name_);
ConfigurableHelper::RegisterOptions(*this, name_ + "Pointer", &pointer_, RegisterOptions(name_ + "Pointer", &pointer_, &pointer_option_info);
&pointer_option_info);
} }
} }
@ -250,19 +247,15 @@ class ValidatedConfigurable : public SimpleConfigurable {
: SimpleConfigurable(name, TestConfigMode::kDefaultMode), : SimpleConfigurable(name, TestConfigMode::kDefaultMode),
validated(false), validated(false),
prepared(0) { prepared(0) {
ConfigurableHelper::RegisterOptions(*this, "Validated", &validated, RegisterOptions("Validated", &validated, &validated_option_info);
&validated_option_info); RegisterOptions("Prepared", &prepared, &prepared_option_info);
ConfigurableHelper::RegisterOptions(*this, "Prepared", &prepared,
&prepared_option_info);
if ((mode & TestConfigMode::kUniqueMode) != 0) { if ((mode & TestConfigMode::kUniqueMode) != 0) {
unique_.reset(new ValidatedConfigurable( unique_.reset(new ValidatedConfigurable(
"Unique" + name_, TestConfigMode::kDefaultMode, false)); "Unique" + name_, TestConfigMode::kDefaultMode, false));
if (dont_prepare) { if (dont_prepare) {
ConfigurableHelper::RegisterOptions(*this, name_ + "Unique", &unique_, RegisterOptions(name_ + "Unique", &unique_, &dont_prepare_option_info);
&dont_prepare_option_info);
} else { } else {
ConfigurableHelper::RegisterOptions(*this, name_ + "Unique", &unique_, RegisterOptions(name_ + "Unique", &unique_, &unique_option_info);
&unique_option_info);
} }
} }
} }
@ -353,10 +346,8 @@ TEST_F(ConfigurableTest, MutableOptionsTest) {
: SimpleConfigurable("mutable", TestConfigMode::kDefaultMode | : SimpleConfigurable("mutable", TestConfigMode::kDefaultMode |
TestConfigMode::kUniqueMode | TestConfigMode::kUniqueMode |
TestConfigMode::kSharedMode) { TestConfigMode::kSharedMode) {
ConfigurableHelper::RegisterOptions(*this, "struct", &options_, RegisterOptions("struct", &options_, &struct_option_info);
&struct_option_info); RegisterOptions("imm", &options_, &imm_option_info);
ConfigurableHelper::RegisterOptions(*this, "imm", &options_,
&imm_option_info);
} }
}; };
MutableConfigurable mc; MutableConfigurable mc;

5
options/configurable_test.h
Unescape View File

@ -112,11 +112,10 @@ class TestConfigurable : public Configurable {
: name_(name), pointer_(nullptr) { : name_(name), pointer_(nullptr) {
prefix_ = "test." + name + "."; prefix_ = "test." + name + ".";
if ((mode & TestConfigMode::kSimpleMode) != 0) { if ((mode & TestConfigMode::kSimpleMode) != 0) {
ConfigurableHelper::RegisterOptions(*this, name_, &options_, map); RegisterOptions(name_, &options_, map);
} }
if ((mode & TestConfigMode::kEnumMode) != 0) { if ((mode & TestConfigMode::kEnumMode) != 0) {
ConfigurableHelper::RegisterOptions(*this, name_ + "Enum", &options_, RegisterOptions(name_ + "Enum", &options_, &enum_option_info);
&enum_option_info);
} }
} }

1
options/customizable_helper.h
Unescape View File

@ -9,7 +9,6 @@
#include <unordered_map> #include <unordered_map>
#include "options/configurable_helper.h" #include "options/configurable_helper.h"
#include "options/options_helper.h"
#include "rocksdb/convenience.h" #include "rocksdb/convenience.h"
#include "rocksdb/customizable.h" #include "rocksdb/customizable.h"
#include "rocksdb/status.h" #include "rocksdb/status.h"

25
options/customizable_test.cc
Unescape View File

@ -98,8 +98,9 @@ static std::unordered_map<std::string, OptionTypeInfo> a_option_info = {
}; };
class ACustomizable : public TestCustomizable { class ACustomizable : public TestCustomizable {
public: public:
ACustomizable(const std::string& id) : TestCustomizable("A"), id_(id) { explicit ACustomizable(const std::string& id)
ConfigurableHelper::RegisterOptions(*this, "A", &opts_, &a_option_info); : TestCustomizable("A"), id_(id) {
RegisterOptions("A", &opts_, &a_option_info);
} }
std::string GetId() const override { return id_; } std::string GetId() const override { return id_; }
static const char* kClassName() { return "A"; } static const char* kClassName() { return "A"; }
@ -141,8 +142,8 @@ static std::unordered_map<std::string, OptionTypeInfo> b_option_info = {
class BCustomizable : public TestCustomizable { class BCustomizable : public TestCustomizable {
private: private:
public: public:
BCustomizable(const std::string& name) : TestCustomizable(name) { explicit BCustomizable(const std::string& name) : TestCustomizable(name) {
ConfigurableHelper::RegisterOptions(*this, name, &opts_, &b_option_info); RegisterOptions(name, &opts_, &b_option_info);
} }
static const char* kClassName() { return "B"; } static const char* kClassName() { return "B"; }
@ -246,13 +247,12 @@ class SimpleConfigurable : public Configurable {
public: public:
SimpleConfigurable() { SimpleConfigurable() {
ConfigurableHelper::RegisterOptions(*this, "simple", &simple_, RegisterOptions("simple", &simple_, &simple_option_info);
&simple_option_info);
} }
SimpleConfigurable( explicit SimpleConfigurable(
const std::unordered_map<std::string, OptionTypeInfo>* map) { const std::unordered_map<std::string, OptionTypeInfo>* map) {
ConfigurableHelper::RegisterOptions(*this, "simple", &simple_, map); RegisterOptions("simple", &simple_, map);
} }
bool IsPrepared() const override { bool IsPrepared() const override {
@ -509,8 +509,7 @@ class ShallowCustomizable : public Customizable {
public: public:
ShallowCustomizable() { ShallowCustomizable() {
inner_ = std::make_shared<ACustomizable>("a"); inner_ = std::make_shared<ACustomizable>("a");
ConfigurableHelper::RegisterOptions(*this, "inner", &inner_, RegisterOptions("inner", &inner_, &inner_option_info);
&inner_option_info);
}; };
static const char* kClassName() { return "shallow"; } static const char* kClassName() { return "shallow"; }
const char* Name() const override { return kClassName(); } const char* Name() const override { return kClassName(); }
@ -641,10 +640,8 @@ TEST_F(CustomizableTest, MutableOptionsTest) {
public: public:
MutableCustomizable() { MutableCustomizable() {
ConfigurableHelper::RegisterOptions(*this, "mutable", &mutable_, RegisterOptions("mutable", &mutable_, &mutable_option_info);
&mutable_option_info); RegisterOptions("immutable", &immutable_, &immutable_option_info);
ConfigurableHelper::RegisterOptions(*this, "immutable", &immutable_,
&immutable_option_info);
} }
const char* Name() const override { return "MutableCustomizable"; } const char* Name() const override { return "MutableCustomizable"; }
}; };

10
options/db_options.cc
Unescape View File

@ -435,10 +435,9 @@ const std::string OptionsHelper::kDBOptionsName = "DBOptions";
class MutableDBConfigurable : public Configurable { class MutableDBConfigurable : public Configurable {
public: public:
MutableDBConfigurable(const MutableDBOptions& mdb) { explicit MutableDBConfigurable(const MutableDBOptions& mdb) {
mutable_ = mdb; mutable_ = mdb;
ConfigurableHelper::RegisterOptions(*this, &mutable_, RegisterOptions(&mutable_, &db_mutable_options_type_info);
&db_mutable_options_type_info);
} }
protected: protected:
@ -447,7 +446,7 @@ class MutableDBConfigurable : public Configurable {
class DBOptionsConfigurable : public MutableDBConfigurable { class DBOptionsConfigurable : public MutableDBConfigurable {
public: public:
DBOptionsConfigurable(const DBOptions& opts) explicit DBOptionsConfigurable(const DBOptions& opts)
: MutableDBConfigurable(MutableDBOptions(opts)), db_options_(opts) { : MutableDBConfigurable(MutableDBOptions(opts)), db_options_(opts) {
// The ImmutableDBOptions currently requires the env to be non-null. Make // The ImmutableDBOptions currently requires the env to be non-null. Make
// sure it is // sure it is
@ -458,8 +457,7 @@ class DBOptionsConfigurable : public MutableDBConfigurable {
copy.env = Env::Default(); copy.env = Env::Default();
immutable_ = ImmutableDBOptions(copy); immutable_ = ImmutableDBOptions(copy);
} }
ConfigurableHelper::RegisterOptions(*this, &immutable_, RegisterOptions(&immutable_, &db_immutable_options_type_info);
&db_immutable_options_type_info);
} }
protected: protected:

3
table/block_based/block_based_table_factory.cc
Unescape View File

@ -428,8 +428,7 @@ BlockBasedTableFactory::BlockBasedTableFactory(
const BlockBasedTableOptions& _table_options) const BlockBasedTableOptions& _table_options)
: table_options_(_table_options) { : table_options_(_table_options) {
InitializeOptions(); InitializeOptions();
ConfigurableHelper::RegisterOptions(*this, &table_options_, RegisterOptions(&table_options_, &block_based_table_type_info);
&block_based_table_type_info);
} }
void BlockBasedTableFactory::InitializeOptions() { void BlockBasedTableFactory::InitializeOptions() {

3
table/cuckoo/cuckoo_table_factory.cc
Unescape View File

@ -95,8 +95,7 @@ static std::unordered_map<std::string, OptionTypeInfo> cuckoo_table_type_info =
CuckooTableFactory::CuckooTableFactory(const CuckooTableOptions& table_options) CuckooTableFactory::CuckooTableFactory(const CuckooTableOptions& table_options)
: table_options_(table_options) { : table_options_(table_options) {
ConfigurableHelper::RegisterOptions(*this, &table_options_, RegisterOptions(&table_options_, &cuckoo_table_type_info);
&cuckoo_table_type_info);
} }
TableFactory* NewCuckooTableFactory(const CuckooTableOptions& table_options) { TableFactory* NewCuckooTableFactory(const CuckooTableOptions& table_options) {

3
table/plain/plain_table_factory.cc
Unescape View File

@ -52,8 +52,7 @@ static std::unordered_map<std::string, OptionTypeInfo> plain_table_type_info = {
PlainTableFactory::PlainTableFactory(const PlainTableOptions& options) PlainTableFactory::PlainTableFactory(const PlainTableOptions& options)
: table_options_(options) { : table_options_(options) {
ConfigurableHelper::RegisterOptions(*this, &table_options_, RegisterOptions(&table_options_, &plain_table_type_info);
&plain_table_type_info);
} }
Status PlainTableFactory::NewTableReader( Status PlainTableFactory::NewTableReader(

Write Preview
Loading…
Cancel
Save