mongo 1.8.2 → 1.8.3.rc0

data/LICENSE

@@ -175,7 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2008-2010 10gen, Inc.
+   Copyright (C) 2008-2013 10gen, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.md

@@ -1,7 +1,4 @@
-[![Build Status][travis-img]][travis-url]
-[![Jenkins Status][jenkins-img]][jenkins-url]
-[![Code Climate][codeclimate-img]][codeclimate-url]
-[![Latest Version][version-img]][version-url]
+[![Build Status][travis-img]][travis-url] [![Jenkins Status][jenkins-img]][jenkins-url] [![Code Climate][codeclimate-img]][codeclimate-url]
 
 [travis-img]: https://secure.travis-ci.org/mongodb/mongo-ruby-driver.png
 [travis-url]: http://travis-ci.org/mongodb/mongo-ruby-driver
@@ -9,8 +6,6 @@
 [codeclimate-url]: https://codeclimate.com/github/mongodb/mongo-ruby-driver
 [jenkins-img]: https://jenkins.10gen.com/job/mongo-ruby-driver/badge/icon
 [jenkins-url]: https://jenkins.10gen.com/job/mongo-ruby-driver/
-[version-img]: https://badge.fury.io/rb/mongo.png
-[version-url]: http://badge.fury.io/rb/mongo
 [api-url]: http://api.mongodb.org/ruby/current
 
 # Documentation
@@ -339,7 +334,7 @@ See [credits](https://github.com/mongodb/mongo-ruby-driver/wiki/Credits).
 
 # License
 
- Copyright 2008-2010 10gen Inc.
+ Copyright (C) 2008-2013 10gen Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/VERSION

@@ -1 +1 @@
-1.8.2
+1.8.3.rc0

data/lib/mongo.rb

@@ -1,21 +1,3 @@
-# encoding: UTF-8
-#
-# --
-# Copyright (C) 2008-2012 10gen 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.
-# ++
-
 module Mongo
   ASCENDING   =  1
   DESCENDING  = -1
@@ -23,6 +5,7 @@ module Mongo
   GEOHAYSTACK = 'geoHaystack'
 
   DEFAULT_MAX_BSON_SIZE = 4 * 1024 * 1024
+  DEFAULT_MAX_MESSAGE_SIZE = DEFAULT_MAX_BSON_SIZE * 2
 
   module Constants
     OP_REPLY        = 1
@@ -62,6 +45,7 @@ require 'mongo/util/pool'
 require 'mongo/util/pool_manager'
 require 'mongo/util/sharding_pool_manager'
 require 'mongo/util/server_version'
+require 'mongo/util/socket_util'
 require 'mongo/util/ssl_socket'
 require 'mongo/util/tcp_socket'
 require 'mongo/util/unix_socket'

data/lib/mongo/collection.rb

@@ -1,20 +1,3 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2012 10gen 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.
-
 module Mongo
 
   # A named collection of documents in a database.
@@ -155,6 +138,13 @@ module Mongo
       self
     end
 
+    # Set a hint field using a named index.
+    # @param [String] hinted index name
+    def named_hint=(hint=nil)
+      @hint = hint
+      self
+    end
+
     # Query the database.
     #
     # The +selector+ argument is a prototype document that all results must
@@ -193,6 +183,8 @@ module Mongo
     #   be specified as Mongo::ASCENDING (or :ascending / :asc) or Mongo::DESCENDING (or :descending / :desc)
     # @option opts [String, Array, OrderedHash] :hint hint for query optimizer, usually not necessary if
     #   using MongoDB > 1.1
+    # @option opts [String] :named_hint for specifying a named index as a hint, will be overriden by :hint
+    #   if :hint is also provided.
     # @option opts [Boolean] :snapshot (false) if true, snapshot mode will be used for this query.
     #   Snapshot mode assures no duplicates are returned, or objects missed, which were preset at both the start and
     #   end of the query's execution.
@@ -227,6 +219,7 @@ module Mongo
       limit              = opts.delete(:limit) || 0
       sort               = opts.delete(:sort)
       hint               = opts.delete(:hint)
+      named_hint         = opts.delete(:named_hint)
       snapshot           = opts.delete(:snapshot)
       batch_size         = opts.delete(:batch_size)
       timeout            = (opts.delete(:timeout) == false) ? false : true
@@ -257,7 +250,7 @@ module Mongo
         :skip               => skip,
         :limit              => limit,
         :order              => sort,
-        :hint               => hint,
+        :hint               => hint || named_hint,
         :snapshot           => snapshot,
         :timeout            => timeout,
         :batch_size         => batch_size,
@@ -416,7 +409,7 @@ module Mongo
     # @core remove remove-instance_method
     def remove(selector={}, opts={})
       write_concern = get_write_concern(opts, self)
-      message = BSON::ByteBuffer.new("\0\0\0\0")
+      message = BSON::ByteBuffer.new("\0\0\0\0", @connection.max_message_size)
       BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@name}")
       message.put_int(0)
       message.put_binary(BSON::BSON_CODER.serialize(selector, false, true, @connection.max_bson_size).to_s)
