diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2015-10-02 17:44:17 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2015-10-06 12:45:03 -0400 |
| commit | 9267d348b98e3be67a85f219ba184c35f35fc309 (patch) | |
| tree | 2f5453f78ff8b15207f9c9df0fc0fffb1f42cb4f /src/mongo/client/read_preference.h | |
| parent | d9f2d8fda800fdc2cbd2be30413412c19a24f97a (diff) | |
| download | mongo-9267d348b98e3be67a85f219ba184c35f35fc309.tar.gz | |
SERVER-20743 Combine target selection and command execution in ShardRegistry.
Also, properly set the metadata field on all commands dispatched through ShardRegistry.
Diffstat (limited to 'src/mongo/client/read_preference.h')
| -rw-r--r-- | src/mongo/client/read_preference.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/client/read_preference.h b/src/mongo/client/read_preference.h index 161cfc0f241..57177c69345 100644 --- a/src/mongo/client/read_preference.h +++ b/src/mongo/client/read_preference.h @@ -121,8 +121,7 @@ struct ReadPreferenceSetting { */ ReadPreferenceSetting(ReadPreference pref, TagSet tags); - // TODO: remove when StatusWith supports non-default constructible types (SERVER-18007) - ReadPreferenceSetting() = default; + explicit ReadPreferenceSetting(ReadPreference pref); inline bool equals(const ReadPreferenceSetting& other) const { return (pref == other.pref) && (tags == other.tags); @@ -148,8 +147,8 @@ struct ReadPreferenceSetting { */ static StatusWith<ReadPreferenceSetting> fromBSON(const BSONObj& readPrefSettingObj); - ReadPreference pref{ReadPreference::PrimaryOnly}; - TagSet tags{TagSet::primaryOnly()}; + ReadPreference pref; + TagSet tags; }; } // namespace mongo |