mongo 0.1.0 → 0.15

data/lib/mongo/db.rb

@@ -1,20 +1,21 @@
 # --
 # Copyright (C) 2008-2009 10gen Inc.
 #
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License, version 3, as
-# published by the Free Software Foundation.
+# 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
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
-# for more details.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# 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 'digest/md5'
 require 'mutex_m'
 require 'mongo/collection'
 require 'mongo/message'
@@ -22,349 +23,533 @@ require 'mongo/query'
 require 'mongo/util/ordered_hash.rb'
 require 'mongo/admin'
 
-module XGen
-  module Mongo
-    module Driver
-
-      # A Mongo database.
-      class DB
-
-        SYSTEM_NAMESPACE_COLLECTION = "system.namespaces"
-        SYSTEM_INDEX_COLLECTION = "system.indexes"
-        SYSTEM_PROFILE_COLLECTION = "system.profile"
-        SYSTEM_COMMAND_COLLECTION = "$cmd"
-
-        # Strict mode enforces collection existence checks. When +true+,
-        # asking for a collection that does not exist or trying to create a
-        # collection that already exists raises an error.
-        #
-        # Strict mode is off (+false+) by default. Its value can be changed at
-        # any time.
-        attr_writer :strict
-
-        # Returns the value of the +strict+ flag.
-        def strict?; @strict; end
-
-        # The name of the database.
-        attr_reader :name
-
-        # Host to which we are currently connected.
-        attr_reader :host
-        # Port to which we are currently connected.
-        attr_reader :port
-
-        # An array of [host, port] pairs.
-        attr_reader :nodes
-
-        # The database's socket. For internal (and Cursor) use only.
-        attr_reader :socket
-
-        # db_name :: The database name
-        #
-        # nodes :: An array of [host, port] pairs.
-        #
-        # When a DB object first connects, it tries the first node. If that
-        # fails, it keeps trying to connect to the remaining nodes until it
-        # sucessfully connects.
-        def initialize(db_name, nodes)
-          raise "Invalid DB name" if !db_name || (db_name && db_name.length > 0 && db_name.include?("."))
-          @name, @nodes = db_name, nodes
-          @strict = false
-          @semaphore = Object.new
-          @semaphore.extend Mutex_m
-          connect_to_first_available_host
+module Mongo
+
+  # A Mongo database.
+  class DB
+
+    SYSTEM_NAMESPACE_COLLECTION = "system.namespaces"
+    SYSTEM_INDEX_COLLECTION = "system.indexes"
+    SYSTEM_PROFILE_COLLECTION = "system.profile"
+    SYSTEM_USER_COLLECTION = "system.users"
+    SYSTEM_COMMAND_COLLECTION = "$cmd"
+
+    # Strict mode enforces collection existence checks. When +true+,
+    # asking for a collection that does not exist or trying to create a
+    # collection that already exists raises an error.
+    #
+    # Strict mode is off (+false+) by default. Its value can be changed at
+    # any time.
+    attr_writer :strict
+
+    # Returns the value of the +strict+ flag.
+    def strict?; @strict; end
+
+    # The name of the database.
+    attr_reader :name
+
+    # Host to which we are currently connected.
+    attr_reader :host
+    # Port to which we are currently connected.
+    attr_reader :port
+
+    # An array of [host, port] pairs.
+    attr_reader :nodes
+
+    # The database's socket. For internal (and Cursor) use only.
+    attr_reader :socket
+
+    def slave_ok?; @slave_ok; end
+    def auto_reconnect?; @auto_reconnect; end
+
+    # A primary key factory object (or +nil+). See the README.doc file or
+    # DB#new for details.
+    attr_reader :pk_factory
+
+    def pk_factory=(pk_factory)
+      raise "error: can not change PK factory" if @pk_factory
+      @pk_factory = pk_factory
+    end
+
+    # Instances of DB are normally obtained by calling Mongo#db.
+    #
+    # db_name :: The database name
+    #
+    # nodes :: An array of [host, port] pairs. See Connection#new, which offers
+    #          a more flexible way of defining nodes.
+    #
+    # options :: A hash of options.
+    #
+    # Options:
+    #
+    # :strict :: If true, collections must exist to be accessed and must
+    #            not exist to be created. See #collection and
+    #            #create_collection.
+    #
+    # :pk :: A primary key factory object that must respond to :create_pk,
+    #        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; this means that the
+    #        object is being used in a repsert but it already exists.) The
+    #        idea here is that when ever a record is inserted, the :pk
+    #        object's +create_pk+ method will be called and the new hash
+    #        returned will be inserted.
+    #
+    # :slave_ok :: Only used if +nodes+ contains only one host/port. If
+    #              false, when connecting to that host/port we check to
+    #              see if the server is the master. If it is not, an error
+    #              is thrown.
+    #
+    # :auto_reconnect :: If the connection gets closed (for example, we
+    #                    have a server pair and saw the "not master"
+    #                    error, which closes the connection), then
+    #                    automatically try to reconnect to the master or
+    #                    to the single server we have been given. Defaults
+    #                    to +false+.
+    # :logger :: Optional Logger instance to which driver usage information
+    #            will be logged.
+    #
+    # When a DB object first connects to a pair, it will find the master
+    # instance and connect to that one. On socket error or if we recieve a
+    # "not master" error, we again find the master of the pair.
+    def initialize(db_name, nodes, options={})
+      case db_name
+      when Symbol, String
+      else
+        raise TypeError, "db_name must be a string or symbol"
+      end
+
+      [" ", ".", "$", "/", "\\"].each do |invalid_char|
+        if db_name.include? invalid_char
+          raise InvalidName, "database names cannot contain the character '#{invalid_char}'"
         end
