Skip to content

SERVER-30166 Replace string with explicit std::string. Enables compul… #1167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
greenius wants to merge 1 commit into from
Closed

SERVER-30166 Replace string with explicit std::string. Enables compul… #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/mongo/db/matcher/expression_leaf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ void ComparisonMatchExpression::debugString(StringBuilder& debug, int level) con
}

void ComparisonMatchExpression::serialize(BSONObjBuilder* out) const {
string opString = "";
std::string opString = "";
switch (matchType()) {
case LT:
opString = "$lt";
Expand Down Expand Up @@ -826,7 +826,7 @@ void BitTestMatchExpression::debugString(StringBuilder& debug, int level) const
}

void BitTestMatchExpression::serialize(BSONObjBuilder* out) const {
string opString = "";
std::string opString = "";

switch (matchType()) {
case BITS_ALL_SET:
Expand Down
38 changes: 19 additions & 19 deletions src/mongo/db/repl/master_slave.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ BSONObj ReplSource::jsobj() {

BSONObjBuilder dbsNextPassBuilder;
int n = 0;
for (set<string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) {
for (set<std::string>::iterator i = addDbNextPass.begin(); i != addDbNextPass.end(); i++) {
n++;
dbsNextPassBuilder.appendBool(*i, 1);
}
Expand All @@ -179,7 +179,7 @@ BSONObj ReplSource::jsobj() {

BSONObjBuilder incompleteCloneDbsBuilder;
n = 0;
for (set<string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) {
for (set<std::string>::iterator i = incompleteCloneDbs.begin(); i != incompleteCloneDbs.end(); i++) {
n++;
incompleteCloneDbsBuilder.appendBool(*i, 1);
}
Expand All @@ -190,7 +190,7 @@ BSONObj ReplSource::jsobj() {
}

void ReplSource::ensureMe(OperationContext* opCtx) {
string myname = getHostName();
std::string myname = getHostName();

// local.me is an identifier for a server for getLastError w:2+
bool exists = Helpers::getSingleton(opCtx, "local.me", _me);
Expand Down Expand Up @@ -381,7 +381,7 @@ class HandshakeCmd : public BasicCommand {
}

virtual bool run(OperationContext* opCtx,
const string& ns,
const std::string& ns,
const BSONObj& cmdObj,
BSONObjBuilder& result) {
HandshakeArgs handshake;
Expand All @@ -399,7 +399,7 @@ class HandshakeCmd : public BasicCommand {
} handshakeCmd;

bool replHandshake(DBClientConnection* conn, const OID& myRID) {
string myname = getHostName();
std::string myname = getHostName();

BSONObjBuilder cmd;
cmd.append("handshake", myRID);
Expand Down Expand Up @@ -450,7 +450,7 @@ void ReplSource::forceResync(OperationContext* opCtx, const char* requester) {
BSONElement e = i.next();
if (e.eoo())
break;
string name = e.embeddedObject().getField("name").valuestr();
std::string name = e.embeddedObject().getField("name").valuestr();
if (!e.embeddedObject().getBoolField("empty")) {
if (name != "local") {
if (only.empty() || only == name) {
Expand Down Expand Up @@ -481,7 +481,7 @@ Status ReplSource::_updateIfDoneWithInitialSync() {
return Status::OK();
}

void ReplSource::resyncDrop(OperationContext* opCtx, const string& dbName) {
void ReplSource::resyncDrop(OperationContext* opCtx, const std::string& dbName) {
log() << "resync: dropping database " << dbName;
invariant(opCtx->lockState()->isW());

Expand Down Expand Up @@ -531,13 +531,13 @@ void ReplSource::resync(OperationContext* opCtx, const std::string& dbName) {

static DatabaseIgnorer ___databaseIgnorer;

void DatabaseIgnorer::doIgnoreUntilAfter(const string& db, const Timestamp& futureOplogTime) {
void DatabaseIgnorer::doIgnoreUntilAfter(const std::string& db, const Timestamp& futureOplogTime) {
if (futureOplogTime > _ignores[db]) {
_ignores[db] = futureOplogTime;
}
}

bool DatabaseIgnorer::ignoreAt(const string& db, const Timestamp& currentOplogTime) {
bool DatabaseIgnorer::ignoreAt(const std::string& db, const Timestamp& currentOplogTime) {
if (_ignores[db].isNull()) {
return false;
}
Expand Down Expand Up @@ -627,7 +627,7 @@ bool ReplSource::handleDuplicateDbName(OperationContext* opCtx,

// The database is present on the master and no conflicting databases
// are present on the master. Drop any local conflicts.
for (set<string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) {
for (set<std::string>::const_iterator i = duplicates.begin(); i != duplicates.end(); ++i) {
___databaseIgnorer.doIgnoreUntilAfter(*i, lastTime);
incompleteCloneDbs.erase(*i);
addDbNextPass.erase(*i);
Expand Down Expand Up @@ -822,10 +822,10 @@ void ReplSource::_sync_pullOpLog_applyOperation(OperationContext* opCtx,
}

void ReplSource::syncToTailOfRemoteLog() {
string _ns = ns();
std::string _ns = ns();
BSONObjBuilder b;
if (!only.empty()) {
b.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only));
b.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only));
}
BSONObj last = oplogReader.findOne(_ns.c_str(), Query(b.done()).sort(BSON("$natural" << -1)));
if (!last.isEmpty()) {
Expand Down Expand Up @@ -873,7 +873,7 @@ class ReplApplyBatchSize
*/
int ReplSource::_sync_pullOpLog(OperationContext* opCtx, int& nApplied) {
int okResultCode = restartSyncAfterSleep;
string ns = string("local.oplog.$") + sourceName();
std::string ns = std::string("local.oplog.$") + sourceName();
LOG(2) << "sync_pullOpLog " << ns << " syncedTo:" << syncedTo.toStringLong() << '\n';

bool tailing = true;
Expand All @@ -893,7 +893,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* opCtx, int& nApplied) {
BSONElement e = i.next();
if (e.eoo())
break;
string name = e.embeddedObject().getField("name").valuestr();
std::string name = e.embeddedObject().getField("name").valuestr();
if (!e.embeddedObject().getBoolField("empty")) {
if (name != "local") {
if (only.empty() || only == name) {
Expand All @@ -916,7 +916,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* opCtx, int& nApplied) {
if (!only.empty()) {
// note we may here skip a LOT of data table scanning, a lot of work for the master.
// maybe append "\\." here?
query.appendRegex("ns", string("^") + pcrecpp::RE::QuoteMeta(only));
query.appendRegex("ns", std::string("^") + pcrecpp::RE::QuoteMeta(only));
}
BSONObj queryObj = query.done();
// e.g. queryObj = { ts: { $gte: syncedTo } }
Expand All @@ -935,7 +935,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* opCtx, int& nApplied) {

// show any deferred database creates from a previous pass
{
set<string>::iterator i = addDbNextPass.begin();
set<std::string>::iterator i = addDbNextPass.begin();
if (i != addDbNextPass.end()) {
BSONObjBuilder b;
b.append("ns", *i + '.');
Expand Down Expand Up @@ -978,7 +978,7 @@ int ReplSource::_sync_pullOpLog(OperationContext* opCtx, int& nApplied) {
BSONObj op = oplogReader.nextSafe();
BSONElement ts = op.getField("ts");
if (ts.type() != Date && ts.type() != bsonTimestamp) {
string err = op.getStringField("$err");
std::string err = op.getStringField("$err");
if (!err.empty()) {
// 13051 is "tailable cursor requested on non capped collection"
if (op.getIntField("code") == 13051) {
Expand Down Expand Up @@ -1143,7 +1143,7 @@ int ReplSource::sync(OperationContext* opCtx, int& nApplied) {

// FIXME Handle cases where this db isn't on default port, or default port is spec'd in
// hostName.
if ((string("localhost") == hostName || string("127.0.0.1") == hostName) &&
if ((std::string("localhost") == hostName || std::string("127.0.0.1") == hostName) &&
serverGlobalParams.port == ServerGlobalParams::DefaultDBPort) {
log() << "can't sync from self (localhost). sources configuration may be wrong." << endl;
sleepsecs(5);
Expand Down Expand Up @@ -1283,7 +1283,7 @@ static void replMain(OperationContext* opCtx) {
if (s) {
stringstream ss;
ss << "sleep " << s << " sec before next pass";
string msg = ss.str();
std::string msg = ss.str();
if (!serverGlobalParams.quiet.load())
log() << msg << endl;
ReplInfo r(msg.c_str());
Expand Down
14 changes: 7 additions & 7 deletions src/mongo/shell/bench.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {
invariant(bsonTemplateEvaluator.setId(_id) == BsonTemplateEvaluator::StatusSuccess);

if (_config->username != "") {
string errmsg;
std::string errmsg;
if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
uasserted(15931, "Authenticating to connection for _benchThread failed: " + errmsg);
}
Expand Down Expand Up @@ -940,7 +940,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {

if (!result["err"].eoo() && result["err"].type() == String &&
(_config->throwGLE || op.throwGLE))
throw DBException((string) "From benchRun GLE" +
throw DBException((std::string) "From benchRun GLE" +
causedBy(result["err"].String()),
result["code"].eoo() ? 0 : result["code"].Int());
}
Expand Down Expand Up @@ -1006,7 +1006,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {

if (!result["err"].eoo() && result["err"].type() == String &&
(_config->throwGLE || op.throwGLE))
throw DBException((string) "From benchRun GLE" +
throw DBException((std::string) "From benchRun GLE" +
causedBy(result["err"].String()),
result["code"].eoo() ? 0 : result["code"].Int());
}
Expand Down Expand Up @@ -1053,7 +1053,7 @@ void BenchRunWorker::generateLoadOnConnection(DBClientBase* conn) {

if (!result["err"].eoo() && result["err"].type() == String &&
(_config->throwGLE || op.throwGLE))
throw DBException((string) "From benchRun GLE " +
throw DBException((std::string) "From benchRun GLE " +
causedBy(result["err"].String()),
result["code"].eoo() ? 0 : result["code"].Int());
}
Expand Down Expand Up @@ -1155,7 +1155,7 @@ void BenchRunWorker::run() {
try {
std::unique_ptr<DBClientBase> conn(_config->createConnection());
if (!_config->username.empty()) {
string errmsg;
std::string errmsg;
if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
uasserted(15932, "Authenticating to connection for benchThread failed: " + errmsg);
}
Expand Down Expand Up @@ -1187,7 +1187,7 @@ void BenchRunner::start() {
std::unique_ptr<DBClientBase> conn(_config->createConnection());
// Must authenticate to admin db in order to run serverStatus command
if (_config->username != "") {
string errmsg;
std::string errmsg;
if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
uasserted(
16704,
Expand Down Expand Up @@ -1223,7 +1223,7 @@ void BenchRunner::stop() {
{
std::unique_ptr<DBClientBase> conn(_config->createConnection());
if (_config->username != "") {
string errmsg;
std::string errmsg;
// this can only fail if admin access was revoked since start of run
if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
uasserted(
Expand Down