mongo 1.3.0 → 1.12.5

data/lib/mongo/db.rb

@@ -1,36 +1,36 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2011 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.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#   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 'timeout'
-require 'thread'
 
 module Mongo
 
   # A MongoDB database.
   class DB
-
-    SYSTEM_NAMESPACE_COLLECTION = "system.namespaces"
-    SYSTEM_INDEX_COLLECTION = "system.indexes"
-    SYSTEM_PROFILE_COLLECTION = "system.profile"
-    SYSTEM_USER_COLLECTION = "system.users"
-    SYSTEM_JS_COLLECTION = "system.js"
-    SYSTEM_COMMAND_COLLECTION = "$cmd"
+    include Mongo::WriteConcern
+
+    SYSTEM_NAMESPACE_COLLECTION = 'system.namespaces'
+    SYSTEM_INDEX_COLLECTION     = 'system.indexes'
+    SYSTEM_PROFILE_COLLECTION   = 'system.profile'
+    SYSTEM_USER_COLLECTION      = 'system.users'
+    SYSTEM_JS_COLLECTION        = 'system.js'
+    SYSTEM_COMMAND_COLLECTION   = '$cmd'
+    MAX_TIME_MS_CODE      = 50
+
+    PROFILE_LEVEL = {
+      :off       => 0,
+      :slow_only => 1,
+      :all       => 2
+    }
 
     # Counter for generating unique request ids.
     @@current_request_id = 0
@@ -40,98 +40,137 @@ module Mongo
     # collection that already exists, raises an error.
     #
     # Strict mode is disabled by default, but enabled (+true+) at any time.
-    attr_writer :strict
+    #
+    # @deprecated Support for strict will be removed in version 2.0 of the driver.
+    def strict=(value)
+      unless ENV['TEST_MODE']
+        warn "Support for strict mode has been deprecated and will be " +
+             "removed in version 2.0 of the driver."
+      end
+      @strict = value
+    end
 
     # Returns the value of the +strict+ flag.
-    def strict?; @strict; end
+    #
+    # @deprecated Support for strict will be removed in version 2.0 of the driver.
+    def strict?
+      @strict
+    end
 
-    # The name of the database and the local safe option.
-    attr_reader :name, :safe
+    # The name of the database and the local write concern options.
+    attr_reader :name, :write_concern
 
-    # The Mongo::Connection instance connecting to the MongoDB server.
-    attr_reader :connection
+    # The Mongo::MongoClient instance connecting to the MongoDB server.
+    attr_reader :client
+
+    # for backward compatibility
+    alias_method :connection, :client
 
     # The length of time that Collection.ensure_index should cache index calls
     attr_accessor :cache_time
 
+    # Read Preference
+    attr_accessor :read, :tag_sets, :acceptable_latency
+
     # Instances of DB are normally obtained by calling Mongo#db.
     #
     # @param [String] name the database name.
-    # @param [Mongo::Connection] connection a connection object pointing to MongoDB. Note
-    #   that databases are usually instantiated via the Connection class. See the examples below.
+    # @param [Mongo::MongoClient] client a connection object pointing to MongoDB. Note
+    #   that databases are usually instantiated via the MongoClient class. See the examples below.
     #
-    # @option opts [Boolean] :strict (False) If true, collections must exist to be accessed and must
-    #   not exist to be created. See DB#collection and DB#create_collection.
+    # @option opts [Boolean] :strict (False) [DEPRECATED] If true, collections existence checks are
+    # performed during a number of relevant operations. See DB#collection, DB#create_collection and
+    # DB#drop_collection.
     #
-    # @option opts [Object, #create_pk(doc)] :pk (Mongo::ObjectId) A primary key factory object,
+    # @option opts [Object, #create_pk(doc)] :pk (BSON::ObjectId) A primary key factory object,
     #   which should take a hash and return a hash which merges the original hash with any primary key
     #   fields the factory wishes to inject. (NOTE: if the object already has a primary key,
     #   the factory should not inject a new key).
     #
