From 153bb259889c59ccc3517fa7623e7caae4a16b56 Mon Sep 17 00:00:00 2001 From: Lamont Nelson Date: Fri, 28 Feb 2020 12:51:10 -0500 Subject: format --- .../client/sdam/json_tests/rs/normalize_case.json | 48 ----------- .../json_tests/rs/normalize_case.json.disabled | 48 +++++++++++ .../sdam/json_tests/rs/normalize_case_me.json | 93 ---------------------- .../json_tests/rs/normalize_case_me.json.disabled | 93 ++++++++++++++++++++++ .../json_tests/sharded/normalize_uri_case.json | 24 ------ .../sharded/normalize_uri_case.json.disabled | 24 ++++++ src/mongo/client/sdam/server_description.h | 3 +- 7 files changed, 166 insertions(+), 167 deletions(-) delete mode 100644 src/mongo/client/sdam/json_tests/rs/normalize_case.json create mode 100644 src/mongo/client/sdam/json_tests/rs/normalize_case.json.disabled delete mode 100644 src/mongo/client/sdam/json_tests/rs/normalize_case_me.json create mode 100644 src/mongo/client/sdam/json_tests/rs/normalize_case_me.json.disabled delete mode 100644 src/mongo/client/sdam/json_tests/sharded/normalize_uri_case.json create mode 100644 src/mongo/client/sdam/json_tests/sharded/normalize_uri_case.json.disabled diff --git a/src/mongo/client/sdam/json_tests/rs/normalize_case.json b/src/mongo/client/sdam/json_tests/rs/normalize_case.json deleted file mode 100644 index 4d0b0ae629b..00000000000 --- a/src/mongo/client/sdam/json_tests/rs/normalize_case.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "description": "Replica set case normalization", - "uri": "mongodb://A/?replicaSet=rs", - "phases": [ - { - "responses": [ - [ - "a:27017", - { - "ok": 1, - "ismaster": true, - "setName": "rs", - "hosts": [ - "A:27017" - ], - "passives": [ - "B:27017" - ], - "arbiters": [ - "C:27017" - ], - "minWireVersion": 0, - "maxWireVersion": 6 - } - ] - ], - "outcome": { - "servers": { - "a:27017": { - "type": "RSPrimary", - "setName": "rs" - }, - "b:27017": { - "type": "Unknown", - "setName": null - }, - "c:27017": { - "type": "Unknown", - "setName": null - } - }, - "topologyType": "ReplicaSetWithPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - } - ] -} diff --git a/src/mongo/client/sdam/json_tests/rs/normalize_case.json.disabled b/src/mongo/client/sdam/json_tests/rs/normalize_case.json.disabled new file mode 100644 index 00000000000..4d0b0ae629b --- /dev/null +++ b/src/mongo/client/sdam/json_tests/rs/normalize_case.json.disabled @@ -0,0 +1,48 @@ +{ + "description": "Replica set case normalization", + "uri": "mongodb://A/?replicaSet=rs", + "phases": [ + { + "responses": [ + [ + "a:27017", + { + "ok": 1, + "ismaster": true, + "setName": "rs", + "hosts": [ + "A:27017" + ], + "passives": [ + "B:27017" + ], + "arbiters": [ + "C:27017" + ], + "minWireVersion": 0, + "maxWireVersion": 6 + } + ] + ], + "outcome": { + "servers": { + "a:27017": { + "type": "RSPrimary", + "setName": "rs" + }, + "b:27017": { + "type": "Unknown", + "setName": null + }, + "c:27017": { + "type": "Unknown", + "setName": null + } + }, + "topologyType": "ReplicaSetWithPrimary", + "logicalSessionTimeoutMinutes": null, + "setName": "rs" + } + } + ] +} diff --git a/src/mongo/client/sdam/json_tests/rs/normalize_case_me.json b/src/mongo/client/sdam/json_tests/rs/normalize_case_me.json deleted file mode 100644 index e854e7fb432..00000000000 --- a/src/mongo/client/sdam/json_tests/rs/normalize_case_me.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "description": "Replica set mixed case normalization", - "uri": "mongodb://A/?replicaSet=rs", - "phases": [ - { - "responses": [ - [ - "a:27017", - { - "ok": 1, - "ismaster": true, - "setName": "rs", - "me": "A:27017", - "hosts": [ - "A:27017" - ], - "passives": [ - "B:27017" - ], - "arbiters": [ - "C:27017" - ], - "minWireVersion": 0, - "maxWireVersion": 6 - } - ] - ], - "outcome": { - "servers": { - "a:27017": { - "type": "RSPrimary", - "setName": "rs" - }, - "b:27017": { - "type": "Unknown", - "setName": null - }, - "c:27017": { - "type": "Unknown", - "setName": null - } - }, - "topologyType": "ReplicaSetWithPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - }, - { - "responses": [ - [ - "b:27017", - { - "ok": 1, - "ismaster": false, - "secondary": true, - "setName": "rs", - "me": "B:27017", - "hosts": [ - "A:27017" - ], - "passives": [ - "B:27017" - ], - "arbiters": [ - "C:27017" - ], - "minWireVersion": 0, - "maxWireVersion": 6 - } - ] - ], - "outcome": { - "servers": { - "a:27017": { - "type": "RSPrimary", - "setName": "rs" - }, - "b:27017": { - "type": "RSSecondary", - "setName": "rs" - }, - "c:27017": { - "type": "Unknown", - "setName": null - } - }, - "topologyType": "ReplicaSetWithPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - } - ] -} diff --git a/src/mongo/client/sdam/json_tests/rs/normalize_case_me.json.disabled b/src/mongo/client/sdam/json_tests/rs/normalize_case_me.json.disabled new file mode 100644 index 00000000000..e854e7fb432 --- /dev/null +++ b/src/mongo/client/sdam/json_tests/rs/normalize_case_me.json.disabled @@ -0,0 +1,93 @@ +{ + "description": "Replica set mixed case normalization", + "uri": "mongodb://A/?replicaSet=rs", + "phases": [ + { + "responses": [ + [ + "a:27017", + { + "ok": 1, + "ismaster": true, + "setName": "rs", + "me": "A:27017", + "hosts": [ + "A:27017" + ], + "passives": [ + "B:27017" + ], + "arbiters": [ + "C:27017" + ], + "minWireVersion": 0, + "maxWireVersion": 6 + } + ] + ], + "outcome": { + "servers": { + "a:27017": { + "type": "RSPrimary", + "setName": "rs" + }, + "b:27017": { + "type": "Unknown", + "setName": null + }, + "c:27017": { + "type": "Unknown", + "setName": null + } + }, + "topologyType": "ReplicaSetWithPrimary", + "logicalSessionTimeoutMinutes": null, + "setName": "rs" + } + }, + { + "responses": [ + [ + "b:27017", + { + "ok": 1, + "ismaster": false, + "secondary": true, + "setName": "rs", + "me": "B:27017", + "hosts": [ + "A:27017" + ], + "passives": [ + "B:27017" + ], + "arbiters": [ + "C:27017" + ], + "minWireVersion": 0, + "maxWireVersion": 6 + } + ] + ], + "outcome": { + "servers": { + "a:27017": { + "type": "RSPrimary", + "setName": "rs" + }, + "b:27017": { + "type": "RSSecondary", + "setName": "rs" + }, + "c:27017": { + "type": "Unknown", + "setName": null + } + }, + "topologyType": "ReplicaSetWithPrimary", + "logicalSessionTimeoutMinutes": null, + "setName": "rs" + } + } + ] +} diff --git a/src/mongo/client/sdam/json_tests/sharded/normalize_uri_case.json b/src/mongo/client/sdam/json_tests/sharded/normalize_uri_case.json deleted file mode 100644 index 4aa7cb08b61..00000000000 --- a/src/mongo/client/sdam/json_tests/sharded/normalize_uri_case.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "description": "Normalize URI case", - "uri": "mongodb://A,B", - "phases": [ - { - "responses": [], - "outcome": { - "servers": { - "a:27017": { - "type": "Unknown", - "setName": null - }, - "b:27017": { - "type": "Unknown", - "setName": null - } - }, - "topologyType": "Unknown", - "logicalSessionTimeoutMinutes": null, - "setName": null - } - } - ] -} diff --git a/src/mongo/client/sdam/json_tests/sharded/normalize_uri_case.json.disabled b/src/mongo/client/sdam/json_tests/sharded/normalize_uri_case.json.disabled new file mode 100644 index 00000000000..4aa7cb08b61 --- /dev/null +++ b/src/mongo/client/sdam/json_tests/sharded/normalize_uri_case.json.disabled @@ -0,0 +1,24 @@ +{ + "description": "Normalize URI case", + "uri": "mongodb://A,B", + "phases": [ + { + "responses": [], + "outcome": { + "servers": { + "a:27017": { + "type": "Unknown", + "setName": null + }, + "b:27017": { + "type": "Unknown", + "setName": null + } + }, + "topologyType": "Unknown", + "logicalSessionTimeoutMinutes": null, + "setName": null + } + } + ] +} diff --git a/src/mongo/client/sdam/server_description.h b/src/mongo/client/sdam/server_description.h index 662890480c2..42e87ab34e8 100644 --- a/src/mongo/client/sdam/server_description.h +++ b/src/mongo/client/sdam/server_description.h @@ -51,8 +51,7 @@ public: * Construct an unknown ServerDescription with default values except the server's address. */ ServerDescription(ServerAddress address) - : _address(std::move(address)), _type(ServerType::kUnknown) { - } + : _address(std::move(address)), _type(ServerType::kUnknown) {} /** * Build a new ServerDescription according to the rules of the SDAM spec based on the -- cgit v1.2.1