+      end
+      if db_name.empty?
+        raise InvalidName, "database name cannot be the empty string"
+      end
+
+      @name, @nodes = db_name, nodes
+      @strict = options[:strict]
+      @pk_factory = options[:pk]
+      @slave_ok = options[:slave_ok] && @nodes.length == 1 # only OK if one node
+      @auto_reconnect = options[:auto_reconnect]
+      @semaphore = Object.new
+      @semaphore.extend Mutex_m
+      @socket = nil
+      @logger = options[:logger]
+      connect_to_master
+    end
 
-        def connect_to_first_available_host
+    def connect_to_master
+      close if @socket
+      @host = @port = nil
+      @nodes.detect { |hp|
+        @host, @port = *hp
+        begin
+          @socket = TCPSocket.new(@host, @port)
+          @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+          # Check for master. Can't call master? because it uses mutex,
+          # which may already be in use during this call.
+          semaphore_is_locked = @semaphore.locked?
+          @semaphore.unlock if semaphore_is_locked
+          is_master = master?
+          @semaphore.lock if semaphore_is_locked
+
+          @slave_ok || is_master
+        rescue SocketError, SystemCallError, IOError => ex
           close if @socket
-          @host = @port = nil
-          @nodes.detect { |hp|
-            @host, @port = *hp
-            begin
-              @socket = TCPSocket.new(@host, @port)
-              break if ok?(db_command(:ismaster => 1)) # success
-            rescue => ex
-              close if @socket
-            end
-            @socket
-          }
-          raise "error: failed to connect to any given host:port" unless @socket
+          false
         end
+      }
+      raise "error: failed to connect to any given host:port" unless @socket
+    end
 
-        # Returns an array of collection names. Each name is of the form
-        # "database_name.collection_name".
-        def collection_names
-          names = collections_info.collect { |doc| doc['name'] || '' }
-          names.delete('')
-          names
-        end
+    # Returns true if +username+ has +password+ in
+    # +SYSTEM_USER_COLLECTION+. +name+ is username, +password+ is
+    # plaintext password.
+    def authenticate(username, password)
+      doc = db_command(:getnonce => 1)
+      raise "error retrieving nonce: #{doc}" unless ok?(doc)
+      nonce = doc['nonce']
+
+      auth = OrderedHash.new
+      auth['authenticate'] = 1
+      auth['user'] = username
+      auth['nonce'] = nonce
+      auth['key'] = Digest::MD5.hexdigest("#{nonce}#{username}#{hash_password(username, password)}")
+      ok?(db_command(auth))
+    end
 