-    # @option opts [Boolean, Hash] :safe (false) Set the default safe-mode options
-    #   propagated to Collection objects instantiated off of this DB. If no
-    #   value is provided, the default value set on this instance's Connection object will be used. This
-    #   default can be overridden upon instantiation of any collection by explicity setting a :safe value
-    #   on initialization
-    # @option opts [Integer] :cache_time (300) Set the time that all ensure_index calls should cache the command.
+    # @option opts [String, Integer, Symbol] :w (1) Set default number of nodes to which a write
+    #   should be acknowledged.
+    # @option opts [Integer] :wtimeout (nil) Set replica set acknowledgement timeout.
+    # @option opts [Boolean] :j (false) If true, block until write operations have been committed
+    #   to the journal. Cannot be used in combination with 'fsync'. Prior to MongoDB 2.6 this option was
+    #   ignored if the server was running without journaling. Starting with MongoDB 2.6, write operations will
+    #   fail with an exception if this option is used when the server is running without journaling.
+    # @option opts [Boolean] :fsync (false) If true, and the server is running without journaling, blocks until
+    #   the server has synced all data files to disk. If the server is running with journaling, this acts the same as
+    #   the 'j' option, blocking until write operations have been committed to the journal.
+    #   Cannot be used in combination with 'j'.
+    #
+    #   Notes on write concern:
+    #     These write concern options are propagated to Collection objects instantiated off of this DB. If no
+    #     options are provided, the default write concern set on this instance's MongoClient object will be used. This
+    #     default can be overridden upon instantiation of any collection by explicitly setting write concern options
+    #     on initialization or at the time of an operation.
     #
-    # @core databases constructor_details
-    def initialize(name, connection, opts={})
-      @name       = Mongo::Support.validate_db_name(name)
-      @connection = connection
+    # @option opts [Integer] :cache_time (300) Set the time that all ensure_index calls should cache the command.
+
+    def initialize(name, client, opts={})
+      # A database name of '$external' is permitted for some auth types
+      Support.validate_db_name(name) unless name == '$external'
+
+      @name       = name
+      @client     = client
       @strict     = opts[:strict]
       @pk_factory = opts[:pk]
-      @safe       = opts.fetch(:safe, @connection.safe)
+
+      @write_concern = get_write_concern(opts, client)
+
+      @read = opts[:read] || @client.read
+      ReadPreference::validate(@read)
+
+      @tag_sets = opts.fetch(:tag_sets, @client.tag_sets)
+      @acceptable_latency = opts.fetch(:acceptable_latency,
+                                       @client.acceptable_latency)
+
       @cache_time = opts[:cache_time] || 300 #5 minutes.
     end
 
-    # Authenticate with the given username and password. Note that mongod
-    # must be started with the --auth option for authentication to be enabled.
-    #
-    # @param [String] username
-    # @param [String] password
-    # @param [Boolean] save_auth
-    #   Save this authentication to the connection object using Connection#add_auth. This
-    #   will ensure that the authentication will be applied on database reconnect. Note
-    #   that this value must be true when using connection pooling.
+    # Authenticate with the given username and password.
+    #
+    # @param username [String] The username.
+    # @param password [String] The user's password. This is not required for
+    #   some authentication mechanisms.
+    # @param save_auth [Boolean]
+    #   Save this authentication to the client object using
+    #   MongoClient#add_auth. This will ensure that the authentication will
+    #   be applied to all sockets and upon database reconnect.
+    # @param source [String] Database with user credentials. This should be
+    #   used to authenticate against a database when the credentials exist
+    #   elsewhere.
+    # @param mechanism [String] The authentication mechanism to be used.
+    # @param extra [Hash] A optional hash of extra options to be stored with
+    #   the credential set.
+    #
+    # @note The ability to disable the save_auth option has been deprecated.
+    #   With save_auth=false specified, driver authentication behavior during
+    #   failovers and reconnections becomes unreliable. This option still
+    #   exists for API compatibility, but it no longer has any effect if
+    #   disabled and now always uses the default behavior (safe_auth=true).
+    #
+    # @raise [AuthenticationError] Raised if authentication fails.
+    # @return [Boolean] The result of the authentication operation.
+    def authenticate(username, password=nil, save_auth=nil, source=nil, mechanism=nil, extra=nil)
+      warn "[DEPRECATED] Disabling the 'save_auth' option no longer has " +
+           "any effect. Please see the API documentation for more details " +
+           "on this change." unless save_auth.nil?
+      @client.add_auth(self.name, username, password, source, mechanism, extra)
+      true
+    end
+
+    # Deauthorizes use for this database for this client connection. Also removes
+    # the saved authentication in the MongoClient class associated with this
+    # database.
     #
     # @return [Boolean]
