mongo 1.7.1 → 1.8.0

data/lib/mongo/util/pool_manager.rb

@@ -1,7 +1,7 @@
 module Mongo
   class PoolManager
 
-    attr_reader :connection, :arbiters, :primary, :secondaries, :primary_pool,
+    attr_reader :client, :arbiters, :primary, :secondaries, :primary_pool,
       :secondary_pool, :secondary_pools, :hosts, :nodes, :members, :seeds,
       :max_bson_size
 
@@ -14,10 +14,10 @@ module Mongo
     # the user may pass an additional list of seeds nodes discovered in real
     # time. The union of these lists will be used when attempting to connect,
     # with the newly-discovered nodes being used first.
-    def initialize(connection, seeds=[])
-      @pinned_pools = {}
-      @connection = connection
-      @seeds = seeds
+    def initialize(client, seeds=[])
+      @pinned_pools         = {}
+      @client               = client
+      @seeds                = seeds
       @previously_connected = false
     end
 
@@ -99,15 +99,16 @@ module Mongo
       read_pool.host_port
     end
 
-    def read_pool(mode=@connection.read_preference, tags=@connection.tag_sets, 
-      acceptable_latency=@connection.acceptable_latency)
+    def read_pool(mode=@client.read_preference,
+                  tags=@client.tag_sets,
+                  acceptable_latency=@client.acceptable_latency)
 
       if mode == :primary && !tags.empty?
         raise MongoArgumentError, "Read preferecy :primary cannot be combined with tags"
       end
 
       pinned = @pinned_pools[Thread.current]
-      if mode && pinned && select_pool([pinned], tags, acceptable_latency) && !pinned.closed?
+      if pinned && pinned.matches_mode(mode) && pinned.matches_tag_sets(tags) && pinned.up?
         pool = pinned
       else
         pool = case mode
@@ -159,18 +160,18 @@ module Mongo
     end
 
     def initialize_data
-      @primary = nil
-      @primary_pool = nil
-      @read = nil
-      @read_pool = nil
-      @arbiters = []
-      @secondaries = []
-      @secondary_pool = nil
-      @secondary_pools = []
-      @hosts = Set.new
-      @members = Set.new
+      @primary          = nil
+      @primary_pool     = nil
+      @read             = nil
+      @read_pool        = nil
+      @arbiters         = []
+      @secondaries      = []
+      @secondary_pool   = nil
+      @secondary_pools  = []
+      @hosts            = Set.new
+      @members          = Set.new
       @refresh_required = false
-      @pinned_pools = {}
+      @pinned_pools     = {}
     end
 
     # Connect to each member of the replica set
@@ -182,7 +183,7 @@ module Mongo
       seed = get_valid_seed_node
 
       seed.node_list.each do |host|
-        node = Mongo::Node.new(self.connection, host)
+        node = Mongo::Node.new(self.client, host)
         if node.connect && node.set_config && node.healthy?
           members << node
         end
@@ -216,9 +217,9 @@ module Mongo
     def assign_primary(member)
       member.last_state = :primary
       @primary = member.host_port
