mongo 1.12.0.rc1 → 1.12.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c40b2e0b36d1dab70bbf23b20961b950469a640
-  data.tar.gz: e5c58505d9876a76b88ad649292e2472b78c5d4d
+  metadata.gz: 07c50e679638684c8277ec5ddd42f271cce1483e
+  data.tar.gz: e64b8dc7593cb392f7b5cbefec0d8a4f3e762579
 SHA512:
-  metadata.gz: e35166ca0624f7b166f2761ee67b166a2c4e7893c317452c529d04e270f03d986b76c22138f5b32546ef5decea0fc4f24fb26bea066ba8bdc6e0245f62727ec4
-  data.tar.gz: 6b49f4cceb3e1ecafe5cbaaa5e0c7a54ae295735e43d9b36cf0ad88d1167165190215468d3eccce6d57d21c9f1e904bec35167af289f2c1590ebb3df44c7b2b9
+  metadata.gz: 75165e8744c3f9429898d168bbc22a454942511fb6eae921e8191ea851fb4f307a59eab075d4cfc14bbc299e4852a1865be48a6bce40a077f81612f5f4162597
+  data.tar.gz: 78d4dedec4689c70597d4ddaed620e43d57c0fa24fd48a6ea2ea53f182026faebb980dec2dcbfb1ffdc53fc666cae322f377733a18e96e248553bea166371044

data/VERSION

@@ -1 +1 @@
-1.12.0.rc1
+1.12.0.rc2

data/lib/mongo/collection.rb

@@ -729,7 +729,8 @@ module Mongo
         seed = {
           :cursor_id => cursor_info['id'],
           :first_batch => cursor_info['firstBatch'],
-          :pool => pinned_pool
+          :pool => pinned_pool,
+          :ns => cursor_info['ns']
         }
 
         return Cursor.new(self, seed.merge!(opts))
@@ -901,7 +902,8 @@ module Mongo
         seed = {
           :cursor_id   => cursor_info['cursor']['id'],
           :first_batch => cursor_info['cursor']['firstBatch'],
-          :pool        => pinned_pool
+          :pool        => pinned_pool,
+          :ns          => cursor_info['ns']
         }
         Cursor.new(self, seed.merge!(opts))
       end

data/lib/mongo/cursor.rb

@@ -23,8 +23,7 @@ module Mongo
     include Mongo::ReadPreference
 
     attr_reader :collection, :selector, :fields,
-      :order, :hint, :snapshot, :timeout,
-      :full_collection_name, :transformer,
+      :order, :hint, :snapshot, :timeout, :transformer,
       :options, :cursor_id, :show_disk_loc,
       :comment, :compile_regex, :read, :tag_sets,
       :acceptable_latency
@@ -40,6 +39,7 @@ module Mongo
       @cursor_id  = opts.delete(:cursor_id)
       @db         = collection.db
       @collection = collection
+      @ns         = opts.delete(:ns)
       @connection = @db.connection
       @logger     = @connection.logger
 
@@ -83,7 +83,6 @@ module Mongo
 
       batch_size(opts.delete(:batch_size) || 0)
 
-      @full_collection_name = "#{@collection.db.name}.#{@collection.name}"
       @cache                = opts.delete(:first_batch) || []
       @returned             = 0
 
@@ -124,6 +123,10 @@ module Mongo
       @cursor_id && @cursor_id != 0
     end
 
+    def full_collection_name
+      @ns || "#{@collection.db.name}.#{@collection.name}"
+    end
+
     # Get the next document specified the cursor options.
     #
     # @return [Hash, Nil] the next document or Nil if no documents remain.
@@ -484,7 +487,7 @@ module Mongo
 
     # Clean output for inspect.
     def inspect
-      "<Mongo::Cursor:0x#{object_id.to_s(16)} namespace='#{@db.name}.#{@collection.name}' " +
+      "<Mongo::Cursor:0x#{object_id.to_s(16)} namespace='#{full_collection_name}' " +
         "@selector=#{@selector.inspect} @cursor_id=#{@cursor_id}>"
     end
 
@@ -580,7 +583,7 @@ module Mongo
       message = BSON::ByteBuffer.new([0, 0, 0, 0])
 
       # DB name.
-      BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@collection.name}")
+      BSON::BSON_RUBY.serialize_cstr(message, full_collection_name)
 
       # Number of results to return.
       if @limit > 0
@@ -636,7 +639,7 @@ module Mongo
     def construct_query_message
       message = BSON::ByteBuffer.new("", @connection.max_bson_size + MongoClient::COMMAND_HEADROOM)
       message.put_int(@options)
-      BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@collection.name}")
+      BSON::BSON_RUBY.serialize_cstr(message, full_collection_name)
       message.put_int(@skip)
       @batch_size > 1 ? message.put_int(@batch_size) : message.put_int(@limit)
       if query_contains_special_fields? && @bson # costs two serialize calls

data/lib/mongo/db.rb

@@ -289,7 +289,23 @@ module Mongo
       if @client.wire_version_feature?(Mongo::MongoClient::MONGODB_2_8)
         cmd = BSON::OrderedHash[:listCollections, 1]
         cmd.merge!(:filter => { :name => coll_name }) if coll_name
-        self.command(cmd)['collections']
+        result = self.command(cmd, :cursor => {})
+        if result.key?('cursor')
+          cursor_info = result['cursor']
+          pinned_pool = @client.pinned_pool
+          pinned_pool = pinned_pool[:pool] if pinned_pool.respond_to?(:keys)
+
+          seed = {
+            :cursor_id => cursor_info['id'],
+            :first_batch => cursor_info['firstBatch'],
+            :pool => pinned_pool,
+            :ns => cursor_info['ns']
+          }
+
+          Cursor.new(Collection.new('$cmd', self), seed).to_a
+        else
+          result['collections']
+        end
       else
         legacy_collections_info(coll_name).to_a
       end