-    #
-    # @raise [AuthenticationError]
-    #
-    # @core authenticate authenticate-instance_method
-    def authenticate(username, password, save_auth=true)
-      if @connection.pool_size > 1
-        if !save_auth
-          raise MongoArgumentError, "If using connection pooling, :save_auth must be set to true."
-        end
-        @connection.authenticate_pools
-      end
-
-      issue_authentication(username, password, save_auth)
-    end
-
-    def issue_authentication(username, password, save_auth=true, opts={})
-      doc = command({:getnonce => 1}, :check_response => false, :socket => opts[:socket])
-      raise MongoDBError, "Error retrieving nonce: #{doc}" unless ok?(doc)
-      nonce = doc['nonce']
-
-      auth = BSON::OrderedHash.new
-      auth['authenticate'] = 1
-      auth['user'] = username
-      auth['nonce'] = nonce
-      auth['key'] = Mongo::Support.auth_key(username, password, nonce)
-      if ok?(self.command(auth, :check_response => false, :socket => opts[:socket]))
-        if save_auth
-          @connection.add_auth(@name, username, password)
-        end
-        true
-      else
-        raise(Mongo::AuthenticationError, "Failed to authenticate user '#{username}' on db '#{self.name}'")
-      end
+    def logout(opts={})
+      @client.remove_auth(self.name)
+      true
     end
 
-    # Adds a stored Javascript function to the database which can executed  
+    # Adds a stored Javascript function to the database which can executed
     # server-side in map_reduce, db.eval and $where clauses.
     #
     # @param [String] function_name
@@ -141,7 +180,7 @@ module Mongo
     def add_stored_function(function_name, code)
       self[SYSTEM_JS_COLLECTION].save(
         {
-          "_id" => function_name, 
+          "_id" => function_name,
           :value => BSON::Code.new(code)
         }
       )
@@ -154,26 +193,50 @@ module Mongo
     #
     # @return [Boolean]
     def remove_stored_function(function_name)
-      if self[SYSTEM_JS_COLLECTION].find_one({"_id" => function_name})
-        self[SYSTEM_JS_COLLECTION].remove({"_id" => function_name}, :safe => true)
-      else
-        return false
-      end
+      return false unless self[SYSTEM_JS_COLLECTION].find_one({"_id" => function_name})
+      self[SYSTEM_JS_COLLECTION].remove({"_id" => function_name}, :w => 1)
     end
 
     # Adds a user to this database for use with authentication. If the user already
-    # exists in the system, the password will be updated.
+    # exists in the system, the password and any additional fields provided in opts
+    # will be updated.
     #
     # @param [String] username
     # @param [String] password
+    # @param [Boolean] read_only
+    #   Create a read-only user.
+    #
+    # @param [Hash] opts
+    #   Optional fields for the user document (e.g. +userSource+, or +roles+)
+    #
+    #   See {http://docs.mongodb.org/manual/reference/privilege-documents}
+    #   for more information.
+    #
+    # @note The use of the opts argument to provide or update additional fields
+    #   on the user document requires MongoDB >= 2.4.0
     #
     # @return [Hash] an object representing the user.
-    def add_user(username, password)
-      users = self[SYSTEM_USER_COLLECTION]
-      user  = users.find_one({:user => username}) || {:user => username}
-      user['pwd'] = Mongo::Support.hash_password(username, password)
-      users.save(user)
-      return user
+    def add_user(username, password=nil, read_only=false, opts={})
+      user_info = command(:usersInfo => username)
+      if user_info.key?('users') && !user_info['users'].empty?
+        create_or_update_user(:updateUser, username, password, read_only, opts)
+      else
+        create_or_update_user(:createUser, username, password, read_only, opts)
+      end
+        # MongoDB >= 2.5.3 requires the use of commands to manage users.
+        # "Command not found" error didn't return an error code (59) before
+        # MongoDB 2.4.7 so we assume that a nil error code means the usersInfo
+        # command doesn't exist and we should fall back to the legacy add user code.
+    rescue OperationFailure => ex
+      if Mongo::ErrorCode::COMMAND_NOT_FOUND_CODES.include?(ex.error_code)
+        legacy_add_user(username, password, read_only, opts)
+      elsif ex.error_code == Mongo::ErrorCode::UNAUTHORIZED
+        # In MongoDB > 2.7 the localhost exception was narrowed, and the usersInfo
+        # command is no longer allowed.  In this case, add the first user.
+        create_or_update_user(:createUser, username, password, read_only, opts)
+      else
+        raise ex
+      end
     end
 
     # Remove the given user from this database. Returns false if the user
@@ -183,35 +246,12 @@ module Mongo
     #
     # @return [Boolean]
     def remove_user(username)
