mongo 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c4b605a3e5313f94d6b6ea757c823eff8474def
-  data.tar.gz: 91e2b48a46fda17e05c59dbec5a2fd8f6ea7ada1
+  metadata.gz: 1a1eba07acbd5cbdc1ea149bee675c8cb19414fc
+  data.tar.gz: 94ede5709c9ed0d5aef5e05e19f6a4c90f5cc1d1
 SHA512:
-  metadata.gz: 12c90d51b5f44b11721f85e043565238dbfa483301c7448df034516a4facd51aa3c486feb2a4b60e822c9f10f154a2d2ea92bf2aebefa6a33ea8e1c3bf78258f
-  data.tar.gz: 9d3ffaa70dec92c43b5dcc43cc14183a9a7537ed0e2f1526f63e4ff9b2e648e99fff7b280828a0bb0e31d1740df86ba76320c33a24a2181a635028d8b8cae6bc
+  metadata.gz: 007196c1e574ed834d0cdf44cde761220a531367d303aa1f074955ac112af6cf16a43943f466a00f1b7e955902e702d0ca99c67a33571d9341095b7258d4ef57
+  data.tar.gz: b8fcc33bf2f9119ada0e8b5c3010ad9246dd7cc32daa6240980955dd680ddd4b8474e92f3ea0fcbe9178042e6536e324d42d6a476c9ef042563f2509d35068c2

data/VERSION

@@ -1 +1 @@
-1.10.1
+1.10.2

data/lib/mongo/bulk_write_collection_view.rb

@@ -294,9 +294,16 @@ module Mongo
         elsif op_type == :update
           n_upserted = 0
           if (upserted = response.fetch("upserted", nil)) # assignment
-            upserted = [{"_id" => upserted}] if upserted.class == BSON::ObjectId # OP_UPDATE non-array
+            upserted = [{"_id" => upserted}] if upserted.class != Array # OP_UPDATE non-array
             n_upserted = upserted.size
             concat(result, "upserted", merge_indexes(upserted, exchange))
+          elsif (response["updatedExisting"] == false && n == 1)
+            # workaround for DRIVERS-151 (non-ObjectID _id fields in pre-2.6 servers)
+            op = exchange[:batch][0]
+            missing_id = op[:u].fetch(:_id, op[:q][:_id]) # _id in update document takes precedence
+            upserted = [ { "_id" => missing_id, "index" => 0 } ]
+            n_upserted = n
+            concat(result, "upserted", merge_indexes(upserted, exchange))
           end
           tally(result, "nUpserted", n_upserted) if n_upserted > 0
           tally(result, "nMatched", n - n_upserted)

data/lib/mongo/connection/pool_manager.rb

@@ -17,6 +17,11 @@ module Mongo
     include ThreadLocalVariableManager
 
     attr_reader :client,
+                :hosts,
+                :pools,
+                :secondaries,
+                :secondary_pools,
+                :arbiters,
                 :primary,
                 :primary_pool,
                 :seeds,
@@ -36,12 +41,12 @@ module Mongo
       @client                                   = client
       @seeds                                    = seeds
 
+      initialize_immutable_state
+      initialize_mutable_state
+
       @pools                                    = Set.new
       @primary                                  = nil
       @primary_pool                             = nil
-      @secondaries                              = Set.new
-      @secondary_pools                          = []
-      @hosts                                    = Set.new
       @members                                  = Set.new
       @refresh_required                         = false
       @max_bson_size                            = DEFAULT_MAX_BSON_SIZE
@@ -70,6 +75,7 @@ module Mongo
           thread_local[:locks][:connecting_manager] = false
         end
       end
+      clone_state
     end
 
     def refresh!(additional_seeds)
@@ -140,47 +146,6 @@ module Mongo
       read_pool.host_port
     end
 
