mongo 1.9.2 → 1.10.0.rc0

data/lib/mongo/{util → connection}/pool_manager.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# 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.
@@ -26,7 +26,9 @@ module Mongo
                 :seeds,
                 :pools,
                 :max_bson_size,
-                :max_message_size
+                :max_message_size,
+                :max_wire_version,
+                :min_wire_version
 
     # Create a new set of connection pools.
     #
@@ -49,6 +51,8 @@ module Mongo
       @refresh_required                         = false
       @max_bson_size                            = DEFAULT_MAX_BSON_SIZE
       @max_message_size                         = @max_bson_size * MESSAGE_SIZE_FACTOR
+      @max_wire_version                         = 0
+      @min_wire_version                         = 0
       @connect_mutex                            = Mutex.new
       thread_local[:locks][:connecting_manager] = false
     end
@@ -147,6 +151,8 @@ module Mongo
       unless @members.size == 0
         @max_bson_size = @members.map(&:max_bson_size).min
         @max_message_size = @members.map(&:max_message_size).min
+        @max_wire_version = @members.map(&:max_wire_version).min
+        @min_wire_version = @members.map(&:min_wire_version).max
       end
     end
 

data/lib/mongo/{util → connection}/sharding_pool_manager.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# 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.

data/lib/mongo/connection/socket.rb

@@ -0,0 +1,18 @@
+# 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 'mongo/connection/socket/socket_util.rb'
+require 'mongo/connection/socket/ssl_socket.rb'
+require 'mongo/connection/socket/tcp_socket.rb'
+require 'mongo/connection/socket/unix_socket.rb'

data/lib/mongo/{util → connection/socket}/socket_util.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# 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.
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'socket'
+require 'timeout'
+
 module SocketUtil
 
-  attr_accessor :pool, :pid
+  attr_accessor :pool, :pid, :auths
 
   def checkout
     @pool.checkout if @pool

data/lib/mongo/{util → connection/socket}/ssl_socket.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# 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.
@@ -12,9 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'socket'
 require 'openssl'
-require 'timeout'
 
 module Mongo
 
@@ -25,9 +23,10 @@ module Mongo
     include SocketUtil
 
     def initialize(host, port, op_timeout=nil, connect_timeout=nil, opts={})
-      @pid             = Process.pid
       @op_timeout      = op_timeout
       @connect_timeout = connect_timeout
+      @pid             = Process.pid
+      @auths           = Set.new
 
       @tcp_socket = ::TCPSocket.new(host, port)
       @tcp_socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)

data/lib/mongo/{util → connection/socket}/tcp_socket.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# 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.
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'socket'
-require 'timeout'
-
 module Mongo
   # Wrapper class for Socket
   #
@@ -28,25 +25,38 @@ module Mongo
       @op_timeout      = op_timeout
       @connect_timeout = connect_timeout
       @pid             = Process.pid
+      @auths           = Set.new
 
-      # TODO: Prefer ipv6 if server is ipv6 enabled
-      @address = Socket.getaddrinfo(host, nil, Socket::AF_INET).first[3]
-      @port    = port
-
-      @socket_address = Socket.pack_sockaddr_in(@port, @address)
-      @socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-      @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+      @socket = handle_connect(host, port)
+    end
 
-      connect
+    def handle_connect(host, port)
+      error = nil
+      # Following python's lead (see PYTHON-356)
+      family = host == 'localhost' ? Socket::AF_INET : Socket::AF_UNSPEC
+      addr_info = Socket.getaddrinfo(host, nil, family, Socket::SOCK_STREAM)
+      addr_info.each do |info|
+        begin
+          sock = Socket.new(info[4], Socket::SOCK_STREAM, 0)
+          sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+          socket_address = Socket.pack_sockaddr_in(port, info[3])
+          connect(sock, socket_address)
+          return sock
+        rescue IOError, SystemCallError => e
+          error = e
+          sock.close if sock
+        end
+      end
+      raise error
     end
 
-    def connect
+    def connect(socket, socket_address)
       if @connect_timeout
         Timeout::timeout(@connect_timeout, ConnectionTimeoutError) do
-          @socket.connect(@socket_address)
+          socket.connect(socket_address)
         end
       else