-      if self[SYSTEM_USER_COLLECTION].find_one({:user => username})
-        self[SYSTEM_USER_COLLECTION].remove({:user => username}, :safe => true)
-      else
-        return false
-      end
-    end
-
-    # Deauthorizes use for this database for this connection. Also removes
-    # any saved authentication in the connection class associated with this
-    # database.
-    #
-    # @raise [MongoDBError] if logging out fails.
-    #
-    # @return [Boolean]
-    def logout(opts={})
-      if @connection.pool_size > 1
-        @connection.logout_pools(@name)
-      end
-
-      issue_logout(opts)
-    end
-
-    def issue_logout(opts={})
-      doc = command({:logout => 1}, :socket => opts[:socket])
-      if ok?(doc)
-        @connection.remove_auth(@name)
-        true
-      else
-        raise MongoDBError, "error logging out: #{doc.inspect}"
+      begin
+        command(:dropUser => username)
+      rescue OperationFailure => ex
+        raise ex unless Mongo::ErrorCode::COMMAND_NOT_FOUND_CODES.include?(ex.error_code)
+        response = self[SYSTEM_USER_COLLECTION].remove({:user => username}, :w => 1)
+        response.key?('n') && response['n'] > 0 ? response : false
       end
     end
 
@@ -219,9 +259,14 @@ module Mongo
     #
     # @return [Array]
     def collection_names
-      names = collections_info.collect { |doc| doc['name'] || '' }
-      names = names.delete_if {|name| name.index(@name).nil? || name.index('$')}
-      names.map {|name| name.sub(@name + '.', '')}
+      if @client.wire_version_feature?(Mongo::MongoClient::MONGODB_3_0)
+        names = collections_info.collect { |doc| doc['name'] || '' }
+        names.delete_if do |name|
+          name.index('$')
+        end
+      else
+        legacy_collection_names
+      end
     end
 
     # Get an array of Collection instances, one for each collection in this database.
@@ -237,13 +282,33 @@ module Mongo
     # a cursor which can be iterated over. For each collection, a hash
     # will be yielded containing a 'name' string and, optionally, an 'options' hash.
     #
-    # @param [String] coll_name return info for the specifed collection only.
+    # @param [String] coll_name return info for the specified collection only.
     #
-    # @return [Mongo::Cursor]
+    # @return [Array] List of collection info.
     def collections_info(coll_name=nil)
-      selector = {}
-      selector[:name] = full_collection_name(coll_name) if coll_name
-      Cursor.new(Collection.new(SYSTEM_NAMESPACE_COLLECTION, self), :selector => selector)
+      if @client.wire_version_feature?(Mongo::MongoClient::MONGODB_3_0)
+        cmd = BSON::OrderedHash[:listCollections, 1]
+        cmd.merge!(:filter => { :name => coll_name }) if coll_name
+        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
     end
 
     # Create a collection.
@@ -251,52 +316,58 @@ module Mongo
     # new collection. If +strict+ is true, will raise an error if
     # collection +name+ already exists.
     #
-    # @param [String] name the name of the new collection.
+    # @param [String, Symbol] name the name of the new collection.
     #
     # @option opts [Boolean] :capped (False) created a capped collection.
     #
-    # @option opts [Integer] :size (Nil) If +capped+ is +true+, specifies the maximum number of
-    #   bytes for the capped collection. If +false+, specifies the number of bytes allocated
+    # @option opts [Integer] :size (Nil) If +capped+ is +true+,
+    #   specifies the maximum number of bytes for the capped collection.
+    #   If +false+, specifies the number of bytes allocated
     #   for the initial extent of the collection.
     #
-    # @option opts [Integer] :max (Nil) If +capped+ is +true+, indicates the maximum number of records
-    #   in a capped collection.
+    # @option opts [Integer] :max (Nil) If +capped+ is +true+, indicates
+    #   the maximum number of records in a capped collection.
     #
-    # @raise [MongoDBError] raised under two conditions: either we're in +strict+ mode and the collection
+    # @raise [MongoDBError] raised under two conditions:
+    #   either we're in +strict+ mode and the collection
     #   already exists or collection creation fails on the server.
     #
+    # @note Note that the options listed may be subset of those available.
+    #   Please see the MongoDB documentation for a full list of supported options by server version.
+    #
     # @return [Mongo::Collection]
     def create_collection(name, opts={})
-      # Does the collection already exist?
-      if collection_names.include?(name)
-        if strict?
-          raise MongoDBError, "Collection #{name} already exists. Currently in strict mode."
-        else
-          return Collection.new(name, self, opts)
-        end
+      name = name.to_s
+      if strict? && collection_names.include?(name)
+        raise MongoDBError, "Collection '#{name}' already exists. (strict=true)"
       end
 