-    def hosts
-      @connect_mutex.synchronize do
-        @hosts.nil? ? nil : @hosts.clone
-      end
-    end
-
-    def pools
-      @connect_mutex.synchronize do
-        @pools.nil? ? nil : @pools.clone
-      end
-    end
-
-    def secondaries
-      @connect_mutex.synchronize do
-        @secondaries.nil? ? nil : @secondaries.clone
-      end
-    end
-
-    def secondary_pools
-      @connect_mutex.synchronize do
-        @secondary_pools.nil? ? nil : @secondary_pools.clone
-      end
-    end
-
-    def arbiters
-      @connect_mutex.synchronize do
-        @arbiters.nil? ? nil : @arbiters.clone
-      end
-    end
-
-    def state_snapshot
-      @connect_mutex.synchronize do
-        { :pools           => @pools.nil?           ? nil : @pools.clone,
-          :secondaries     => @secondaries.nil?     ? nil : @secondaries.clone,
-          :secondary_pools => @secondary_pools.nil? ? nil : @secondary_pools.clone,
-          :hosts           => @hosts.nil?           ? nil : @hosts.clone,
-          :arbiters        => @arbiters.nil?        ? nil : @arbiters.clone
-        }
-      end
-    end
-
     private
 
     def update_max_sizes
@@ -203,7 +168,7 @@ module Mongo
 
     # For any existing members, close and remove any that are unhealthy or already closed.
     def disconnect_old_members
-      @pools.reject!   {|pool| !pool.healthy? }
+      @pools_mutable.reject!   {|pool| !pool.healthy? }
       @members.reject! {|node| !node.healthy? }
     end
 
@@ -243,13 +208,13 @@ module Mongo
     def initialize_pools(members)
       @primary_pool = nil
       @primary = nil
-      @secondaries.clear
-      @secondary_pools.clear
-      @hosts.clear
+      @secondaries_mutable.clear
+      @secondary_pools_mutable.clear
+      @hosts_mutable.clear
 
       members.each do |member|
         member.last_state = nil
-        @hosts << member.host_string
+        @hosts_mutable << member.host_string
         if member.primary?
           assign_primary(member)
         elsif member.secondary?
@@ -258,13 +223,13 @@ module Mongo
         end
       end
 
-      @arbiters = members.first.arbiters
+      @arbiters_mutable = members.first.arbiters
     end
 
     def assign_primary(member)
       member.last_state = :primary
       @primary = member.host_port
-      if existing = @pools.detect {|pool| pool.node == member }
+      if existing = @pools_mutable.detect {|pool| pool.node == member }
         @primary_pool = existing
       else
         @primary_pool = Pool.new(self.client, member.host, member.port,
@@ -272,23 +237,23 @@ module Mongo
           :timeout => self.client.pool_timeout,
           :node => member
         )
-        @pools << @primary_pool
+        @pools_mutable << @primary_pool
       end
     end
 
     def assign_secondary(member)
       member.last_state = :secondary
-      @secondaries << member.host_port
-      if existing = @pools.detect {|pool| pool.node == member }
-        @secondary_pools << existing
+      @secondaries_mutable << member.host_port
+      if existing = @pools_mutable.detect {|pool| pool.node == member }
+        @secondary_pools_mutable << existing
       else
         pool = Pool.new(self.client, member.host, member.port,
           :size => self.client.pool_size,
           :timeout => self.client.pool_timeout,
           :node => member
         )
-        @secondary_pools << pool
-        @pools << pool
+        @secondary_pools_mutable << pool
+        @pools_mutable << pool
       end
     end
 
@@ -321,5 +286,35 @@ module Mongo
        end
        members
     end
+
+    def initialize_immutable_state
+      @hosts           = Set.new.freeze
+      @pools           = Set.new.freeze
+      @secondaries     = Set.new.freeze
+      @secondary_pools = [].freeze
+      @arbiters        = [].freeze
+    end
+
+    def initialize_mutable_state
+      @hosts_mutable           = Set.new
+      @pools_mutable           = Set.new
+      @secondaries_mutable     = Set.new
+      @secondary_pools_mutable = []
+      @arbiters_mutable        = []
+    end
+
+    def clone_state
+      @hosts           = @hosts_mutable.clone
+      @pools           = @pools_mutable.clone
+      @secondaries     = @secondaries_mutable.clone
+      @secondary_pools = @secondary_pools_mutable.clone
+      @arbiters        = @arbiters_mutable.clone
+
+      @hosts.freeze
+      @pools.freeze
+      @secondaries.freeze
+      @secondary_pools.freeze
+      @arbiters.freeze
+    end
   end
 end