-      @primary_pool = Pool.new(self.connection, member.host, member.port,
-        :size => self.connection.pool_size,
-        :timeout => self.connection.pool_timeout,
+      @primary_pool = Pool.new(self.client, member.host, member.port,
+        :size => self.client.pool_size,
+        :timeout => self.client.pool_timeout,
         :node => member
       )
     end
@@ -226,9 +227,9 @@ module Mongo
     def assign_secondary(member)
       member.last_state = :secondary
       @secondaries << member.host_port
-      pool = Pool.new(self.connection, member.host, member.port,
-        :size => self.connection.pool_size,
-        :timeout => self.connection.pool_timeout,
+      pool = Pool.new(self.client, member.host, member.port,
+        :size => self.client.pool_size,
+        :timeout => self.client.pool_timeout,
         :node => member
       )
       @secondary_pools << pool
@@ -268,7 +269,7 @@ module Mongo
     # If we don't get a response, raise an exception.
     def get_valid_seed_node
       @seeds.each do |seed|
-        node = Mongo::Node.new(self.connection, seed)
+        node = Mongo::Node.new(self.client, seed)
         if !node.connect
           next
         elsif node.set_config && node.healthy?

data/lib/mongo/util/server_version.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# 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.

data/lib/mongo/util/sharding_pool_manager.rb

@@ -3,15 +3,15 @@ module Mongo
   module ShardingNode
     def set_config
       begin
-        @config = @connection['admin'].command({:ismaster => 1}, :socket => @socket)
+        @config = @client['admin'].command({:ismaster => 1}, :socket => @socket)
 
         # warning: instance variable @logger not initialized
         #if @config['msg'] && @logger
-        #  @connection.log(:warn, "#{config['msg']}")
+        #  @client.log(:warn, "#{config['msg']}")
         #end
 
       rescue ConnectionFailure, OperationFailure, OperationTimeout, SocketError, SystemCallError, IOError => ex
-        @connection.log(:warn, "Attempted connection to node #{host_string} raised " +
+        @client.log(:warn, "Attempted connection to node #{host_string} raised " +
             "#{ex.class}: #{ex.message}")
 
         # Socket may already be nil from issuing command
@@ -39,7 +39,7 @@ module Mongo
 
   class ShardingPoolManager < PoolManager
 
-    attr_reader :connection, :primary, :primary_pool, :hosts, :nodes,
+    attr_reader :client, :primary, :primary_pool, :hosts, :nodes,
       :max_bson_size, :members
 
     # Create a new set of connection pools.
@@ -49,7 +49,7 @@ module Mongo
     # the user may pass an additional list of seeds nodes discovered in real
     # time. The union of these lists will be used when attempting to connect,
     # with the newly-discovered nodes being used first.
-    def initialize(connection, seeds=[])
+    def initialize(client, seeds=[])
       super
     end
 
@@ -81,7 +81,7 @@ module Mongo
     # The config.mongos find can't be part of the connect call chain due to infinite recursion
     def check_connection_health
       begin
-        seeds = @connection['config']['mongos'].find.to_a.map{|doc| doc['_id']}
+        seeds = @client['config']['mongos'].find.to_a.map{|doc| doc['_id']}
         if @seeds != seeds
           @seeds = seeds
           @refresh_required = true
@@ -102,7 +102,7 @@ module Mongo
       seed = get_valid_seed_node
 
       seed.node_list.each do |host|
-        node = Mongo::Node.new(self.connection, host)
+        node = Mongo::Node.new(self.client, host)
         node.extend ShardingNode
         if node.connect && node.set_config
           members << node
@@ -124,7 +124,7 @@ module Mongo
     # If we don't get a response, raise an exception.
     def get_valid_seed_node
       @seeds.each do |seed|
-        node = Mongo::Node.new(self.connection, seed)
+        node = Mongo::Node.new(self.client, seed)
         node.extend ShardingNode
         if !node.connect
           next

data/lib/mongo/util/ssl_socket.rb

@@ -20,7 +20,7 @@ module Mongo
 
       @ssl = OpenSSL::SSL::SSLSocket.new(@socket)
       @ssl.sync_close = true
-      
+
       connect
     end
 
@@ -48,10 +48,6 @@ module Mongo
       end 
     end
 
-    def setsockopt(key, value, n)
-      @ssl.setsockopt(key, value, n)
-    end
-
     def close
       @ssl.close
     end

data/lib/mongo/util/support.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# 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.
@@ -20,15 +20,31 @@ require 'digest/md5'
 
 module Mongo
   module Support
+
     include Mongo::Conversions
     extend self
 
-    READ_PREFERENCES = [:primary, :primary_preferred, :secondary, :secondary_preferred, :nearest]
+    READ_PREFERENCES = [
+      :primary,
+      :primary_preferred,
+      :secondary,
+      :secondary_preferred,
+      :nearest
+    ]
 
     # Commands that may be sent to replica-set secondaries, depending on
     # read preference and tags. All other commands are always run on the primary.
-    SECONDARY_OK_COMMANDS = ['group', 'aggregate', 'collstats', 'dbstats', 'count', 'distinct',
-      'geonear', 'geosearch', 'geowalk']
+    SECONDARY_OK_COMMANDS = [
+      'group',
+      'aggregate',
+      'collstats',
+      'dbstats',
+      'count',
+      'distinct',
+      'geonear',
+      'geosearch',
+      'geowalk'
+    ]
 
     # Generate an MD5 for authentication.
     #
@@ -69,10 +85,10 @@ module Mongo
       command = selector.keys.first.to_s.downcase
 
       if command == 'mapreduce'
-        map_reduce = selector[command]
-        if map_reduce && map_reduce.is_a?(Hash) && map_reduce.has_key?('out')
-          map_reduce['out'] == 'inline' ? false : true
-        end
+        out = selector.select { |k, v| k.to_s.downcase == 'out' }.first.last
+        # mongo looks at the first key in the out object, and doesn't
+        # look at the value
+        out.is_a?(Hash) && out.keys.first.to_s.downcase == 'inline' ? true : false
       else
         SECONDARY_OK_COMMANDS.member?(command)
       end

data/lib/mongo/util/tcp_socket.rb

@@ -58,10 +58,6 @@ module Mongo
       end
     end
 
-    def setsockopt(key, value, n)
-      @socket.setsockopt(key, value, n)
-    end
-
     def close
       @socket.close
     end

data/lib/mongo/util/uri_parser.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# 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.
@@ -35,7 +35,20 @@ module Mongo
     MONGODB_URI_SPEC = "mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]"
 
     SPEC_ATTRS = [:nodes, :auths]
-    OPT_ATTRS  = [:connect, :replicaset, :slaveok, :safe, :w, :wtimeout, :fsync, :journal, :connecttimeoutms, :sockettimeoutms, :wtimeoutms]
+
+    OPT_ATTRS  = [
+      :connect,
+      :replicaset,
+      :slaveok,
+      :safe,
+      :w,
+      :wtimeout,
+      :fsync,
+      :journal,
+      :connecttimeoutms,
+      :sockettimeoutms,
+      :wtimeoutms
+    ]
 
     OPT_VALID  = {:connect          => lambda {|arg| ['direct', 'replicaset', 'true', 'false', true, false].include?(arg)},
                   :replicaset       => lambda {|arg| arg.length > 0},
@@ -76,9 +89,20 @@ module Mongo
                   :wtimeoutms       => lambda {|arg| arg.to_i }
                  }
 
-    attr_reader :auths, :connect, :replicaset, :slaveok, :safe, :w, :wtimeout, :fsync, :journal, :connecttimeoutms, :sockettimeoutms, :wtimeoutms
-
-    # Parse a MongoDB URI. This method is used by Connection.from_uri.
+    attr_reader :auths,
+                :connect,
+                :replicaset,
+                :slaveok,
+                :safe,
+                :w,
+                :wtimeout,
+                :fsync,
+                :journal,
+                :connecttimeoutms,
+                :sockettimeoutms,
+                :wtimeoutms
+
+    # Parse a MongoDB URI. This method is used by MongoClient.from_uri.
     # Returns an array of nodes and an array of db authorizations, if applicable.
     #
     # @note Passwords can contain any character except for ','
@@ -100,17 +124,25 @@ module Mongo
       validate_connect
     end
 
-    # Create a Mongo::Connection or a Mongo::ReplSetConnection based on the URI.
+    # Create a Mongo::MongoClient or a Mongo::MongoReplicaSetClient based on the URI.
     #
     # @note Don't confuse this with attribute getter method #connect.
     #
-    # @return [Connection,ReplSetConnection]
-    def connection(extra_opts)
+    # @return [MongoClient,MongoReplicaSetClient]
+    def connection(extra_opts, legacy=false)
       opts = connection_options.merge! extra_opts
-      if replicaset?
-        ReplSetConnection.new(nodes, opts)
+      if(legacy)
+        if replicaset?
+          ReplSetConnection.new(nodes, opts)
+        else
+          Connection.new(host, port, opts)
+        end
       else
-        Connection.new(host, port, opts)
+        if replicaset?
+          MongoReplicaSetClient.new(nodes, opts)
+        else
+          MongoClient.new(host, port, opts)
+        end
       end
     end
 
@@ -147,42 +179,26 @@ module Mongo
       nodes[0][1].to_i
     end
 
-    # Options that can be passed to Mongo::Connection.new or Mongo::ReplSetConnection.new
+    # Options that can be passed to MongoClient.new or MongoReplicaSetClient.new
     # @return [Hash]
     def connection_options
       opts = {}
 
-      if (@w || @journal || @wtimeout || @fsync || @wtimeoutms) && !@safe
-        raise MongoArgumentError, "Safe must be true if w, journal, wtimeoutMS, or fsync is specified"
+      if @wtimeout
+        warn "Using wtimeout in a URI is deprecated, please use wtimeoutMS. It will be removed in v2.0."
+        opts[:wtimeout] = @wtimeout
       end
+      opts[:wtimeout] = @wtimeoutms
 
-      if @safe
-        if @w || @journal || @wtimeout || @fsync || @wtimeoutms
-          safe_opts = {}
-          safe_opts[:w] = @w if @w
-          safe_opts[:j] = @journal if @journal
-          
-          if @wtimeout
-            warn "Using wtimeout in a URI is deprecated, please use wtimeoutMS. It will be removed in v2.0."
-            safe_opts[:wtimeout] = @wtimeout
-          end
-          
-          if @wtimeoutms
-            safe_opts[:wtimeout] = @wtimeoutms
-          end
-          
-          safe_opts[:fsync] = @fsync if @fsync
-        else
-          safe_opts = true
-        end
+      opts[:w] = 1 if @safe
+      opts[:w] = @w if @w
+      opts[:j] = @journal
+      opts[:fsync] = @fsync
 
-        opts[:safe] = safe_opts
-      end
-      
       if @connecttimeoutms
         opts[:connect_timeout] = @connecttimeoutms
       end
-      
+
       if @sockettimeoutms
         opts[:op_timeout] = @sockettimeoutms
       end
@@ -235,7 +251,7 @@ module Mongo
 
       hosturis.each do |hosturi|
         # If port is present, use it, otherwise use default port
-        host, port = hosturi.split(':') + [Connection::DEFAULT_PORT]
+        host, port = hosturi.split(':') + [MongoClient::DEFAULT_PORT]
 
         if !(port.to_s =~ /^\d+$/)
           raise MongoArgumentError, "Invalid port #{port}; port must be specified as digits."

data/lib/mongo/util/write_concern.rb

@@ -0,0 +1,67 @@
+# encoding: UTF-8
+
+# --
+# Copyright (C) 2008-2011 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
+  module WriteConcern
+
+    attr_reader :legacy_write_concern
+
+    @@safe_warn = nil
+    def write_concern_from_legacy(opts)
+      # Warn if 'safe' parameter is being used,
+      if opts.key?(:safe) && !@@safe_warn && !ENV['TEST_MODE']
+        warn "[DEPRECATED] The 'safe' write concern option has been deprecated in favor of 'w'."
+        @@safe_warn = true
+      end
+
+      # nil:   set :w => 0
+      # false: set :w => 0
+      # true:  set :w => 1
+      # hash:  set :w => 0 and merge with opts
+
+      unless opts.has_key?(:w)
+        opts[:w] = 0 # legacy default, unacknowledged
+        safe     = opts.delete(:safe)
+        if(safe && safe.is_a?(Hash))
+          opts.merge!(safe)
+        elsif(safe == true)
+          opts[:w] = 1
+        end
+      end
+    end
+
+    # todo: throw exception for conflicting write concern options
+    def get_write_concern(opts, parent=nil)
+      write_concern_from_legacy(opts) if opts.key?(:safe) || @legacy_write_concern
+      write_concern = {
+        :w        => 1,
+        :j        => false,
+        :fsync    => false,
+        :wtimeout => false
+      }
+      write_concern.merge!(parent.write_concern) if parent
+      write_concern.merge!(opts.reject {|k,v| !write_concern.keys.include?(k)})
+      write_concern
+    end
+
+    def self.gle?(write_concern)
+      write_concern[:w] > 0 || write_concern[:j] || write_concern[:fsync] || write_concern[:wtimeout]
+    end
+
+  end
+end