@@ -493,11 +509,27 @@ module Mongo
     #   defining the index.
     def index_information(collection_name)
       if @client.wire_version_feature?(Mongo::MongoClient::MONGODB_2_8)
-        result = self.command(:listIndexes => collection_name)['indexes']
+        result = self.command({ :listIndexes => collection_name }, :cursor => {})
+        if result.key?('cursor')
+          cursor_info = result['cursor']
+          pinned_pool = @client.pinned_pool
+          pinned_pool = pinned_pool[:pool] if pinned_pool.respond_to?(:keys)
+
+          seed = {
+            :cursor_id => cursor_info['id'],
+            :first_batch => cursor_info['firstBatch'],
+            :pool => pinned_pool,
+            :ns => cursor_info['ns']
+          }
+
+          indexes = Cursor.new(Collection.new('$cmd', self), seed).to_a
+        else
+          indexes = result['indexes']
+        end
       else
-        result = legacy_list_indexes(collection_name)
+        indexes = legacy_list_indexes(collection_name)
       end
-      result.reduce({}) do |info, index|
+      indexes.reduce({}) do |info, index|
         info.merge!(index['name'] => index)
       end
     end
@@ -589,6 +621,9 @@ module Mongo
         end.join('; ')
         message << ').'
         code = result['code'] || result['assertionCode']
+        if result['writeErrors']
+          code = result['writeErrors'].first['code']
+        end
         raise ExecutionTimeout.new(message, code, result) if code == MAX_TIME_MS_CODE
         raise OperationFailure.new(message, code, result)
       end

data/test/functional/collection_test.rb

@@ -345,6 +345,18 @@ class CollectionTest < Test::Unit::TestCase
     end
   end
 
+  def test_error_code
+    coll = @db['test-error-code']
+    coll.ensure_index(BSON::OrderedHash[:x, Mongo::ASCENDING], { :unique => true })
+    coll.save(:x => 2)
+    begin
+      coll.save(:x => 2)
+    rescue => ex
+      assert_not_nil ex.error_code
+    end
+    coll.drop
+  end
+
   def test_aggregation_cursor
     return unless @version >= '2.5.1'
     [10, 1000].each do |size|

data/test/functional/cursor_test.rb

@@ -468,21 +468,19 @@ class CursorTest < Test::Unit::TestCase
   def test_kill_cursors
     @coll.drop
 
-    client_cursors = @db.command("cursorInfo" => 1)["clientCursors_size"]
+    client_cursors = cursor_count(@db)
 
     10000.times do |i|
       @coll.insert("i" => i)
     end
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     10.times do |i|
       @coll.find_one()
     end
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     10.times do |i|
       a = @coll.find()
@@ -490,38 +488,32 @@ class CursorTest < Test::Unit::TestCase
       a.close()
     end
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     a = @coll.find()
     a.next_document
 
-    assert_not_equal(client_cursors,
-                     @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_not_equal(client_cursors, cursor_count(@db))
 
     a.close()
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     a = @coll.find({}, :limit => 10).next_document
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     @coll.find() do |cursor|
       cursor.next_document
     end
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
 
     @coll.find() { |cursor|
       cursor.next_document
     }
 
-    assert_equal(client_cursors,
-                 @db.command("cursorInfo" => 1)["clientCursors_size"])
+    assert_equal(client_cursors, cursor_count(@db))
   end
 
   def test_count_with_fields
@@ -680,4 +672,12 @@ class CursorTest < Test::Unit::TestCase
       assert_instance_of(klass, instance)
     end
   end
+
+  def cursor_count(db)
+    if @version > '2.6.0'
+      db.command("serverStatus" => 1)["metrics"]["cursor"]["open"]["total"]
+    else
+      db.command("cursorInfo" => 1)["clientCursors_size"]
+    end
+  end
 end

data/test/unit/cursor_test.rb

@@ -138,7 +138,15 @@ class CursorUnitTest < Test::Unit::TestCase
       assert_equal 100, @cursor.batch_size
     end
 
-    context "conected to mongos" do
+    context 'when an alternate namespace is specified' do
+
+      should 'use the alternate namespace' do
+        cursor = Cursor.new(@collection, :ns => 'other_db.other_collection')
+        assert_equal('other_db.other_collection', cursor.full_collection_name)
+      end
+    end
+
+    context "connected to mongos" do
       setup do
         @connection.stubs(:mongos?).returns(true)
         @tag_sets = [{:dc => "ny"}]
@@ -211,7 +219,7 @@ class CursorUnitTest < Test::Unit::TestCase
       end
     end
 
-    context "not conected to mongos" do
+    context "not connected to mongos" do
       setup do
         @connection.stubs(:mongos?).returns(false)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 1.12.0.rc1
+  version: 1.12.0.rc2
 platform: ruby
 authors:
 - Emily Stolfo
@@ -34,7 +34,7 @@ cert_chain:
   JrZM8w8wGbIOeLtoQqa7HB/jOYbTahH7KMNh2LHAbOR93hNIJxVRa4iwxiMQ75tN
   9WUIAJ4AEtjwRg1Bz0OwDo3aucPCBpx77+/FWhv7JYY=
   -----END CERTIFICATE-----
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -42,14 +42,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0.rc1
+        version: 1.12.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0.rc1
+        version: 1.12.0.rc2
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables: