mongo 1.3.0 → 1.12.5

data/test/unit/safe_test.rb

@@ -1,65 +1,79 @@
-require './test/test_helper'
-
-class SafeTest < Test::Unit::TestCase
-
-  context "Safe mode on connection: " do
+# Copyright (C) 2009-2013 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'test_helper'
+
+class SafeUnitTest < Test::Unit::TestCase
+
+  context "Write-Concern modes on Mongo::Connection " do
     setup do
-      @safe_value = {:w => 7}
-      @con = Mongo::Connection.new('localhost', 27017, :safe => @safe_value, :connect => false)
+      @safe_value = {:w => 7, :j => false, :fsync => false, :wtimeout => nil}
+      @connection = Mongo::Connection.new('localhost', 27017, :safe => @safe_value, :connect => false)
     end
 
     should "propogate to DB" do
-      db = @con['foo']
-      assert_equal @safe_value, db.safe
+      db = @connection[TEST_DB]
+      assert_equal @safe_value[:w], db.write_concern[:w]
 
 
-      db = @con.db('foo')
-      assert_equal @safe_value, db.safe
+      db = @connection.db(TEST_DB)
+      assert_equal @safe_value[:w], db.write_concern[:w]
 
-      db = DB.new('foo', @con)
-      assert_equal @safe_value, db.safe
+      db = DB.new(TEST_DB, @connection)
+      assert_equal @safe_value[:w], db.write_concern[:w]
     end
 
     should "allow db override" do
-      db = DB.new('foo', @con, :safe => false)
-      assert_equal false, db.safe
+      db = DB.new(TEST_DB, @connection, :safe => false)
+      assert_equal 0, db.write_concern[:w]
 
-      db = @con.db('foo', :safe => false)
-      assert_equal false, db.safe
+      db = @connection.db(TEST_DB, :safe => false)
+      assert_equal 0, db.write_concern[:w]
     end
 
     context "on DB: " do
       setup do
-        @db = @con['foo']
+        @db = @connection[TEST_DB]
       end
 
       should "propogate to collection" do
         col = @db.collection('bar')
-        assert_equal @safe_value, col.safe
+        assert_equal @safe_value, col.write_concern
 
         col = @db['bar']
-        assert_equal @safe_value, col.safe
+        assert_equal @safe_value, col.write_concern
 
         col = Collection.new('bar', @db)
-        assert_equal @safe_value, col.safe
+        assert_equal @safe_value, col.write_concern
       end
 
       should "allow override on collection" do
         col = @db.collection('bar', :safe => false)
-        assert_equal false, col.safe
+        assert_equal 0, col.write_concern[:w]
 
         col = Collection.new('bar', @db, :safe => false)
-        assert_equal false, col.safe
+        assert_equal 0, col.write_concern[:w]
       end
     end
 
     context "on operations supporting safe mode" do
       setup do
-        @col = @con['foo']['bar']
+        @col = @connection[TEST_DB]['bar']
       end
 
       should "use default value on insert" do
-        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
+        @connection.expects(:send_message_with_gle).with do |op, msg, log, n, safe|
           safe == @safe_value
         end
 
@@ -67,20 +81,20 @@ class SafeTest < Test::Unit::TestCase
       end
 
       should "allow override alternate value on insert" do
-        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
-          safe == {:w => 100}
+        @connection.expects(:send_message_with_gle).with do |op, msg, log, n, safe|
+          safe == {:w => 100, :j => false, :fsync => false, :wtimeout => nil}
         end
 
         @col.insert({:a => 1}, :safe => {:w => 100})
       end
 
       should "allow override to disable on insert" do
-        @con.expects(:send_message)
+        @connection.expects(:send_message)
         @col.insert({:a => 1}, :safe => false)
       end
 
       should "use default value on update" do
-        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
+        @connection.expects(:send_message_with_gle).with do |op, msg, log, n, safe|
           safe == @safe_value
         end
 
@@ -88,20 +102,39 @@ class SafeTest < Test::Unit::TestCase
       end
 
       should "allow override alternate value on update" do
-        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
-          safe == {:w => 100}
+        @connection.expects(:send_message_with_gle).with do |op, msg, log, n, safe|
+          safe == {:w => 100, :j => false, :fsync => false, :wtimeout => nil}
         end
 
         @col.update({:a => 1}, {:a => 2}, :safe => {:w => 100})
       end
 
       should "allow override to disable on update" do
-        @con.expects(:send_message)
+        @connection.expects(:send_message)
         @col.update({:a => 1}, {:a => 2}, :safe => false)
       end
 