-      # Create a new collection.
-      oh = BSON::OrderedHash.new
-      oh[:create] = name
-      doc = command(oh.merge(opts || {}))
-      return Collection.new(name, self, :pk => @pk_factory) if ok?(doc)
+      begin
+        cmd = BSON::OrderedHash.new
+        cmd[:create] = name
+        doc = command(cmd.merge(opts || {}))
+        return Collection.new(name, self, :pk => @pk_factory) if ok?(doc)
+      rescue OperationFailure => e
+        return Collection.new(name, self, :pk => @pk_factory) if e.message =~ /exists/
+        raise e
+      end
       raise MongoDBError, "Error creating collection: #{doc.inspect}"
     end
 
     # Get a collection by name.
     #
-    # @param [String] name the collection name.
+    # @param [String, Symbol] name the collection name.
     # @param [Hash] opts any valid options that can be passed to Collection#new.
     #
-    # @raise [MongoDBError] if collection does not already exist and we're in +strict+ mode.
+    # @raise [MongoDBError] if collection does not already exist and we're in
+    #   +strict+ mode.
     #
     # @return [Mongo::Collection]
     def collection(name, opts={})
-      if strict? && !collection_names.include?(name)
-        raise Mongo::MongoDBError, "Collection #{name} doesn't exist. Currently in strict mode."
+      if strict? && !collection_names.include?(name.to_s)
+        raise MongoDBError, "Collection '#{name}' doesn't exist. (strict=true)"
       else
-        opts[:safe] = opts.fetch(:safe, @safe)
+        opts = opts.dup
         opts.merge!(:pk => @pk_factory) unless opts[:pk]
         Collection.new(name, self, opts)
       end
@@ -305,13 +376,16 @@ module Mongo
 
     # Drop a collection by +name+.
     #
-    # @param [String] name
+    # @param [String, Symbol] name
     #
     # @return [Boolean] +true+ on success or +false+ if the collection name doesn't exist.
     def drop_collection(name)
-      return true unless collection_names.include?(name)
-
-      ok?(command(:drop => name))
+      return false if strict? && !collection_names.include?(name.to_s)
+      begin
+        ok?(command(:drop => name))
+      rescue OperationFailure
+        false
+      end
     end
 
     # Run the getlasterror command with the specified replication options.
@@ -319,6 +393,7 @@ module Mongo
     # @option opts [Boolean] :fsync (false)
     # @option opts [Integer] :w (nil)
     # @option opts [Integer] :wtimeout (nil)
+    # @option opts [Boolean] :j (false)
     #
     # @return [Hash] the entire response to getlasterror.
     #
@@ -328,7 +403,7 @@ module Mongo
       cmd[:getlasterror] = 1
       cmd.merge!(opts)
       doc = command(cmd, :check_response => false)
-      raise MongoDBError, "error retrieving last error: #{doc.inspect}" unless ok?(doc)
+      raise MongoDBError, "Error retrieving last error: #{doc.inspect}" unless ok?(doc)
       doc
     end
 
@@ -340,19 +415,15 @@ module Mongo
       get_last_error['err'] != nil
     end
 
-    # Get the most recent error to have occured on this database.
+    # Get the most recent error to have occurred on this database.
     #
-    # This command only returns errors that have occured since the last call to
+    # This command only returns errors that have occurred since the last call to
     # DB#reset_error_history - returns +nil+ if there is no such error.
     #
     # @return [String, Nil] the text of the error or +nil+ if no error has occurred.
     def previous_error
       error = command(:getpreverror => 1)
-      if error["err"]
-        error
-      else
-        nil
-      end
+      error["err"] ? error : nil
     end
 
     # Reset the error history of this database
@@ -379,19 +450,22 @@ module Mongo
     # Evaluate a JavaScript expression in MongoDB.
     #
     # @param [String, Code] code a JavaScript expression to evaluate server-side.
-    # @param [Integer, Hash] args any additional argument to be passed to the +code+ expression when 
+    # @param [Integer, Hash] args any additional argument to be passed to the +code+ expression when
     #   it's run on the server.
     #
+    # @note the eval command is deprecated in MongoDB 3.0 and will be removed in a future server version.
+    #
     # @return [String] the return value of the function.
     def eval(code, *args)
-      if not code.is_a? BSON::Code
+      unless code.is_a?(BSON::Code)
         code = BSON::Code.new(code)
       end
 
-      oh = BSON::OrderedHash.new
-      oh[:$eval] = code
-      oh[:args]  = args
-      doc = command(oh)
+      cmd = BSON::OrderedHash.new
+      cmd[:$eval] = code
+      cmd.merge!(args.pop) if args.last.respond_to?(:keys) && args.last.key?(:nolock)
+      cmd[:args] = args
+      doc = command(cmd)
       doc['retval']
     end
 