@@ -464,7 +457,7 @@ module Mongo
     def update(selector, document, opts={})
       # Initial byte is 0.
       write_concern = get_write_concern(opts, self)
-      message = BSON::ByteBuffer.new("\0\0\0\0")
+      message = BSON::ByteBuffer.new("\0\0\0\0", @connection.max_message_size)
       BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@name}")
       update_options  = 0
       update_options += 1 if opts[:upsert]
@@ -474,7 +467,7 @@ module Mongo
       check_keys = document.keys.first.to_s.start_with?("$") ? false : true
 
       message.put_int(update_options)
-      message.put_binary(BSON::BSON_CODER.serialize(selector, false, true).to_s)
+      message.put_binary(BSON::BSON_CODER.serialize(selector, false, true, @connection.max_bson_size).to_s)
       message.put_binary(BSON::BSON_CODER.serialize(document, check_keys, true, @connection.max_bson_size).to_s)
 
       instrument(:update, :database => @db.name, :collection => @name, :selector => selector, :document => document) do
@@ -1065,11 +1058,11 @@ module Mongo
     # Takes an array of +documents+, an optional +collection_name+, and a
     # +check_keys+ setting.
     def insert_documents(documents, collection_name=@name, check_keys=true, write_concern={}, flags={})
+      message = BSON::ByteBuffer.new("", @connection.max_message_size)
       if flags[:continue_on_error]
-        message = BSON::ByteBuffer.new
         message.put_int(1)
       else
-        message = BSON::ByteBuffer.new("\0\0\0\0")
+        message.put_int(0)
       end
 
       collect_on_error = !!flags[:collect_on_error]
@@ -1093,7 +1086,10 @@ module Mongo
             message.put_binary(BSON::BSON_CODER.serialize(doc, check_keys, true, @connection.max_bson_size).to_s)
           end
         end
-      raise InvalidOperation, "Exceded maximum insert size of 16,777,216 bytes" if message.size > @connection.max_bson_size
+
+      if message.size > @connection.max_message_size
+        raise InvalidOperation, "Exceded maximum insert size of #{@connection.max_message_size} bytes"
+      end
 
       instrument(:insert, :database => @db.name, :collection => collection_name, :documents => documents) do
         if Mongo::WriteConcern.gle?(write_concern)

data/lib/mongo/cursor.rb

@@ -1,19 +1,3 @@
-# encoding: UTF-8
-
-# Copyright (C) 2008-2012 10gen 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.
-
 module Mongo
 
   # A cursor over query results. Returned objects are hashes.
@@ -66,7 +50,8 @@ module Mongo
       @options    = 0
 
       # Use this socket for the query
-      @socket     = opts[:socket]
+      @socket = opts[:socket]
+      @pool   = nil
 
       @closed       = false
       @query_run    = false
@@ -197,7 +182,7 @@ module Mongo
     #
     # @param [Symbol, Array, Hash, OrderedHash] order either 1) a key to sort by 2)
     #   an array of [key, direction] pairs to sort by or 3) a hash of
-    #   field => direction pairs to sort by. Direction should be specified as 
+    #   field => direction pairs to sort by. Direction should be specified as
     #   Mongo::ASCENDING (or :ascending / :asc) or Mongo::DESCENDING
     #   (or :descending / :desc)
     #
@@ -339,7 +324,16 @@ module Mongo
         message.put_int(1)
         message.put_long(@cursor_id)
         log(:debug, "Cursor#close #{@cursor_id}")
-        @connection.send_message(Mongo::Constants::OP_KILL_CURSORS, message, :socket => @socket)
+        begin
+          socket = @pool.checkout
+          @connection.send_message(
+            Mongo::Constants::OP_KILL_CURSORS,
+            message,
+            :socket => socket
+          )
+        ensure
+          socket.checkin
+        end
       end
       @cursor_id = 0
       @closed    = true
@@ -468,23 +462,23 @@ module Mongo
     #
     # Upon ConnectionFailure, tries query 3 times if socket was not provided
     # and the query is either not a command or is a secondary_ok command.
-    # 
+    #
     # Pins pools upon successful read and unpins pool upon ConnectionFailure
     #
     def send_initial_query
       tries = 0
       instrument(:find, instrument_payload) do
         begin
-          tries += 1
           message = construct_query_message
-          sock    = @socket || checkout_socket_from_connection
+          socket = @socket || checkout_socket_from_connection
           results, @n_received, @cursor_id = @connection.receive_message(
-            Mongo::Constants::OP_QUERY, message, nil, sock, @command,
+            Mongo::Constants::OP_QUERY, message, nil, socket, @command,
             nil, @options & OP_QUERY_EXHAUST != 0)
         rescue ConnectionFailure => ex
+          socket.close if socket
+          @connection.refresh
           if tries < 3 && !@socket && (!@command || Mongo::Support::secondary_ok?(@selector))
-            @connection.unpin_pool(sock.pool) if sock
-            @connection.refresh
+            tries += 1
             retry
           else
             raise ex
@@ -492,9 +486,8 @@ module Mongo
         rescue OperationFailure, OperationTimeout => ex
           raise ex
         ensure