+      should "use default value on save" do
+        @connection.expects(:send_message_with_gle).with do |op, msg, log, n, safe|
+          safe == @safe_value
+        end
+        @col.save({:a => 1})
+      end
+
+      should "allow override alternate value on save" do
+        @connection.expects(:send_message_with_gle).with do |op, msg, log, n, safe|
+          safe == @safe_value.merge(:w => 1)
+        end
+        @col.save({:a => 1}, :safe => true)
+      end
+
+      should "allow override to disable on save" do
+        @connection.expects(:send_message)
+        @col.save({:a => 1}, :safe => false)
+      end
+
       should "use default value on remove" do
-        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
+        @connection.expects(:send_message_with_gle).with do |op, msg, log, n, safe|
           safe == @safe_value
         end
 
@@ -109,15 +142,15 @@ class SafeTest < Test::Unit::TestCase
       end
 
       should "allow override alternate value on remove" do
-        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
-          safe == {:w => 100}
+        @connection.expects(:send_message_with_gle).with do |op, msg, log, n, safe|
+          safe == {:w => 100, :j => false, :fsync => false, :wtimeout => nil}
         end
 
         @col.remove({}, :safe => {:w => 100})
       end
 
       should "allow override to disable on remove" do
-        @con.expects(:send_message)
+        @connection.expects(:send_message)
         @col.remove({}, :safe => false)
       end
     end

data/test/unit/sharding_pool_manager_test.rb

@@ -0,0 +1,84 @@
+# Copyright (C) 2009-2013 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'test_helper'
+include Mongo
+
+class ShardingPoolManagerUnitTest < Test::Unit::TestCase
+
+  context "Initialization: " do
+
+    setup do
+      TCPSocket.stubs(:new).returns(new_mock_socket)
+      @db = new_mock_db
+
+      @client = stub("MongoShardedClient")
+      @client.stubs(:connect_timeout).returns(5)
+      @client.stubs(:op_timeout).returns(5)
+      @client.stubs(:pool_size).returns(2)
+      @client.stubs(:pool_timeout).returns(100)
+      @client.stubs(:socket_class).returns(TCPSocket)
+      @client.stubs(:mongos?).returns(true)
+      @client.stubs(:[]).returns(@db)
+      @client.stubs(:socket_opts)
+
+      @client.stubs(:replica_set_name).returns(nil)
+      @client.stubs(:log)
+      @arbiters = ['localhost:27020']
+      @hosts = [
+        'localhost:27017',
+        'localhost:27018',
+        'localhost:27019'
+      ]
+
+      @ismaster = {
+        'hosts' => @hosts,
+        'arbiters' => @arbiters,
+        'maxBsonObjectSize' => 1024,
+        'maxMessageSizeBytes' => 1024 * 2.5,
+        'maxWireVersion' => 1,
+        'minWireVersion' => 0
+      }
+    end
+
+    should "populate pools correctly" 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({'secondary' => true, 'maxWireVersion' => 0}),
+        @ismaster.merge({'secondary' => true, 'minWireVersion' => 0}),
+        @ismaster.merge({'arbiterOnly' => true})
+      )
+
+      seed = ['localhost:27017']
+      manager = Mongo::ShardingPoolManager.new(@client, seed)
+      @client.stubs(:local_manager).returns(manager)
+      manager.connect
+
+      formatted_seed = ['localhost', 27017]
+
+      assert manager.seeds.include? formatted_seed
+      assert_equal 500, manager.max_bson_size
+      assert_equal 700, manager.max_message_size
+      assert_equal 0, manager.max_wire_version
+      assert_equal 0, manager.min_wire_version
+    end
+  end
+end

data/test/unit/write_concern_test.rb