-        @socket.connect(@socket_address)
+        socket.connect(socket_address)
       end
     end
 

data/lib/mongo/{util → connection/socket}/unix_socket.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# 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.
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'socket'
-
 module Mongo
+
+  attr_accessor :auths
+
   # Wrapper class for Socket
   #
   # Emulates UNIXSocket with operation and connection timeout
@@ -24,6 +25,8 @@ module Mongo
     def initialize(socket_path, port=:socket, op_timeout=nil, connect_timeout=nil, opts={})
       @op_timeout      = op_timeout
       @connect_timeout = connect_timeout
+      @pid             = Process.pid
+      @auths           = Set.new
 
       @address         = socket_path
       @port            = :socket # purposely override input
@@ -34,4 +37,3 @@ module Mongo
     end
   end
 end
-

data/lib/mongo/cursor.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# 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.
@@ -26,7 +26,8 @@ module Mongo
       :order, :hint, :snapshot, :timeout,
       :full_collection_name, :transformer,
       :options, :cursor_id, :show_disk_loc,
-      :comment, :read, :tag_sets, :acceptable_latency
+      :comment, :compile_regex, :read, :tag_sets,
+      :acceptable_latency
 
     # Create a new cursor.
     #
@@ -34,54 +35,57 @@ module Mongo
     # similar methods. Application developers shouldn't have to create cursors manually.
     #
     # @return [Cursor]
-    #
-    # @core cursors constructor_details
     def initialize(collection, opts={})
-      @cursor_id  = nil
+      opts = opts.dup
+      @cursor_id  = opts.delete(:cursor_id)
       @db         = collection.db
       @collection = collection
       @connection = @db.connection
       @logger     = @connection.logger
 
       # Query selector
-      @selector   = opts[:selector] || {}
+      @selector   = opts.delete(:selector) || {}
+
+      # Query pre-serialized bson to append
+      @bson    = @selector.delete(:bson)
 
       # Special operators that form part of $query
-      @order      = opts[:order]
-      @explain    = opts[:explain]
-      @hint       = opts[:hint]
-      @snapshot   = opts[:snapshot]
-      @max_scan   = opts.fetch(:max_scan, nil)
-      @return_key = opts.fetch(:return_key, nil)
-      @show_disk_loc = opts.fetch(:show_disk_loc, nil)
-      @comment    = opts[:comment]
+      @order         = opts.delete(:order)
+      @explain       = opts.delete(:explain)
+      @hint          = opts.delete(:hint)
+      @snapshot      = opts.delete(:snapshot)
+      @max_scan      = opts.delete(:max_scan)
+      @return_key    = opts.delete(:return_key)
+      @show_disk_loc = opts.delete(:show_disk_loc)
+      @comment       = opts.delete(:comment)
+      @compile_regex = opts.key?(:compile_regex) ? opts.delete(:compile_regex) : true
 
       # Wire-protocol settings
-      @fields     = convert_fields_for_query(opts[:fields])
-      @skip       = opts[:skip]     || 0
-      @limit      = opts[:limit]    || 0
-      @tailable   = opts[:tailable] || false
-      @timeout    = opts.fetch(:timeout, true)
-      @options    = 0
+      @fields   = convert_fields_for_query(opts.delete(:fields))
+      @skip     = opts.delete(:skip)     || 0
+      @limit    = opts.delete(:limit)    || 0
+      @tailable = opts.delete(:tailable)
+      @timeout  = opts.key?(:timeout) ? opts.delete(:timeout) : true
+      @options  = 0
 
       # Use this socket for the query
-      @socket = opts[:socket]
-      @pool   = nil
+      @socket = opts.delete(:socket)
+      @pool   = opts.delete(:pool)
 
-      @closed       = false
-      @query_run    = false
+      @closed    = false
+      @query_run = false
 
-      @transformer = opts[:transformer]
-      @read =  opts[:read] || @collection.read
+      @transformer        = opts.delete(:transformer)
+      @read               = opts.delete(:read)               || @collection.read
       Mongo::ReadPreference::validate(@read)
-      @tag_sets = opts[:tag_sets] || @collection.tag_sets
-      @acceptable_latency = opts[:acceptable_latency] || @collection.acceptable_latency
+      @tag_sets           = opts.delete(:tag_sets)           || @collection.tag_sets
+      @acceptable_latency = opts.delete(:acceptable_latency) || @collection.acceptable_latency
 
