mongo 1.8.3.rc1 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec398480b1b7ced8276797d36e9257fecbc1707
-  data.tar.gz: 735c75e4d0877dc57cfede2016201a121737af4b
+  metadata.gz: 9292e4cac6a44329fb7c7940421fe07ff8e787bd
+  data.tar.gz: 14a5d525f6fd6cefe6694576e02d841d2882994b
 SHA512:
-  metadata.gz: fe1e61dcef314f5ea551c7e1f96ccbeae3aa7969d714c2774dd17a694912267b14f86a3f9c73ccea0d0a3f2b4e3ad72c319c46ab2c9a28001f7a005f7d1de87f
-  data.tar.gz: 37d440db17fd4820dabfecf12b4da396ec8912593ef15256fc86e8839a1e3e1952f12bb484165069e5a63dffd4cdcd3eff031393881867b3ce3fea73cb99cea3
+  metadata.gz: b58e0adafd2a3b6522a74c87c8aaae7ea7ae2968fc8fa83b1fe0851accc74df459e683d3755a5d96d84509d19b6b3e11c55d35a6ed4024997b28d847dd587233
+  data.tar.gz: a910cea9b47023cd6bca4771557d00e435f2acc9234acafcfd43445e82ab947e941bca3db71afb2030aeedb1454e0956bf530b8e82b6b606b5a9d5b9fd404e1b

data.tar.gz.sig

