mongo 2.0.0.beta → 2.0.0.rc

data/spec/mongo/operation/write/drop_index_spec.rb

@@ -11,7 +11,7 @@ describe Mongo::Operation::Write::DropIndex do
       end
 
       before do
-        authorized_collection.indexes.create(spec, unique: true)
+        authorized_collection.indexes.create_one(spec, unique: true)
       end
 
       let(:operation) do

data/spec/mongo/operation/write/insert_spec.rb

@@ -82,12 +82,12 @@ describe Mongo::Operation::Write::Insert do
   describe '#execute' do
 
     before do
-      authorized_collection.indexes.create({ name: 1 }, { unique: true })
+      authorized_collection.indexes.create_one({ name: 1 }, { unique: true })
     end
 
     after do
-      authorized_collection.find.remove_many
-      authorized_collection.indexes.drop({ name: 1 })
+      authorized_collection.find.delete_many
+      authorized_collection.indexes.drop_one('name_1')
     end
 
     context 'when inserting a single document' do

data/spec/mongo/operation/write/update_spec.rb

@@ -78,7 +78,7 @@ describe Mongo::Operation::Write::Update do
     end
 
     after do
-      authorized_collection.find.remove_many
+      authorized_collection.find.delete_many
     end
 
     context 'when updating a single document' do

data/spec/mongo/server_selection_spec.rb

@@ -28,7 +28,7 @@ describe 'Server Selection' do
           address = Mongo::Address.new(server['address'])
           Mongo::Server.new(address, Mongo::Event::Listeners.new).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
-            allow(s).to receive(:tags).and_return(server['tag_sets'].first)
+            allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
             allow(s).to receive(:primary?).and_return(server['type'] == 'RSPrimary')
           end
@@ -40,7 +40,7 @@ describe 'Server Selection' do
           address = Mongo::Address.new(server['address'])
           Mongo::Server.new(address, Mongo::Event::Listeners.new).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
-            allow(s).to receive(:tags).and_return(server['tag_sets'].first)
+            allow(s).to receive(:tags).and_return(server['tags'])
           end
         end
       end

data/spec/support/authorization.rb

@@ -74,7 +74,9 @@ TEST_USER = Mongo::Auth::User.new(
   password: 'password',
   roles: [
     { role: Mongo::Auth::Roles::READ_WRITE, db: TEST_DB },
-    { role: Mongo::Auth::Roles::DATABASE_ADMIN, db: TEST_DB }
+    { role: Mongo::Auth::Roles::DATABASE_ADMIN, db: TEST_DB },
+    { role: Mongo::Auth::Roles::READ_WRITE, db: 'invalid_database' },
+    { role: Mongo::Auth::Roles::DATABASE_ADMIN, db: 'invalid_database' }
   ]
 )
 
