mongo 2.12.1 → 2.13.0

data/spec/mongo/server_selector/primary_preferred_spec.rb

@@ -11,6 +11,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
   end
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector accepting hedge'
   it_behaves_like 'a server selector with sensitive data in its options'
 
   describe '#initialize' do
@@ -106,13 +107,13 @@ describe Mongo::ServerSelector::PrimaryPreferred do
     end
   end
 
-  describe '#select' do
+  describe '#select_in_replica_set' do
 
     context 'no candidates' do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -120,7 +121,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:candidates) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq( [primary] )
+        expect(selector.send(:select_in_replica_set, candidates)).to eq( [primary] )
       end
     end
 
@@ -128,7 +129,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:candidates) { [secondary] }
 
       it 'returns an array with the secondary' do
-        expect(selector.send(:select, candidates)).to eq( [secondary] )
+        expect(selector.send(:select_in_replica_set, candidates)).to eq( [secondary] )
       end
     end
 
@@ -137,7 +138,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:expected) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
       end
     end
 
@@ -146,7 +147,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:expected) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
       end
     end
 
@@ -167,7 +168,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [primary] }
 
           it 'returns array with primary' do
-            expect(selector.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
           end
         end
 
@@ -175,7 +176,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [matching_primary] }
 
           it 'returns array with matching primary' do
-            expect(selector.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_primary])
           end
         end
 
@@ -183,7 +184,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [matching_secondary] }
 
           it 'returns array with matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
 
@@ -191,7 +192,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [secondary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
       end
@@ -202,7 +203,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [primary, secondary, secondary] }
 
           it 'returns an array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
           end
         end
 
@@ -210,7 +211,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [matching_primary, secondary, secondary] }
 
           it 'returns an array of the primary' do
-            expect(selector.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_primary])
           end
         end
 
@@ -219,7 +220,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:expected) { [primary] }
 
           it 'returns an array of the primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -228,7 +229,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:expected) { [primary] }
 
           it 'returns an array of the primary ' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -237,7 +238,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:expected) { [primary] }
 
           it 'returns an array of the primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
       end
@@ -253,7 +254,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [far_primary] }
 
           it 'returns array with far primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
 
@@ -261,7 +262,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
           let(:candidates) { [far_secondary] }
 
           it 'returns array with far primary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
 
         end
@@ -276,7 +277,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [primary] }
 
             it 'returns an array of the primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -285,7 +286,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [primary] }
 
             it 'returns an array of the primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -294,7 +295,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [far_primary] }
 
             it 'returns an array of the far primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -303,7 +304,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [far_primary] }
 
             it 'returns an array of the far primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -314,7 +315,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
               let(:expected) { [primary] }
 
               it 'returns an array of the primary' do
-                expect(selector.send(:select, candidates)).to eq(expected)
+                expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
               end
             end
 
@@ -323,7 +324,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
               let(:expected) { [far_primary] }
 
               it 'returns an array with primary' do
-                expect(selector.send(:select, candidates)).to eq(expected)
+                expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
               end
             end
           end
@@ -336,7 +337,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [secondary] }
 
             it 'returns an array with the secondary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -345,7 +346,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [secondary] }
 
             it 'returns an array of the secondary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -354,7 +355,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
             let(:expected) { [secondary, secondary] }
 
             it 'returns an array of the secondary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
         end

data/spec/mongo/server_selector/primary_spec.rb

@@ -50,6 +50,24 @@ describe Mongo::ServerSelector::Primary do
     end
   end
 
+  describe '#hedge' do
+    context 'hedge not provided' do
+      it 'returns an empty array' do
+        expect(selector.hedge).to be_nil
+      end
+    end
+
+    context 'hedge provided' do
+      let(:hedge) { { enabled: true } }
+
+      it 'raises an error' do
+        expect {
+          selector.tag_sets
+        }.to raise_error(Mongo::Error::InvalidServerPreference)
+      end
+    end
+  end
+
   describe '#to_mongos' do
 
     it 'returns nil' do
@@ -77,13 +95,13 @@ describe Mongo::ServerSelector::Primary do
     end
   end
 