@@ -1,3 +1 @@
-`�m���mO���ۧqD��ij�\j
-��:��Ԍ{*Hm��}#]�9��Pu9)=4rQ���1�R��/��|�����J_Ş�6*
-���%�H����b�mtgϳ�@	�����B.��.�@'s/�ó'���E��T��]ɘ)_��ݻxD�'��̰7��'����6�Q;����>�MP����L/�O�͈����_"c��2��Q���os�m��%8��Yp�?��2��`�w��Q�n�l��(CBs\�
+(K��[���yܷ�Y��/���#rC�l�o���30ij�~a���E6Bc\X%YJQ�s�'M

data/VERSION

@@ -1 +1 @@
-1.8.3.rc1
+1.8.3

data/lib/mongo/cursor.rb

@@ -552,7 +552,7 @@ module Mongo
       message.put_int(@options)
       BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@collection.name}")
       message.put_int(@skip)
-      message.put_int(@limit)
+      @batch_size > 1 ? message.put_int(@batch_size) : message.put_int(@limit)
       spec = query_contains_special_fields? ? construct_query_spec : @selector
       message.put_binary(BSON::BSON_CODER.serialize(spec, false, false, @connection.max_bson_size).to_s)
       message.put_binary(BSON::BSON_CODER.serialize(@fields, false, false, @connection.max_bson_size).to_s) if @fields

data/test/functional/collection_test.rb

@@ -902,6 +902,66 @@ class TestCollection < Test::Unit::TestCase
     # assert_equal :mike, @@test.find_one("foo" => "mike")["foo"]
   end
 
+  def test_batch_size
+    n_docs = 6
+    batch_size = n_docs/2
+    n_docs.times do |i|
+      @@test.save(:foo => i)
+    end
+
+    doc_count = 0
+    cursor = @@test.find({}, :batch_size => batch_size)
+    cursor.next
+    assert_equal batch_size, cursor.instance_variable_get(:@returned)
+    doc_count += batch_size
+    batch_size.times { cursor.next }
+    assert_equal doc_count + batch_size, cursor.instance_variable_get(:@returned)
+    doc_count += batch_size
+    assert_equal n_docs, doc_count
+  end
+
+  def test_batch_size_with_smaller_limit
+    n_docs = 6
+    batch_size = n_docs/2
+    n_docs.times do |i|
+      @@test.insert(:foo => i)
+    end
+
+    cursor = @@test.find({}, :batch_size => batch_size, :limit => 2)
+    cursor.next
+    assert_equal 2, cursor.instance_variable_get(:@returned)
+  end
+
+  def test_batch_size_with_larger_limit
+    n_docs = 6
+    batch_size = n_docs/2
+    n_docs.times do |i|
+      @@test.insert(:foo => i)
+    end
+
+    doc_count = 0
+    cursor = @@test.find({}, :batch_size => batch_size, :limit => n_docs + 5)
+    cursor.next
+    assert_equal batch_size, cursor.instance_variable_get(:@returned)
+    doc_count += batch_size
+    batch_size.times { cursor.next }
+    assert_equal doc_count + batch_size, cursor.instance_variable_get(:@returned)
+    doc_count += batch_size
+    assert_equal n_docs, doc_count
+end
+
+  def test_batch_size_with_negative_limit
+    n_docs = 6
+    batch_size = n_docs/2
+    n_docs.times do |i|
+      @@test.insert(:foo => i)
+    end
+
+    cursor = @@test.find({}, :batch_size => batch_size, :limit => -7)
+    cursor.next
+    assert_equal n_docs, cursor.instance_variable_get(:@returned)
+  end
+
   def test_limit_and_skip
     10.times do |i|
       @@test.save(:foo => i)

data/test/replica_set/cursor_test.rb

@@ -41,6 +41,11 @@ class ReplicaSetCursorTest < Test::Unit::TestCase
     assert_cursors_on_members(:secondary)
   end
 
+  def test_intervening_query_secondary
+    setup_client(:primary)
+    refresh_while_iterating(:secondary)
+  end
+
   private
 
   def setup_client(read=:primary)
@@ -169,4 +174,25 @@ class ReplicaSetCursorTest < Test::Unit::TestCase
       cursor_clone.next
     end
   end
+
+  def refresh_while_iterating(read)
+    set_read_client_and_tag(read)
+
+    read_opts = {:read => read}
+    read_opts[:tag_sets] = [{:node => @tag}]
+    read_opts[:batch_size] = 2
+    cursor = @coll.find({}, read_opts)
+
+    2.times { cursor.next }
+    port = cursor.instance_variable_get(:@pool).port
+    host = cursor.instance_variable_get(:@pool).host
+    # Refresh connection
+    @client.refresh
+    assert_nothing_raised do
+      cursor.next
+    end
+
+    assert_equal port, cursor.instance_variable_get(:@pool).port
+    assert_equal host, cursor.instance_variable_get(:@pool).host
+  end
 end

data/test/replica_set/refresh_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'benchmark'
 
 class ReplicaSetRefreshTest < Test::Unit::TestCase
 
@@ -7,98 +6,76 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
     ensure_cluster(:rs)
   end
 
-  def test_connect_and_manual_refresh_with_secondaries_down
+  def test_connect_and_manual_refresh_with_secondary_down
     num_secondaries = @rs.secondaries.size
     client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :refresh_mode => false)
 
     assert_equal num_secondaries, client.secondaries.size
     assert client.connected?
     assert_equal client.read_pool, client.primary_pool
+    old_refresh_version = client.refresh_version
 
-    @rs.secondaries.each {|s| s.stop}
+    @rs.stop_secondary
 
     client.refresh
-    assert client.secondaries.empty?
+    assert_equal num_secondaries - 1, client.secondaries.size
     assert client.connected?
     assert_equal client.read_pool, client.primary_pool
+    assert client.refresh_version > old_refresh_version
+    old_refresh_version = client.refresh_version
 
     # Test no changes after restart until manual refresh
     @rs.restart
-    assert client.secondaries.empty?
+    assert_equal num_secondaries - 1, client.secondaries.size
     assert client.connected?
     assert_equal client.read_pool, client.primary_pool
+    assert_equal client.refresh_version, old_refresh_version
 
     # Refresh and ensure state
     client.refresh
-    assert_equal client.read_pool, client.primary_pool
     assert_equal num_secondaries, client.secondaries.size
+    assert client.connected?
+    assert_equal client.read_pool, client.primary_pool
+    assert client.refresh_version > old_refresh_version
   end
 
-  def test_automated_refresh_with_secondaries_down
+  def test_automated_refresh_with_secondary_down
     num_secondaries = @rs.secondaries.size
     client = MongoReplicaSetClient.new(@rs.repl_set_seeds,
       :refresh_interval => 1, :refresh_mode => :sync, :read => :secondary_preferred)
 
-    # Ensure secondaries not available and read from primary
+    # Ensure secondaries are all recognized by client and client is connected
     assert_equal num_secondaries, client.secondaries.size
     assert client.connected?
     assert client.secondary_pools.include?(client.read_pool)
+    pool = client.read_pool
 
-    @rs.secondaries.each{|s| s.stop}
+    @rs.member_by_name(pool.host_string).stop
     sleep(2)
 
+    old_refresh_version = client.refresh_version
+    # Trigger synchronous refresh
     client['foo']['bar'].find_one
 
-    assert client.secondaries.empty?
     assert client.connected?
-    assert_equal client.read_pool, client.primary_pool
-
-    old_refresh_version = client.refresh_version
+    assert client.refresh_version > old_refresh_version
+    assert_equal num_secondaries - 1, client.secondaries.size
+    assert client.secondary_pools.include?(client.read_pool)
+    assert_not_equal pool, client.read_pool
 
     # Restart nodes and ensure refresh interval has passed
     @rs.restart
     sleep(2)
 
-    assert client.refresh_version == old_refresh_version,
-      "Refresh version has changed."
-
+    old_refresh_version = client.refresh_version
     # Trigger synchronous refresh
     client['foo']['bar'].find_one
 
+    assert client.connected?
     assert client.refresh_version > old_refresh_version,
       "Refresh version hasn't changed."
     assert_equal num_secondaries, client.secondaries.size
       "No secondaries have been added."
-    assert client.manager.read_pool != client.manager.primary,
-      "Read pool and primary pool are identical."
-  end
-  
-  def test_automated_refresh_when_secondary_goes_down
-    client = MongoReplicaSetClient.new(@rs.repl_set_seeds,
-      :refresh_interval => 1, :refresh_mode => :sync)
-
-    num_secondaries = client.secondary_pools.size
-    old_refresh_version = client.refresh_version
-
-    @rs.stop_secondary
-    sleep(2)
-
-    assert client.refresh_version == old_refresh_version,
-      "Refresh version has changed."
-
-    client['foo']['bar'].find_one
-
-    assert client.refresh_version > old_refresh_version,
-      "Refresh version hasn't changed."
-    assert_equal num_secondaries - 1, client.secondaries.size
-    assert_equal num_secondaries - 1, client.secondary_pools.size
-
-    @rs.restart
-    sleep(2)
-
-    client['foo']['bar'].find_one
-
-    assert_equal num_secondaries, client.secondaries.size
     assert_equal num_secondaries, client.secondary_pools.size
   end
 =begin
@@ -150,4 +127,4 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
     assert_equal 2, client.secondaries.length
   end
 =end
-end
+end

data/test/tools/mongo_config.rb

@@ -430,10 +430,14 @@ module Mongo
 
       def members_by_name(names)
         names.collect do |name|
-          servers.find{|server| server.host_port == name}
+          member_by_name(name)
         end.compact
       end
 
+      def member_by_name(name)
+        servers.find{|server| server.host_port == name}
+      end
+
       def primary
         members_by_name([primary_name]).first
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 1.8.3.rc1
+  version: 1.8.3
 platform: ruby
 authors:
 - Tyler Brock
@@ -33,7 +33,7 @@ cert_chain:
   8v7zLF2XliYbfurYIwkcXs8yPn8ggApBIy9bX6VJxRs/l2+UvqzaHIFaFy/F8/GP
   RNTuXsVG5NDACo7Q
   -----END CERTIFICATE-----
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -41,14 +41,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.3.rc1
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.3.rc1
+        version: 1.8.3
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables:
@@ -173,9 +173,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: mongo
 rubygems_version: 2.0.0
@@ -249,4 +249,3 @@ test_files:
 - test/unit/safe_test.rb
 - test/unit/util_test.rb
 - test/unit/write_concern_test.rb
-has_rdoc: yard