summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVeres Lajos <vlajos@gmail.com>2014-06-06 12:03:42 -0400
committerMatt Kangas <matt.kangas@mongodb.com>2014-06-09 23:43:00 -0400
commita98f839cf93baba5e424c427f4ed73395e7c3c1e (patch)
tree06ee775f5baad4c37bd72bd831d1f1061dba63f3
parentfceab66c30c64d5c9de1454c2c412445ef8b0362 (diff)
downloadmongo-a98f839cf93baba5e424c427f4ed73395e7c3c1e.tar.gz
SERVER-9634 typo fixes
Signed-off-by: Matt Kangas <matt.kangas@mongodb.com>
-rw-r--r--buildscripts/cpplint.py4
-rw-r--r--jstests/auth/basic_role_auth.js2
-rw-r--r--jstests/disk/killall.js2
-rw-r--r--jstests/libs/slow_weekly_util.js2
-rw-r--r--jstests/replsets/sync_passive2.js2
-rwxr-xr-xjstests/sharding/read_pref.js2
-rw-r--r--src/mongo/db/fts/stop_words.h2
-rw-r--r--src/mongo/dbtests/jstests.cpp4
-rw-r--r--src/mongo/dbtests/threadedtests.cpp2
-rw-r--r--src/mongo/scripting/engine_v8-3.25.h2
-rw-r--r--src/mongo/scripting/engine_v8.h2
-rw-r--r--src/mongo/shell/mongo.js2
-rw-r--r--src/mongo/shell/query.js2
-rw-r--r--src/mongo/util/concurrency/mutexdebugger.h44
-rw-r--r--src/mongo/util/descriptive_stats.h2
-rw-r--r--src/mongo/util/ntservice.cpp2
-rw-r--r--src/mongo/util/safe_num.cpp2
17 files changed, 40 insertions, 40 deletions
diff --git a/buildscripts/cpplint.py b/buildscripts/cpplint.py
index c3d788ec49a..b498857abca 100644
--- a/buildscripts/cpplint.py
+++ b/buildscripts/cpplint.py
@@ -2978,7 +2978,7 @@ def UpdateIncludeState(filename, include_state, io=codecs):
io: The io factory to use to read the file. Provided for testability.
Returns:
- True if a header was succesfully added. False otherwise.
+ True if a header was successfully added. False otherwise.
"""
headerfile = None
try:
@@ -3050,7 +3050,7 @@ def CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error,
# Let's copy the include_state so it is only messed up within this function.
include_state = include_state.copy()
- # Did we find the header for this file (if any) and succesfully load it?
+ # Did we find the header for this file (if any) and successfully load it?
header_found = False
# Use the absolute path so that matching works properly.
diff --git a/jstests/auth/basic_role_auth.js b/jstests/auth/basic_role_auth.js
index c1ea6626506..41dcd899006 100644
--- a/jstests/auth/basic_role_auth.js
+++ b/jstests/auth/basic_role_auth.js
@@ -122,7 +122,7 @@ var checkErr = function(shouldPass, opFunc) {
*
* @param db {DB} the database object to use.
* @param allowedActions {Object} the lists of operations that are allowed for the
- * current user. The data structure is represented as a map with the presense of
+ * current user. The data structure is represented as a map with the presence of
* a field name means that the operation is allowed and not allowed if it is
* not present. The list of field names are: insert, update, remove, query, killOp,
* currentOp, index_r, index_w, profile_r, profile_w, user_r, user_w, killCursor,
diff --git a/jstests/disk/killall.js b/jstests/disk/killall.js
index 3be9f530780..90c56f74064 100644
--- a/jstests/disk/killall.js
+++ b/jstests/disk/killall.js
@@ -9,7 +9,7 @@
* infinitely looping operation, we ensure that killall interrupts the drop command (drop is
* normally a short lived operation and is otherwise difficult to kill deterministically). The
* subsequent drop() on restart would historically assert if the data integrity issue caused by
- * SERVER-1818 occured.
+ * SERVER-1818 occurred.
*/
port = allocatePorts( 1 )[ 0 ]
diff --git a/jstests/libs/slow_weekly_util.js b/jstests/libs/slow_weekly_util.js
index 1e2c7391cb1..f5f89643f16 100644
--- a/jstests/libs/slow_weekly_util.js
+++ b/jstests/libs/slow_weekly_util.js
@@ -15,6 +15,6 @@ SlowWeeklyMongod.prototype.getDB = function( name ) {
SlowWeeklyMongod.prototype.stop = function(){
stopMongod( this.port );
var end = new Date();
- print( "slowWeekly test: " + this.name + " completed succesfully in " + ( ( end.getTime() - this.start.getTime() ) / 1000 ) + " seconds" );
+ print( "slowWeekly test: " + this.name + " completed successfully in " + ( ( end.getTime() - this.start.getTime() ) / 1000 ) + " seconds" );
};
diff --git a/jstests/replsets/sync_passive2.js b/jstests/replsets/sync_passive2.js
index 5c5cb212665..10178103cfd 100644
--- a/jstests/replsets/sync_passive2.js
+++ b/jstests/replsets/sync_passive2.js
@@ -205,7 +205,7 @@ replTest.awaitReplication(60000);
printjson(replTest.status());
print("force 2 to sync from 3");
-// This briefly causes 2 to sync from 3, but members have a strong prefrence for not syncing from
+// This briefly causes 2 to sync from 3, but members have a strong preference for not syncing from
// a slave delayed node so it may switch to another sync source quickly.
result = replTest.nodes[2].getDB("admin")
.runCommand({replSetSyncFrom: replTest.host+":"+replTest.ports[3]});
diff --git a/jstests/sharding/read_pref.js b/jstests/sharding/read_pref.js
index e2a46c7aba5..b930678a2b5 100755
--- a/jstests/sharding/read_pref.js
+++ b/jstests/sharding/read_pref.js
@@ -1,5 +1,5 @@
/**
- * Integration test for read prefrence and tagging. The more comprehensive unit test
+ * Integration test for read preference and tagging. The more comprehensive unit test
* can be found in dbtests/replica_set_monitor_test.cpp.
*/
diff --git a/src/mongo/db/fts/stop_words.h b/src/mongo/db/fts/stop_words.h
index 22ec22f3fa8..b10990408f7 100644
--- a/src/mongo/db/fts/stop_words.h
+++ b/src/mongo/db/fts/stop_words.h
@@ -52,7 +52,7 @@ namespace mongo {
size_t numStopWords() const { return _words.size(); }
- static const StopWords* getStopWords( const FTSLanguage& langauge );
+ static const StopWords* getStopWords( const FTSLanguage& language );
private:
~StopWords(){}
unordered_set<std::string> _words;
diff --git a/src/mongo/dbtests/jstests.cpp b/src/mongo/dbtests/jstests.cpp
index fef4d95869a..d8a116ee6ea 100644
--- a/src/mongo/dbtests/jstests.cpp
+++ b/src/mongo/dbtests/jstests.cpp
@@ -835,7 +835,7 @@ namespace JSTests {
void run() {
scoped_ptr<Scope> scope(globalScriptEngine->newScope());
scope->localConnect("ExecTimeoutDB");
- // assert timeout occured
+ // assert timeout occurred
ASSERT(!scope->exec("var a = 1; while (true) { ; }",
"ExecTimeout", false, true, false, 1));
}
@@ -849,7 +849,7 @@ namespace JSTests {
void run() {
scoped_ptr<Scope> scope(globalScriptEngine->newScope());
scope->localConnect("ExecNoTimeoutDB");
- // assert no timeout occured
+ // assert no timeout occurred
ASSERT(scope->exec("var a = function() { return 1; }",
"ExecNoTimeout", false, true, false, 5 * 60 * 1000));
}
diff --git a/src/mongo/dbtests/threadedtests.cpp b/src/mongo/dbtests/threadedtests.cpp
index a22f9cf2ebb..564564164e0 100644
--- a/src/mongo/dbtests/threadedtests.cpp
+++ b/src/mongo/dbtests/threadedtests.cpp
@@ -201,7 +201,7 @@ namespace ThreadedTests {
ASSERT(lockState.threadState() == what && lockState.isAtLeastReadLocked("local"));
}
else if( q == 1 ) {
- // test locking local only -- with no preceeding lock
+ // test locking local only -- with no preceding lock
{
Lock::DBRead x(&lockState, "local");
//Lock::DBRead y("q");
diff --git a/src/mongo/scripting/engine_v8-3.25.h b/src/mongo/scripting/engine_v8-3.25.h
index 741d0b7560a..db41e9c5fc6 100644
--- a/src/mongo/scripting/engine_v8-3.25.h
+++ b/src/mongo/scripting/engine_v8-3.25.h
@@ -593,7 +593,7 @@ namespace mongo {
/**
* Check for an error condition (e.g. empty handle, JS exception, OOM) after executing
* a v8 operation.
- * @resultHandle handle storing the result of the preceeding v8 operation
+ * @resultHandle handle storing the result of the preceding v8 operation
* @try_catch the active v8::TryCatch exception handler
* @param reportError if true, log an error message
* @param assertOnError if true, throw an exception if an error is detected
diff --git a/src/mongo/scripting/engine_v8.h b/src/mongo/scripting/engine_v8.h
index 29e995576a3..6f7f1019e1f 100644
--- a/src/mongo/scripting/engine_v8.h
+++ b/src/mongo/scripting/engine_v8.h
@@ -567,7 +567,7 @@ namespace mongo {
/**
* Check for an error condition (e.g. empty handle, JS exception, OOM) after executing
* a v8 operation.
- * @resultHandle handle storing the result of the preceeding v8 operation
+ * @resultHandle handle storing the result of the preceding v8 operation
* @try_catch the active v8::TryCatch exception handler
* @param reportError if true, log an error message
* @param assertOnError if true, throw an exception if an error is detected
diff --git a/src/mongo/shell/mongo.js b/src/mongo/shell/mongo.js
index df8d825c4d5..a28e3b2b692 100644
--- a/src/mongo/shell/mongo.js
+++ b/src/mongo/shell/mongo.js
@@ -81,7 +81,7 @@ Mongo.prototype.tojson = Mongo.prototype.toString;
/**
* Sets the read preference.
*
- * @param mode {string} read prefrence mode to use. Pass null to disable read
+ * @param mode {string} read preference mode to use. Pass null to disable read
* preference.
* @param tagSet {Array.<Object>} optional. The list of tags to use, order matters.
* Note that this object only keeps a shallow copy of this array.
diff --git a/src/mongo/shell/query.js b/src/mongo/shell/query.js
index 8e8613fcd86..304a96c84ad 100644
--- a/src/mongo/shell/query.js
+++ b/src/mongo/shell/query.js
@@ -258,7 +258,7 @@ DBQuery.prototype.maxTimeMS = function( maxTimeMS ) {
/**
* Sets the read preference for this cursor.
*
- * @param mode {string} read prefrence mode to use.
+ * @param mode {string} read preference mode to use.
* @param tagSet {Array.<Object>} optional. The list of tags to use, order matters.
* Note that this object only keeps a shallow copy of this array.
*
diff --git a/src/mongo/util/concurrency/mutexdebugger.h b/src/mongo/util/concurrency/mutexdebugger.h
index f0674e671e6..0dea3049c9e 100644
--- a/src/mongo/util/concurrency/mutexdebugger.h
+++ b/src/mongo/util/concurrency/mutexdebugger.h
@@ -52,9 +52,9 @@ namespace mongo {
*/
class MutexDebugger {
typedef const char * mid; // mid = mutex ID
- typedef std::map<mid,int> Preceeding;
+ typedef std::map<mid,int> Preceding;
std::map< mid, int > maxNest;
- boost::thread_specific_ptr< Preceeding > us;
+ boost::thread_specific_ptr< Preceding > us;
std::map< mid, std::set<mid> > followers;
boost::mutex &x;
unsigned magic;
@@ -74,12 +74,12 @@ namespace mongo {
MutexDebugger();
std::string currentlyLocked() const {
- Preceeding *_preceeding = us.get();
- if( _preceeding == 0 )
+ Preceding *_preceding = us.get();
+ if( _preceding == 0 )
return "";
- Preceeding &preceeding = *_preceeding;
+ Preceding &preceding = *_preceding;
std::stringstream q;
- for( Preceeding::const_iterator i = preceeding.begin(); i != preceeding.end(); i++ ) {
+ for( Preceding::const_iterator i = preceding.begin(); i != preceding.end(); i++ ) {
if( i->second > 0 )
q << " " << i->first << ' ' << i->second << '\n';
}
@@ -90,24 +90,24 @@ namespace mongo {
if( this == 0 || m == 0 ) return;
verify( magic == 0x12345678 );
- Preceeding *_preceeding = us.get();
- if( _preceeding == 0 )
- us.reset( _preceeding = new Preceeding() );
- Preceeding &preceeding = *_preceeding;
+ Preceding *_preceding = us.get();
+ if( _preceding == 0 )
+ us.reset( _preceding = new Preceding() );
+ Preceding &preceding = *_preceding;
if( a == m ) {
aBreakPoint();
- if( preceeding[b.c_str()] ) {
+ if( preceding[b.c_str()] ) {
std::cout << "****** MutexDebugger error! warning " << b << " was locked before " << a << std::endl;
verify(false);
}
}
- preceeding[m]++;
- if( preceeding[m] > 1 ) {
+ preceding[m]++;
+ if( preceding[m] > 1 ) {
// recursive re-locking.
- if( preceeding[m] > maxNest[m] )
- maxNest[m] = preceeding[m];
+ if( preceding[m] > maxNest[m] )
+ maxNest[m] = preceding[m];
return;
}
@@ -116,7 +116,7 @@ namespace mongo {
{
boost::mutex::scoped_lock lk(x);
followers[m];
- for( Preceeding::iterator i = preceeding.begin(); i != preceeding.end(); i++ ) {
+ for( Preceding::iterator i = preceding.begin(); i != preceding.end(); i++ ) {
if( m != i->first && i->second > 0 ) {
followers[i->first].insert(m);
if( followers[m].count(i->first) != 0 ) {
@@ -128,7 +128,7 @@ namespace mongo {
"\n " << bad << " was already locked and should not be."
"\n set a and b above to debug.\n";
std::stringstream q;
- for( Preceeding::iterator i = preceeding.begin(); i != preceeding.end(); i++ ) {
+ for( Preceding::iterator i = preceding.begin(); i != preceding.end(); i++ ) {
if( i->first != m && i->first != bad && i->second > 0 )
q << " " << i->first << '\n';
}
@@ -148,11 +148,11 @@ namespace mongo {
}
void leaving(mid m) {
if( this == 0 || m == 0 ) return; // still in startup pre-main()
- Preceeding& preceeding = *us.get();
- preceeding[m]--;
- if( preceeding[m] < 0 ) {
- std::cout << "ERROR: lock count for " << m << " is " << preceeding[m] << std::endl;
- verify( preceeding[m] >= 0 );
+ Preceding& preceding = *us.get();
+ preceding[m]--;
+ if( preceding[m] < 0 ) {
+ std::cout << "ERROR: lock count for " << m << " is " << preceding[m] << std::endl;
+ verify( preceding[m] >= 0 );
}
}
};
diff --git a/src/mongo/util/descriptive_stats.h b/src/mongo/util/descriptive_stats.h
index 05904a9dc34..cacc7f096ca 100644
--- a/src/mongo/util/descriptive_stats.h
+++ b/src/mongo/util/descriptive_stats.h
@@ -204,7 +204,7 @@ namespace mongo {
};
/**
- * Provides the funcionality of both BasicEstimators and DistributionEstimators.
+ * Provides the functionality of both BasicEstimators and DistributionEstimators.
*/
template <class Sample, std::size_t NumQuantiles>
class SummaryEstimators :
diff --git a/src/mongo/util/ntservice.cpp b/src/mongo/util/ntservice.cpp
index eecea0b178b..78d9bbe3699 100644
--- a/src/mongo/util/ntservice.cpp
+++ b/src/mongo/util/ntservice.cpp
@@ -327,7 +327,7 @@ namespace {
bool serviceInstalled;
- // TODO: If neccessary grant user "Login as a Service" permission.
+ // TODO: If necessary grant user "Login as a Service" permission.
if ( !serviceUser.empty() ) {
wstring actualServiceUser;
if ( serviceUser.find(L"\\") == string::npos ) {
diff --git a/src/mongo/util/safe_num.cpp b/src/mongo/util/safe_num.cpp
index 0b5211a2082..7f683a58ce3 100644
--- a/src/mongo/util/safe_num.cpp
+++ b/src/mongo/util/safe_num.cpp
@@ -107,7 +107,7 @@ namespace mongo {
return _value.doubleVal == rhs._value.doubleVal;
}
- // If we're mixing integers and doubles, we should be carefull. Some integers are
+ // If we're mixing integers and doubles, we should be careful. Some integers are
// too big to be accuratelly represented in a double. If we're within a safe range
// we compare both sides as doubles.
const double lhsDouble = getDouble(*this);