Post-merge fixes after pull request percona#14

ldonoso · Jan 28, 2022 · b6cc090 · b6cc090
1 parent 646dd38
commit b6cc090
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
@@ -35,7 +35,7 @@
 #include "rdb_cf_manager.h"
 
 #include "rocksdb/table.h"
-#include "utilities/convenience.h"
+#include "rocksdb/utilities/convenience.h"
 
 /* This is here to get PRIu64, PRId64 */
 #ifndef __STDC_FORMAT_MACROS

diff --git a/storage/rocksdb/rdb_cf_options.h b/storage/rocksdb/rdb_cf_options.h
@@ -18,7 +18,7 @@
 #include <unordered_map>
 
 namespace rocksdb {
-  class ColumnFamilyOptions;
+class ColumnFamilyOptions;
 }
 
 /*
@@ -31,13 +31,13 @@ namespace rocksdb {
     families not found in the map.
 */
 class Cf_options {
-public:
+ public:
   void Get(const std::string &cf_name, rocksdb::ColumnFamilyOptions *opts);
 
   bool SetDefault(const std::string &default_config);
   bool ParseConfigFile(const std::string &path);
 
-private:
+ private:
   typedef std::unordered_map<std::string, std::string> NameToConfig;
 
   /* cf_name -> value map */