@@ -404,10 +478,10 @@ module Mongo
     #
     # @raise MongoDBError if there's an error renaming the collection.
     def rename_collection(from, to)
-      oh = BSON::OrderedHash.new
-      oh[:renameCollection] = "#{@name}.#{from}"
-      oh[:to] = "#{@name}.#{to}"
-      doc = DB.new('admin', @connection).command(oh, :check_response => false)
+      cmd = BSON::OrderedHash.new
+      cmd[:renameCollection] = "#{@name}.#{from}"
+      cmd[:to] = "#{@name}.#{to}"
+      doc = DB.new('admin', @client).command(cmd, :check_response => false)
       ok?(doc) || raise(MongoDBError, "Error renaming collection: #{doc.inspect}")
     end
 
@@ -419,12 +493,12 @@ module Mongo
     #
     # @return [True] returns +true+ on success.
     #
-    # @raise MongoDBError if there's an error renaming the collection.
+    # @raise MongoDBError if there's an error dropping the index.
     def drop_index(collection_name, index_name)
-      oh = BSON::OrderedHash.new
-      oh[:deleteIndexes] = collection_name
-      oh[:index] = index_name.to_s
-      doc = command(oh, :check_response => false)
+      cmd = BSON::OrderedHash.new
+      cmd[:deleteIndexes] = collection_name
+      cmd[:index] = index_name.to_s
+      doc = command(cmd, :check_response => false)
       ok?(doc) || raise(MongoDBError, "Error with drop_index command: #{doc.inspect}")
     end
 
@@ -433,22 +507,40 @@ module Mongo
     #
     # @param [String] collection_name
     #
-    # @return [Hash] keys are index names and the values are lists of [key, direction] pairs
+    # @return [Hash] keys are index names and the values are lists of [key, type] pairs
     #   defining the index.
     def index_information(collection_name)
-      sel  = {:ns => full_collection_name(collection_name)}
-      info = {}
-      Cursor.new(Collection.new(SYSTEM_INDEX_COLLECTION, self), :selector => sel).each do |index|
-        info[index['name']] = index
+      if @client.wire_version_feature?(Mongo::MongoClient::MONGODB_3_0)
+        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
+        indexes = legacy_list_indexes(collection_name)
+      end
+      indexes.reduce({}) do |info, index|
+        info.merge!(index['name'] => index)
       end
-      info
     end
 
     # Return stats on this database. Uses MongoDB's dbstats command.
     #
     # @return [Hash]
     def stats
-      self.command({:dbstats => 1})
+      self.command(:dbstats => 1)
     end
 
     # Return +true+ if the supplied +doc+ contains an 'ok' field with the value 1.
@@ -470,38 +562,75 @@ module Mongo
     # to see how it works.
     #
     # @param [OrderedHash, Hash] selector an OrderedHash, or a standard Hash with just one
-    # key, specifying the command to be performed. In Ruby 1.9, OrderedHash isn't necessary since
-    # hashes are ordered by default.
+    # key, specifying the command to be performed. In Ruby 1.9 and above, OrderedHash isn't necessary
+    # because hashes are ordered by default.
     #
     # @option opts [Boolean] :check_response (true) If +true+, raises an exception if the
-    # command fails.
+    #   command fails.
     # @option opts [Socket] :socket a socket to use for sending the command. This is mainly for internal use.
+    # @option opts [:primary, :secondary] :read Read preference for this command. See Collection#find for
+    #   more details.
+    # @option opts [String]  :comment (nil) a comment to include in profiling logs
+    # @option opts [Boolean] :compile_regex (true) whether BSON regex objects should be compiled into Ruby regexes.
+    #   If false, a BSON::Regex object will be returned instead.
     #
     # @return [Hash]
-    #
-    # @core commands command_instance-method
     def command(selector, opts={})
