Skip to content

Commit fbefcc7

Browse files
blauddenblaudden
committed
Bug#57381 typo in ndb_mgmd: "depricated"
 - Fixes all spelling errors of deprecated in storage/ndb to avoid future copy/paste error - Fixes the deprecation error message for PortNumber to not say anything about another parameter to use.
1 parent 8f68ec2 commit fbefcc7

File tree

11 files changed

+52
-51
lines changed

11 files changed

+52
-51
lines changed

‎storage/ndb/include/kernel/signaldata/DictTabInfo.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ class DictTabInfo {
628628
Uint32 tabInfoData[DataLength];
629629

630630
public:
631-
enum Depricated
631+
enum Deprecated
632632
{
633633
AttributeDGroup = 1009, //Default NotDGroup
634634
AttributeStoredInd = 1011, //Default NotStored

‎storage/ndb/include/kernel/signaldata/ListTables.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ struct ListTablesData
8181
};
8282

8383
/**
84-
* DEPRICATED
84+
* DEPRECATED
8585
* It is convenient to pack request/response data per table in one
8686
* 32-bit word...
8787
*

‎storage/ndb/include/mgmapi/mgmapi.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ extern "C" {
490490
const char *ndb_mgm_get_connectstring(NdbMgmHandle handle, char *buf, int buf_sz);
491491

492492
/**
493-
* DEPRICATED: use ndb_mgm_set_timeout instead.
493+
* DEPRECATED: use ndb_mgm_set_timeout instead.
494494
*
495495
* @param handle NdbMgmHandle
496496
* @param seconds number of seconds

‎storage/ndb/include/ndbapi/NdbDictionary.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ class NdbDictionary {
11281128
#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
11291129
/**
11301130
* Get the number of columns in the index
1131-
* Depricated, use getNoOfColumns instead.
1131+
* Deprecated, use getNoOfColumns instead.
11321132
*/
11331133
int getNoOfIndexColumns() const;
11341134
#endif
@@ -1141,7 +1141,7 @@ class NdbDictionary {
11411141
#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
11421142
/**
11431143
* Get a specific column name in the index
1144-
* Depricated, use getColumn instead.
1144+
* Deprecated, use getColumn instead.
11451145
*/
11461146
const char * getIndexColumn(int no) const ;
11471147
#endif
@@ -1241,7 +1241,7 @@ class NdbDictionary {
12411241
* Add a column name to the index definition
12421242
* Note that the order of indexes will be in
12431243
* the order they are added (only matters for ordered indexes).
1244-
* Depricated, use addColumnName instead.
1244+
* Deprecated, use addColumnName instead.
12451245
*/
12461246
int addIndexColumn(const char * name);
12471247
#endif
@@ -1258,7 +1258,7 @@ class NdbDictionary {
12581258
* Add several column names to the index definition
12591259
* Note that the order of indexes will be in
12601260
* the order they are added (only matters for ordered indexes).
1261-
* Depricated, use addColumnNames instead.
1261+
* Deprecated, use addColumnNames instead.
12621262
*/
12631263
int addIndexColumns(int noOfNames, const char ** names);
12641264
#endif

‎storage/ndb/include/ndbapi/NdbOperation.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class NdbOperation
230230
* dirtyRead is a deprecated name for committedRead
231231
*
232232
* @return 0 if successful otherwise -1.
233-
* @depricated
233+
* @deprecated
234234
*/
235235
virtual int dirtyRead();
236236

‎storage/ndb/src/kernel/vm/VMSignal.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class Signal {
9696
Uint32 getNoOfSections() const;
9797

9898
/**
99-
* Old depricated methods...
99+
* Old deprecated methods...
100100
*/
101101
Uint32 length() const { return getLength();}
102102
BlockReference senderBlockRef() const { return getSendersBlockRef();}

‎storage/ndb/src/mgmsrv/ConfigInfo.cpp

+37-36
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static bool checkTCPConstraints(InitConfigFileParser::Context &, const char *);
9797
static bool fixNodeHostname(InitConfigFileParser::Context & ctx, const char * data);
9898
static bool fixHostname(InitConfigFileParser::Context & ctx, const char * data);
9999
static bool fixNodeId(InitConfigFileParser::Context & ctx, const char * data);
100-
static bool fixDepricated(InitConfigFileParser::Context & ctx, const char *);
100+
static bool fixDeprecated(InitConfigFileParser::Context & ctx, const char *);
101101
static bool fixFileSystemPath(InitConfigFileParser::Context & ctx, const char * data);
102102
static bool fixBackupDataDir(InitConfigFileParser::Context & ctx, const char * data);
103103
static bool fixShmUniqueId(InitConfigFileParser::Context & ctx, const char * data);
@@ -152,7 +152,7 @@ ConfigInfo::m_SectionRules[] = {
152152
{ "SCI", fixPortNumber, 0 }, // has to come after fixHostName
153153

154154
{ "*", applyDefaultValues, "user" },
155-
{ "*", fixDepricated, 0 },
155+
{ "*", fixDeprecated, 0 },
156156
{ "*", applyDefaultValues, "system" },
157157

158158
{ "SHM", fixShmKey, 0 }, // has to come after apply default values
@@ -223,7 +223,7 @@ ConfigInfo::m_ConfigRules[] = {
223223
{ 0, 0 }
224224
};
225225

226-
struct DepricationTransform {
226+
struct DeprecationTransform {
227227
const char * m_section;
228228
const char * m_oldName;
229229
const char * m_newName;
@@ -232,7 +232,7 @@ struct DepricationTransform {
232232
};
233233

234234
static
235-
const DepricationTransform f_deprication[] = {
235+
const DeprecationTransform f_deprecation[] = {
236236
{ DB_TOKEN, "Discless", "Diskless", 0, 1 },
237237
{ DB_TOKEN, "Id", "NodeId", 0, 1 },
238238
{ API_TOKEN, "Id", "NodeId", 0, 1 },
@@ -316,8 +316,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
316316
KEY_INTERNAL,
317317
"ByteOrder",
318318
"COMPUTER",
319-
0,
320-
ConfigInfo::CI_DEPRICATED,
319+
0, // No new parameter to use instead of deprecated
320+
ConfigInfo::CI_DEPRECATED,
321321
false,
322322
ConfigInfo::CI_STRING,
323323
0,
@@ -466,8 +466,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
466466
KEY_INTERNAL,
467467
"Id",
468468
DB_TOKEN,
469-
"",
470-
ConfigInfo::CI_DEPRICATED,
469+
0, // No new parameter to use instead of deprecated
470+
ConfigInfo::CI_DEPRECATED,
471471
false,
472472
ConfigInfo::CI_INT,
473473
MANDATORY,
@@ -562,8 +562,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
562562
CFG_DB_NO_INDEXES,
563563
"MaxNoOfIndexes",
564564
DB_TOKEN,
565-
"Total number of indexes that can be defined in the system",
566-
ConfigInfo::CI_DEPRICATED,
565+
// The name of new parameter to use instead of deprecated
566+
"MaxNoOfOrderedIndexes or MaxNoOfUniqueHashIndexes",
567+
ConfigInfo::CI_DEPRECATED,
567568
false,
568569
ConfigInfo::CI_INT,
569570
"128",
@@ -1169,8 +1170,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
11691170
CFG_DB_LCP_DISC_PAGES_TUP_SR,
11701171
"NoOfDiskPagesToDiskDuringRestartTUP",
11711172
DB_TOKEN,
1172-
"DiskCheckpointSpeedSr",
1173-
ConfigInfo::CI_DEPRICATED,
1173+
"DiskCheckpointSpeedSr", // The new parameter name to use
1174+
ConfigInfo::CI_DEPRECATED,
11741175
0,
11751176
ConfigInfo::CI_INT,
11761177
"40",
@@ -1181,8 +1182,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
11811182
CFG_DB_LCP_DISC_PAGES_TUP,
11821183
"NoOfDiskPagesToDiskAfterRestartTUP",
11831184
DB_TOKEN,
1184-
"DiskCheckpointSpeed",
1185-
ConfigInfo::CI_DEPRICATED,
1185+
"DiskCheckpointSpeed", // The new parameter name to use
1186+
ConfigInfo::CI_DEPRECATED,
11861187
0,
11871188
ConfigInfo::CI_INT,
11881189
"40",
@@ -1193,8 +1194,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
11931194
CFG_DB_LCP_DISC_PAGES_ACC_SR,
11941195
"NoOfDiskPagesToDiskDuringRestartACC",
11951196
DB_TOKEN,
1196-
"DiskCheckpointSpeedSr",
1197-
ConfigInfo::CI_DEPRICATED,
1197+
"DiskCheckpointSpeedSr", // The new parameter name to use
1198+
ConfigInfo::CI_DEPRECATED,
11981199
0,
11991200
ConfigInfo::CI_INT,
12001201
"20",
@@ -1206,7 +1207,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
12061207
"NoOfDiskPagesToDiskAfterRestartACC",
12071208
DB_TOKEN,
12081209
"DiskCheckpointSpeed",
1209-
ConfigInfo::CI_DEPRICATED,
1210+
ConfigInfo::CI_DEPRECATED, // The new parameter name to use
12101211
0,
12111212
ConfigInfo::CI_INT,
12121213
"20",
@@ -1230,8 +1231,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
12301231
KEY_INTERNAL,
12311232
"Discless",
12321233
DB_TOKEN,
1233-
"Diskless",
1234-
ConfigInfo::CI_DEPRICATED,
1234+
"Diskless", // The new parameter name to use
1235+
ConfigInfo::CI_DEPRECATED,
12351236
CI_RESTART_INITIAL | CI_RESTART_SYSTEM,
12361237
ConfigInfo::CI_BOOL,
12371238
"false",
@@ -1892,8 +1893,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
18921893
KEY_INTERNAL,
18931894
"Id",
18941895
API_TOKEN,
1895-
"",
1896-
ConfigInfo::CI_DEPRICATED,
1896+
0, // No new parameter to use instead of deprecated
1897+
ConfigInfo::CI_DEPRECATED,
18971898
false,
18981899
ConfigInfo::CI_INT,
18991900
MANDATORY,
@@ -2097,8 +2098,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
20972098
KEY_INTERNAL,
20982099
"Id",
20992100
MGM_TOKEN,
2100-
"",
2101-
ConfigInfo::CI_DEPRICATED,
2101+
0, // No new parameter to use instead of deprecated
2102+
ConfigInfo::CI_DEPRECATED,
21022103
false,
21032104
ConfigInfo::CI_INT,
21042105
MANDATORY,
@@ -2333,8 +2334,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
23332334
CFG_CONNECTION_SERVER_PORT,
23342335
"PortNumber",
23352336
"TCP",
2336-
"Port used for this transporter",
2337-
ConfigInfo::CI_DEPRICATED,
2337+
0, // No new parameter to use instead of deprecated
2338+
ConfigInfo::CI_DEPRECATED,
23382339
false,
23392340
ConfigInfo::CI_INT,
23402341
MANDATORY,
@@ -2502,8 +2503,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
25022503
CFG_CONNECTION_SERVER_PORT,
25032504
"PortNumber",
25042505
"SHM",
2505-
"Port used for this transporter",
2506-
ConfigInfo::CI_DEPRICATED,
2506+
0, // No new parameter to use instead of deprecated
2507+
ConfigInfo::CI_DEPRECATED,
25072508
false,
25082509
ConfigInfo::CI_INT,
25092510
MANDATORY,
@@ -2736,8 +2737,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
27362737
CFG_CONNECTION_SERVER_PORT,
27372738
"PortNumber",
27382739
"SCI",
2739-
"Port used for this transporter",
2740-
ConfigInfo::CI_DEPRICATED,
2740+
0, // No new parameter to use instead of deprecated
2741+
ConfigInfo::CI_DEPRECATED,
27412742
false,
27422743
ConfigInfo::CI_INT,
27432744
MANDATORY,
@@ -2945,7 +2946,7 @@ ConfigInfo::ConfigInfo()
29452946
const Status status = param._status;
29462947
require(status == CI_USED ||
29472948
status == CI_EXPERIMENTAL ||
2948-
status == CI_DEPRICATED ||
2949+
status == CI_DEPRECATED ||
29492950
status == CI_NOTIMPLEMENTED ||
29502951
status == CI_INTERNAL);
29512952
pinfo.put("Status", status);
@@ -3662,7 +3663,7 @@ void ConfigInfo::print_impl(const char* section_filter,
36623663
for (const char* n = it.first(); n != NULL; n = it.next()) {
36633664
// Skip entries with different F- and P-names
36643665
if (getStatus(sec, n) == ConfigInfo::CI_INTERNAL) continue;
3665-
if (getStatus(sec, n) == ConfigInfo::CI_DEPRICATED) continue;
3666+
if (getStatus(sec, n) == ConfigInfo::CI_DEPRECATED) continue;
36663667
if (getStatus(sec, n) == ConfigInfo::CI_NOTIMPLEMENTED) continue;
36673668
printer.parameter(s, sec, n, *this);
36683669
}
@@ -3682,7 +3683,7 @@ void ConfigInfo::print_impl(const char* section_filter,
36823683
for (const char* n = it.first(); n != NULL; n = it.next()) {
36833684
// Skip entries with different F- and P-names
36843685
if (getStatus(sec, n) == ConfigInfo::CI_INTERNAL) continue;
3685-
if (getStatus(sec, n) == ConfigInfo::CI_DEPRICATED) continue;
3686+
if (getStatus(sec, n) == ConfigInfo::CI_DEPRECATED) continue;
36863687
if (getStatus(sec, n) == ConfigInfo::CI_NOTIMPLEMENTED) continue;
36873688
printer.parameter(s, sec, n, *this);
36883689
}
@@ -4556,7 +4557,7 @@ transform(InitConfigFileParser::Context & ctx,
45564557
if(!((oldType == PropertiesType_Uint32 || oldType == PropertiesType_Uint64)
45574558
&& (newType == ConfigInfo::CI_INT || newType == ConfigInfo::CI_INT64 || newType == ConfigInfo::CI_BOOL))){
45584559
ndbout << "oldType: " << (int)oldType << ", newType: " << (int)newType << endl;
4559-
ctx.reportError("Unable to handle type conversion w.r.t deprication %s %s"
4560+
ctx.reportError("Unable to handle type conversion w.r.t deprecation %s %s"
45604561
"- [%s] starting at line: %d",
45614562
oldName, newName,
45624563
ctx.fname, ctx.m_sectionLineno);
@@ -4567,7 +4568,7 @@ transform(InitConfigFileParser::Context & ctx,
45674568

45684569
Uint64 newVal = (Uint64)((Int64)oldVal * mul + add);
45694570
if(!ctx.m_info->verify(ctx.m_currentInfo, newName, newVal)){
4570-
ctx.reportError("Unable to handle deprication, new value not within bounds"
4571+
ctx.reportError("Unable to handle deprecation, new value not within bounds"
45714572
"%s %s - [%s] starting at line: %d",
45724573
oldName, newName,
45734574
ctx.fname, ctx.m_sectionLineno);
@@ -4583,7 +4584,7 @@ transform(InitConfigFileParser::Context & ctx,
45834584
}
45844585

45854586
static bool
4586-
fixDepricated(InitConfigFileParser::Context & ctx, const char * data){
4587+
fixDeprecated(InitConfigFileParser::Context & ctx, const char * data){
45874588
const char * name;
45884589
/**
45894590
* Transform old values to new values
@@ -4592,7 +4593,7 @@ fixDepricated(InitConfigFileParser::Context & ctx, const char * data){
45924593
Properties tmp(true);
45934594
Properties::Iterator it(ctx.m_currentSection);
45944595
for (name = it.first(); name != NULL; name = it.next()) {
4595-
const DepricationTransform * p = &f_deprication[0];
4596+
const DeprecationTransform * p = &f_deprecation[0];
45964597
while(p->m_section != 0){
45974598
if(strcmp(p->m_section, ctx.fname) == 0){
45984599
double mul = p->m_mul;

‎storage/ndb/src/mgmsrv/ConfigInfo.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ConfigInfo {
4848
};
4949
enum Status { CI_USED, ///< Active
5050
CI_EXPERIMENTAL, ///< Active but experimental
51-
CI_DEPRICATED, ///< Can be used, but shouldn't
51+
CI_DEPRECATED, ///< Can be used, but shouldn't
5252
CI_NOTIMPLEMENTED, ///< Is ignored.
5353
CI_INTERNAL ///< Not configurable by the user
5454
};

‎storage/ndb/src/mgmsrv/InitConfigFileParser.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -290,13 +290,13 @@ InitConfigFileParser::storeNameValuePair(Context& ctx,
290290
if (status == ConfigInfo::CI_NOTIMPLEMENTED) {
291291
ctx.reportWarning("[%s] %s not yet implemented", ctx.fname, fname);
292292
}
293-
if (status == ConfigInfo::CI_DEPRICATED) {
293+
if (status == ConfigInfo::CI_DEPRECATED) {
294294
const char * desc = m_info->getDescription(ctx.m_currentInfo, fname);
295295
if(desc && desc[0]){
296-
ctx.reportWarning("[%s] %s is depricated, use %s instead",
296+
ctx.reportWarning("[%s] %s is deprecated, use %s instead",
297297
ctx.fname, fname, desc);
298298
} else if (desc == 0){
299-
ctx.reportWarning("[%s] %s is depricated", ctx.fname, fname);
299+
ctx.reportWarning("[%s] %s is deprecated", ctx.fname, fname);
300300
}
301301
}
302302

‎storage/ndb/test/include/NdbSchemaCon.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class NdbApiSignal;
4747
* into the database.
4848
*
4949
* @note Currently only one table can be added per transaction.
50-
* @note Depricated, use NdbDictionary
50+
* @note Deprecated, use NdbDictionary
5151
*/
5252
class NdbSchemaCon
5353
{

‎storage/ndb/test/include/NdbSchemaOp.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class Ndb;
125125
*
126126
* The NdbSchemaOp object is created using NdbSchemaCon::getNdbSchemaOp.
127127
*
128-
* @note This class is depricated and is now replaced with the class
128+
* @note This class is deprecated and is now replaced with the class
129129
* NdbDictionary.
130130
*/
131131
class NdbSchemaOp

0 commit comments

Comments
 (0)