-      batch_size(opts[:batch_size] || 0)
+      batch_size(opts.delete(:batch_size) || 0)
 
       @full_collection_name = "#{@collection.db.name}.#{@collection.name}"
-      @cache        = []
-      @returned     = 0
+      @cache                = opts.delete(:first_batch) || []
+      @returned             = 0
 
       if(!@timeout)
         add_option(OP_QUERY_NO_CURSOR_TIMEOUT)
@@ -93,11 +97,19 @@ module Mongo
         add_option(OP_QUERY_TAILABLE)
       end
 
+      # If a cursor_id is provided, this is a cursor for a command
+      if @cursor_id
+        @command_cursor = true
+        @query_run      = true
+      end
+
       if @collection.name =~ /^\$cmd/ || @collection.name =~ /^system/
         @command = true
       else
         @command = false
       end
+
+      @opts = opts
     end
 
     # Guess whether the cursor is alive on the server.
@@ -126,18 +138,25 @@ module Mongo
       end
       doc = @cache.shift
 
-      if doc && doc['$err']
-        err = doc['$err']
+      if doc && (err = doc['errmsg'] || doc['$err']) # assignment
+        code = doc['code']
 
         # If the server has stopped being the master (e.g., it's one of a
         # pair but it has died or something like that) then we close that
         # connection. The next request will re-open on master server.
         if err.include?("not master")
           @connection.close
-          raise ConnectionFailure.new(err, doc['code'], doc)
+          raise ConnectionFailure.new(err, code, doc)
         end
 
-        raise OperationFailure.new(err, doc['code'], doc)
+        # Handle server side operation execution timeout
+        if code == 50
+          raise ExecutionTimeout.new(err, code, doc)
+        end
+
+        raise OperationFailure.new(err, code, doc)
+      elsif doc && (writeConcernError = doc['writeConcernError']) && writeConcernError['errInfo'] == {"wtimeout" => true} # assignment
+        raise OperationFailure.new('timeout ' + writeConcernError['errmsg'], writeConcernError['code'], doc)
       end
 
       if @transformer.nil?
@@ -151,6 +170,7 @@ module Mongo
     # Reset this cursor on the server. Cursor options, such as the
     # query string and the values for skip and limit, are preserved.
     def rewind!
+      check_command_cursor
       close
       @cache.clear
       @cursor_id  = nil
@@ -175,6 +195,7 @@ module Mongo
     #
     # @raise [OperationFailure] on a database error.
     def count(skip_and_limit = false)
+      check_command_cursor
       command = BSON::OrderedHash["count",  @collection.name, "query",  @selector]
 
       if skip_and_limit
@@ -219,8 +240,6 @@ module Mongo
     # @return [Integer] the current number_to_return if no parameter is given.
     #
     # @raise [InvalidOperation] if this cursor has already been used.
-    #
-    # @core limit limit-instance_method
     def limit(number_to_return=nil)
       return @limit unless number_to_return
       check_modifiable
@@ -250,6 +269,31 @@ module Mongo
       self
     end
 
+    # Instruct the server to abort queries after they exceed the specified
+    # wall-clock execution time.
+    #
+    # A query that completes in under its time limit will "roll over"
+    # remaining time to the first getmore op (which will then "roll over"
+    # its remaining time to the second getmore op and so on, until the
+    # time limit is hit).
+    #
+    # Cursors returned by successful time-limited queries will still obey
+    # the default cursor idle timeout (unless the "no cursor idle timeout"
+    # flag has been set).
+    #
+    # @note This will only have an effect in MongoDB 2.5+
+    #
+    # @param max_time_ms [Fixnum] max execution time (in milliseconds)
+    #
+    # @return [Fixnum, Cursor] either the current max_time_ms or cursor
+    def max_time_ms(max_time_ms=nil)
+      return @max_time_ms unless max_time_ms
+      check_modifiable
+
+      @max_time_ms = max_time_ms
+      self
+    end
+
     # Set the batch size for server responses.
     #
     # Note that the batch size will take effect only on queries