-      check_response = opts.fetch(:check_response, true)
-      socket         = opts[:socket]
-      raise MongoArgumentError, "command must be given a selector" unless selector.is_a?(Hash) && !selector.empty?
-      if selector.keys.length > 1 && RUBY_VERSION < '1.9' && selector.class != BSON::OrderedHash
-        raise MongoArgumentError, "DB#command requires an OrderedHash when hash contains multiple keys"
+      raise MongoArgumentError, "Command must be given a selector" unless selector.respond_to?(:keys) && !selector.empty?
+
+      opts = opts.dup
+      # deletes :check_response and returns the value, if nil defaults to the block result
+      check_response = opts.delete(:check_response) { true }
+
+      # build up the command hash
+      command = opts.key?(:socket) ? { :socket => opts.delete(:socket) } : {}
+      command.merge!(:comment => opts.delete(:comment)) if opts.key?(:comment)
+      command.merge!(:compile_regex => opts.delete(:compile_regex)) if opts.key?(:compile_regex)
+      command[:limit] = -1
+      command[:read] = Mongo::ReadPreference::cmd_read_pref(opts.delete(:read), selector) if opts.key?(:read)
+
+      if RUBY_VERSION < '1.9' && selector.class != BSON::OrderedHash
+        if selector.keys.length > 1
+          raise MongoArgumentError, "DB#command requires an OrderedHash when hash contains multiple keys"
+        end
+        if opts.keys.size > 0
+          # extra opts will be merged into the selector, so make sure it's an OH in versions < 1.9
+          selector = selector.dup
+          selector = BSON::OrderedHash.new.merge!(selector)
+        end
       end
 
+      # arbitrary opts are merged into the selector
+      command[:selector] = selector.merge!(opts)
+
       begin
-        result = Cursor.new(system_command_collection,
-          :limit => -1, :selector => selector, :socket => socket).next_document
+        result = Cursor.new(system_command_collection, command).next_document
       rescue OperationFailure => ex
-        raise OperationFailure, "Database command '#{selector.keys.first}' failed: #{ex.message}"
+        if check_response
+          raise ex.class.new("Database command '#{selector.keys.first}' failed: #{ex.message}", ex.error_code, ex.result)
+        else
+          result = ex.result
+        end
       end
 
-      if result.nil?
-        raise OperationFailure, "Database command '#{selector.keys.first}' failed: returned null."
-      elsif (check_response && !ok?(result))
-        raise OperationFailure, "Database command '#{selector.keys.first}' failed: #{result.inspect}"
-      else
-        result
+      raise OperationFailure,
+        "Database command '#{selector.keys.first}' failed: returned null." unless result
+
+      if check_response && (!ok?(result) || result['writeErrors'] || result['writeConcernError'])
+        message = "Database command '#{selector.keys.first}' failed: ("
+        message << result.map do |key, value|
+          "#{key}: '#{value}'"
+        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
+
+      result
     end
 
     # A shortcut returning db plus dot plus collection name.
@@ -524,9 +653,8 @@ module Mongo
     #
     # @raise [MongoArgumentError] if the primary key factory has already been set.
     def pk_factory=(pk_factory)
-      if @pk_factory
-        raise MongoArgumentError, "Cannot change primary key factory once it's been set"
-      end
+      raise MongoArgumentError,
+        "Cannot change primary key factory once it's been set" if @pk_factory
 
       @pk_factory = pk_factory
     end
@@ -535,23 +663,16 @@ module Mongo
     # get the results using DB#profiling_info.
     #
     # @return [Symbol] :off, :slow_only, or :all
-    #
-    # @core profiling profiling_level-instance_method
     def profiling_level
-      oh = BSON::OrderedHash.new
-      oh[:profile] = -1
-      doc = command(oh, :check_response => false)
-      raise "Error with profile command: #{doc.inspect}" unless ok?(doc) && doc['was'].kind_of?(Numeric)
-      case doc['was'].to_i
-      when 0
-        :off
-      when 1
-        :slow_only
-      when 2
-        :all
-      else
-        raise "Error: illegal profiling level value #{doc['was']}"
-      end
+      cmd = BSON::OrderedHash.new
+      cmd[:profile] = -1
+      doc = command(cmd, :check_response => false)
+
+      raise "Error with profile command: #{doc.inspect}" unless ok?(doc)
+
+      level_sym = PROFILE_LEVEL.invert[doc['was'].to_i]
+      raise "Error: illegal profiling level value #{doc['was']}" unless level_sym
+      level_sym
     end
 
     # Set this database's profiling level. If profiling is enabled, you can
@@ -559,18 +680,9 @@ module Mongo
     #
     # @param [Symbol] level acceptable options are +:off+, +:slow_only+, or +:all+.
     def profiling_level=(level)
-      oh = BSON::OrderedHash.new
-      oh[:profile] = case level
-                     when :off
-                       0
-                     when :slow_only
-                       1
-                     when :all
-                       2
-                     else
-                       raise "Error: illegal profiling level value #{level}"
-                     end
-      doc = command(oh, :check_response => false)
+      cmd = BSON::OrderedHash.new
+      cmd[:profile] = PROFILE_LEVEL[level]
+      doc = command(cmd, :check_response => false)
       ok?(doc) || raise(MongoDBError, "Error with profile command: #{doc.inspect}")
     end
 
