Skip to content

M
mariadb
Commit 432c12de authored by joreland@mysql.com's avatar joreland@mysql.com
Browse files
Options

wl1744 - fix compiler problems

parent 32796b48
Hide whitespace changes
Inline Side-by-side
Showing with 434 additions and 429 deletions
ndb/include/debugger/GrepError.hpp
View file @ 432c12de
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
*/ */
class GrepError { class GrepError {
public: public:
enum Code { enum GE_Code {
NO_ERROR = 0, GE_NO_ERROR = 0,
SUBSCRIPTION_ID_NOMEM = 1, SUBSCRIPTION_ID_NOMEM = 1,
SUBSCRIPTION_ID_NOT_FOUND = 2, SUBSCRIPTION_ID_NOT_FOUND = 2,
SUBSCRIPTION_ID_NOT_UNIQUE = 3, SUBSCRIPTION_ID_NOT_UNIQUE = 3,
...@@ -82,12 +82,12 @@ public: ...@@ -82,12 +82,12 @@ public:
}; };
struct ErrorDescription { struct ErrorDescription {
Code errCode; GE_Code errCode;
const char * name; const char * name;
}; };
static const ErrorDescription errorDescriptions[]; static const ErrorDescription errorDescriptions[];
static const Uint32 noOfErrorDescs; static const Uint32 noOfErrorDescs;
static const char * getErrorDesc(GrepError::Code err); static const char * getErrorDesc(GrepError::GE_Code err);
}; };
......
ndb/include/kernel/LogLevel.hpp
View file @ 432c12de
...@@ -89,7 +89,7 @@ public: ...@@ -89,7 +89,7 @@ public:
return memcmp(this, &l, sizeof(* this)) == 0; return memcmp(this, &l, sizeof(* this)) == 0;
} }
LogLevel& operator=(const class EventSubscribeReq & req); LogLevel& operator=(const struct EventSubscribeReq & req);
private: private:
/** /**
......
ndb/include/kernel/signaldata/FsCloseReq.hpp
View file @ 432c12de
...@@ -75,7 +75,7 @@ inline ...@@ -75,7 +75,7 @@ inline
void void
FsCloseReq::setRemoveFileFlag(UintR & fileflag, bool removefile){ FsCloseReq::setRemoveFileFlag(UintR & fileflag, bool removefile){
// ASSERT_BOOL(removefile, "FsCloseReq::setRemoveFileFlag"); // ASSERT_BOOL(removefile, "FsCloseReq::setRemoveFileFlag");
if (removefile == true) if (removefile)
fileflag = 1; fileflag = 1;
else else
fileflag = 0; fileflag = 0;
......
ndb/include/mgmapi/mgmapi.h
View file @ 432c12de
...@@ -730,7 +730,7 @@ extern "C" { ...@@ -730,7 +730,7 @@ extern "C" {
int ndb_mgm_get_int_parameter(const ndb_mgm_configuration_iterator*, int ndb_mgm_get_int_parameter(const ndb_mgm_configuration_iterator*,
int param, unsigned * value); int param, unsigned * value);
int ndb_mgm_get_int64_parameter(const ndb_mgm_configuration_iterator*, int ndb_mgm_get_int64_parameter(const ndb_mgm_configuration_iterator*,
int param, unsigned long long * value); int param, Uint64 * value);
int ndb_mgm_get_string_parameter(const ndb_mgm_configuration_iterator*, int ndb_mgm_get_string_parameter(const ndb_mgm_configuration_iterator*,
int param, const char ** value); int param, const char ** value);
#ifdef __cplusplus #ifdef __cplusplus
......
ndb/include/mgmcommon/IPCConfig.hpp
View file @ 432c12de
...@@ -59,7 +59,7 @@ public: ...@@ -59,7 +59,7 @@ public:
void print() const { props->print(); } void print() const { props->print(); }
static Uint32 configureTransporters(Uint32 nodeId, static Uint32 configureTransporters(Uint32 nodeId,
const class ndb_mgm_configuration &, const struct ndb_mgm_configuration &,
class TransporterRegistry &); class TransporterRegistry &);
private: private:
......
ndb/include/portlib/NdbTCP.h
View file @ 432c12de
...@@ -40,7 +40,7 @@ typedef int socklen_t; ...@@ -40,7 +40,7 @@ typedef int socklen_t;
#define InetErrno (* inet_errno()) #define InetErrno (* inet_errno())
#elif NDB_WIN32 #elif defined NDB_WIN32
/** /**
* Include files needed * Include files needed
......
ndb/include/transporter/TransporterRegistry.hpp
View file @ 432c12de
...@@ -224,7 +224,7 @@ public: ...@@ -224,7 +224,7 @@ public:
const char *m_interface; const char *m_interface;
}; };
Vector<Transporter_interface> m_transporter_interface; Vector<Transporter_interface> m_transporter_interface;
void add_transporter_interface(const char *interface, unsigned short port); void add_transporter_interface(const char *interf, unsigned short port);
protected: protected:
private: private:
......
ndb/include/util/Parser.hpp
View file @ 432c12de
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "NdbOut.hpp" #include "NdbOut.hpp"
class ParserImpl; class ParserImpl;
template<class T> class ParserRow; template<class T> struct ParserRow;
//#define PARSER_DEBUG //#define PARSER_DEBUG
#ifdef PARSER_DEBUG #ifdef PARSER_DEBUG
...@@ -130,11 +130,11 @@ public: ...@@ -130,11 +130,11 @@ public:
* The void* equivalent implementation * The void* equivalent implementation
*/ */
class ParserImpl { class ParserImpl {
public:
class Dummy {}; class Dummy {};
typedef ParserRow<Dummy> DummyRow; typedef ParserRow<Dummy> DummyRow;
typedef Parser<Dummy>::Context Context; typedef Parser<Dummy>::Context Context;
template<class T> friend class Parser;
private:
ParserImpl(const DummyRow rows[], class InputStream & in, ParserImpl(const DummyRow rows[], class InputStream & in,
bool b_cmd, bool b_empty, bool b_iarg); bool b_cmd, bool b_empty, bool b_iarg);
......
ndb/include/util/SimpleProperties.hpp
View file @ 432c12de
...@@ -38,20 +38,20 @@ public: ...@@ -38,20 +38,20 @@ public:
/** /**
* Value types * Value types
*/ */
enum ValueType { enum ValueType {
Uint32Value = 0, Uint32Value = 0,
StringValue = 1, StringValue = 1,
BinaryValue = 2, BinaryValue = 2,
InvalidValue = 3 InvalidValue = 3
}; };
/** /**
* Struct for defining mapping to be used with unpack * Struct for defining mapping to be used with unpack
*/ */
struct SP2StructMapping { struct SP2StructMapping {
Uint16 Key; Uint16 Key;
Uint32 Offset; Uint32 Offset;
SimpleProperties::ValueType Type; ValueType Type;
Uint32 minValue; Uint32 minValue;
Uint32 maxValue; Uint32 maxValue;
Uint32 Length_Offset; // Offset used for looking up length of Uint32 Length_Offset; // Offset used for looking up length of
...@@ -233,7 +233,7 @@ private: ...@@ -233,7 +233,7 @@ private:
*/ */
class SimplePropertiesSectionReader : public SimpleProperties::Reader { class SimplePropertiesSectionReader : public SimpleProperties::Reader {
public: public:
SimplePropertiesSectionReader(class SegmentedSectionPtr &, SimplePropertiesSectionReader(struct SegmentedSectionPtr &,
class SectionSegmentPool &); class SectionSegmentPool &);
virtual void reset(); virtual void reset();
...@@ -248,8 +248,8 @@ private: ...@@ -248,8 +248,8 @@ private:
Uint32 m_pos; Uint32 m_pos;
Uint32 m_len; Uint32 m_len;
class SectionSegmentPool & m_pool; class SectionSegmentPool & m_pool;
class SectionSegment * m_head; struct SectionSegment * m_head;
class SectionSegment * m_currentSegment; struct SectionSegment * m_currentSegment;
}; };
inline inline
...@@ -275,15 +275,15 @@ public: ...@@ -275,15 +275,15 @@ public:
/** /**
* This "unlinks" the writer from the memory * This "unlinks" the writer from the memory
*/ */
void getPtr(class SegmentedSectionPtr & dst); void getPtr(struct SegmentedSectionPtr & dst);
private: private:
Int32 m_pos; Int32 m_pos;
Uint32 m_sz; Uint32 m_sz;
class SectionSegmentPool & m_pool; class SectionSegmentPool & m_pool;
class SectionSegment * m_head; struct SectionSegment * m_head;
Uint32 m_prevPtrI; // Prev to m_currentSegment Uint32 m_prevPtrI; // Prev to m_currentSegment
class SectionSegment * m_currentSegment; struct SectionSegment * m_currentSegment;
}; };
#endif #endif
ndb/src/common/debugger/EventLogger.cpp
View file @ 432c12de
...@@ -1028,7 +1028,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1028,7 +1028,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
"Grep::SSCoord:Error code: %d Error message: %s" "Grep::SSCoord:Error code: %d Error message: %s"
" (subId=%d,SubKey=%d)", " (subId=%d,SubKey=%d)",
err, err,
GrepError::getErrorDesc((GrepError::Code)err), GrepError::getErrorDesc((GrepError::GE_Code)err),
subId, subId,
subKey); subKey);
break; break;
...@@ -1045,7 +1045,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1045,7 +1045,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subId, subId,
subKey, subKey,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
case GrepEvent::GrepSS_SubStartMetaRef: case GrepEvent::GrepSS_SubStartMetaRef:
...@@ -1061,7 +1061,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1061,7 +1061,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subId, subId,
subKey, subKey,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
case GrepEvent::GrepSS_SubStartDataRef: case GrepEvent::GrepSS_SubStartDataRef:
...@@ -1076,7 +1076,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1076,7 +1076,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subId, subId,
subKey, subKey,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
case GrepEvent::GrepSS_SubSyncMetaRef: case GrepEvent::GrepSS_SubSyncMetaRef:
...@@ -1091,7 +1091,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1091,7 +1091,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subId, subId,
subKey, subKey,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
case GrepEvent::GrepSS_SubSyncDataRef: case GrepEvent::GrepSS_SubSyncDataRef:
...@@ -1108,7 +1108,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1108,7 +1108,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subKey, subKey,
gci, gci,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
case GrepEvent::GrepSS_SubRemoveRef: case GrepEvent::GrepSS_SubRemoveRef:
...@@ -1123,7 +1123,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1123,7 +1123,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subId, subId,
subKey, subKey,
err, err,
GrepError::getErrorDesc((GrepError::Code)err) GrepError::getErrorDesc((GrepError::GE_Code)err)
); );
break; break;
} }
...@@ -1137,7 +1137,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1137,7 +1137,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
"Grep::PSCoord: Error code: %d Error Message: %s" "Grep::PSCoord: Error code: %d Error Message: %s"
" (subId=%d,SubKey=%d)", " (subId=%d,SubKey=%d)",
err, err,
GrepError::getErrorDesc((GrepError::Code)err), GrepError::getErrorDesc((GrepError::GE_Code)err),
subId, subId,
subKey); subKey);
break; break;
...@@ -1154,7 +1154,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1154,7 +1154,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subId, subId,
subKey, subKey,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
case GrepEvent::GrepPS_SubStartMetaRef: case GrepEvent::GrepPS_SubStartMetaRef:
...@@ -1170,7 +1170,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1170,7 +1170,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subId, subId,
subKey, subKey,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
case GrepEvent::GrepPS_SubStartDataRef: case GrepEvent::GrepPS_SubStartDataRef:
...@@ -1185,7 +1185,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1185,7 +1185,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subId, subId,
subKey, subKey,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
case GrepEvent::GrepPS_SubSyncMetaRef: case GrepEvent::GrepPS_SubSyncMetaRef:
...@@ -1200,7 +1200,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1200,7 +1200,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subId, subId,
subKey, subKey,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
case GrepEvent::GrepPS_SubSyncDataRef: case GrepEvent::GrepPS_SubSyncDataRef:
...@@ -1217,7 +1217,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1217,7 +1217,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subKey, subKey,
gci, gci,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
case GrepEvent::GrepPS_SubRemoveRef: case GrepEvent::GrepPS_SubRemoveRef:
...@@ -1232,7 +1232,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1232,7 +1232,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
subId, subId,
subKey, subKey,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
case GrepEvent::Rep_Disconnect: case GrepEvent::Rep_Disconnect:
...@@ -1244,7 +1244,7 @@ EventLogger::getText(char * m_text, size_t m_text_len, ...@@ -1244,7 +1244,7 @@ EventLogger::getText(char * m_text, size_t m_text_len,
" Error code: %d Error Message: %s", " Error code: %d Error Message: %s",
nodeId, nodeId,
err, err,
GrepError::getErrorDesc((GrepError::Code)err)); GrepError::getErrorDesc((GrepError::GE_Code)err));
break; break;
} }
......
ndb/src/common/debugger/GrepError.cpp
View file @ 432c12de
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
*/ */
const GrepError::ErrorDescription GrepError::errorDescriptions[] = { const GrepError::ErrorDescription GrepError::errorDescriptions[] = {
{ GrepError::NO_ERROR, { GrepError::GE_NO_ERROR,
"No error" }, "No error" },
{ GrepError::SUBSCRIPTION_ID_NOMEM, { GrepError::SUBSCRIPTION_ID_NOMEM,
"Not enough resources to allocate the subscription" }, "Not enough resources to allocate the subscription" },
...@@ -119,7 +119,7 @@ GrepError::noOfErrorDescs = sizeof(GrepError::errorDescriptions) / ...@@ -119,7 +119,7 @@ GrepError::noOfErrorDescs = sizeof(GrepError::errorDescriptions) /
* gets the corresponding error message to an err code * gets the corresponding error message to an err code
*/ */
const char * const char *
GrepError::getErrorDesc(GrepError::Code err) { GrepError::getErrorDesc(GrepError::GE_Code err) {
for(Uint32 i = 0; i<noOfErrorDescs; i++){ for(Uint32 i = 0; i<noOfErrorDescs; i++){
if(err == errorDescriptions[i].errCode){ if(err == errorDescriptions[i].errCode){
......
ndb/src/common/debugger/signaldata/FsCloseReq.cpp
View file @ 432c12de
...@@ -31,7 +31,7 @@ printFSCLOSEREQ(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiv ...@@ -31,7 +31,7 @@ printFSCLOSEREQ(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiv
sig->userReference); sig->userReference);
fprintf(output, " Flags: H\'%.8x, ", sig->fileFlag); fprintf(output, " Flags: H\'%.8x, ", sig->fileFlag);
if (sig->getRemoveFileFlag(sig->fileFlag) == true) if (sig->getRemoveFileFlag(sig->fileFlag))
fprintf(output, "Remove file"); fprintf(output, "Remove file");
else else
fprintf(output, "Don't remove file"); fprintf(output, "Don't remove file");
......
ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
View file @ 432c12de
...@@ -31,7 +31,7 @@ printFSREADWRITEREQ(FILE * output, const Uint32 * theData, ...@@ -31,7 +31,7 @@ printFSREADWRITEREQ(FILE * output, const Uint32 * theData,
fprintf(output, " UserReference: H\'%.8x", sig->userReference); fprintf(output, " UserReference: H\'%.8x", sig->userReference);
fprintf(output, " Operation flag: H\'%.8x (", sig->operationFlag); fprintf(output, " Operation flag: H\'%.8x (", sig->operationFlag);
if (sig->getSyncFlag(sig->operationFlag) == true) if (sig->getSyncFlag(sig->operationFlag))
fprintf(output, "Sync,"); fprintf(output, "Sync,");
else else
fprintf(output, "No sync,"); fprintf(output, "No sync,");
......
ndb/src/common/logger/LogHandlerList.hpp
View file @ 432c12de
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#define LOGHANDLERLIST_H #define LOGHANDLERLIST_H
class LogHandler; class LogHandler;
#include <ndb_global.h>
/** /**
* Provides a simple linked list of log handlers. * Provides a simple linked list of log handlers.
......
ndb/src/common/mgmcommon/ConfigRetriever.cpp
View file @ 432c12de
...@@ -178,9 +178,10 @@ ConfigRetriever::getConfig(NdbMgmHandle m_handle){ ...@@ -178,9 +178,10 @@ ConfigRetriever::getConfig(NdbMgmHandle m_handle){
return conf; return conf;
} }
ndb_mgm_configuration * ndb_mgm_configuration *
ConfigRetriever::getConfig(const char * filename){ ConfigRetriever::getConfig(const char * filename){
#ifndef NDB_WIN32
struct stat sbuf; struct stat sbuf;
const int res = stat(filename, &sbuf); const int res = stat(filename, &sbuf);
...@@ -217,8 +218,10 @@ ConfigRetriever::getConfig(const char * filename){ ...@@ -217,8 +218,10 @@ ConfigRetriever::getConfig(const char * filename){
return 0; return 0;
} }
delete [] buf2; delete [] buf2;
return (ndb_mgm_configuration*)cvf.m_cfg; return (ndb_mgm_configuration*)cvf.m_cfg;
#else
return 0;
#endif
} }
void void
......
ndb/src/common/transporter/TransporterRegistry.cpp
View file @ 432c12de
...@@ -1167,31 +1167,31 @@ TransporterRegistry::stop_clients() ...@@ -1167,31 +1167,31 @@ TransporterRegistry::stop_clients()
} }
void void
TransporterRegistry::add_transporter_interface(const char *interface, unsigned short port) TransporterRegistry::add_transporter_interface(const char *interf, unsigned short port)
{ {
DBUG_ENTER("TransporterRegistry::add_transporter_interface"); DBUG_ENTER("TransporterRegistry::add_transporter_interface");
DBUG_PRINT("enter",("interface=%s, port= %d", interface, port)); DBUG_PRINT("enter",("interface=%s, port= %d", interf, port));
if (interface && strlen(interface) == 0) if (interf && strlen(interf) == 0)
interface= 0; interf= 0;
for (unsigned i= 0; i < m_transporter_interface.size(); i++) for (unsigned i= 0; i < m_transporter_interface.size(); i++)
{ {
Transporter_interface &tmp= m_transporter_interface[i]; Transporter_interface &tmp= m_transporter_interface[i];
if (port != tmp.m_service_port) if (port != tmp.m_service_port)
continue; continue;
if (interface != 0 && tmp.m_interface != 0 && if (interf != 0 && tmp.m_interface != 0 &&
strcmp(interface, tmp.m_interface) == 0) strcmp(interf, tmp.m_interface) == 0)
{ {
DBUG_VOID_RETURN; // found match, no need to insert DBUG_VOID_RETURN; // found match, no need to insert
} }
if (interface == 0 && tmp.m_interface == 0) if (interf == 0 && tmp.m_interface == 0)
{ {
DBUG_VOID_RETURN; // found match, no need to insert DBUG_VOID_RETURN; // found match, no need to insert
} }
} }
Transporter_interface t; Transporter_interface t;
t.m_service_port= port; t.m_service_port= port;
t.m_interface= interface; t.m_interface= interf;
m_transporter_interface.push_back(t); m_transporter_interface.push_back(t);
DBUG_PRINT("exit",("interface and port added")); DBUG_PRINT("exit",("interface and port added"));
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
...@@ -1200,7 +1200,7 @@ TransporterRegistry::add_transporter_interface(const char *interface, unsigned s ...@@ -1200,7 +1200,7 @@ TransporterRegistry::add_transporter_interface(const char *interface, unsigned s
bool bool
TransporterRegistry::start_service(SocketServer& socket_server) TransporterRegistry::start_service(SocketServer& socket_server)
{ {
if (m_transporter_interface.size() > 0 && nodeIdSpecified != true) if (m_transporter_interface.size() > 0 && !nodeIdSpecified)
{ {
ndbout_c("TransporterRegistry::startReceiving: localNodeId not specified"); ndbout_c("TransporterRegistry::startReceiving: localNodeId not specified");
return false; return false;
......
ndb/src/kernel/blocks/grep/Grep.hpp
View file @ 432c12de
...@@ -380,16 +380,16 @@ public: ...@@ -380,16 +380,16 @@ public:
Uint32 subId, Uint32 subId,
Uint32 subKey, Uint32 subKey,
BlockReference to, BlockReference to,
GrepError::Code err); GrepError::GE_Code err);
void sendSubRemoveRef_SS(Signal * signal, void sendSubRemoveRef_SS(Signal * signal,
SubCoordinator sub, SubCoordinator sub,
GrepError::Code err); GrepError::GE_Code err);
void sendRefToSS(Signal * signal, void sendRefToSS(Signal * signal,
SubCoordinator sub, SubCoordinator sub,
GrepError::Code err, GrepError::GE_Code err,
SubscriptionData::Part part = (SubscriptionData::Part)0); SubscriptionData::Part part = (SubscriptionData::Part)0);
void setRepRef(BlockReference rr) { m_repRef = rr; }; void setRepRef(BlockReference rr) { m_repRef = rr; };
...@@ -496,7 +496,7 @@ public: ...@@ -496,7 +496,7 @@ public:
void sendRefToPSCoord(Signal * signal, void sendRefToPSCoord(Signal * signal,
Subscription sub, Subscription sub,
GrepError::Code err, GrepError::GE_Code err,
SubscriptionData::Part part = (SubscriptionData::Part)0); SubscriptionData::Part part = (SubscriptionData::Part)0);
//protected: //protected:
......
ndb/src/kernel/vm/Configuration.cpp
View file @ 432c12de
...@@ -556,7 +556,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){ ...@@ -556,7 +556,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
noOfDBNodes++; // No of NDB processes noOfDBNodes++; // No of NDB processes
if(nodeId > MAX_NDB_NODES){ if(nodeId > MAX_NDB_NODES){
snprintf(buf, sizeof(buf), "Maximum node id for a ndb node is: %d", BaseString::snprintf(buf, sizeof(buf), "Maximum node id for a ndb node is: %d",
MAX_NDB_NODES); MAX_NDB_NODES);
ERROR_SET(fatal, ERR_INVALID_CONFIG, msg, buf); ERROR_SET(fatal, ERR_INVALID_CONFIG, msg, buf);
} }
......
ndb/src/kernel/vm/Configuration.hpp
View file @ 432c12de
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <ndb_types.h> #include <ndb_types.h>
class ConfigRetriever; class ConfigRetriever;
class LocalConfig; struct LocalConfig;
class Configuration { class Configuration {
public: public:
......
ndb/src/kernel/vm/SimplePropertiesSection.cpp
View file @ 432c12de
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "LongSignal.hpp" #include "LongSignal.hpp"
SimplePropertiesSectionReader::SimplePropertiesSectionReader SimplePropertiesSectionReader::SimplePropertiesSectionReader
(class SegmentedSectionPtr & ptr, class SectionSegmentPool & pool) (struct SegmentedSectionPtr & ptr, class SectionSegmentPool & pool)
: m_pool(pool) : m_pool(pool)
{ {
if(ptr.p == 0){ if(ptr.p == 0){
...@@ -190,7 +190,7 @@ SimplePropertiesSectionWriter::putWords(const Uint32 * src, Uint32 len){ ...@@ -190,7 +190,7 @@ SimplePropertiesSectionWriter::putWords(const Uint32 * src, Uint32 len){
} }
void void
SimplePropertiesSectionWriter::getPtr(class SegmentedSectionPtr & dst){ SimplePropertiesSectionWriter::getPtr(struct SegmentedSectionPtr & dst){
// Set last ptr and size // Set last ptr and size
if(m_pos >= 0){ if(m_pos >= 0){
dst.p = m_head; dst.p = m_head;
......
ndb/src/mgmapi/mgmapi_configuration.cpp
View file @ 432c12de
#include <ndb_types.h>
#include <mgmapi.h> #include <mgmapi.h>
#include "mgmapi_configuration.hpp" #include "mgmapi_configuration.hpp"
#include <new> #include <new>
...@@ -138,7 +139,7 @@ ndb_mgm_get_int_parameter(const ndb_mgm_configuration_iterator* iter, ...@@ -138,7 +139,7 @@ ndb_mgm_get_int_parameter(const ndb_mgm_configuration_iterator* iter,
extern "C" extern "C"
int int
ndb_mgm_get_int64_parameter(const ndb_mgm_configuration_iterator* iter, ndb_mgm_get_int64_parameter(const ndb_mgm_configuration_iterator* iter,
int param, unsigned long long * value){ int param, Uint64 * value){
return iter->get(param, value); return iter->get(param, value);
} }
......
ndb/src/mgmapi/mgmapi_configuration.hpp
View file @ 432c12de
...@@ -21,7 +21,7 @@ struct ndb_mgm_configuration_iterator { ...@@ -21,7 +21,7 @@ struct ndb_mgm_configuration_iterator {
int find(int param, unsigned value); int find(int param, unsigned value);
int get(int param, unsigned * value) const ; int get(int param, unsigned * value) const ;
int get(int param, unsigned long long * value) const ; int get(int param, Uint64 * value) const ;
int get(int param, const char ** value) const ; int get(int param, const char ** value) const ;
// //
......
ndb/src/mgmsrv/ConfigInfo.cpp
View file @ 432c12de
...@@ -256,9 +256,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -256,9 +256,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"COMPUTER", "COMPUTER",
"COMPUTER", "COMPUTER",
"Computer section", "Computer section",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::SECTION, ConfigInfo::CI_SECTION,
0, 0,
0, 0 }, 0, 0 },
...@@ -267,9 +267,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -267,9 +267,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Id", "Id",
"COMPUTER", "COMPUTER",
"Name of computer", "Name of computer",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MANDATORY, MANDATORY,
0, 0 }, 0, 0 },
...@@ -278,9 +278,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -278,9 +278,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HostName", "HostName",
"COMPUTER", "COMPUTER",
"Hostname of computer (e.g. mysql.com)", "Hostname of computer (e.g. mysql.com)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MANDATORY, MANDATORY,
0, 0 }, 0, 0 },
...@@ -289,9 +289,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -289,9 +289,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ByteOrder", "ByteOrder",
"COMPUTER", "COMPUTER",
0, 0,
ConfigInfo::DEPRICATED, ConfigInfo::CI_DEPRICATED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0,
0 }, 0 },
...@@ -304,9 +304,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -304,9 +304,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"SYSTEM", "SYSTEM",
"SYSTEM", "SYSTEM",
"System section", "System section",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::SECTION, ConfigInfo::CI_SECTION,
(const char *)CFG_SECTION_SYSTEM, (const char *)CFG_SECTION_SYSTEM,
0, 0 }, 0, 0 },
...@@ -315,9 +315,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -315,9 +315,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Name", "Name",
"SYSTEM", "SYSTEM",
"Name of system (NDB Cluster)", "Name of system (NDB Cluster)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MANDATORY, MANDATORY,
0, 0 }, 0, 0 },
...@@ -326,9 +326,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -326,9 +326,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ReplicationRole", "ReplicationRole",
"SYSTEM", "SYSTEM",
"Role in Global Replication (None, Primary, or Standby)", "Role in Global Replication (None, Primary, or Standby)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -337,9 +337,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -337,9 +337,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"PrimaryMGMNode", "PrimaryMGMNode",
"SYSTEM", "SYSTEM",
"Node id of Primary "MGM_TOKEN_PRINT" node", "Node id of Primary "MGM_TOKEN_PRINT" node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -349,9 +349,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -349,9 +349,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ConfigGenerationNumber", "ConfigGenerationNumber",
"SYSTEM", "SYSTEM",
"Configuration generation number", "Configuration generation number",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -364,9 +364,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -364,9 +364,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
DB_TOKEN, DB_TOKEN,
DB_TOKEN, DB_TOKEN,
"Node section", "Node section",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::SECTION, ConfigInfo::CI_SECTION,
(const char *)NODE_TYPE_DB, (const char *)NODE_TYPE_DB,
0, 0 0, 0
}, },
...@@ -376,9 +376,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -376,9 +376,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HostName", "HostName",
DB_TOKEN, DB_TOKEN,
"Name of computer for this node", "Name of computer for this node",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -387,9 +387,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -387,9 +387,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"System", "System",
DB_TOKEN, DB_TOKEN,
"Name of system for this node", "Name of system for this node",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -398,9 +398,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -398,9 +398,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Id", "Id",
DB_TOKEN, DB_TOKEN,
"Number identifying the database node ("DB_TOKEN_PRINT")", "Number identifying the database node ("DB_TOKEN_PRINT")",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"1", "1",
STR_VALUE(MAX_NODES) }, STR_VALUE(MAX_NODES) },
...@@ -410,9 +410,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -410,9 +410,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ServerPort", "ServerPort",
DB_TOKEN, DB_TOKEN,
"Port used to setup transporter", "Port used to setup transporter",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
UNDEFINED, UNDEFINED,
"1", "1",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -422,9 +422,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -422,9 +422,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NoOfReplicas", "NoOfReplicas",
DB_TOKEN, DB_TOKEN,
"Number of copies of all data in the database (1-4)", "Number of copies of all data in the database (1-4)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"1", "1",
"4" }, "4" },
...@@ -434,9 +434,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -434,9 +434,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfAttributes", "MaxNoOfAttributes",
DB_TOKEN, DB_TOKEN,
"Total number of attributes stored in database. I.e. sum over all tables", "Total number of attributes stored in database. I.e. sum over all tables",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1000", "1000",
"32", "32",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -446,9 +446,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -446,9 +446,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfTables", "MaxNoOfTables",
DB_TOKEN, DB_TOKEN,
"Total number of tables stored in the database", "Total number of tables stored in the database",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"128", "128",
"8", "8",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -458,9 +458,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -458,9 +458,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfOrderedIndexes", "MaxNoOfOrderedIndexes",
DB_TOKEN, DB_TOKEN,
"Total number of ordered indexes that can be defined in the system", "Total number of ordered indexes that can be defined in the system",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"128", "128",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -470,9 +470,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -470,9 +470,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfUniqueHashIndexes", "MaxNoOfUniqueHashIndexes",
DB_TOKEN, DB_TOKEN,
"Total number of unique hash indexes that can be defined in the system", "Total number of unique hash indexes that can be defined in the system",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"64", "64",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -482,9 +482,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -482,9 +482,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfIndexes", "MaxNoOfIndexes",
DB_TOKEN, DB_TOKEN,
"Total number of indexes that can be defined in the system", "Total number of indexes that can be defined in the system",
ConfigInfo::DEPRICATED, ConfigInfo::CI_DEPRICATED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"128", "128",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -494,9 +494,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -494,9 +494,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfConcurrentIndexOperations", "MaxNoOfConcurrentIndexOperations",
DB_TOKEN, DB_TOKEN,
"Total number of index operations that can execute simultaneously on one "DB_TOKEN_PRINT" node", "Total number of index operations that can execute simultaneously on one "DB_TOKEN_PRINT" node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"8K", "8K",
"0", "0",
STR_VALUE(MAX_INT_RNIL) STR_VALUE(MAX_INT_RNIL)
...@@ -507,9 +507,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -507,9 +507,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfTriggers", "MaxNoOfTriggers",
DB_TOKEN, DB_TOKEN,
"Total number of triggers that can be defined in the system", "Total number of triggers that can be defined in the system",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"768", "768",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -519,9 +519,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -519,9 +519,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfFiredTriggers", "MaxNoOfFiredTriggers",
DB_TOKEN, DB_TOKEN,
"Total number of triggers that can fire simultaneously in one "DB_TOKEN_PRINT" node", "Total number of triggers that can fire simultaneously in one "DB_TOKEN_PRINT" node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"4000", "4000",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -531,9 +531,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -531,9 +531,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ExecuteOnComputer", "ExecuteOnComputer",
DB_TOKEN, DB_TOKEN,
"String referencing an earlier defined COMPUTER", "String referencing an earlier defined COMPUTER",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -542,9 +542,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -542,9 +542,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfSavedMessages", "MaxNoOfSavedMessages",
DB_TOKEN, DB_TOKEN,
"Max number of error messages in error log and max number of trace files", "Max number of error messages in error log and max number of trace files",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"25", "25",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -554,9 +554,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -554,9 +554,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"LockPagesInMainMemory", "LockPagesInMainMemory",
DB_TOKEN, DB_TOKEN,
"If set to yes, then NDB Cluster data will not be swapped out to disk", "If set to yes, then NDB Cluster data will not be swapped out to disk",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"false", "false",
"false", "false",
"true" }, "true" },
...@@ -566,9 +566,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -566,9 +566,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"TimeBetweenWatchDogCheck", "TimeBetweenWatchDogCheck",
DB_TOKEN, DB_TOKEN,
"Time between execution checks inside a database node", "Time between execution checks inside a database node",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"6000", "6000",
"70", "70",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -578,9 +578,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -578,9 +578,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"StopOnError", "StopOnError",
DB_TOKEN, DB_TOKEN,
"If set to N, "DB_TOKEN_PRINT" automatically restarts/recovers in case of node failure", "If set to N, "DB_TOKEN_PRINT" automatically restarts/recovers in case of node failure",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"true", "true",
"false", "false",
"true" }, "true" },
...@@ -590,9 +590,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -590,9 +590,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"RestartOnErrorInsert", "RestartOnErrorInsert",
DB_TOKEN, DB_TOKEN,
"See src/kernel/vm/Emulator.hpp NdbRestartType for details", "See src/kernel/vm/Emulator.hpp NdbRestartType for details",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"2", "2",
"0", "0",
"4" }, "4" },
...@@ -602,9 +602,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -602,9 +602,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfConcurrentOperations", "MaxNoOfConcurrentOperations",
DB_TOKEN, DB_TOKEN,
"Max number of operation records in transaction coordinator", "Max number of operation records in transaction coordinator",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"32k", "32k",
"32", "32",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -614,9 +614,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -614,9 +614,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfLocalOperations", "MaxNoOfLocalOperations",
DB_TOKEN, DB_TOKEN,
"Max number of operation records defined in the local storage node", "Max number of operation records defined in the local storage node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
UNDEFINED, UNDEFINED,
"32", "32",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -626,9 +626,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -626,9 +626,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfLocalScans", "MaxNoOfLocalScans",
DB_TOKEN, DB_TOKEN,
"Max number of fragment scans in parallel in the local storage node", "Max number of fragment scans in parallel in the local storage node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
UNDEFINED, UNDEFINED,
"32", "32",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -638,9 +638,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -638,9 +638,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"BatchSizePerLocalScan", "BatchSizePerLocalScan",
DB_TOKEN, DB_TOKEN,
"Used to calculate the number of lock records for scan with hold lock", "Used to calculate the number of lock records for scan with hold lock",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
STR_VALUE(DEF_BATCH_SIZE), STR_VALUE(DEF_BATCH_SIZE),
"1", "1",
STR_VALUE(MAX_PARALLEL_OP_PER_SCAN) }, STR_VALUE(MAX_PARALLEL_OP_PER_SCAN) },
...@@ -650,9 +650,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -650,9 +650,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfConcurrentTransactions", "MaxNoOfConcurrentTransactions",
DB_TOKEN, DB_TOKEN,
"Max number of transaction executing concurrently on the "DB_TOKEN_PRINT" node", "Max number of transaction executing concurrently on the "DB_TOKEN_PRINT" node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"4096", "4096",
"32", "32",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -662,9 +662,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -662,9 +662,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfConcurrentScans", "MaxNoOfConcurrentScans",
DB_TOKEN, DB_TOKEN,
"Max number of scans executing concurrently on the "DB_TOKEN_PRINT" node", "Max number of scans executing concurrently on the "DB_TOKEN_PRINT" node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"256", "256",
"2", "2",
"500" }, "500" },
...@@ -674,9 +674,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -674,9 +674,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"TransactionBufferMemory", "TransactionBufferMemory",
DB_TOKEN, DB_TOKEN,
"Dynamic buffer space (in bytes) for key and attribute data allocated for each "DB_TOKEN_PRINT" node", "Dynamic buffer space (in bytes) for key and attribute data allocated for each "DB_TOKEN_PRINT" node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1M", "1M",
"1K", "1K",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -686,9 +686,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -686,9 +686,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"IndexMemory", "IndexMemory",
DB_TOKEN, DB_TOKEN,
"Number bytes on each "DB_TOKEN_PRINT" node allocated for storing indexes", "Number bytes on each "DB_TOKEN_PRINT" node allocated for storing indexes",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT64, ConfigInfo::CI_INT64,
"18M", "18M",
"1M", "1M",
"1024G" }, "1024G" },
...@@ -698,9 +698,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -698,9 +698,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"DataMemory", "DataMemory",
DB_TOKEN, DB_TOKEN,
"Number bytes on each "DB_TOKEN_PRINT" node allocated for storing data", "Number bytes on each "DB_TOKEN_PRINT" node allocated for storing data",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT64, ConfigInfo::CI_INT64,
"80M", "80M",
"1M", "1M",
"1024G" }, "1024G" },
...@@ -710,9 +710,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -710,9 +710,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"UndoIndexBuffer", "UndoIndexBuffer",
DB_TOKEN, DB_TOKEN,
"Number bytes on each "DB_TOKEN_PRINT" node allocated for writing UNDO logs for index part", "Number bytes on each "DB_TOKEN_PRINT" node allocated for writing UNDO logs for index part",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"2M", "2M",
"1M", "1M",
STR_VALUE(MAX_INT_RNIL)}, STR_VALUE(MAX_INT_RNIL)},
...@@ -722,9 +722,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -722,9 +722,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"UndoDataBuffer", "UndoDataBuffer",
DB_TOKEN, DB_TOKEN,
"Number bytes on each "DB_TOKEN_PRINT" node allocated for writing UNDO logs for data part", "Number bytes on each "DB_TOKEN_PRINT" node allocated for writing UNDO logs for data part",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"16M", "16M",
"1M", "1M",
STR_VALUE(MAX_INT_RNIL)}, STR_VALUE(MAX_INT_RNIL)},
...@@ -734,9 +734,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -734,9 +734,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"RedoBuffer", "RedoBuffer",
DB_TOKEN, DB_TOKEN,
"Number bytes on each "DB_TOKEN_PRINT" node allocated for writing REDO logs", "Number bytes on each "DB_TOKEN_PRINT" node allocated for writing REDO logs",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"8M", "8M",
"1M", "1M",
STR_VALUE(MAX_INT_RNIL)}, STR_VALUE(MAX_INT_RNIL)},
...@@ -746,9 +746,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -746,9 +746,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"LongMessageBuffer", "LongMessageBuffer",
DB_TOKEN, DB_TOKEN,
"Number bytes on each "DB_TOKEN_PRINT" node allocated for internal long messages", "Number bytes on each "DB_TOKEN_PRINT" node allocated for internal long messages",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1M", "1M",
"512k", "512k",
STR_VALUE(MAX_INT_RNIL)}, STR_VALUE(MAX_INT_RNIL)},
...@@ -758,9 +758,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -758,9 +758,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"StartPartialTimeout", "StartPartialTimeout",
DB_TOKEN, DB_TOKEN,
"Time to wait before trying to start wo/ all nodes. 0=Wait forever", "Time to wait before trying to start wo/ all nodes. 0=Wait forever",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"30000", "30000",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -770,9 +770,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -770,9 +770,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"StartPartitionedTimeout", "StartPartitionedTimeout",
DB_TOKEN, DB_TOKEN,
"Time to wait before trying to start partitioned. 0=Wait forever", "Time to wait before trying to start partitioned. 0=Wait forever",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"60000", "60000",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -782,9 +782,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -782,9 +782,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"StartFailureTimeout", "StartFailureTimeout",
DB_TOKEN, DB_TOKEN,
"Time to wait before terminating. 0=Wait forever", "Time to wait before terminating. 0=Wait forever",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -794,9 +794,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -794,9 +794,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HeartbeatIntervalDbDb", "HeartbeatIntervalDbDb",
DB_TOKEN, DB_TOKEN,
"Time between "DB_TOKEN_PRINT"-"DB_TOKEN_PRINT" heartbeats. "DB_TOKEN_PRINT" considered dead after 3 missed HBs", "Time between "DB_TOKEN_PRINT"-"DB_TOKEN_PRINT" heartbeats. "DB_TOKEN_PRINT" considered dead after 3 missed HBs",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1500", "1500",
"10", "10",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -806,9 +806,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -806,9 +806,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HeartbeatIntervalDbApi", "HeartbeatIntervalDbApi",
DB_TOKEN, DB_TOKEN,
"Time between "API_TOKEN_PRINT"-"DB_TOKEN_PRINT" heartbeats. "API_TOKEN_PRINT" connection closed after 3 missed HBs", "Time between "API_TOKEN_PRINT"-"DB_TOKEN_PRINT" heartbeats. "API_TOKEN_PRINT" connection closed after 3 missed HBs",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1500", "1500",
"100", "100",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -818,9 +818,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -818,9 +818,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"TimeBetweenLocalCheckpoints", "TimeBetweenLocalCheckpoints",
DB_TOKEN, DB_TOKEN,
"Time between taking snapshots of the database (expressed in 2log of bytes)", "Time between taking snapshots of the database (expressed in 2log of bytes)",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"20", "20",
"0", "0",
"31" }, "31" },
...@@ -830,9 +830,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -830,9 +830,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"TimeBetweenGlobalCheckpoints", "TimeBetweenGlobalCheckpoints",
DB_TOKEN, DB_TOKEN,
"Time between doing group commit of transactions to disk", "Time between doing group commit of transactions to disk",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"2000", "2000",
"10", "10",
"32000" }, "32000" },
...@@ -842,9 +842,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -842,9 +842,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NoOfFragmentLogFiles", "NoOfFragmentLogFiles",
DB_TOKEN, DB_TOKEN,
"No of 16 Mbyte Redo log files in each of 4 file sets belonging to "DB_TOKEN_PRINT" node", "No of 16 Mbyte Redo log files in each of 4 file sets belonging to "DB_TOKEN_PRINT" node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"8", "8",
"1", "1",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -854,9 +854,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -854,9 +854,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfOpenFiles", "MaxNoOfOpenFiles",
DB_TOKEN, DB_TOKEN,
"Max number of files open per "DB_TOKEN_PRINT" node.(One thread is created per file)", "Max number of files open per "DB_TOKEN_PRINT" node.(One thread is created per file)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"40", "40",
"20", "20",
"256" }, "256" },
...@@ -867,9 +867,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -867,9 +867,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"TimeBetweenInactiveTransactionAbortCheck", "TimeBetweenInactiveTransactionAbortCheck",
DB_TOKEN, DB_TOKEN,
"Time between inactive transaction checks", "Time between inactive transaction checks",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1000", "1000",
"1000", "1000",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -883,9 +883,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -883,9 +883,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"to execute or send another part (query, statement) of the transaction.\n" "to execute or send another part (query, statement) of the transaction.\n"
"If the application takes too long time, the transaction gets aborted.\n" "If the application takes too long time, the transaction gets aborted.\n"
"Timeout set to 0 means that we don't timeout at all on application wait.", "Timeout set to 0 means that we don't timeout at all on application wait.",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
STR_VALUE(MAX_INT_RNIL), STR_VALUE(MAX_INT_RNIL),
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -898,9 +898,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -898,9 +898,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"This is the time the transaction coordinator waits for each database node\n" "This is the time the transaction coordinator waits for each database node\n"
"of the transaction to execute a request. If the database node takes too\n" "of the transaction to execute a request. If the database node takes too\n"
"long time, the transaction gets aborted.", "long time, the transaction gets aborted.",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1200", "1200",
"50", "50",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -910,9 +910,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -910,9 +910,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NoOfDiskPagesToDiskDuringRestartTUP", "NoOfDiskPagesToDiskDuringRestartTUP",
DB_TOKEN, DB_TOKEN,
"?", "?",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"40", "40",
"1", "1",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -922,9 +922,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -922,9 +922,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NoOfDiskPagesToDiskAfterRestartTUP", "NoOfDiskPagesToDiskAfterRestartTUP",
DB_TOKEN, DB_TOKEN,
"?", "?",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"40", "40",
"1", "1",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -934,9 +934,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -934,9 +934,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NoOfDiskPagesToDiskDuringRestartACC", "NoOfDiskPagesToDiskDuringRestartACC",
DB_TOKEN, DB_TOKEN,
"?", "?",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"20", "20",
"1", "1",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -946,9 +946,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -946,9 +946,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NoOfDiskPagesToDiskAfterRestartACC", "NoOfDiskPagesToDiskAfterRestartACC",
DB_TOKEN, DB_TOKEN,
"?", "?",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"20", "20",
"1", "1",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -959,9 +959,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -959,9 +959,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Diskless", "Diskless",
DB_TOKEN, DB_TOKEN,
"Run wo/ disk", "Run wo/ disk",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"false", "false",
"false", "false",
"true"}, "true"},
...@@ -971,9 +971,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -971,9 +971,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Discless", "Discless",
DB_TOKEN, DB_TOKEN,
"Diskless", "Diskless",
ConfigInfo::DEPRICATED, ConfigInfo::CI_DEPRICATED,
true, true,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"false", "false",
"false", "false",
"true"}, "true"},
...@@ -985,9 +985,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -985,9 +985,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ArbitrationTimeout", "ArbitrationTimeout",
DB_TOKEN, DB_TOKEN,
"Max time (milliseconds) database partion waits for arbitration signal", "Max time (milliseconds) database partion waits for arbitration signal",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"3000", "3000",
"10", "10",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -997,9 +997,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -997,9 +997,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"DataDir", "DataDir",
DB_TOKEN, DB_TOKEN,
"Data directory for this node", "Data directory for this node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MYSQLCLUSTERDIR, MYSQLCLUSTERDIR,
0, 0 }, 0, 0 },
...@@ -1008,9 +1008,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1008,9 +1008,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"FileSystemPath", "FileSystemPath",
DB_TOKEN, DB_TOKEN,
"Path to directory where the "DB_TOKEN_PRINT" node stores its data (directory must exist)", "Path to directory where the "DB_TOKEN_PRINT" node stores its data (directory must exist)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1019,9 +1019,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1019,9 +1019,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"LogLevelStartup", "LogLevelStartup",
DB_TOKEN, DB_TOKEN,
"Node startup info printed on stdout", "Node startup info printed on stdout",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1", "1",
"0", "0",
"15" }, "15" },
...@@ -1031,9 +1031,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1031,9 +1031,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"LogLevelShutdown", "LogLevelShutdown",
DB_TOKEN, DB_TOKEN,
"Node shutdown info printed on stdout", "Node shutdown info printed on stdout",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
"15" }, "15" },
...@@ -1043,9 +1043,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1043,9 +1043,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"LogLevelStatistic", "LogLevelStatistic",
DB_TOKEN, DB_TOKEN,
"Transaction, operation, transporter info printed on stdout", "Transaction, operation, transporter info printed on stdout",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
"15" }, "15" },
...@@ -1055,9 +1055,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1055,9 +1055,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"LogLevelCheckpoint", "LogLevelCheckpoint",
DB_TOKEN, DB_TOKEN,
"Local and Global checkpoint info printed on stdout", "Local and Global checkpoint info printed on stdout",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
"15" }, "15" },
...@@ -1067,9 +1067,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1067,9 +1067,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"LogLevelNodeRestart", "LogLevelNodeRestart",
DB_TOKEN, DB_TOKEN,
"Node restart, node failure info printed on stdout", "Node restart, node failure info printed on stdout",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
"15" }, "15" },
...@@ -1079,9 +1079,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1079,9 +1079,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"LogLevelConnection", "LogLevelConnection",
DB_TOKEN, DB_TOKEN,
"Node connect/disconnect info printed on stdout", "Node connect/disconnect info printed on stdout",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
"15" }, "15" },
...@@ -1091,9 +1091,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1091,9 +1091,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"LogLevelError", "LogLevelError",
DB_TOKEN, DB_TOKEN,
"Transporter, heartbeat errors printed on stdout", "Transporter, heartbeat errors printed on stdout",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
"15" }, "15" },
...@@ -1103,9 +1103,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1103,9 +1103,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"LogLevelInfo", "LogLevelInfo",
DB_TOKEN, DB_TOKEN,
"Heartbeat and log info printed on stdout", "Heartbeat and log info printed on stdout",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
"15" }, "15" },
...@@ -1118,9 +1118,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1118,9 +1118,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ParallelBackups", "ParallelBackups",
DB_TOKEN, DB_TOKEN,
"Maximum number of parallel backups", "Maximum number of parallel backups",
ConfigInfo::NOTIMPLEMENTED, ConfigInfo::CI_NOTIMPLEMENTED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1", "1",
"1", "1",
"1" }, "1" },
...@@ -1130,9 +1130,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1130,9 +1130,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"BackupDataDir", "BackupDataDir",
DB_TOKEN, DB_TOKEN,
"Path to where to store backups", "Path to where to store backups",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1141,9 +1141,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1141,9 +1141,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"BackupMemory", "BackupMemory",
DB_TOKEN, DB_TOKEN,
"Total memory allocated for backups per node (in bytes)", "Total memory allocated for backups per node (in bytes)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"4M", // sum of BackupDataBufferSize and BackupLogBufferSize "4M", // sum of BackupDataBufferSize and BackupLogBufferSize
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1153,9 +1153,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1153,9 +1153,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"BackupDataBufferSize", "BackupDataBufferSize",
DB_TOKEN, DB_TOKEN,
"Default size of databuffer for a backup (in bytes)", "Default size of databuffer for a backup (in bytes)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"2M", // remember to change BackupMemory "2M", // remember to change BackupMemory
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1165,9 +1165,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1165,9 +1165,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"BackupLogBufferSize", "BackupLogBufferSize",
DB_TOKEN, DB_TOKEN,
"Default size of logbuffer for a backup (in bytes)", "Default size of logbuffer for a backup (in bytes)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"2M", // remember to change BackupMemory "2M", // remember to change BackupMemory
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1177,9 +1177,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1177,9 +1177,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"BackupWriteSize", "BackupWriteSize",
DB_TOKEN, DB_TOKEN,
"Default size of filesystem writes made by backup (in bytes)", "Default size of filesystem writes made by backup (in bytes)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"32K", "32K",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1192,9 +1192,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1192,9 +1192,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"REP", "REP",
"REP", "REP",
"Node section", "Node section",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::SECTION, ConfigInfo::CI_SECTION,
(const char *)NODE_TYPE_REP, (const char *)NODE_TYPE_REP,
0, 0 0, 0
}, },
...@@ -1204,9 +1204,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1204,9 +1204,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HostName", "HostName",
"REP", "REP",
"Name of computer for this node", "Name of computer for this node",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1215,9 +1215,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1215,9 +1215,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"System", "System",
"REP", "REP",
"Name of system for this node", "Name of system for this node",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1226,9 +1226,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1226,9 +1226,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Id", "Id",
"REP", "REP",
"Number identifying replication node (REP)", "Number identifying replication node (REP)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"1", "1",
STR_VALUE(MAX_NODES) }, STR_VALUE(MAX_NODES) },
...@@ -1238,9 +1238,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1238,9 +1238,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ExecuteOnComputer", "ExecuteOnComputer",
"REP", "REP",
"String referencing an earlier defined COMPUTER", "String referencing an earlier defined COMPUTER",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MANDATORY, MANDATORY,
0, 0 }, 0, 0 },
...@@ -1249,9 +1249,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1249,9 +1249,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HeartbeatIntervalRepRep", "HeartbeatIntervalRepRep",
"REP", "REP",
"Time between REP-REP heartbeats. Connection closed after 3 missed HBs", "Time between REP-REP heartbeats. Connection closed after 3 missed HBs",
ConfigInfo::USED, ConfigInfo::CI_USED,
true, true,
ConfigInfo::INT, ConfigInfo::CI_INT,
"3000", "3000",
"100", "100",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1264,9 +1264,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1264,9 +1264,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
API_TOKEN, API_TOKEN,
API_TOKEN, API_TOKEN,
"Node section", "Node section",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::SECTION, ConfigInfo::CI_SECTION,
(const char *)NODE_TYPE_API, (const char *)NODE_TYPE_API,
0, 0 0, 0
}, },
...@@ -1276,9 +1276,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1276,9 +1276,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HostName", "HostName",
API_TOKEN, API_TOKEN,
"Name of computer for this node", "Name of computer for this node",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1287,9 +1287,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1287,9 +1287,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"System", "System",
API_TOKEN, API_TOKEN,
"Name of system for this node", "Name of system for this node",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1298,9 +1298,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1298,9 +1298,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Id", "Id",
API_TOKEN, API_TOKEN,
"Number identifying application node ("API_TOKEN_PRINT")", "Number identifying application node ("API_TOKEN_PRINT")",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"1", "1",
STR_VALUE(MAX_NODES) }, STR_VALUE(MAX_NODES) },
...@@ -1310,9 +1310,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1310,9 +1310,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ExecuteOnComputer", "ExecuteOnComputer",
API_TOKEN, API_TOKEN,
"String referencing an earlier defined COMPUTER", "String referencing an earlier defined COMPUTER",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1321,9 +1321,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1321,9 +1321,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ArbitrationRank", "ArbitrationRank",
API_TOKEN, API_TOKEN,
"If 0, then "API_TOKEN_PRINT" is not arbitrator. Kernel selects arbitrators in order 1, 2", "If 0, then "API_TOKEN_PRINT" is not arbitrator. Kernel selects arbitrators in order 1, 2",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
"2" }, "2" },
...@@ -1333,9 +1333,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1333,9 +1333,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ArbitrationDelay", "ArbitrationDelay",
API_TOKEN, API_TOKEN,
"When asked to arbitrate, arbitrator waits this long before voting (msec)", "When asked to arbitrate, arbitrator waits this long before voting (msec)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1345,9 +1345,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1345,9 +1345,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxScanBatchSize", "MaxScanBatchSize",
"API", "API",
"The maximum collective batch size for one scan", "The maximum collective batch size for one scan",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
STR_VALUE(MAX_SCAN_BATCH_SIZE), STR_VALUE(MAX_SCAN_BATCH_SIZE),
"32k", "32k",
"16M" }, "16M" },
...@@ -1357,9 +1357,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1357,9 +1357,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"BatchByteSize", "BatchByteSize",
"API", "API",
"The default batch size in bytes", "The default batch size in bytes",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
STR_VALUE(SCAN_BATCH_SIZE), STR_VALUE(SCAN_BATCH_SIZE),
"1k", "1k",
"1M" }, "1M" },
...@@ -1369,9 +1369,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1369,9 +1369,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"BatchSize", "BatchSize",
"API", "API",
"The default batch size in number of records", "The default batch size in number of records",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
STR_VALUE(DEF_BATCH_SIZE), STR_VALUE(DEF_BATCH_SIZE),
"1", "1",
STR_VALUE(MAX_PARALLEL_OP_PER_SCAN) }, STR_VALUE(MAX_PARALLEL_OP_PER_SCAN) },
...@@ -1384,9 +1384,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1384,9 +1384,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
MGM_TOKEN, MGM_TOKEN,
MGM_TOKEN, MGM_TOKEN,
"Node section", "Node section",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::SECTION, ConfigInfo::CI_SECTION,
(const char *)NODE_TYPE_MGM, (const char *)NODE_TYPE_MGM,
0, 0 0, 0
}, },
...@@ -1396,9 +1396,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1396,9 +1396,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HostName", "HostName",
MGM_TOKEN, MGM_TOKEN,
"Name of computer for this node", "Name of computer for this node",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1407,9 +1407,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1407,9 +1407,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"DataDir", "DataDir",
MGM_TOKEN, MGM_TOKEN,
"Data directory for this node", "Data directory for this node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MYSQLCLUSTERDIR, MYSQLCLUSTERDIR,
0, 0 }, 0, 0 },
...@@ -1418,9 +1418,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1418,9 +1418,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"System", "System",
MGM_TOKEN, MGM_TOKEN,
"Name of system for this node", "Name of system for this node",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1429,9 +1429,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1429,9 +1429,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Id", "Id",
MGM_TOKEN, MGM_TOKEN,
"Number identifying the management server node ("MGM_TOKEN_PRINT")", "Number identifying the management server node ("MGM_TOKEN_PRINT")",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"1", "1",
STR_VALUE(MAX_NODES) }, STR_VALUE(MAX_NODES) },
...@@ -1441,9 +1441,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1441,9 +1441,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"LogDestination", "LogDestination",
MGM_TOKEN, MGM_TOKEN,
"String describing where logmessages are sent", "String describing where logmessages are sent",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
0, 0,
0, 0 }, 0, 0 },
...@@ -1452,9 +1452,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1452,9 +1452,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ExecuteOnComputer", "ExecuteOnComputer",
MGM_TOKEN, MGM_TOKEN,
"String referencing an earlier defined COMPUTER", "String referencing an earlier defined COMPUTER",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
0, 0,
0, 0 }, 0, 0 },
...@@ -1463,9 +1463,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1463,9 +1463,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"MaxNoOfSavedEvents", "MaxNoOfSavedEvents",
MGM_TOKEN, MGM_TOKEN,
"", "",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"100", "100",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1475,9 +1475,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1475,9 +1475,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"PortNumber", "PortNumber",
MGM_TOKEN, MGM_TOKEN,
"Port number to give commands to/fetch configurations from management server", "Port number to give commands to/fetch configurations from management server",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
NDB_BASE_PORT, NDB_BASE_PORT,
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1487,9 +1487,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1487,9 +1487,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"PortNumberStats", "PortNumberStats",
MGM_TOKEN, MGM_TOKEN,
"Port number used to get statistical information from a management server", "Port number used to get statistical information from a management server",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"2199", "2199",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1499,9 +1499,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1499,9 +1499,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ArbitrationRank", "ArbitrationRank",
MGM_TOKEN, MGM_TOKEN,
"If 0, then "MGM_TOKEN_PRINT" is not arbitrator. Kernel selects arbitrators in order 1, 2", "If 0, then "MGM_TOKEN_PRINT" is not arbitrator. Kernel selects arbitrators in order 1, 2",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1", "1",
"0", "0",
"2" }, "2" },
...@@ -1511,9 +1511,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1511,9 +1511,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ArbitrationDelay", "ArbitrationDelay",
MGM_TOKEN, MGM_TOKEN,
"", "",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1526,9 +1526,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1526,9 +1526,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"TCP", "TCP",
"TCP", "TCP",
"Connection section", "Connection section",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::SECTION, ConfigInfo::CI_SECTION,
(const char *)CONNECTION_TYPE_TCP, (const char *)CONNECTION_TYPE_TCP,
0, 0 0, 0
}, },
...@@ -1538,9 +1538,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1538,9 +1538,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HostName1", "HostName1",
"TCP", "TCP",
"Name/IP of computer on one side of the connection", "Name/IP of computer on one side of the connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1549,9 +1549,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1549,9 +1549,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HostName2", "HostName2",
"TCP", "TCP",
"Name/IP of computer on one side of the connection", "Name/IP of computer on one side of the connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1560,9 +1560,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1560,9 +1560,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId1", "NodeId1",
"TCP", "TCP",
"Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection", "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MANDATORY, MANDATORY,
0, 0 }, 0, 0 },
...@@ -1571,9 +1571,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1571,9 +1571,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId2", "NodeId2",
"TCP", "TCP",
"Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection", "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MANDATORY, MANDATORY,
0, 0 }, 0, 0 },
...@@ -1582,9 +1582,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1582,9 +1582,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"SendSignalId", "SendSignalId",
"TCP", "TCP",
"Sends id in each signal. Used in trace files.", "Sends id in each signal. Used in trace files.",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"true", "true",
"false", "false",
"true" }, "true" },
...@@ -1595,9 +1595,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1595,9 +1595,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Checksum", "Checksum",
"TCP", "TCP",
"If checksum is enabled, all signals between nodes are checked for errors", "If checksum is enabled, all signals between nodes are checked for errors",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"false", "false",
"false", "false",
"true" }, "true" },
...@@ -1607,9 +1607,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1607,9 +1607,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"PortNumber", "PortNumber",
"TCP", "TCP",
"Port used for this transporter", "Port used for this transporter",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1619,9 +1619,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1619,9 +1619,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"SendBufferMemory", "SendBufferMemory",
"TCP", "TCP",
"Bytes of buffer for signals sent from this node", "Bytes of buffer for signals sent from this node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"256K", "256K",
"16K", "16K",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1631,9 +1631,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1631,9 +1631,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ReceiveBufferMemory", "ReceiveBufferMemory",
"TCP", "TCP",
"Bytes of buffer for signals received by this node", "Bytes of buffer for signals received by this node",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"64K", "64K",
"16K", "16K",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1643,9 +1643,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1643,9 +1643,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Proxy", "Proxy",
"TCP", "TCP",
"", "",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1654,9 +1654,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1654,9 +1654,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId1_System", "NodeId1_System",
"TCP", "TCP",
"System for node 1 in connection", "System for node 1 in connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1665,9 +1665,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1665,9 +1665,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId2_System", "NodeId2_System",
"TCP", "TCP",
"System for node 2 in connection", "System for node 2 in connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1680,9 +1680,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1680,9 +1680,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"SHM", "SHM",
"SHM", "SHM",
"Connection section", "Connection section",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::SECTION, ConfigInfo::CI_SECTION,
(const char *)CONNECTION_TYPE_SHM, (const char *)CONNECTION_TYPE_SHM,
0, 0 }, 0, 0 },
...@@ -1691,9 +1691,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1691,9 +1691,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId1", "NodeId1",
"SHM", "SHM",
"Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection", "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MANDATORY, MANDATORY,
0, 0 }, 0, 0 },
...@@ -1702,9 +1702,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1702,9 +1702,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"PortNumber", "PortNumber",
"SHM", "SHM",
"Port used for this transporter", "Port used for this transporter",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1714,9 +1714,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1714,9 +1714,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId2", "NodeId2",
"SHM", "SHM",
"Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection", "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MANDATORY, MANDATORY,
0, 0 }, 0, 0 },
...@@ -1725,9 +1725,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1725,9 +1725,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"SendSignalId", "SendSignalId",
"SHM", "SHM",
"Sends id in each signal. Used in trace files.", "Sends id in each signal. Used in trace files.",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"false", "false",
"false", "false",
"true" }, "true" },
...@@ -1738,9 +1738,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1738,9 +1738,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Checksum", "Checksum",
"SHM", "SHM",
"If checksum is enabled, all signals between nodes are checked for errors", "If checksum is enabled, all signals between nodes are checked for errors",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"true", "true",
"false", "false",
"true" }, "true" },
...@@ -1750,9 +1750,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1750,9 +1750,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ShmKey", "ShmKey",
"SHM", "SHM",
"A shared memory key", "A shared memory key",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1762,9 +1762,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1762,9 +1762,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ShmSize", "ShmSize",
"SHM", "SHM",
"Size of shared memory segment", "Size of shared memory segment",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1M", "1M",
"4K", "4K",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1774,9 +1774,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1774,9 +1774,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId1_System", "NodeId1_System",
"SHM", "SHM",
"System for node 1 in connection", "System for node 1 in connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1785,9 +1785,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1785,9 +1785,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId2_System", "NodeId2_System",
"SHM", "SHM",
"System for node 2 in connection", "System for node 2 in connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1799,9 +1799,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1799,9 +1799,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"SCI", "SCI",
"SCI", "SCI",
"Connection section", "Connection section",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::SECTION, ConfigInfo::CI_SECTION,
(const char *)CONNECTION_TYPE_SCI, (const char *)CONNECTION_TYPE_SCI,
0, 0 0, 0
}, },
...@@ -1811,9 +1811,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1811,9 +1811,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId1", "NodeId1",
"SCI", "SCI",
"Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection", "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MANDATORY, MANDATORY,
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1823,9 +1823,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1823,9 +1823,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId2", "NodeId2",
"SCI", "SCI",
"Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection", "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
MANDATORY, MANDATORY,
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1835,9 +1835,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1835,9 +1835,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HostName1", "HostName1",
"SCI", "SCI",
"Name/IP of computer on one side of the connection", "Name/IP of computer on one side of the connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1846,9 +1846,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1846,9 +1846,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HostName2", "HostName2",
"SCI", "SCI",
"Name/IP of computer on one side of the connection", "Name/IP of computer on one side of the connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1857,9 +1857,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1857,9 +1857,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"PortNumber", "PortNumber",
"SCI", "SCI",
"Port used for this transporter", "Port used for this transporter",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1869,9 +1869,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1869,9 +1869,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Host1SciId0", "Host1SciId0",
"SCI", "SCI",
"SCI-node id for adapter 0 on Host1 (a computer can have two adapters)", "SCI-node id for adapter 0 on Host1 (a computer can have two adapters)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1881,9 +1881,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1881,9 +1881,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Host1SciId1", "Host1SciId1",
"SCI", "SCI",
"SCI-node id for adapter 1 on Host1 (a computer can have two adapters)", "SCI-node id for adapter 1 on Host1 (a computer can have two adapters)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1893,9 +1893,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1893,9 +1893,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Host2SciId0", "Host2SciId0",
"SCI", "SCI",
"SCI-node id for adapter 0 on Host2 (a computer can have two adapters)", "SCI-node id for adapter 0 on Host2 (a computer can have two adapters)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1905,9 +1905,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1905,9 +1905,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Host2SciId1", "Host2SciId1",
"SCI", "SCI",
"SCI-node id for adapter 1 on Host2 (a computer can have two adapters)", "SCI-node id for adapter 1 on Host2 (a computer can have two adapters)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"0", "0",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1917,9 +1917,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1917,9 +1917,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"SendSignalId", "SendSignalId",
"SCI", "SCI",
"Sends id in each signal. Used in trace files.", "Sends id in each signal. Used in trace files.",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"true", "true",
"false", "false",
"true" }, "true" },
...@@ -1929,9 +1929,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1929,9 +1929,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Checksum", "Checksum",
"SCI", "SCI",
"If checksum is enabled, all signals between nodes are checked for errors", "If checksum is enabled, all signals between nodes are checked for errors",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"false", "false",
"false", "false",
"true" }, "true" },
...@@ -1941,9 +1941,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1941,9 +1941,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"SendLimit", "SendLimit",
"SCI", "SCI",
"Transporter send buffer contents are sent when this no of bytes is buffered", "Transporter send buffer contents are sent when this no of bytes is buffered",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"8K", "8K",
"128", "128",
"32K" }, "32K" },
...@@ -1953,9 +1953,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1953,9 +1953,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"SharedBufferSize", "SharedBufferSize",
"SCI", "SCI",
"Size of shared memory segment", "Size of shared memory segment",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1M", "1M",
"64K", "64K",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -1965,9 +1965,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1965,9 +1965,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId1_System", "NodeId1_System",
"SCI", "SCI",
"System for node 1 in connection", "System for node 1 in connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1976,9 +1976,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1976,9 +1976,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId2_System", "NodeId2_System",
"SCI", "SCI",
"System for node 2 in connection", "System for node 2 in connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -1990,9 +1990,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -1990,9 +1990,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"OSE", "OSE",
"OSE", "OSE",
"Connection section", "Connection section",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::SECTION, ConfigInfo::CI_SECTION,
(const char *)CONNECTION_TYPE_OSE, (const char *)CONNECTION_TYPE_OSE,
0, 0 0, 0
}, },
...@@ -2002,9 +2002,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -2002,9 +2002,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HostName1", "HostName1",
"OSE", "OSE",
"Name of computer on one side of the connection", "Name of computer on one side of the connection",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -2013,9 +2013,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -2013,9 +2013,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"HostName2", "HostName2",
"OSE", "OSE",
"Name of computer on one side of the connection", "Name of computer on one side of the connection",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -2024,9 +2024,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -2024,9 +2024,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId1", "NodeId1",
"OSE", "OSE",
"Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection", "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
MANDATORY, MANDATORY,
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -2036,9 +2036,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -2036,9 +2036,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId2", "NodeId2",
"OSE", "OSE",
"Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection", "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
UNDEFINED, UNDEFINED,
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -2048,9 +2048,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -2048,9 +2048,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"SendSignalId", "SendSignalId",
"OSE", "OSE",
"Sends id in each signal. Used in trace files.", "Sends id in each signal. Used in trace files.",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"true", "true",
"false", "false",
"true" }, "true" },
...@@ -2060,9 +2060,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -2060,9 +2060,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"Checksum", "Checksum",
"OSE", "OSE",
"If checksum is enabled, all signals between nodes are checked for errors", "If checksum is enabled, all signals between nodes are checked for errors",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::BOOL, ConfigInfo::CI_BOOL,
"false", "false",
"false", "false",
"true" }, "true" },
...@@ -2072,9 +2072,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -2072,9 +2072,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"PrioASignalSize", "PrioASignalSize",
"OSE", "OSE",
"Size of priority A signals (in bytes)", "Size of priority A signals (in bytes)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1000", "1000",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -2084,9 +2084,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -2084,9 +2084,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"PrioBSignalSize", "PrioBSignalSize",
"OSE", "OSE",
"Size of priority B signals (in bytes)", "Size of priority B signals (in bytes)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"1000", "1000",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -2096,9 +2096,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -2096,9 +2096,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"ReceiveArraySize", "ReceiveArraySize",
"OSE", "OSE",
"Number of OSE signals checked for correct ordering (in no of OSE signals)", "Number of OSE signals checked for correct ordering (in no of OSE signals)",
ConfigInfo::USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::INT, ConfigInfo::CI_INT,
"10", "10",
"0", "0",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
...@@ -2108,9 +2108,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -2108,9 +2108,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId1_System", "NodeId1_System",
"OSE", "OSE",
"System for node 1 in connection", "System for node 1 in connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
...@@ -2119,9 +2119,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -2119,9 +2119,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"NodeId2_System", "NodeId2_System",
"OSE", "OSE",
"System for node 2 in connection", "System for node 2 in connection",
ConfigInfo::INTERNAL, ConfigInfo::CI_INTERNAL,
false, false,
ConfigInfo::STRING, ConfigInfo::CI_STRING,
UNDEFINED, UNDEFINED,
0, 0 }, 0, 0 },
}; };
...@@ -2169,7 +2169,7 @@ ConfigInfo::ConfigInfo() ...@@ -2169,7 +2169,7 @@ ConfigInfo::ConfigInfo()
} }
switch (param._type) { switch (param._type) {
case BOOL: case CI_BOOL:
{ {
bool tmp_bool; bool tmp_bool;
require(InitConfigFileParser::convertStringToBool(param._min, tmp_bool)); require(InitConfigFileParser::convertStringToBool(param._min, tmp_bool));
...@@ -2178,8 +2178,8 @@ ConfigInfo::ConfigInfo() ...@@ -2178,8 +2178,8 @@ ConfigInfo::ConfigInfo()
pinfo.put64("Max", tmp_bool); pinfo.put64("Max", tmp_bool);
break; break;
} }
case INT: case CI_INT:
case INT64: case CI_INT64:
{ {
Uint64 tmp_uint64; Uint64 tmp_uint64;
require(InitConfigFileParser::convertStringToUint64(param._min, tmp_uint64)); require(InitConfigFileParser::convertStringToUint64(param._min, tmp_uint64));
...@@ -2188,10 +2188,10 @@ ConfigInfo::ConfigInfo() ...@@ -2188,10 +2188,10 @@ ConfigInfo::ConfigInfo()
pinfo.put64("Max", tmp_uint64); pinfo.put64("Max", tmp_uint64);
break; break;
} }
case SECTION: case CI_SECTION:
pinfo.put("SectionType", (Uint32)UintPtr(param._default)); pinfo.put("SectionType", (Uint32)UintPtr(param._default));
break; break;
case STRING: case CI_STRING:
break; break;
} }
...@@ -2209,7 +2209,7 @@ ConfigInfo::ConfigInfo() ...@@ -2209,7 +2209,7 @@ ConfigInfo::ConfigInfo()
// Replace section with modified section // Replace section with modified section
m_info.put(param._section, section, true); m_info.put(param._section, section, true);
if(param._type != ConfigInfo::SECTION){ if(param._type != ConfigInfo::CI_SECTION){
Properties * p; Properties * p;
if(!m_systemDefaults.getCopy(param._section, &p)){ if(!m_systemDefaults.getCopy(param._section, &p)){
p = new Properties(true); p = new Properties(true);
...@@ -2218,20 +2218,20 @@ ConfigInfo::ConfigInfo() ...@@ -2218,20 +2218,20 @@ ConfigInfo::ConfigInfo()
param._default != MANDATORY){ param._default != MANDATORY){
switch (param._type) switch (param._type)
{ {
case SECTION: case CI_SECTION:
break; break;
case STRING: case CI_STRING:
require(p->put(param._fname, param._default)); require(p->put(param._fname, param._default));
break; break;
case BOOL: case CI_BOOL:
{ {
bool tmp_bool; bool tmp_bool;
require(InitConfigFileParser::convertStringToBool(param._default, default_bool)); require(InitConfigFileParser::convertStringToBool(param._default, default_bool));
require(p->put(param._fname, default_bool)); require(p->put(param._fname, default_bool));
break; break;
} }
case INT: case CI_INT:
case INT64: case CI_INT64:
{ {
Uint64 tmp_uint64; Uint64 tmp_uint64;
require(InitConfigFileParser::convertStringToUint64(param._default, default_uint64)); require(InitConfigFileParser::convertStringToUint64(param._default, default_uint64));
...@@ -2253,7 +2253,7 @@ ConfigInfo::ConfigInfo() ...@@ -2253,7 +2253,7 @@ ConfigInfo::ConfigInfo()
exit(-1); exit(-1);
} }
if(m_ParamInfo[i]._type == ConfigInfo::SECTION) if(m_ParamInfo[i]._type == ConfigInfo::CI_SECTION)
continue; continue;
const Properties * p = getInfo(m_ParamInfo[i]._section); const Properties * p = getInfo(m_ParamInfo[i]._section);
...@@ -2272,12 +2272,12 @@ ConfigInfo::ConfigInfo() ...@@ -2272,12 +2272,12 @@ ConfigInfo::ConfigInfo()
* Getters * Getters
****************************************************************************/ ****************************************************************************/
inline void warning(const char * src, const char * arg){ inline void warning(const char * src, const char * arg){
ndbout << "Illegal call to ConfigInfo::" << src << "() - " << arg << endl; ndbout << "Illegal call to ConfigInfo::CI_" << src << "() - " << arg << endl;
abort(); abort();
} }
const Properties * const Properties *
ConfigInfo::getInfo(const char * section) const { ConfigInfo::CI_getInfo(const char * section) const {
const Properties * p; const Properties * p;
if(!m_info.get(section, &p)){ if(!m_info.get(section, &p)){
return 0; return 0;
...@@ -2391,41 +2391,41 @@ ConfigInfo::getType(const Properties * section, const char* fname) const { ...@@ -2391,41 +2391,41 @@ ConfigInfo::getType(const Properties * section, const char* fname) const {
return (ConfigInfo::Type) getInfoInt(section, fname, "Type"); return (ConfigInfo::Type) getInfoInt(section, fname, "Type");
} }
ConfigInfo::Status ConfigInfo::CI_Status
ConfigInfo::getStatus(const Properties * section, const char* fname) const { ConfigInfo::CI_getStatus(const Properties * section, const char* fname) const {
return (ConfigInfo::Status) getInfoInt(section, fname, "Status"); return (ConfigInfo::CI_Status) getInfoInt(section, fname, "Status");
} }
/**************************************************************************** /****************************************************************************
* Printers * Printers
****************************************************************************/ ****************************************************************************/
void ConfigInfo::print() const { void ConfigInfo::CI_print() const {
Properties::Iterator it(&m_info); Properties::Iterator it(&m_info);
for (const char* n = it.first(); n != NULL; n = it.next()) { for (const char* n = it.first(); n != NULL; n = it.next()) {
print(n); print(n);
} }
} }
void ConfigInfo::print(const char* section) const { void ConfigInfo::CI_print(const char* section) const {
ndbout << "****** " << section << " ******" << endl << endl; ndbout << "****** " << section << " ******" << endl << endl;
const Properties * sec = getInfo(section); const Properties * sec = getInfo(section);
Properties::Iterator it(sec); Properties::Iterator it(sec);
for (const char* n = it.first(); n != NULL; n = it.next()) { for (const char* n = it.first(); n != NULL; n = it.next()) {
// Skip entries with different F- and P-names // Skip entries with different F- and P-names
if (getStatus(sec, n) == ConfigInfo::INTERNAL) continue; if (getStatus(sec, n) == ConfigInfo::CI_INTERNAL) continue;
if (getStatus(sec, n) == ConfigInfo::DEPRICATED) continue; if (getStatus(sec, n) == ConfigInfo::CI_DEPRICATED) continue;
if (getStatus(sec, n) == ConfigInfo::NOTIMPLEMENTED) continue; if (getStatus(sec, n) == ConfigInfo::CI_NOTIMPLEMENTED) continue;
print(sec, n); print(sec, n);
} }
} }
void ConfigInfo::print(const Properties * section, void ConfigInfo::CI_print(const Properties * section,
const char* parameter) const { const char* parameter) const {
ndbout << parameter; ndbout << parameter;
// ndbout << getDescription(section, parameter) << endl; // ndbout << getDescription(section, parameter) << endl;
switch (getType(section, parameter)) { switch (getType(section, parameter)) {
case ConfigInfo::BOOL: case ConfigInfo::CI_BOOL:
ndbout << " (Boolean value)" << endl; ndbout << " (Boolean value)" << endl;
ndbout << getDescription(section, parameter) << endl; ndbout << getDescription(section, parameter) << endl;
if (getDefault(section, parameter) == false) { if (getDefault(section, parameter) == false) {
...@@ -2440,8 +2440,8 @@ void ConfigInfo::print(const Properties * section, ...@@ -2440,8 +2440,8 @@ void ConfigInfo::print(const Properties * section,
ndbout << endl; ndbout << endl;
break; break;
case ConfigInfo::INT: case ConfigInfo::CI_INT:
case ConfigInfo::INT64: case ConfigInfo::CI_INT64:
ndbout << " (Non-negative Integer)" << endl; ndbout << " (Non-negative Integer)" << endl;
ndbout << getDescription(section, parameter) << endl; ndbout << getDescription(section, parameter) << endl;
if (getDefault(section, parameter) == (UintPtr)MANDATORY) { if (getDefault(section, parameter) == (UintPtr)MANDATORY) {
...@@ -2456,7 +2456,7 @@ void ConfigInfo::print(const Properties * section, ...@@ -2456,7 +2456,7 @@ void ConfigInfo::print(const Properties * section,
ndbout << endl; ndbout << endl;
break; break;
case ConfigInfo::STRING: case ConfigInfo::CI_STRING:
ndbout << " (String)" << endl; ndbout << " (String)" << endl;
ndbout << getDescription(section, parameter) << endl; ndbout << getDescription(section, parameter) << endl;
if (getDefault(section, parameter) == (UintPtr)MANDATORY) { if (getDefault(section, parameter) == (UintPtr)MANDATORY) {
...@@ -2466,7 +2466,7 @@ void ConfigInfo::print(const Properties * section, ...@@ -2466,7 +2466,7 @@ void ConfigInfo::print(const Properties * section,
} }
ndbout << endl; ndbout << endl;
break; break;
case ConfigInfo::SECTION: case ConfigInfo::CI_SECTION:
break; break;
} }
} }
...@@ -2743,29 +2743,29 @@ applyDefaultValues(InitConfigFileParser::Context & ctx, ...@@ -2743,29 +2743,29 @@ applyDefaultValues(InitConfigFileParser::Context & ctx,
Properties::Iterator it(defaults); Properties::Iterator it(defaults);
for(const char * name = it.first(); name != NULL; name = it.next()){ for(const char * name = it.first(); name != NULL; name = it.next()){
ConfigInfo::Status st = ctx.m_info->getStatus(ctx.m_currentInfo, name); ConfigInfo::CI_Status st = ctx.m_info->getStatus(ctx.m_currentInfo, name);
if(!ctx.m_currentSection->contains(name)){ if(!ctx.m_currentSection->contains(name)){
switch (ctx.m_info->getType(ctx.m_currentInfo, name)){ switch (ctx.m_info->getType(ctx.m_currentInfo, name)){
case ConfigInfo::INT: case ConfigInfo::CI_INT:
case ConfigInfo::BOOL:{ case ConfigInfo::CI_BOOL:{
Uint32 val = 0; Uint32 val = 0;
::require(defaults->get(name, &val)); ::require(defaults->get(name, &val));
ctx.m_currentSection->put(name, val); ctx.m_currentSection->put(name, val);
break; break;
} }
case ConfigInfo::INT64:{ case ConfigInfo::CI_INT64:{
Uint64 val = 0; Uint64 val = 0;
::require(defaults->get(name, &val)); ::require(defaults->get(name, &val));
ctx.m_currentSection->put64(name, val); ctx.m_currentSection->put64(name, val);
break; break;
} }
case ConfigInfo::STRING:{ case ConfigInfo::CI_STRING:{
const char * val; const char * val;
::require(defaults->get(name, &val)); ::require(defaults->get(name, &val));
ctx.m_currentSection->put(name, val); ctx.m_currentSection->put(name, val);
break; break;
} }
case ConfigInfo::SECTION: case ConfigInfo::CI_SECTION:
break; break;
} }
} }
...@@ -3163,9 +3163,9 @@ transform(InitConfigFileParser::Context & ctx, ...@@ -3163,9 +3163,9 @@ transform(InitConfigFileParser::Context & ctx,
PropertiesType oldType; PropertiesType oldType;
require(ctx.m_currentSection->getTypeOf(oldName, &oldType)); require(ctx.m_currentSection->getTypeOf(oldName, &oldType));
ConfigInfo::Type newType = ctx.m_info->getType(ctx.m_currentInfo, newName); ConfigInfo::CI_Type newType = ctx.m_info->getType(ctx.m_currentInfo, newName);
if(!((oldType == PropertiesType_Uint32 || oldType == PropertiesType_Uint64) if(!((oldType == PropertiesType_Uint32 || oldType == PropertiesType_Uint64)
&& (newType == ConfigInfo::INT || newType == ConfigInfo::INT64 || newType == ConfigInfo::BOOL))){ && (newType == ConfigInfo::CI_INT || newType == ConfigInfo::CI_INT64 || newType == ConfigInfo::CI_BOOL))){
ndbout << "oldType: " << (int)oldType << ", newType: " << (int)newType << endl; ndbout << "oldType: " << (int)oldType << ", newType: " << (int)newType << endl;
ctx.reportError("Unable to handle type conversion w.r.t deprication %s %s" ctx.reportError("Unable to handle type conversion w.r.t deprication %s %s"
"- [%s] starting at line: %d", "- [%s] starting at line: %d",
...@@ -3185,9 +3185,9 @@ transform(InitConfigFileParser::Context & ctx, ...@@ -3185,9 +3185,9 @@ transform(InitConfigFileParser::Context & ctx,
return false; return false;
} }
if(newType == ConfigInfo::INT || newType == ConfigInfo::BOOL){ if(newType == ConfigInfo::CI_INT || newType == ConfigInfo::CI_BOOL){
require(dst.put(newName, (Uint32)newVal)); require(dst.put(newName, (Uint32)newVal));
} else if(newType == ConfigInfo::INT64) { } else if(newType == ConfigInfo::CI_INT64) {
require(dst.put64(newName, newVal)); require(dst.put64(newName, newVal));
} }
return true; return true;
...@@ -3269,7 +3269,7 @@ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){ ...@@ -3269,7 +3269,7 @@ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){
require(sec->get("Status", &status)); require(sec->get("Status", &status));
require(sec->get("SectionType", &typeVal)); require(sec->get("SectionType", &typeVal));
if(id == KEY_INTERNAL || status == ConfigInfo::INTERNAL){ if(id == KEY_INTERNAL || status == ConfigInfo::CI_INTERNAL){
ndbout_c("skipping section %s", ctx.fname); ndbout_c("skipping section %s", ctx.fname);
break; break;
} }
...@@ -3326,7 +3326,7 @@ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){ ...@@ -3326,7 +3326,7 @@ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){
} }
static bool static bool
sanity_checks(Vector<ConfigInfo::ConfigRuleSection>&sections, sanity_checks(Vector<ConfigInfo::CI_ConfigRuleSection>&sections,
struct InitConfigFileParser::Context &ctx, struct InitConfigFileParser::Context &ctx,
const char * rule_data) const char * rule_data)
{ {
...@@ -3349,7 +3349,7 @@ sanity_checks(Vector<ConfigInfo::ConfigRuleSection>&sections, ...@@ -3349,7 +3349,7 @@ sanity_checks(Vector<ConfigInfo::ConfigRuleSection>&sections,
} }
static bool static bool
add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections, add_node_connections(Vector<ConfigInfo::CI_ConfigRuleSection>&sections,
struct InitConfigFileParser::Context &ctx, struct InitConfigFileParser::Context &ctx,
const char * rule_data) const char * rule_data)
{ {
...@@ -3401,7 +3401,7 @@ add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections, ...@@ -3401,7 +3401,7 @@ add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections,
for (Uint32 j= i+1;; j++){ for (Uint32 j= i+1;; j++){
if(!p_db_nodes.get("", j, &nodeId2)) break; if(!p_db_nodes.get("", j, &nodeId2)) break;
if(!p_connections2.get("", nodeId1+nodeId2<<16, &dummy)) { if(!p_connections2.get("", nodeId1+nodeId2<<16, &dummy)) {
ConfigInfo::ConfigRuleSection s; ConfigInfo::CI_ConfigRuleSection s;
s.m_sectionType= BaseString("TCP"); s.m_sectionType= BaseString("TCP");
s.m_sectionData= new Properties(true); s.m_sectionData= new Properties(true);
char buf[16]; char buf[16];
...@@ -3418,7 +3418,7 @@ add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections, ...@@ -3418,7 +3418,7 @@ add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections,
if(!p_connections.get("", nodeId1, &dummy)) { if(!p_connections.get("", nodeId1, &dummy)) {
for (Uint32 j= 0;; j++){ for (Uint32 j= 0;; j++){
if(!p_db_nodes.get("", j, &nodeId2)) break; if(!p_db_nodes.get("", j, &nodeId2)) break;
ConfigInfo::ConfigRuleSection s; ConfigInfo::CI_ConfigRuleSection s;
s.m_sectionType= BaseString("TCP"); s.m_sectionType= BaseString("TCP");
s.m_sectionData= new Properties(true); s.m_sectionData= new Properties(true);
char buf[16]; char buf[16];
...@@ -3435,7 +3435,7 @@ add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections, ...@@ -3435,7 +3435,7 @@ add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections,
} }
static bool add_server_ports(Vector<ConfigInfo::ConfigRuleSection>&sections, static bool add_server_ports(Vector<ConfigInfo::CI_ConfigRuleSection>&sections,
struct InitConfigFileParser::Context &ctx, struct InitConfigFileParser::Context &ctx,
const char * rule_data) const char * rule_data)
{ {
...@@ -3475,7 +3475,7 @@ static bool add_server_ports(Vector<ConfigInfo::ConfigRuleSection>&sections, ...@@ -3475,7 +3475,7 @@ static bool add_server_ports(Vector<ConfigInfo::ConfigRuleSection>&sections,
} }
static bool static bool
check_node_vs_replicas(Vector<ConfigInfo::ConfigRuleSection>&sections, check_node_vs_replicas(Vector<ConfigInfo::CI_ConfigRuleSection>&sections,
struct InitConfigFileParser::Context &ctx, struct InitConfigFileParser::Context &ctx,
const char * rule_data) const char * rule_data)
{ {
...@@ -3602,4 +3602,4 @@ check_node_vs_replicas(Vector<ConfigInfo::ConfigRuleSection>&sections, ...@@ -3602,4 +3602,4 @@ check_node_vs_replicas(Vector<ConfigInfo::ConfigRuleSection>&sections,
return true; return true;
} }
template class Vector<ConfigInfo::ConfigRuleSection>; template class Vector<ConfigInfo::CI_ConfigRuleSection>;
ndb/src/mgmsrv/ConfigInfo.hpp
View file @ 432c12de
...@@ -38,11 +38,11 @@ static const char* UNDEFINED = 0; // Default value for undefined ...@@ -38,11 +38,11 @@ static const char* UNDEFINED = 0; // Default value for undefined
*/ */
class ConfigInfo { class ConfigInfo {
public: public:
enum Type { BOOL, INT, INT64, STRING, SECTION }; enum Type { CI_BOOL, CI_INT, CI_INT64, CI_STRING, CI_SECTION };
enum Status { USED, ///< Active enum Status { CI_USED, ///< Active
DEPRICATED, ///< Can be, but shouldn't CI_DEPRICATED, ///< Can be, but shouldn't
NOTIMPLEMENTED, ///< Is ignored. CI_NOTIMPLEMENTED, ///< Is ignored.
INTERNAL ///< Not configurable by the user CI_INTERNAL ///< Not configurable by the user
}; };
/** /**
......
ndb/src/ndbapi/Ndb.cpp
View file @ 432c12de
...@@ -22,7 +22,7 @@ Name: Ndb.cpp ...@@ -22,7 +22,7 @@ Name: Ndb.cpp
******************************************************************************/ ******************************************************************************/
#include <ndb_global.h> #include <ndb_global.h>
#include <pthread.h>
#include "NdbApiSignal.hpp" #include "NdbApiSignal.hpp"
#include "NdbImpl.hpp" #include "NdbImpl.hpp"
......
ndb/src/ndbapi/NdbImpl.hpp
View file @ 432c12de
...@@ -107,7 +107,7 @@ Uint32 convertEndian(Uint32 Data); ...@@ -107,7 +107,7 @@ Uint32 convertEndian(Uint32 Data);
enum WaitSignalType { enum WaitSignalType {
NO_WAIT = 0, NO_WAIT = 0,
WAIT_NODE_FAILURE = 1, // Node failure during wait WAIT_NODE_FAILURE = 1, // Node failure during wait
WAIT_TIMEOUT = 2, // Timeout during wait WST_WAIT_TIMEOUT = 2, // Timeout during wait
WAIT_TC_SEIZE = 3, WAIT_TC_SEIZE = 3,
WAIT_TC_RELEASE = 4, WAIT_TC_RELEASE = 4,
......
ndb/src/ndbapi/ObjectMap.hpp
View file @ 432c12de
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
class NdbObjectIdMap //: NdbLockable class NdbObjectIdMap //: NdbLockable
{ {
public: public:
STATIC_CONST( InvalidId = ~0 ); STATIC_CONST( InvalidId = ~(Uint32)0 );
NdbObjectIdMap(Uint32 initalSize = 128, Uint32 expandSize = 10); NdbObjectIdMap(Uint32 initalSize = 128, Uint32 expandSize = 10);
~NdbObjectIdMap(); ~NdbObjectIdMap();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7