@@ -317,9 +361,8 @@ module Mongo
     # Get the explain plan for this cursor.
     #
     # @return [Hash] a document containing the explain plan for this cursor.
-    #
-    # @core explain explain-instance_method
     def explain
+      check_command_cursor
       c = Cursor.new(@collection,
         query_options_hash.merge(:limit => -@limit.abs, :explain => true))
       explanation = c.next_document
@@ -496,13 +539,13 @@ module Mongo
           socket = @socket || checkout_socket_from_connection
           results, @n_received, @cursor_id = @connection.receive_message(
             Mongo::Constants::OP_QUERY, message, nil, socket, @command,
-            nil, exhaust?)
+            nil, exhaust?, compile_regex?)
         rescue ConnectionFailure => ex
           socket.close if socket
           @pool = nil
           @connection.unpin_pool
           @connection.refresh
-          if tries < 3 && !@socket && (!@command || Mongo::Support::secondary_ok?(@selector))
+          if tries < 3 && !@socket && (!@command || Mongo::ReadPreference::secondary_ok?(@selector))
             tries += 1
             retry
           else
@@ -548,7 +591,8 @@ module Mongo
 
       begin
         results, @n_received, @cursor_id = @connection.receive_message(
-          Mongo::Constants::OP_GET_MORE, message, nil, socket, @command, nil)
+          Mongo::Constants::OP_GET_MORE, message, nil, socket, @command,
+          nil, exhaust?, compile_regex?)
       ensure
         socket.checkin
       end
@@ -562,7 +606,7 @@ module Mongo
       begin
         if @pool
           socket = @pool.checkout
-        elsif @command && !Mongo::Support::secondary_ok?(@selector)
+        elsif @command && !Mongo::ReadPreference::secondary_ok?(@selector)
           socket = @connection.checkout_reader({:mode => :primary})
         else
           socket = @connection.checkout_reader(read_preference)
@@ -580,13 +624,24 @@ module Mongo
     end
 
     def construct_query_message
-      message = BSON::ByteBuffer.new("", @connection.max_message_size)
+      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}")
       message.put_int(@skip)
       @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)
+      if query_contains_special_fields? && @bson # costs two serialize calls
+        query_message = BSON::BSON_CODER.serialize(@selector, false, false, @connection.max_bson_size + MongoClient::APPEND_HEADROOM)
+        query_message.grow(@bson)
+        query_spec = construct_query_spec
+        query_spec.delete('$query')
+        query_message.grow(BSON::BSON_CODER.serialize(query_spec, false, false, @connection.max_bson_size))
+      else # costs only one serialize call
+        spec = query_contains_special_fields? ? construct_query_spec : @selector
+        spec.merge!(@opts)
+        query_message = BSON::BSON_CODER.serialize(spec, false, false, @connection.max_bson_size + MongoClient::APPEND_HEADROOM)
+        query_message.grow(@bson) if @bson
+      end
+      message.put_binary(query_message.to_s)
       message.put_binary(BSON::BSON_CODER.serialize(@fields, false, false, @connection.max_bson_size).to_s) if @fields
       message
     end
@@ -612,6 +667,7 @@ module Mongo
       spec['$returnKey']   = true if @return_key
       spec['$showDiskLoc'] = true if @show_disk_loc
       spec['$comment']  = @comment if @comment
+      spec['$maxTimeMS'] = @max_time_ms if @max_time_ms
       if needs_read_pref?
         read_pref = Mongo::ReadPreference::mongos(@read, @tag_sets)
         spec['$readPreference'] = read_pref if read_pref
@@ -625,7 +681,7 @@ module Mongo
 
     def query_contains_special_fields?
       @order || @explain || @hint || @snapshot || @show_disk_loc ||
-        @max_scan || @return_key || @comment || needs_read_pref?
+        @max_scan || @return_key || @comment || @max_time_ms || needs_read_pref?
     end
 
     def close_cursor_if_query_complete
@@ -646,5 +702,15 @@ module Mongo
         raise InvalidOperation, "Cannot modify the query once it has been run or closed."
       end
     end
+
+    def check_command_cursor
+      if @command_cursor
+        raise InvalidOperation, "Cannot call #{caller.first} on command cursors"
+      end
+    end
+
+    def compile_regex?
+      @compile_regex
+    end
   end
 end