-        # Returns a cursor over query result hashes. Each hash contains a
-        # 'name' string and optionally an 'options' hash. If +coll_name+ is
-        # specified, an array of length 1 is returned.
-        def collections_info(coll_name=nil)
-          selector = {}
-          selector[:name] = full_coll_name(coll_name) if coll_name
-          query(Collection.new(self, SYSTEM_NAMESPACE_COLLECTION), Query.new(selector))
-        end
+    # Deauthorizes use for this database for this connection.
+    def logout
+      doc = db_command(:logout => 1)
+      raise "error logging out: #{doc.inspect}" unless ok?(doc)
+    end
 
-        # Create a collection. If +strict+ is false, will return existing or
-        # new collection. If +strict+ is true, will raise an error if
-        # collection +name+ already exists.
-        #
-        # Options is an optional hash:
-        #
-        # :capped :: Boolean. If not specified, capped is +false+.
-        #
-        # :size :: If +capped+ is +true+, specifies the maximum number of
-        #          bytes. If +false+, specifies the initial extent of the
-        #          collection.
-        #
-        # :max :: Max number of records in a capped collection. Optional.
-        def create_collection(name, options={})
-          # First check existence
-          if collection_names.include?(full_coll_name(name))
-            if strict?
-              raise "Collection #{name} already exists. Currently in strict mode."
-            else
-              return Collection.new(self, name)
-            end
-          end
+    # Returns an array of collection names in this database.
+    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 + '.', '')}
+    end
 
-          # Create new collection
-          oh = OrderedHash.new
-          oh[:create] = name
-          doc = db_command(oh.merge(options || {}))
-          ok = doc['ok']
-          return Collection.new(self, name) if ok.kind_of?(Numeric) && (ok.to_i == 1 || ok.to_i == 0)
-          raise "Error creating collection: #{doc.inspect}"
-        end
+    # Retruns an array of Collection instances, one for each collection in this
+    # database.
+    def collections
+      collection_names.map do |collection_name|
+        Collection.new(self, collection_name)
+      end
+    end
 
-        def admin
-          Admin.new(self)
-        end
+    # Returns a cursor over query result hashes. Each hash contains a
+    # 'name' string and optionally an 'options' hash. If +coll_name+ is
+    # specified, an array of length 1 is returned.
+    def collections_info(coll_name=nil)
+      selector = {}
+      selector[:name] = full_coll_name(coll_name) if coll_name
+      query(Collection.new(self, SYSTEM_NAMESPACE_COLLECTION), Query.new(selector))
+    end
 
-        # Return a collection. If +strict+ is false, will return existing or
-        # new collection. If +strict+ is true, will raise an error if
-        # collection +name+ does not already exists.
-        def collection(name)
-          return Collection.new(self, name) if collection_names.include?(full_coll_name(name))
-          if strict?
-            raise "Collection #{name} doesn't exist. Currently in strict mode."
-          else
-            create_collection(name)
-          end
+    # Create a collection. If +strict+ is false, will return existing or
+    # new collection. If +strict+ is true, will raise an error if
+    # collection +name+ already exists.
+    #
+    # Options is an optional hash:
+    #
+    # :capped :: Boolean. If not specified, capped is +false+.
+    #
+    # :size :: If +capped+ is +true+, specifies the maximum number of
+    #          bytes. If +false+, specifies the initial extent of the
+    #          collection.
+    #
+    # :max :: Max number of records in a capped collection. Optional.
+    def create_collection(name, options={})
+      # First check existence
+      if collection_names.include?(name)
+        if strict?
+          raise "Collection #{name} already exists. Currently in strict mode."
+        else
+          return Collection.new(self, name)
         end
+      end
 
-        # Drop collection +name+. Returns +true+ on success or if the
-        # collection does not exist, +false+ otherwise.
-        def drop_collection(name)
-          return true unless collection_names.include?(full_coll_name(name))
+      # Create new collection
+      oh = OrderedHash.new
+      oh[:create] = name
+      doc = db_command(oh.merge(options || {}))
+      ok = doc['ok']
+      return Collection.new(self, name) if ok.kind_of?(Numeric) && (ok.to_i == 1 || ok.to_i == 0)
+      raise "Error creating collection: #{doc.inspect}"
+    end
 
-          coll = collection(name)
-          coll.drop_indexes     # Mongo requires that we drop indexes manually
-          ok?(db_command(:drop => name))
-        end
+    def admin
+      Admin.new(self)
+    end
 