@@ -0,0 +1,175 @@
+# Copyright (C) 2009-2013 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'test_helper'
+
+class WriteConcernUnitTest < Test::Unit::TestCase
+
+  context "Write-Concern modes on Mongo::MongoClient " do
+    setup do
+      @write_concern = {
+        :w        => 7,
+        :j        => false,
+        :fsync    => false,
+        :wtimeout => nil
+      }
+
+      class Mongo::MongoClient
+        public :build_get_last_error_message, :build_command_message
+      end
+
+      @client =
+        MongoClient.new('localhost', 27017,
+          @write_concern.merge({:connect => false}))
+    end
+
+    should "propogate to DB" do
+      db = @client[TEST_DB]
+      assert_equal @write_concern, db.write_concern
+
+
+      db = @client.db(TEST_DB)
+      assert_equal @write_concern, db.write_concern
+
+      db = DB.new(TEST_DB, @client)
+      assert_equal @write_concern, db.write_concern
+    end
+
+    should "allow db override" do
+      db = DB.new(TEST_DB, @client, :w => 0)
+      assert_equal 0, db.write_concern[:w]
+
+      db = @client.db(TEST_DB, :w => 0)
+      assert_equal 0, db.write_concern[:w]
+    end
+
+    context "on DB: " do
+      setup do
+        @db = @client[TEST_DB]
+      end
+
+      should "propogate to collection" do
+        collection = @db.collection('bar')
+        assert_equal @write_concern, collection.write_concern
+
+        collection = @db['bar']
+        assert_equal @write_concern, collection.write_concern
+
+        collection = Collection.new('bar', @db)
+        assert_equal @write_concern, collection.write_concern
+      end
+
+      should "allow override on collection" do
+        collection = @db.collection('bar', :w => 0)
+        assert_equal 0, collection.write_concern[:w]
+
+        collection = Collection.new('bar', @db, :w => 0)
+        assert_equal 0, collection.write_concern[:w]
+      end
+    end
+
+    context "on operations supporting 'gle' mode" do
+      setup do
+        @collection = @client[TEST_DB]['bar']
+      end
+
+      should "not send w = 1 to the server" do
+        gle = @client.build_get_last_error_message("fake", {:w => 1})
+        assert_equal gle, @client.build_command_message("fake", {:getlasterror => 1})
+      end
+
+      should "use default value on insert" do
+        @client.expects(:send_message_with_gle).with do |op, msg, log, n, wc|
+          wc == @write_concern
+        end
+
+        @collection.insert({:a => 1})
+      end
+
+      should "allow override alternate value on insert" do
+        @client.expects(:send_message_with_gle).with do |op, msg, log, n, wc|
+          wc == {:w => 100, :j => false, :fsync => false, :wtimeout => nil}
+        end
+
+        @collection.insert({:a => 1}, {:w => 100})
+      end
+
+      should "allow override to disable on insert" do
+        @client.expects(:send_message)
+        @collection.insert({:a => 1}, :w => 0)
+      end
+
+      should "use default value on update" do
+        @client.expects(:send_message_with_gle).with do |op, msg, log, n, wc|
+          wc == @write_concern
+        end
+
+        @collection.update({:a => 1}, {:a => 2})
+      end
+
+      should "allow override alternate value on update" do
+        @client.expects(:send_message_with_gle).with do |op, msg, log, n, wc|
+          wc == {:w => 100, :j => false, :fsync => false, :wtimeout => nil}
+        end
+
+        @collection.update({:a => 1}, {:a => 2}, {:w => 100})
+      end
+
+      should "allow override to disable on update" do
+        @client.expects(:send_message)
+        @collection.update({:a => 1}, {:a => 2}, :w => 0)
+      end
+
+      should "use default value on save" do
+        @client.expects(:send_message_with_gle).with do |op, msg, log, n, wc|
+          wc == @write_concern
+        end
+        @collection.save({:a => 1})
+      end
+
+      should "allow override alternate value on save" do
+        @client.expects(:send_message_with_gle).with do |op, msg, log, n, wc|
+          wc == @write_concern.merge(:w => 1)
+        end
+        @collection.save({:a => 1}, :w => 1)
+      end
+
+      should "allow override to disable on save" do
+        @client.expects(:send_message)
+        @collection.save({:a => 1}, :w => 0)
+      end
+
+      should "use default value on remove" do
+        @client.expects(:send_message_with_gle).with do |op, msg, log, n, wc|
+          wc == @write_concern
+        end
+
+        @collection.remove
+      end
+
+      should "allow override alternate value on remove" do
+        @client.expects(:send_message_with_gle).with do |op, msg, log, n, wc|
+          wc == {:w => 100, :j => false, :fsync => false, :wtimeout => nil}
+        end
+
+        @collection.remove({}, {:w => 100})
+      end
+
+      should "allow override to disable on remove" do
+        @client.expects(:send_message)
+        @collection.remove({}, :w => 0)
+      end
+    end
+  end
+end

data.tar.gz.sig

@@ -0,0 +1,3 @@
+C��=�%˔b{?�@J��6�tI�B��gr�W��NB�)ٙ2�4�j�G��^]vM��(�0@{l�!�3�/:}��{#�r�
+q
+�x9s�����ۊ{u��3+y�������J��<K)k_�jӴ�#>ϟ���b9���1���p��6��:���,-���dO���v�A��U�w��QecΦH��p�Fw���6s�K
 /�������?����$&#���]J4���n9�b�du��ɝ�w}�@$}t��