diff options
author | Randolph Tan <randolph@10gen.com> | 2013-12-02 11:17:52 -0500 |
---|---|---|
committer | Randolph Tan <randolph@10gen.com> | 2014-01-06 15:45:55 -0500 |
commit | cc6e1b9cab1e42e4b41ff9689cca500ff106074c (patch) | |
tree | 094e3d44afc26ebb0c9ab9fa9a12da8e0125d653 /src/mongo/db | |
parent | e89dccbef9b83ac8101dcceab64f5c6e09b6de50 (diff) | |
download | mongo-cc6e1b9cab1e42e4b41ff9689cca500ff106074c.tar.gz |
SERVER-11875 Convert internal writes to use write commands
Diffstat (limited to 'src/mongo/db')
-rw-r--r-- | src/mongo/db/SConscript | 1 | ||||
-rw-r--r-- | src/mongo/db/write_concern.h | 23 | ||||
-rw-r--r-- | src/mongo/db/write_concern_options.cpp | 39 | ||||
-rw-r--r-- | src/mongo/db/write_concern_options.h | 65 |
4 files changed, 107 insertions, 21 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index a2c62e4c22d..91e36615208 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -14,6 +14,7 @@ env.Library( 'field_ref.cpp', 'field_ref_set.cpp', 'field_parser.cpp', + 'write_concern_options.cpp' ], LIBDEPS=[ '$BUILD_DIR/mongo/bson', diff --git a/src/mongo/db/write_concern.h b/src/mongo/db/write_concern.h index ca26cd99b82..6253bfd5107 100644 --- a/src/mongo/db/write_concern.h +++ b/src/mongo/db/write_concern.h @@ -28,28 +28,9 @@ #pragma once -namespace mongo { - - struct WriteConcernOptions { - - WriteConcernOptions() { reset(); } +#include "mongo/db/write_concern_options.h" - Status parse( const BSONObj& obj ); - - void reset() { - syncMode = NONE; - wNumNodes = 0; - wMode = ""; - wTimeout = 0; - } - - enum SyncMode { NONE, FSYNC, JOURNAL } syncMode; - - int wNumNodes; - string wMode; - - int wTimeout; - }; +namespace mongo { struct WriteConcernResult { WriteConcernResult() { diff --git a/src/mongo/db/write_concern_options.cpp b/src/mongo/db/write_concern_options.cpp new file mode 100644 index 00000000000..8597e55d28f --- /dev/null +++ b/src/mongo/db/write_concern_options.cpp @@ -0,0 +1,39 @@ +/* Copyright (C) 2014 MongoDB Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * As a special exception, the copyright holders give permission to link the + * code of portions of this program with the OpenSSL library under certain + * conditions as described in each individual source file and distribute + * linked combinations including the program with the OpenSSL library. You + * must comply with the GNU Affero General Public License in all respects for + * all of the code used other than as permitted herein. If you modify file(s) + * with this exception, you may extend this exception to your version of the + * file(s), but you are not obligated to do so. If you do not wish to do so, + * delete this exception statement from your version. If you delete this + * exception statement from all source files in the program, then also delete + * it in the license file. + */ + +#include "mongo/db/write_concern_options.h" + +#include "mongo/client/dbclientinterface.h" + +namespace mongo { + + const BSONObj WriteConcernOptions::Default = BSONObj(); + const BSONObj WriteConcernOptions::Acknowledged(BSON("w" << W_NORMAL)); + const BSONObj WriteConcernOptions::AllConfigs = BSONObj(); + const BSONObj WriteConcernOptions::Unacknowledged(BSON("w" << W_NONE)); + +} diff --git a/src/mongo/db/write_concern_options.h b/src/mongo/db/write_concern_options.h new file mode 100644 index 00000000000..fd2b7544639 --- /dev/null +++ b/src/mongo/db/write_concern_options.h @@ -0,0 +1,65 @@ +/* Copyright (C) 2014 MongoDB Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * As a special exception, the copyright holders give permission to link the + * code of portions of this program with the OpenSSL library under certain + * conditions as described in each individual source file and distribute + * linked combinations including the program with the OpenSSL library. You + * must comply with the GNU Affero General Public License in all respects for + * all of the code used other than as permitted herein. If you modify file(s) + * with this exception, you may extend this exception to your version of the + * file(s), but you are not obligated to do so. If you do not wish to do so, + * delete this exception statement from your version. If you delete this + * exception statement from all source files in the program, then also delete + * it in the license file. + */ + +#pragma once + +#include <string> + +#include "mongo/base/status.h" +#include "mongo/db/jsobj.h" + +namespace mongo { + + struct WriteConcernOptions { + public: + + static const BSONObj Default; + static const BSONObj Acknowledged; + static const BSONObj AllConfigs; + static const BSONObj Unacknowledged; + + WriteConcernOptions() { reset(); } + + Status parse( const BSONObj& obj ); + + void reset() { + syncMode = NONE; + wNumNodes = 0; + wMode = ""; + wTimeout = 0; + } + + enum SyncMode { NONE, FSYNC, JOURNAL } syncMode; + + int wNumNodes; + std::string wMode; + + int wTimeout; + }; + +} + |