-          checkin_socket(sock) unless @socket
+          socket.checkin unless @socket || socket.nil?
         end
-        @connection.pin_pool(sock.pool) if !@command && !@socket
         @returned += @n_received
         @cache += results
         @query_run = true
@@ -523,13 +516,13 @@ module Mongo
       message.put_long(@cursor_id)
       log(:debug, "cursor.refresh() for cursor #{@cursor_id}") if @logger
 
-      sock = @socket || checkout_socket_from_connection
+      socket = checkout_socket_from_connection
 
       begin
         results, @n_received, @cursor_id = @connection.receive_message(
-          Mongo::Constants::OP_GET_MORE, message, nil, sock, @command, nil)
+          Mongo::Constants::OP_GET_MORE, message, nil, socket, @command, nil)
       ensure
-        checkin_socket(sock) unless @socket
+        socket.checkin
       end
 
       @returned += @n_received
@@ -540,14 +533,16 @@ module Mongo
     def checkout_socket_from_connection
       begin
         if @command && !Mongo::Support::secondary_ok?(@selector)
-          @connection.checkout_reader(:primary)
+          socket = @connection.checkout_reader(:primary)
         else
-          @connection.checkout_reader(@read, @tag_sets, @acceptable_latency)
+          socket = @connection.checkout_reader(@read, @tag_sets, @acceptable_latency)
         end
       rescue SystemStackError, NoMemoryError, SystemCallError => ex
         @connection.close
         raise ex
       end
+      @pool = socket.pool
+      socket
     end
 
     def checkin_socket(sock)
@@ -555,14 +550,14 @@ module Mongo
     end
 
     def construct_query_message
-      message = BSON::ByteBuffer.new
+      message = BSON::ByteBuffer.new("", @connection.max_message_size)
       message.put_int(@options)
       BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@collection.name}")
       message.put_int(@skip)
       message.put_int(@limit)
       spec = query_contains_special_fields? ? construct_query_spec : @selector
-      message.put_binary(BSON::BSON_CODER.serialize(spec, false).to_s)
-      message.put_binary(BSON::BSON_CODER.serialize(@fields, false).to_s) if @fields
+      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
       message
     end
 

data/lib/mongo/db.rb

@@ -1,21 +1,3 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2012 10gen 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 'socket'
 require 'thread'
 
@@ -127,7 +109,7 @@ module Mongo
         socket = @connection.checkout_reader(:primary_preferred)
         issue_authentication(username, password, save_auth, :socket => socket)
       ensure
-        socket.pool.checkin(socket) if socket
+        socket.checkin if socket
       end
 
       @connection.authenticate_pools

data/lib/mongo/exceptions.rb

@@ -1,22 +1,3 @@
-# encoding: UTF-8
-
-#
-# --
-# Copyright (C) 2008-2012 10gen 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.
-# ++
-
 module Mongo
   # Generic Mongo Ruby Driver exception class.
   class MongoRubyError < StandardError; end

data/lib/mongo/gridfs/grid.rb

@@ -1,21 +1,3 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2012 10gen 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.
-# ++
-
 module Mongo
 
   # Implementation of the MongoDB GridFS specification. A file store.
@@ -38,11 +20,11 @@ module Mongo
       @chunks  = @db["#{fs_name}.chunks"]
       @fs_name = fs_name
 
-      # Create indexes only if we're connected to a primary node.
+      # This will create indexes only if we're connected to a primary node.
       connection = @db.connection
-      if (connection.class == MongoClient && connection.read_primary?) ||
-          (connection.class == MongoReplicaSetClient && connection.primary)
-        @chunks.create_index([['files_id', Mongo::ASCENDING], ['n', Mongo::ASCENDING]], :unique => true)
+      begin
+        @chunks.ensure_index([['files_id', Mongo::ASCENDING], ['n', Mongo::ASCENDING]], :unique => true)
+      rescue Mongo::ConnectionFailure
       end
     end
 
@@ -70,13 +52,20 @@ module Mongo
     #
     # @return [BSON::ObjectId] the file's id.
     def put(data, opts={})
-      opts     = opts.dup
-      filename = opts.delete(:filename)
-      opts.merge!(default_grid_io_opts)
-      file = GridIO.new(@files, @chunks, filename, 'w', opts)
-      file.write(data)
-      file.close  
-      file.files_id
+      begin
+        # Ensure there is an index on files_id and n, as state may have changed since instantiation of self.
+        # Recall that index definitions are cached with ensure_index so this statement won't unneccesarily repeat index creation.
+        @chunks.ensure_index([['files_id', Mongo::ASCENDING], ['n', Mongo::ASCENDING]], :unique => true)
+        opts     = opts.dup
+        filename = opts.delete(:filename)
+        opts.merge!(default_grid_io_opts)
+        file = GridIO.new(@files, @chunks, filename, 'w', opts)
+        file.write(data)
+        file.close
+        file.files_id
+      rescue Mongo::ConnectionFailure => e
+        raise e, "Failed to create necessary index and write data."
+      end
     end
 
     # Read a file from the file store.