-        # Returns true if this database is a master (or is not paired with any
-        # other database), false if it is a slave.
-        def master?
-          doc = db_command(:ismaster => 1)
-          is_master = doc['ismaster']
-          ok?(doc) && is_master.kind_of?(Numeric) && is_master.to_i == 1
-        end
+    # Return a collection. If +strict+ is false, will return existing or
+    # new collection. If +strict+ is true, will raise an error if
+    # collection +name+ does not already exists.
+    def collection(name)
+      return Collection.new(self, name) if !strict? || collection_names.include?(name)
+      raise "Collection #{name} doesn't exist. Currently in strict mode."
+    end
+    alias_method :[], :collection
 
-        # Returns a string of the form "host:port" that points to the master
-        # database. Works even if this is the master database.
-        def master
-          doc = db_command(:ismaster => 1)
-          is_master = doc['ismaster']
-          raise "Error retrieving master database" unless ok?(doc) && is_master.kind_of?(Numeric)
-          case is_master.to_i
-          when 1
-            "#@host:#@port"
-          else
-            doc['remote']
-          end
-        end
+    # Drop collection +name+. Returns +true+ on success or if the
+    # collection does not exist, +false+ otherwise.
+    def drop_collection(name)
+      return true unless collection_names.include?(name)
 
-        # Switches our socket to the master database. If we are already the
-        # master, no change is made.
-        def switch_to_master
-          master_str = master()
-          unless master_str == "#@host:#@port"
-            @semaphore.synchronize {
-              master_str =~ /(.+):(\d+)/
-              @host, @port = $1, $2
-              close()
-              @socket = TCPSocket.new(@host, @port)
-            }
-          end
-        end
+      ok?(db_command(:drop => name))
+    end
 
-        # Close the connection to the database.
-        def close
-          @socket.close if @socket
-          @socket = nil
-        end
+    # Returns the error message from the most recently executed database
+    # operation for this connection, or +nil+ if there was no error.
+    def error
+      doc = db_command(:getlasterror => 1)
+      raise "error retrieving last error: #{doc}" unless ok?(doc)
+      doc['err']
+    end
 
-        def connected?
-          @socket != nil
-        end
+    # Get status information from the last operation on this connection.
+    def last_status
+      db_command(:getlasterror => 1)
+    end
 
-        # Send a MsgMessage to the database.
-        def send_message(msg)
-          send_to_db(MsgMessage.new(msg))
-        end
-        
-        # Returns a Cursor over the query results.
-        #
-        # Note that the query gets sent lazily; the cursor calls
-        # #send_query_message when needed. If the caller never requests an
-        # object from the cursor, the query never gets sent.
-        def query(collection, query)
-          Cursor.new(self, collection, query)
-        end
+    # Returns +true+ if an error was caused by the most recently executed
+    # database operation.
+    def error?
+      error != nil
+    end
 
-        # Used by a Cursor to lazily send the query to the database.
-        def send_query_message(query_message)
-          @semaphore.synchronize {
-            send_to_db(query_message)
-          }
-        end
+    # Get the most recent error to have occured on this database
+    #
+    # Only returns errors that have occured since the last call to
+    # DB#reset_error_history - returns +nil+ if there is no such error.
+    def previous_error
+      error = db_command(:getpreverror => 1)
+      if error["err"]
+        error
+      else
+        nil
+      end
+    end
 
-        # Remove the records that match +selector+ from +collection_name+.
-        # Normally called by Collection#remove or Collection#clear.
-        def remove_from_db(collection_name, selector)
-          @semaphore.synchronize {
-            send_to_db(RemoveMessage.new(@name, collection_name, selector))
-          }
-        end
+    # Reset the error history of this database
+    #
+    # Calls to DB#previous_error will only return errors that have occurred
+    # since the most recent call to this method.
+    def reset_error_history
+      db_command(:reseterror => 1)
+    end
 
-        # Update records in +collection_name+ that match +selector+ by
-        # applying +obj+ as an update. Normally called by Collection#replace.
-        def replace_in_db(collection_name, selector, obj)
-          @semaphore.synchronize {
-            send_to_db(UpdateMessage.new(@name, collection_name, selector, obj, false))
-          }
-        end
+    # Returns true if this database is a master (or is not paired with any
+    # other database), false if it is a slave.
+    def master?
+      doc = db_command(:ismaster => 1)
+      is_master = doc['ismaster']
+      ok?(doc) && is_master.kind_of?(Numeric) && is_master.to_i == 1
+    end
 
