@@ -66,14 +66,20 @@ bool Rdb_cf_options::get(const std::string &cf_name,
6666 rocksdb::ColumnFamilyOptions *const opts) {
6767 assert (opts != nullptr );
6868
69+ rocksdb::ConfigOptions config_options;
70+ config_options.input_strings_escaped = false ;
71+ config_options.ignore_unknown_options = false ;
72+
6973 // Get defaults.
70- rocksdb::GetColumnFamilyOptionsFromString (*opts, m_default_config, opts);
74+ rocksdb::GetColumnFamilyOptionsFromString (config_options, *opts,
75+ m_default_config, opts);
7176
7277 // Get a custom confguration if we have one.
7378 Name_to_config_t::iterator it = m_name_map.find (cf_name);
7479
7580 if (it != m_name_map.end ()) {
76- rocksdb::GetColumnFamilyOptionsFromString (*opts, it->second , opts);
81+ rocksdb::GetColumnFamilyOptionsFromString (config_options, *opts, it->second ,
82+ opts);
7783 return true ;
7884 }
7985 return false ;
@@ -92,10 +98,13 @@ void Rdb_cf_options::update(const std::string &cf_name,
9298
9399bool Rdb_cf_options::set_default (const std::string &default_config) {
94100 rocksdb::ColumnFamilyOptions options;
101+ rocksdb::ConfigOptions config_options;
102+ config_options.input_strings_escaped = false ;
103+ config_options.ignore_unknown_options = false ;
95104
96105 if (!default_config.empty ()) {
97106 rocksdb::Status s = rocksdb::GetColumnFamilyOptionsFromString (
98- options, default_config, &options);
107+ config_options, options, default_config, &options);
99108 if (!s.ok ()) {
100109 // NO_LINT_DEBUG
101110 fprintf (stderr,
@@ -259,6 +268,9 @@ bool Rdb_cf_options::parse_cf_options(const std::string &cf_options,
259268 std::string opt_str;
260269 std::stringstream ss;
261270 rocksdb::ColumnFamilyOptions options;
271+ rocksdb::ConfigOptions config_options;
272+ config_options.input_strings_escaped = false ;
273+ config_options.ignore_unknown_options = false ;
262274
263275 // Only print warnings if the caller didn't pass an output stream
264276 bool print_warnings = (output == nullptr );
@@ -296,8 +308,8 @@ bool Rdb_cf_options::parse_cf_options(const std::string &cf_options,
296308 }
297309
298310 // Generate an error if the <opt_str> is not valid according to RocksDB.
299- rocksdb::Status s =
300- rocksdb::GetColumnFamilyOptionsFromString ( options, opt_str, &options);
311+ rocksdb::Status s = rocksdb::GetColumnFamilyOptionsFromString (
312+ config_options, options, opt_str, &options);
301313 if (!s.ok ()) {
302314 (*output) << " Invalid cf config for '" << cf.c_str ()
303315 << " ' in override options: " << s.getState ()
0 commit comments