data/mongo.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
   s.require_paths     = ['lib']
   s.has_rdoc          = 'yard'
 
-  s.add_dependency('bson', "~> #{s.version}")
+  s.add_dependency('bson', "#{s.version}")
 end

data/test/functional/bulk_write_collection_view_test.rb

@@ -339,6 +339,16 @@ class BulkWriteCollectionViewTest < Test::Unit::TestCase
       end
     end
 
+   # ----- REPLACE -----
+
+    should "raise an error when we attempt to use replace" do
+      assert_raise NoMethodError do
+        bulk = @collection.initialize_ordered_bulk_op
+        bulk.find({:a => 2}).replace({:a => 1})
+        bulk.execute
+      end
+    end
+
     # ----- REPLACE_ONE -----
 
     should "check arg for replacement, set :update, :u, :multi, terminate and return view for #replace_one" do
@@ -501,6 +511,27 @@ class BulkWriteCollectionViewTest < Test::Unit::TestCase
       end
     end
 
+    should "count nUpserted correctly when _id is not an ObjectId (upsert-update)" do
+      with_write_commands_and_operations(@db.connection) do |wire_version|
+        @collection.remove
+
+        bulk = @collection.initialize_unordered_bulk_op
+        bulk.find({:_id => 3}).upsert.update({"$set" => {:b => 3}})
+        result = bulk.execute
+        assert_match_document(
+            {
+                "ok" => 1,
+                "n" => 1,
+                "nMatched" => 0,
+                "nUpserted" => 1,
+                "nModified" => batch_commands?(wire_version) ? 0 : nil,
+                "upserted" => [
+                    { "_id" => 3, "index" => 0 }
+                ]
+            }, result, "wire_version:#{wire_version}")
+      end
+    end
+
     # ----- UPSERT-UPDATE_ONE -----
 
     should "#upsert a document without affecting non-upsert update_ones" do
@@ -544,6 +575,27 @@ class BulkWriteCollectionViewTest < Test::Unit::TestCase
       end
     end
 
+
+    should "count nUpserted correctly when _id is not an ObjectId (upsert-update_one)" do
+      with_write_commands_and_operations(@db.connection) do |wire_version|
+        @collection.remove
+        bulk = @collection.initialize_ordered_bulk_op
+        bulk.find({:_id => 2}).upsert.update_one({"$set" => {:x => 2}})
+        result = bulk.execute
+        assert_match_document(
+            {
+                "ok" => 1,
+                "n" => 1,
+                "nMatched" => 0,
+                "nUpserted" => 1,
+                "nModified" => batch_commands?(wire_version) ? 0 : nil,
+                "upserted" => [
+                    {"_id" => 2, "index" => 0 }
+                ]
+            }, result, "wire_version:#{wire_version}")
+      end
+    end
+
     # ----- UPSERT-REPLACE_ONE -----
 
     should "not affect non-upsert replace_ones in same batch as #upsert-replace_one" do
@@ -598,6 +650,28 @@ class BulkWriteCollectionViewTest < Test::Unit::TestCase
       assert_equal({"nM" => nil}, nil_tally_responses([{"nM" => 1}, {"nM" => nil}, {"nM" => 3}], "nM"))
     end
 