-        # Alias for #replace_in_db. Normally called by Collection.modify.
-        alias_method :modify_in_db, :replace_in_db
-
-        # Update records in +collection_name+ that match +selector+ by
-        # applying +obj+ as an update. If no match, inserts (???). Normally
-        # called by Collection#repsert.
-        def repsert_in_db(collection_name, selector, obj)
-          # TODO if PKInjector, inject
-          @semaphore.synchronize {
-            send_to_db(UpdateMessage.new(@name, collection_name, selector, obj, true))
-            obj
-          }
-        end
+    # Returns a string of the form "host:port" that points to the master
+    # database. Works even if this is the master database.
+    def master
+      doc = db_command(:ismaster => 1)
+      is_master = doc['ismaster']
+      raise "Error retrieving master database: #{doc.inspect}" unless ok?(doc) && is_master.kind_of?(Numeric)
+      case is_master.to_i
+      when 1
+        "#@host:#@port"
+      else
+        doc['remote']
+      end
+    end
 
-        # Return the number of records in +collection_name+ that match
-        # +selector+. If +selector+ is +nil+ or an empty hash, returns the
-        # count of all records. Normally called by Collection#count.
-        def count(collection_name, selector={})
-          oh = OrderedHash.new
-          oh[:count] = collection_name
-          oh[:query] = selector || {}
-          doc = db_command(oh)
-          return doc['n'].to_i if ok?(doc)
-          raise "Error with count command: #{doc.inspect}"
-        end
+    # Close the connection to the database.
+    def close
+      if @socket
+        s = @socket
+        @socket = nil
+        s.close
+      end
+    end
 
-        # Drop index +name+ from +collection_name+. Normally called from
-        # Collection#drop_index or Collection#drop_indexes.
-        def drop_index(collection_name, name)
-          oh = OrderedHash.new
-          oh[:deleteIndexes] = collection_name
-          oh[:index] = name
-          doc = db_command(oh)
-          raise "Error with drop_index command: #{doc.inspect}" unless ok?(doc)
-        end
+    def connected?
+      @socket != nil
+    end
 
-        # Return an array of hashes, one for each index on +collection_name+.
-        # Normally called by Collection#index_information. Each hash contains:
-        #
-        # :name :: Index name
-        #
-        # :keys :: Hash whose keys are the names of the fields that make up
-        #          the key and values are integers.
-        #
-        # :ns :: Namespace; same as +collection_name+.
-        def index_information(collection_name)
-          sel = {:ns => full_coll_name(collection_name)}
-          query(Collection.new(self, SYSTEM_INDEX_COLLECTION), Query.new(sel)).collect { |row|
-            h = {:name => row['name']}
-            raise "Name of index on return from db was nil. Coll = #{full_coll_name(collection_name)}" unless h[:name]
-
-            h[:keys] = row['key']
-            raise "Keys for index on return from db was nil. Coll = #{full_coll_name(collection_name)}" unless h[:keys]
-
-            h[:ns] = row['ns']
-            raise "Namespace for index on return from db was nil. Coll = #{full_coll_name(collection_name)}" unless h[:ns]
-            h[:ns].sub!(/.*\./, '')
-            raise "Error: ns != collection" unless h[:ns] == collection_name
-
-            h
-          }
-        end
+    def receive_full(length)
+      message = ""
+      while message.length < length do
+        chunk = @socket.recv(length - message.length)
+        raise "connection closed" unless chunk.length > 0
+        message += chunk
+      end
+      message
+    end
 