@@ -590,11 +702,16 @@ module Mongo
     # @raise [MongoDBError] if the command fails or there's a problem with the validation
     #   data, or if the collection is invalid.
     def validate_collection(name)
-      doc = command({:validate => name}, :check_response => false)
+      cmd = BSON::OrderedHash.new
+      cmd[:validate] = name
+      cmd[:full] = true
+      doc = command(cmd, :check_response => false)
+
       raise MongoDBError, "Error with validate command: #{doc.inspect}" unless ok?(doc)
-      result = doc['result']
-      raise MongoDBError, "Error with validation data: #{doc.inspect}" unless result.kind_of?(String)
-      raise MongoDBError, "Error: invalid collection #{name}: #{doc.inspect}" if result =~ /\b(exception|corrupt)\b/i
+
+      if (doc.has_key?('valid') && !doc['valid']) || (doc['result'] =~ /\b(exception|corrupt)\b/i)
+        raise MongoDBError, "Error: invalid collection #{name}: #{doc.inspect}"
+      end
       doc
     end
 
@@ -603,5 +720,89 @@ module Mongo
     def system_command_collection
       Collection.new(SYSTEM_COMMAND_COLLECTION, self)
     end
+
+    # Create a new user.
+    #
+    # @param username [String] The username.
+    # @param password [String] The user's password.
+    # @param read_only [Boolean] Create a read-only user (deprecated in MongoDB >= 2.6)
+    # @param opts [Hash]
+    #
+    # @private
+    def create_or_update_user(command, username, password, read_only, opts)
+      if read_only || !opts.key?(:roles)
+        warn "Creating a user with the read_only option or without roles is " +
+             "deprecated in MongoDB >= 2.6"
+      end
+
+      # The password is always salted and hashed by the driver.
+      if opts.key?(:digestPassword)
+        raise MongoArgumentError,
+          "The digestPassword option is not available via DB#add_user. " +
+          "Use DB#command(:createUser => ...) instead for this option."
+      end
+
+      opts = opts.dup
+      pwd = Mongo::Authentication.hash_password(username, password) if password
+      cmd_opts = pwd ? { :pwd => pwd } : {}
+      # specify that the server shouldn't digest the password because the driver does
+      cmd_opts[:digestPassword] = false
+      unless opts.key?(:roles)
+        if name == 'admin'
+          roles = read_only ? ['readAnyDatabase'] : ['root']
+        else
+          roles = read_only ? ['read'] : ["dbOwner"]
+        end
+        cmd_opts[:roles] = roles
+      end
+      cmd_opts[:writeConcern] =
+        opts.key?(:writeConcern) ? opts.delete(:writeConcern) : { :w => 1 }
+      cmd_opts.merge!(opts)
+      command({ command => username }, cmd_opts)
+    end
+
+    # Create a user in MongoDB versions < 2.5.3.
+    # Called by #add_user if the 'usersInfo' command fails.
+    #
+    # @param username [String] The username.
+    # @param password [String] (nil) The user's password.
+    # @param read_only [Boolean] (false) Create a read-only user.
+    # @param opts [Hash]
+    #
+    # @private
+    def legacy_add_user(username, password=nil, read_only=false, opts={})
+      users = self[SYSTEM_USER_COLLECTION]
+      user  = users.find_one(:user => username) || {:user => username}
+      user['pwd'] =
+        Mongo::Authentication.hash_password(username, password) if password
+      user['readOnly'] = true if read_only
+      user.merge!(opts)
+      begin
+        users.save(user)
+      rescue OperationFailure => ex
+        # adding first admin user fails GLE in MongoDB 2.2
+        raise ex unless ex.message =~ /login/
+      end
+      user
+    end
+
+    def legacy_list_indexes(collection_name)
+      sel  = {:ns => full_collection_name(collection_name)}
+      Cursor.new(Collection.new(SYSTEM_INDEX_COLLECTION, self), :selector => sel)
+    end
+
+    def legacy_collections_info(coll_name=nil)
+      selector = {}
+      selector[:name] = full_collection_name(coll_name) if coll_name
+      Cursor.new(Collection.new(SYSTEM_NAMESPACE_COLLECTION, self), :selector => selector)
+    end
+
+    def legacy_collection_names
+      names = legacy_collections_info.collect { |doc| doc['name'] || '' }
+      names = names.delete_if do |name|
+        name.index(@name).nil? || name.index('$')
+      end
+      names.map {|name| name.sub(@name + '.', '')}
+    end
   end
 end