ndb

 - Add a CI_BITMASK type for configuration parameters to make it possible
  for the ndb_mgmd to validate the bitmask spec. early.
 - Make LockExecuteThreadToCPU use the new type. Set max to 65535(i.e 
  same as in ndbd).

Author: blaudden

storage/ndb/src/mgmsrv/ConfigInfo.cpp

@@ -637,9 +637,11 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     "CPU list indicating which CPU will run the execution thread(s)",
     ConfigInfo::CI_USED,
     0,
-    ConfigInfo::CI_STRING,
+    ConfigInfo::CI_BITMASK,
     0,
-    0, 0 },
+    0,
+    "65535"
+  },
 
   {
     CFG_DB_MAINT_LOCK_CPU,
@@ -3013,6 +3015,20 @@ ConfigInfo::ConfigInfo()
         else if(param._default)
           pinfo.put("Default", param._default);
 	break;
+
+      case CI_BITMASK:
+        assert(param._min == 0); // Bitmask can't have min value
+
+	Uint64 tmp_uint64;
+	require(InitConfigFileParser::convertStringToUint64(param._max,
+                                                            tmp_uint64));
+	pinfo.put64("Max", tmp_uint64);
+
+        if(param._default == MANDATORY)
+          pinfo.put("Mandatory", (Uint32)1);
+        else if(param._default)
+          pinfo.put("Default", param._default);
+        break;
     }
 
     // Check that pinfo is really new
@@ -3043,6 +3059,7 @@ ConfigInfo::ConfigInfo()
 	    break;
 	  case CI_ENUM:
 	  case CI_STRING:
+          case CI_BITMASK:
 	    require(p->put(param._fname, param._default));
 	    break;
 	  case CI_BOOL:
@@ -3429,6 +3446,7 @@ class PrettyPrinter : public ConfigPrinter {
       fprintf(m_out, "\n");
       break;
 
+    case ConfigInfo::CI_BITMASK:
     case ConfigInfo::CI_ENUM:
     case ConfigInfo::CI_STRING:
       fprintf(m_out, "%s (String)\n", param_name);
@@ -3552,6 +3570,7 @@ class XMLPrinter : public ConfigPrinter {
       pairs.put("max", buf.c_str());
     break;
 
+    case ConfigInfo::CI_BITMASK:
     case ConfigInfo::CI_ENUM:
     case ConfigInfo::CI_STRING:
       pairs.put("type", "string");
@@ -3959,6 +3978,7 @@ applyDefaultValues(InitConfigFileParser::Context & ctx,
           DBUG_PRINT("info",("%s=%lld #default",name,val));
 	  break;
 	}
+        case ConfigInfo::CI_BITMASK:
 	case ConfigInfo::CI_STRING:{
 	  const char * val;
 	  require(defaults->get(name, &val));
@@ -3987,6 +4007,7 @@ applyDefaultValues(InitConfigFileParser::Context & ctx,
           DBUG_PRINT("info",("%s=%lld",name,val));
           break;
         }
+        case ConfigInfo::CI_BITMASK:
         case ConfigInfo::CI_ENUM:
         case ConfigInfo::CI_STRING:{
           const char * val;

storage/ndb/src/mgmsrv/ConfigInfo.hpp

@@ -43,6 +43,7 @@ class ConfigInfo {
                      CI_INT64,
                      CI_STRING,
                      CI_ENUM, // String externaly, int internally
+                     CI_BITMASK, // String both externally and internally
                      CI_SECTION
   };
   enum Status      { CI_USED,            ///< Active

storage/ndb/src/mgmsrv/InitConfigFileParser.cpp

@@ -24,6 +24,7 @@
 #include "ConfigInfo.hpp"
 #include "EventLogger.hpp"
 #include <m_string.h>
+#include <util/SparseBitmask.hpp>
 
 extern EventLogger *g_eventLogger;
 
@@ -348,6 +349,40 @@ InitConfigFileParser::storeNameValuePair(Context& ctx,
     break;
   }
 
+  case ConfigInfo::CI_BITMASK:{
+    if (strlen(value) <= 0)
+    {
+      ctx.reportError("Illegal value '%s' for parameter %s. "
+                      "Error: Zero length string",
+                      value, fname);
+      return false;
+    }
+    Uint64 max = m_info->getMax(ctx.m_currentInfo, fname);
+    SparseBitmask mask(max);
+    int res = mask.parseMask(value);
+    if (res < 0)
+    {
+      BaseString desc("Unknown error.");
+      switch(res)
+      {
+      case -1:
+        desc.assign("Invalid syntax for bitmask");
+        break;
+      case -2:
+        desc.assfmt("Too large id used in bitmask, max is %llu", max);
+        break;
+      default:
+        break;
+      }
+
+      ctx.reportError("Illegal value '%s' for parameter %s. Error: %s",
+                      value, fname, desc.c_str());
+      return false;
+    }
+    require(ctx.m_currentSection->put(fname, value));
+    break;
+  }
+
   case ConfigInfo::CI_SECTION:
     abort();
   }
@@ -792,6 +827,7 @@ InitConfigFileParser::parse_mycnf()
 	break;
       case ConfigInfo::CI_ENUM:
       case ConfigInfo::CI_STRING: 
+      case ConfigInfo::CI_BITMASK:
 	opt.value = (uchar**)malloc(sizeof(char *));
 	opt.var_type = GET_STR;
 	break;