-  describe '#select' do
+  describe '#select_in_replica_set' do
 
     context 'no candidates' do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -91,7 +109,7 @@ describe Mongo::ServerSelector::Primary do
       let(:candidates) { [secondary] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -99,7 +117,7 @@ describe Mongo::ServerSelector::Primary do
       let(:candidates) { [primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq([primary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
       end
     end
 
@@ -107,7 +125,7 @@ describe Mongo::ServerSelector::Primary do
       let(:candidates) { [secondary, primary] }
 
       it 'returns an array with the primary' do
-        expect(selector.send(:select, candidates)).to eq([primary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
       end
     end
 
@@ -121,7 +139,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_primary] }
 
           it 'returns array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
 
@@ -129,7 +147,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_secondary] }
 
           it 'returns empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
       end
@@ -140,7 +158,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_primary, far_secondary] }
 
           it 'returns an array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
 
@@ -148,7 +166,7 @@ describe Mongo::ServerSelector::Primary do
           let(:candidates) { [far_primary, far_secondary] }
 
           it 'returns an array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
       end

data/spec/mongo/server_selector/secondary_preferred_spec.rb

@@ -12,6 +12,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
   it_behaves_like 'a server selector with sensitive data in its options'
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector accepting hedge'
 
   describe '#initialize' do
 
@@ -107,15 +108,31 @@ describe Mongo::ServerSelector::SecondaryPreferred do
         expect(selector.to_mongos).to eq(expected)
       end
     end
-  end
 
-  describe '#select' do
+    context 'hedge provided' do
+      let(:hedge) { { enabled: true } }
+
+      it 'returns a formatted read preference' do
+        expect(selector.to_mongos).to eq({ mode: 'secondaryPreferred', hedge: { enabled: true } })
+      end
+    end
+
+    context 'hedge not provided' do
+      let(:hedge) { nil }
+
+      it 'returns nil' do
+        expect(selector.to_mongos).to be_nil
+      end
+    end
+
+  end
 
+  describe '#select_in_replica_set' do
     context 'no candidates' do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -123,7 +140,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       let(:candidates) { [primary] }
 
       it 'returns array with primary' do
-        expect(selector.send(:select, candidates)).to eq([primary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
       end
     end
 
@@ -131,7 +148,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       let(:candidates) { [secondary] }
 
       it 'returns array with secondary' do
-        expect(selector.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
       end
     end
 
@@ -140,7 +157,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       let(:expected) { [secondary, primary] }
 
       it 'returns array with secondary first, then primary' do
-        expect(selector.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
       end
     end
 
@@ -149,7 +166,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       let(:expected) { [secondary, primary] }
 
       it 'returns array with secondary and primary' do
-        expect(selector.send(:select, candidates)).to eq(expected)
+        expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
       end
     end
 
@@ -173,7 +190,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary] }
 
           it 'returns array with primary' do
-            expect(selector.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
           end
         end
 
@@ -181,7 +198,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [matching_primary] }
 
           it 'returns array with matching primary' do
-            expect(selector.send(:select, candidates)).to eq([matching_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_primary])
           end
         end
 
@@ -189,7 +206,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [matching_secondary] }
 
           it 'returns array with matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
 
@@ -197,7 +214,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [secondary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
       end
@@ -208,7 +225,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary, secondary, secondary] }
 
           it 'returns an array with the primary' do
-            expect(selector.send(:select, candidates)).to eq([primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([primary])
           end
         end
 
@@ -216,7 +233,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary, matching_secondary] }
 
           it 'returns an array of the matching secondary, then primary' do
-            expect(selector.send(:select, candidates)).to eq(
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(
               [matching_secondary, primary]
             )
           end
@@ -227,7 +244,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) { [matching_secondary, matching_secondary, primary] }
 
           it 'returns an array of the matching secondaries, then primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -236,7 +253,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) {[matching_secondary, matching_primary] }
 
           it 'returns an array of the matching secondary, then the primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
       end
@@ -252,7 +269,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [far_primary] }
 
           it 'returns array with primary' do
-            expect(selector.send(:select, candidates)).to eq([far_primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_primary])
           end
         end
 
@@ -260,7 +277,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
         end
       end
@@ -271,7 +288,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary, secondary] }
 
           it 'returns an array with secondary, then primary' do
-            expect(selector.send(:select, candidates)).to eq([secondary, primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary, primary])
           end
         end
 
@@ -279,7 +296,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:candidates) { [primary, far_secondary] }
 
           it 'returns an array with the secondary, then primary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary, primary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary, primary])
           end
         end
 
@@ -288,7 +305,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) { [secondary, far_primary] }
 
           it 'returns an array with secondary, then primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -297,7 +314,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
           let(:expected) { [far_secondary, far_primary] }
 
           it 'returns an array with secondary, then primary' do
-            expect(selector.send(:select, candidates)).to eq(expected)
+            expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
           end
         end
 
@@ -308,7 +325,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
             let(:expected) { [secondary, primary] }
 
             it 'returns an array with near secondary, then primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
 
@@ -317,7 +334,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
             let(:expected) { [secondary, secondary, far_primary] }
 
             it 'returns an array with secondaries, then primary' do
-              expect(selector.send(:select, candidates)).to eq(expected)
+              expect(selector.send(:select_in_replica_set, candidates)).to eq(expected)
             end
           end
         end