-        # Create a new index on +collection_name+ named +index_name+. +fields+
-        # should be an array of field names. Normally called by
-        # Collection#create_index.
-        def create_index(collection_name, index_name, fields)
-          sel = {:name => index_name, :ns => full_coll_name(collection_name)}
-          field_h = {}
-          fields.each { |f| field_h[f] = 1 }
-          sel[:key] = field_h
-          @semaphore.synchronize {
-            send_to_db(InsertMessage.new(@name, SYSTEM_INDEX_COLLECTION, sel))
-          }
-        end
+    # Send a MsgMessage to the database.
+    def send_message(msg)
+      send_to_db(MsgMessage.new(msg))
+    end
+
+    # Returns a Cursor over the query results.
+    #
+    # Note that the query gets sent lazily; the cursor calls
+    # #send_query_message when needed. If the caller never requests an
+    # object from the cursor, the query never gets sent.
+    def query(collection, query, admin=false)
+      Cursor.new(self, collection, query, admin)
+    end
+
+    # Used by a Cursor to lazily send the query to the database.
+    def send_query_message(query_message)
+      send_to_db(query_message)
+    end
+
+    # Remove the records that match +selector+ from +collection_name+.
+    # Normally called by Collection#remove or Collection#clear.
+    def remove_from_db(collection_name, selector)
+      _synchronize {
+        send_to_db(RemoveMessage.new(@name, collection_name, selector))
+      }
+    end
+
+    # Update records in +collection_name+ that match +selector+ by
+    # applying +obj+ as an update. Normally called by Collection#replace.
+    def replace_in_db(collection_name, selector, obj)
+      _synchronize {
+        send_to_db(UpdateMessage.new(@name, collection_name, selector, obj, false))
+      }
+    end
+
+    # Update records in +collection_name+ that match +selector+ by
+    # applying +obj+ as an update. If no match, inserts (???). Normally
+    # called by Collection#repsert.
+    def repsert_in_db(collection_name, selector, obj)
+      _synchronize {
+        obj = @pk_factory.create_pk(obj) if @pk_factory
+        send_to_db(UpdateMessage.new(@name, collection_name, selector, obj, true))
+        obj
+      }
+    end
+
+    # Dereference a DBRef, getting the document it points to.
+    def dereference(dbref)
+      collection(dbref.namespace).find_one("_id" => dbref.object_id)
+    end
+
+    # Evaluate a JavaScript expression on MongoDB.
+    # +code+ should be a string or Code instance containing a JavaScript
+    # expression. Additional arguments will be passed to that expression
+    # when it is run on the server.
+    def eval(code, *args)
+      if not code.is_a? Code
+        code = Code.new(code)
+      end
+
+      oh = OrderedHash.new
+      oh[:$eval] = code
+      oh[:args] = args
+      doc = db_command(oh)
+      return doc['retval'] if ok?(doc)
+      raise OperationFailure, "eval failed: #{doc['errmsg']}"
+    end
+
+    # Rename collection +from+ to +to+. Meant to be called by
+    # Collection#rename.
+    def rename_collection(from, to)
+      oh = OrderedHash.new
+      oh[:renameCollection] = "#{@name}.#{from}"
+      oh[:to] = "#{@name}.#{to}"
+      doc = db_command(oh, true)
+      raise "Error renaming collection: #{doc.inspect}" unless ok?(doc)
+    end
+
+    # Drop index +name+ from +collection_name+. Normally called from
+    # Collection#drop_index or Collection#drop_indexes.
+    def drop_index(collection_name, name)
+      oh = OrderedHash.new
+      oh[:deleteIndexes] = collection_name
+      oh[:index] = name
+      doc = db_command(oh)
+      raise "Error with drop_index command: #{doc.inspect}" unless ok?(doc)
+    end
 