+
+    should "count nUpserted correctly when _id is not an ObjectId (upsert-replace_one)" do
+      with_write_commands_and_operations(@db.connection) do |wire_version|
+        @collection.remove
+        bulk = @collection.initialize_unordered_bulk_op
+        bulk.find({:a => 1}).upsert.replace_one({:_id => 2})
+        result = bulk.execute
+        assert_match_document(
+            {
+                "ok" => 1,
+                "n" => 1,
+                "nMatched" => 0,
+                "nUpserted" => 1,
+                "nModified" => batch_commands?(wire_version) ? 0 : nil,
+                "upserted" => [
+                                { "_id" => 2, "index" => 0 }
+                ]
+            }, result, "wire_version:#{wire_version}")
+        assert_equal 1, @collection.count
+      end
+    end
+
     # ----- MIXED OPS, ORDERED -----
 
     should "execute, return result and reset @ops for #execute" do

data/test/replica_set/refresh_test.rb

@@ -123,6 +123,24 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
     end
   end
 
+
+  def test_manager_recursive_locking
+    # See RUBY-775
+    # This tests that there isn't recursive locking when a pool manager reconnects
+    # to all replica set members. The bug in RUBY-775 occurred because the same lock
+    # acquired in order to connect the pool manager was used to read the pool manager's
+    # state.
+    client = MongoReplicaSetClient.new(@rs.repl_set_seeds)
+
+    cursor = client[TEST_DB]['rs-refresh-test'].find
+    client.stubs(:receive_message).raises(ConnectionFailure)
+    client.manager.stubs(:refresh_required?).returns(true)
+    client.manager.stubs(:check_connection_health).returns(true)
+    assert_raise ConnectionFailure do
+      cursor.next
+    end
+  end
+
 =begin
   def test_automated_refresh_with_removed_node
     client = MongoReplicaSetClient.new(@rs.repl_set_seeds,

data/test/unit/pool_manager_test.rb

@@ -106,37 +106,6 @@ class PoolManagerUnitTest < Test::Unit::TestCase
       assert_equal [['localhost', 27020]], manager.arbiters
     end
 
-    should "return clones of pool lists" do
-
-      @db.stubs(:command).returns(
-        # First call to get a socket.
-        @ismaster.merge({'ismaster' => true}),
-
-        # Subsequent calls to configure pools.
-        @ismaster.merge({'ismaster' => true}),
-        @ismaster.merge({'secondary' => true, 'maxBsonObjectSize' => 500}),
-        @ismaster.merge({'secondary' => true, 'maxMessageSizeBytes' => 700}),
-        @ismaster.merge({'arbiterOnly' => true})
-      )
-
-      seeds = [['localhost', 27017], ['localhost', 27018]]
-      manager = Mongo::PoolManager.new(@client, seeds)
-      @client.stubs(:local_manager).returns(manager)
-      manager.connect
-
-      assert_not_equal manager.instance_variable_get(:@arbiters).object_id, manager.arbiters.object_id
-      assert_not_equal manager.instance_variable_get(:@secondaries).object_id, manager.secondaries.object_id
-      assert_not_equal manager.instance_variable_get(:@secondary_pools).object_id, manager.secondary_pools.object_id
-      assert_not_equal manager.instance_variable_get(:@hosts).object_id, manager.hosts.object_id
-      assert_not_equal manager.instance_variable_get(:@pools).object_id, manager.pools.object_id
-
-      assert_not_equal manager.instance_variable_get(:@arbiters).object_id, manager.state_snapshot[:arbiters].object_id
-      assert_not_equal manager.instance_variable_get(:@secondaries).object_id, manager.state_snapshot[:secondaries].object_id
-      assert_not_equal manager.instance_variable_get(:@secondary_pools).object_id, manager.state_snapshot[:secondary_pools].object_id
-      assert_not_equal manager.instance_variable_get(:@hosts).object_id, manager.state_snapshot[:hosts].object_id
-      assert_not_equal manager.instance_variable_get(:@pools).object_id, manager.state_snapshot[:pools].object_id
-    end
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Emily Stolfo
@@ -34,22 +34,22 @@ cert_chain:
   JrZM8w8wGbIOeLtoQqa7HB/jOYbTahH7KMNh2LHAbOR93hNIJxVRa4iwxiMQ75tN
   9WUIAJ4AEtjwRg1Bz0OwDo3aucPCBpx77+/FWhv7JYY=
   -----END CERTIFICATE-----
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.10.2
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables: