1 files changed, 30 insertions, 47 deletions

diff --git a/ndb/src/common/mgmcommon/InitConfigFileParser.hpp b/ndb/src/common/mgmcommon/InitConfigFileParser.hpp
index f4f27abb055..6b7482c12ae 100644
--- a/ndb/src/common/mgmcommon/InitConfigFileParser.hpp
+++ b/ndb/src/common/mgmcommon/InitConfigFileParser.hpp
@@ -20,6 +20,7 @@
 #include <ndb_global.h>
 
 #include <Properties.hpp>
+#include <ConfigValues.hpp>
 
 class Config;
 class ConfigInfo;
@@ -28,18 +29,40 @@ class ConfigInfo;
  * @class InitConfigFileParser
  * @brief Reads initial config file and returns Config object
  * 
- * This class contains one public method InitConfigFileParser::getConfig, 
+ * This class contains one public method InitConfigFileParser::parseConfig, 
  * which reads an initial configuration file and returns a Config 
  * object if the config file has correct syntax and semantic. 
  */
 class InitConfigFileParser {
 public:
+  /**
+   *   Constructor
+   */
+  InitConfigFileParser();
+  ~InitConfigFileParser();
+
+  /**
+   *   Reads the initial configuration file, checks syntax and semantic
+   *   and stores internally the values of all parameters.
+   *
+   *   @returns Config or NULL on failure
+   *   @note must be freed by caller
+   */
+  Config * parseConfig(FILE * file);
+  Config * parseConfig(const char * filename);
+
+  /**
+   * Parser context struct
+   */
   enum ContextSectionType { Undefined, Section, DefaultSection };
 
   /**
    *   Context = Which section in init config file we are currently parsing
    */
   struct Context {
+    Context(const ConfigInfo *);
+    ~Context();
+
     ContextSectionType  type; ///< Section type (e.g. default section,section)
     char          fname[256]; ///< Section name occuring in init config file
     char          pname[256]; ///< Section name stored in properties object
@@ -47,8 +70,8 @@ public:
     Uint32   m_sectionLineno; ///< Where did current section start
 
     const ConfigInfo * m_info;           // The config info
-    const Properties * m_config;         // The config object
-    const Properties * m_defaults;       // The user defaults
+    Properties * m_config;               // The config object
+    Properties * m_defaults;             // The user defaults
     
     Properties       * m_currentSection; // The current section I'm in
     const Properties * m_userDefaults;   // The defaults of this section
@@ -56,36 +79,13 @@ public:
     const Properties * m_currentInfo;    // The "info" for this section
     
     Properties         m_userProperties; // User properties (temporary values)
+    ConfigValuesFactory m_configValues;  //
 
   public:
     void reportError(const char * msg, ...);
     void reportWarning(const char * msg, ...);
   };
 
-
-  /**
-   *   Constructor
-   *   @param initialConfigFileName: Name of the initial configuration file
-   */
-  InitConfigFileParser(const char* initialConfigFileName);
-  ~InitConfigFileParser();
-
-  /**
-   *   Reads the initial configuration file, checks syntax and semantic
-   *   and stores internally the values of all parameters.
-   *
-   *   @returns  true if succeeded, o/w false (e.g. incorrect config file)
-   */
-  bool readConfigFile();
-
-  /**
-   *   Get config.  Must execute InitConfigFileParser::readConfigFile first.
-   *
-   *   @returns  Config if succeeded, o/w NULL 
-   */
-  const Config* getConfig();
-
-
 private:
   /**
    *   Check if line only contains space/comments
@@ -111,33 +111,16 @@ private:
   bool parseNameValuePair(Context&, const char* line);
   bool storeNameValuePair(Context&, const char* fname, const char* value);
   
-  bool convertStringToUint32(const char* s, Uint32& val, Uint32 log10base = 0);
+  bool convertStringToUint64(const char* s, Uint64& val, Uint32 log10base = 0);
   bool convertStringToBool(const char* s, bool& val);
+  bool storeSection(Context&);
 
   const Properties* getSection(const char * name, const Properties* src); 
   
-  /***************************************************************************
-   *  VARIABLES
-   ***************************************************************************/
-  FILE*        m_initConfigStream;
-
   /**
    *   Information about parameters (min, max values etc)
    */
-  const ConfigInfo* m_info;
-
-  /**
-   *   Configuration from initial configuration file 
-   *   (returned by InitConfigFileParser::readConfigFile)
-   */
-  Config* m_config;
-
-  /**
-   *   Default values specified in default sections
-   */
-  Properties* m_defaults;
-
-  bool storeSection(Context&);
+  ConfigInfo* m_info;
 };
 
 #endif // InitConfigFileParser_H