-        # Insert +objects+ into +collection_name+. Normally called by
-        # Collection#insert.
-        def insert_into_db(collection_name, objects)
-          @semaphore.synchronize {
-            objects.each { |o| send_to_db(InsertMessage.new(@name, collection_name, o)) }
+    # Get information on the indexes for the collection +collection_name+.
+    # Normally called by Collection#index_information. Returns a hash where
+    # the keys are index names (as returned by Collection#create_index and
+    # the values are lists of [key, direction] pairs specifying the index
+    # (as passed to Collection#create_index).
+    def index_information(collection_name)
+      sel = {:ns => full_coll_name(collection_name)}
+      info = {}
+      query(Collection.new(self, SYSTEM_INDEX_COLLECTION), Query.new(sel)).each { |index|
+        info[index['name']] = index['key'].to_a
+      }
+      info
+    end
+
+    # Create a new index on +collection_name+. +field_or_spec+
+    # should be either a single field name or a Array of [field name,
+    # direction] pairs. Directions should be specified as
+    # Mongo::ASCENDING or Mongo::DESCENDING. Normally called
+    # by Collection#create_index. If +unique+ is true the index will
+    # enforce a uniqueness constraint.
+    def create_index(collection_name, field_or_spec, unique=false)
+      field_h = OrderedHash.new
+      if field_or_spec.is_a?(String) || field_or_spec.is_a?(Symbol)
+        field_h[field_or_spec.to_s] = 1
+      else
+        field_or_spec.each { |f| field_h[f[0].to_s] = f[1] }
+      end
+      name = gen_index_name(field_h)
+      sel = {
+        :name => name,
+        :ns => full_coll_name(collection_name),
+        :key => field_h,
+        :unique => unique
+      }
+      _synchronize {
+        send_to_db(InsertMessage.new(@name, SYSTEM_INDEX_COLLECTION, false, sel))
+      }
+      name
+    end
+
+    # Insert +objects+ into +collection_name+. Normally called by
+    # Collection#insert. Returns a new array containing the _ids
+    # of the inserted documents.
+    def insert_into_db(collection_name, objects)
+      _synchronize {
+        if @pk_factory
+          objects.collect! { |o|
+            @pk_factory.create_pk(o)
           }
+        else
+          objects = objects.collect do |o|
+            o[:_id] || o['_id'] ? o : o.merge!(:_id => ObjectID.new)
+          end
         end
+        send_to_db(InsertMessage.new(@name, collection_name, true, *objects))
+        objects.collect { |o| o[:_id] || o['_id'] }
+      }
+    end
 
-        def send_to_db(message)
-          @socket.print(message.buf.to_s)
-        end
+    def send_to_db(message)
+      connect_to_master if !connected? && @auto_reconnect
+      begin
+        @logger.debug("  MONGODB #{message}") if @logger
+        @socket.print(message.buf.to_s)
+        @socket.flush
+      rescue => ex
+        close
+        raise ex
+      end
+    end
 
-        def full_coll_name(collection_name)
-          "#{@name}.#{collection_name}"
-        end
+    def full_coll_name(collection_name)
+      "#{@name}.#{collection_name}"
+    end
 
-        # Return +true+ if +doc+ contains an 'ok' field with the value 1.
-        def ok?(doc)
-          ok = doc['ok']
-          ok.kind_of?(Numeric) && ok.to_i == 1
+    # Return +true+ if +doc+ contains an 'ok' field with the value 1.
+    def ok?(doc)
+      ok = doc['ok']
+      ok.kind_of?(Numeric) && ok.to_i == 1
+    end
+
+    # DB commands need to be ordered, so selector must be an OrderedHash
+    # (or a Hash with only one element). What DB commands really need is
+    # that the "command" key be first.
+    def db_command(selector, use_admin_db=false)
+      if !selector.kind_of?(OrderedHash)
+        if !selector.kind_of?(Hash) || selector.keys.length > 1
+          raise "db_command must be given an OrderedHash when there is more than one key"
         end
+      end
 
-        # DB commands need to be ordered, so selector must be an OrderedHash
-        # (or a Hash with only one element). What DB commands really need is
-        # that the "command" key be first.
-        #
-        # Do not call this. Intended for driver use only.
-        def db_command(selector)
-          if !selector.kind_of?(OrderedHash)
-            if !selector.kind_of?(Hash) || selector.keys.length > 1
-              raise "db_command must be given an OrderedHash when there is more than one key"
-            end
-          end
+      q = Query.new(selector)
+      q.number_to_return = -1
+      query(Collection.new(self, SYSTEM_COMMAND_COLLECTION), q, use_admin_db).next_object
+    end
 
-          q = Query.new(selector)
-          q.number_to_return = 1
-          query(Collection.new(self, SYSTEM_COMMAND_COLLECTION), q).next_object
-        end
+    def _synchronize &block
+      @semaphore.synchronize &block
+    end
 
-      end
+    private
+
+    def hash_password(username, plaintext)
+      Digest::MD5.hexdigest("#{username}:mongo:#{plaintext}")
+    end
+
+    def gen_index_name(spec)
+      temp = []
+      spec.each_pair { |field, direction|
+        temp = temp.push("#{field}_#{direction}")
+      }
+      return temp.join("_")
     end
   end
 end