@@ -95,7 +97,7 @@ TEST_READ_WRITE_USER = Mongo::Auth::User.new(
 # The write concern to use in the tests.
 #
 # @since 2.0.0
-WRITE_CONCERN = CONNECT == :direct || :sharded ? { w: 1 } : { w: 'majority' }
+WRITE_CONCERN = (CONNECT == :replica_set) ? { w: ADDRESSES.size } : { w: 1 }
 
 # Provides an authorized mongo client on the default test database for the
 # default test user.

data/spec/support/server_selection.rb

@@ -56,12 +56,6 @@ module Mongo
         # @since 2.0.0
         attr_reader :suitable_servers
 
-        # @return [ Array<Hash> ] in_latency_window The subset of suitable servers that falls
-        #  within the allowable latency window.
-        #
-        # @since 2.0.0
-        attr_reader :in_latency_window
-
         # @return [ Mongo::Cluster::Topology ] type The topology type.
         #
         # @since 2.0.0
@@ -80,8 +74,7 @@ module Mongo
           @description = "#{@test['topology_description']['type']}: #{File.basename(file)}"
           @read_preference = @test['read_preference']
           @read_preference['mode'] = READ_PREFERENCES[@read_preference['mode']]
-          @candidate_servers = @test['candidate_servers']
-          @eligible_servers = @test['eligible_servers']
+          @candidate_servers = @test['topology_description']['servers']
           @suitable_servers = @test['suitable_servers']
           @in_latency_window = @test['in_latency_window']
           @type = TOPOLOGY_TYPES[@test['topology_description']['type']]
@@ -134,6 +127,30 @@ module Mongo
         def invalid_server_preference?
           read_preference['mode'] == 'Primary' && read_preference['tag_sets']
         end
+
+        # The subset of suitable servers that falls within the allowable latency
+        #   window.
+        # We have to correct for our server selection algorithm that adds the primary
+        #  to the end of the list for SecondaryPreferred read preference mode.
+        #
+        # @example Get the list of suitable servers within the latency window.
+        #   spec.in_latency_window
+        #
+        # @return [ Array<Hash> ] The servers within the latency window.
+        #
+        # @since 2.0.0
+        def in_latency_window
+          if read_preference['mode'] == :secondary_preferred && primary
+            return @in_latency_window.push(primary).uniq
+          end
+          @in_latency_window
+        end
+
+        private
+
+        def primary
+          @candidate_servers.find { |s| s['type'] == 'RSPrimary' }
+        end
       end
     end
   end

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/Nearest.yml

@@ -6,25 +6,19 @@ topology_description:
     address: b:27017
     avg_rtt_ms: 5
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
   - &2
     address: c:27017
     avg_rtt_ms: 100
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
 operation: read
 read_preference:
   mode: Nearest
   tag_sets:
   - data_center: nyc
-candidate_servers:
-- *1
-- *2
-eligible_servers:
-- *1
-- *2
 suitable_servers:
 - *1
 - *2

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/Nearest_non_matching.yml

@@ -2,26 +2,20 @@
 topology_description:
   type: ReplicaSetNoPrimary
   servers:
-  - &1
-    address: b:27017
+  - address: b:27017
     avg_rtt_ms: 5
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
-  - &2
-    address: c:27017
+    tags:
+      data_center: nyc
+  - address: c:27017
     avg_rtt_ms: 100
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
 operation: read
 read_preference:
   mode: Nearest
   tag_sets:
   - data_center: sf
-candidate_servers:
-- *1
-- *2
-eligible_servers: []
 suitable_servers: []
 in_latency_window: []

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/Primary.yml

@@ -5,19 +5,17 @@ topology_description:
   - address: b:27017
     avg_rtt_ms: 5
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
   - address: c:27017
     avg_rtt_ms: 100
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
 operation: read
 read_preference:
   mode: Primary
   tag_sets:
   - {}
-candidate_servers: []
-eligible_servers: []
 suitable_servers: []
 in_latency_window: []

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/PrimaryPreferred.yml

@@ -6,25 +6,19 @@ topology_description:
     address: b:27017
     avg_rtt_ms: 5
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
   - &2
     address: c:27017
     avg_rtt_ms: 100
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
 operation: read
 read_preference:
   mode: PrimaryPreferred
   tag_sets:
   - {}
-candidate_servers:
-- *1
-- *2
-eligible_servers:
-- *1
-- *2
 suitable_servers:
 - *1
 - *2

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/PrimaryPreferred_non_matching.yml

@@ -2,26 +2,20 @@
 topology_description:
   type: ReplicaSetNoPrimary
   servers:
-  - &1
-    address: b:27017
+  - address: b:27017
     avg_rtt_ms: 5
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
-  - &2
-    address: c:27017
+    tags:
+      data_center: nyc
+  - address: c:27017
     avg_rtt_ms: 100
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
 operation: read
 read_preference:
   mode: PrimaryPreferred
   tag_sets:
   - data_center: sf
-candidate_servers:
-- *1
-- *2
-eligible_servers: []
 suitable_servers: []
 in_latency_window: []

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/Secondary.yml

@@ -6,25 +6,19 @@ topology_description:
     address: b:27017
     avg_rtt_ms: 5
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
   - &2
     address: c:27017
     avg_rtt_ms: 100
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
 operation: read
 read_preference:
   mode: Secondary
   tag_sets:
   - data_center: nyc
-candidate_servers:
-- *1
-- *2
-eligible_servers:
-- *1
-- *2
 suitable_servers:
 - *1
 - *2

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/SecondaryPreferred.yml

@@ -6,25 +6,19 @@ topology_description:
     address: b:27017
     avg_rtt_ms: 5
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
   - &2
     address: c:27017
     avg_rtt_ms: 100
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
 operation: read
 read_preference:
   mode: SecondaryPreferred
   tag_sets:
   - data_center: nyc
-candidate_servers:
-- *1
-- *2
-eligible_servers:
-- *1
-- *2
 suitable_servers:
 - *1
 - *2

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/SecondaryPreferred_non_matching.yml

@@ -2,26 +2,20 @@
 topology_description:
   type: ReplicaSetNoPrimary
   servers:
-  - &1
-    address: b:27017
+  - address: b:27017
     avg_rtt_ms: 5
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
-  - &2
-    address: c:27017
+    tags:
+      data_center: nyc
+  - address: c:27017
     avg_rtt_ms: 100
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
 operation: read
 read_preference:
   mode: SecondaryPreferred
   tag_sets:
   - data_center: sf
-candidate_servers:
-- *1
-- *2
-eligible_servers: []
 suitable_servers: []
 in_latency_window: []

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/Secondary_non_matching.yml

@@ -2,26 +2,20 @@
 topology_description:
   type: ReplicaSetNoPrimary
   servers:
-  - &1
-    address: b:27017
+  - address: b:27017
     avg_rtt_ms: 5
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
-  - &2
-    address: c:27017
+    tags:
+      data_center: nyc
+  - address: c:27017
     avg_rtt_ms: 100
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
 operation: read
 read_preference:
   mode: Secondary
   tag_sets:
   - data_center: sf
-candidate_servers:
-- *1
-- *2
-eligible_servers: []
 suitable_servers: []
 in_latency_window: []

data/spec/support/server_selection/selection/ReplicaSetWithPrimary/read/Nearest.yml

@@ -6,36 +6,28 @@ topology_description:
     address: b:27017
     avg_rtt_ms: 5
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
-  - &2
+    tags:
+      data_center: nyc
+  - &3
     address: c:27017
     avg_rtt_ms: 100
     type: RSSecondary
-    tag_sets:
-    - data_center: nyc
-  - &3
+    tags:
+      data_center: nyc
+  - &2
     address: a:27017
     avg_rtt_ms: 26
     type: RSPrimary
-    tag_sets:
-    - data_center: nyc
+    tags:
+      data_center: nyc
 operation: read
 read_preference:
   mode: Nearest
   tag_sets:
   - data_center: nyc
-candidate_servers:
-- *1
-- *2
-- *3
-eligible_servers:
-- *1
-- *2
-- *3
 suitable_servers:
 - *1
-- *3
 - *2
+- *3
 in_latency_window:
 - *1