mongo 0.17.1 → 0.18

data/test/test_db.rb

@@ -17,9 +17,10 @@ class DBTest < Test::Unit::TestCase
 
   include Mongo
 
-  @@host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
-  @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
-  @@db = Connection.new(@@host, @@port).db('ruby-mongo-test')
+  @@host  = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+  @@port  = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
+  @@conn  = Connection.new(@@host, @@port)
+  @@db    = @@conn.db('ruby-mongo-test')
   @@users = @@db.collection('system.users')
 
   def setup
@@ -35,8 +36,8 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_close
-    @@db.close
-    assert !@@db.connected?
+    @@conn.close
+    assert !@@conn.connected?
     begin
       @@db.collection('test').insert('a' => 1)
       fail "expected 'NilClass' exception"
@@ -52,10 +53,10 @@ class DBTest < Test::Unit::TestCase
     output = StringIO.new
     logger = Logger.new(output)
     logger.level = Logger::DEBUG
-    db = Connection.new(@host, @port, :logger => logger).db('ruby-mongo-test')
-    assert_equal logger, db.logger
+    conn = Connection.new(@host, @port, :logger => logger)
+    assert_equal logger, conn.logger
     
-    db.logger.debug 'testing'
+    conn.logger.debug 'testing'
     assert output.string.include?('testing')
   end
 
@@ -89,12 +90,16 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_pair
-    @@db.close
+    @@conn.close
     @@users = nil
-    @@db = Connection.new({:left => "this-should-fail", :right => [@@host, @@port]}).db('ruby-mongo-test')
-    assert @@db.connected?
+    @@conn  = Connection.new({:left => "this-should-fail", :right => [@@host, @@port]})
+    @@db    = @@conn['ruby-mongo-test']
+    assert @@conn.connected?
   ensure
-    @@db = Connection.new(@@host, @@port).db('ruby-mongo-test') unless @@db.connected?
+    unless @@conn.connected?
+      @@conn = Connection.new(@@host, @@port) 
+      @@db   = @@conn.db('ruby-mongo-test')
+    end
     @@users = @@db.collection('system.users')
   end
 
@@ -122,7 +127,8 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_pk_factory_reset
-    db = Connection.new(@@host, @@port).db('ruby-mongo-test')
+    conn = Connection.new(@@host, @@port)
+    db   = conn.db('ruby-mongo-test')
     db.pk_factory = Object.new # first time
     begin
       db.pk_factory = Object.new
@@ -130,7 +136,7 @@ class DBTest < Test::Unit::TestCase
     rescue => ex
       assert_match /can not change PK factory/, ex.to_s
     ensure
-      db.close
+      conn.close
     end
   end
 
@@ -144,33 +150,18 @@ class DBTest < Test::Unit::TestCase
     @@db.logout                  # only testing that we don't throw exception
   end
 
-  def test_auto_connect
-    @@db.close
-    db = Connection.new(@@host, @@port, :auto_reconnect => true).db('ruby-mongo-test')
-    assert db.connected?
-    assert db.auto_reconnect?
-    db.close
-    assert !db.connected?
-    assert db.auto_reconnect?
-    db.collection('test').insert('a' => 1)
-    assert db.connected?
-  ensure
-    @@db = Connection.new(@@host, @@port).db('ruby-mongo-test')
-    @@users = @@db.collection('system.users')
-  end
-
   def test_error
     @@db.reset_error_history
     assert_nil @@db.error
     assert !@@db.error?
     assert_nil @@db.previous_error
 
-    @@db.send(:db_command, :forceerror => 1)
+    @@db.send(:command, :forceerror => 1)
     assert @@db.error?
     assert_not_nil @@db.error
     assert_not_nil @@db.previous_error
 
-    @@db.send(:db_command, :forceerror => 1)
+    @@db.send(:command, :forceerror => 1)
     assert @@db.error?
     assert @@db.error
     prev_error = @@db.previous_error
@@ -207,10 +198,10 @@ class DBTest < Test::Unit::TestCase
     assert !@@db.last_status()["updatedExisting"]
   end
 
-  def test_text_port_number
-    db = DB.new('ruby-mongo-test', [[@@host, @@port.to_s]])
-    # If there is no error, all is well
-    db.collection('users').remove
+  def test_text_port_number_raises_no_errors
+    conn = Connection.new(@@host, @@port.to_s)
+    db   = conn['ruby-mongo-test']
+    assert db.collection('users').remove
   end
 
 end

data/test/test_db_api.rb

@@ -6,11 +6,11 @@ require 'test/unit'
 class DBAPITest < Test::Unit::TestCase
   include Mongo
 
-  @@connection = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+  @@conn = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
                         ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
-  @@db   = @@connection.db("ruby-mongo-test")
+  @@db   = @@conn.db("ruby-mongo-test")
   @@coll = @@db.collection('test')
-  @@version = @@connection.server_version
+  @@version = @@conn.server_version
 
   def setup
     @@coll.remove
@@ -95,7 +95,7 @@ class DBAPITest < Test::Unit::TestCase
     # Can't compare _id values because at insert, an _id was added to @r1 by
     # the database but we don't know what it is without re-reading the record
     # (which is what we are doing right now).
-#     assert_equal doc['_id'], @r1['_id']
+#   assert_equal doc['_id'], @r1['_id']
     assert_equal doc['a'], @r1['a']
   end
 
@@ -167,7 +167,7 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 1, docs[3]['a']
 
     # Sorting using array of names; assumes ascending order.
-    docs = @@coll.find({'a' => { '$lt' => 10 }}, :sort => ['a']).to_a
+    docs = @@coll.find({'a' => { '$lt' => 10 }}, :sort => 'a').to_a
     assert_equal 4, docs.size
     assert_equal 1, docs[0]['a']
     assert_equal 2, docs[1]['a']
@@ -197,22 +197,9 @@ class DBAPITest < Test::Unit::TestCase
     # order of the keys won't be guaranteed thus your sort won't make sense.
     oh = OrderedHash.new
     oh['a'] = -1
-    docs = @@coll.find({'a' => { '$lt' => 10 }}, :sort => oh).to_a
-    assert_equal 4, docs.size
-    assert_equal 4, docs[0]['a']
-    assert_equal 3, docs[1]['a']
-    assert_equal 2, docs[2]['a']
-    assert_equal 1, docs[3]['a']
-
-    oh = OrderedHash.new
-    oh['b'] = -1
-    oh['a'] = 1
-    docs = @@coll.find({'a' => { '$lt' => 10 }}, :sort => oh).to_a
-    assert_equal 4, docs.size
-    assert_equal 1, docs[0]['a']
-    assert_equal 3, docs[1]['a']
-    assert_equal 2, docs[2]['a']
-    assert_equal 4, docs[3]['a']
+    assert_raise InvalidSortValueError do 
+      docs = @@coll.find({'a' => { '$lt' => 10 }}, :sort => oh).to_a
+    end
   end
 
   def test_find_limits
@@ -488,14 +475,6 @@ class DBAPITest < Test::Unit::TestCase
     end
   end
 
-  def test_ismaster
-    assert @@db.master?
-  end
-
-  def test_master
-    assert_equal "#{@@db.host}:#{@@db.port}", @@db.master
-  end
-
   def test_where
     @@coll.insert('a' => 2)
     @@coll.insert('a' => 3)
@@ -776,7 +755,7 @@ class DBAPITest < Test::Unit::TestCase
   # doesn't really test functionality, just that the option is set correctly
   def test_snapshot
     @@db.collection("test").find({}, :snapshot => true).to_a
-    assert_raise RuntimeError do
+    assert_raise OperationFailure do
       @@db.collection("test").find({}, :snapshot => true, :sort => 'a').to_a
     end
   end

data/test/test_helper.rb

@@ -22,4 +22,19 @@ require 'mongo'
 # NOTE: most tests assume that MongoDB is running.
 class Test::Unit::TestCase
   include Mongo
+
+  # Generic code for rescuing connection failures and retrying operations.
+  # This could be combined with some timeout functionality.
+  def rescue_connection_failure
+    success = false
+    while !success
+      begin
+        yield
+        success = true
+      rescue Mongo::ConnectionFailure
+        puts "Rescuing"
+        sleep(1)
+      end
+    end
+  end
 end

data/test/test_slave_connection.rb

@@ -9,8 +9,9 @@ class SlaveConnectionTest < Test::Unit::TestCase
   def self.connect_to_slave
     @@host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
     @@port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
-    db = Connection.new(@@host, @@port, :slave_ok => true).db('ruby-mongo-demo')
-    !db.master?
+    conn = Connection.new(@@host, @@port, :slave_ok => true)
+    cmd = conn['admin'].command(:ismaster => 1)
+    cmd['ok'] == 1 && cmd['ismaster'] != 1
   end
 
   if self.connect_to_slave
@@ -30,8 +31,8 @@ class SlaveConnectionTest < Test::Unit::TestCase
     puts "Not connected to slave; skipping slave connection tests."
 
     def test_slave_ok_false_on_queries
-      @db = Connection.new(@@host, @@port).db('ruby-mongo-demo')
-      assert !@db.slave_ok?
+      @conn = Connection.new(@@host, @@port)
+      assert !@conn.slave_ok?
     end
   end
 end

data/test/test_threading.rb

@@ -4,14 +4,14 @@ class TestThreading < Test::Unit::TestCase
 
   include Mongo
 
-  @@db = Connection.new.db('ruby-mongo-test')
+  @@db = Connection.new('localhost', 27017, :pool_size => 1, :timeout => 3).db('ruby-mongo-test')
   @@coll = @@db.collection('thread-test-collection')
 
   def set_up_safe_data
     @@db.drop_collection('duplicate')
     @@db.drop_collection('unique')
     @duplicate = @@db.collection('duplicate')
-    @unique    = @@db.collection('unique') 
+    @unique    = @@db.collection('unique')
 
     @duplicate.insert("test" => "insert")
     @duplicate.insert("test" => "update")

data/test/threading/test_threading_large_pool.rb

@@ -0,0 +1,90 @@
+require 'test/test_helper'
+
+# Essentialy the same as test_threading.rb but with an expanded pool for
+# testing multiple connections.
+class TestThreadingLargePool < Test::Unit::TestCase
+
+  include Mongo
+
+  @@db = Connection.new('localhost', 27017, :pool_size => 50, :timeout => 15).db('ruby-mongo-test')
+  @@coll = @@db.collection('thread-test-collection')
+
+  def set_up_safe_data
+    @@db.drop_collection('duplicate')
+    @@db.drop_collection('unique')
+    @duplicate = @@db.collection('duplicate')
+    @unique    = @@db.collection('unique')
+
+    @duplicate.insert("test" => "insert")
+    @duplicate.insert("test" => "update")
+    @unique.insert("test" => "insert")
+    @unique.insert("test" => "update")
+    @unique.create_index("test", true)
+  end
+
+  def test_safe_update
+    set_up_safe_data
+    threads = []
+    100.times do |i|
+      threads[i] = Thread.new do
+        if i % 2 == 0
+          assert_raise Mongo::OperationFailure do
+            @unique.update({"test" => "insert"}, {"$set" => {"test" => "update"}}, :safe => true)
+          end
+        else
+          @duplicate.update({"test" => "insert"}, {"$set" => {"test" => "update"}}, :safe => true)
+        end
+      end
+    end
+  
+    100.times do |i|
+      threads[i].join
+    end
+  end
+
+  def test_safe_insert
+    set_up_safe_data
+    threads = []
+    100.times do |i|
+      threads[i] = Thread.new do
+        if i % 2 == 0
+          assert_raise Mongo::OperationFailure do
+            @unique.insert({"test" => "insert"}, :safe => true)
+          end
+        else
+          @duplicate.insert({"test" => "insert"}, :safe => true)
+        end
+      end
+    end
+  
+    100.times do |i|
+      threads[i].join
+    end
+  end
+
+  def test_threading
+    @@coll.drop
+    @@coll = @@db.collection('thread-test-collection')
+
+    1000.times do |i|
+      @@coll.insert("x" => i)
+    end
+
+    threads = []
+
+    10.times do |i|
+      threads[i] = Thread.new do
+        sum = 0
+        @@coll.find().each do |document|
+          sum += document["x"]
+        end
+        assert_equal 499500, sum
+      end
+    end
+
+    10.times do |i|
+      threads[i].join
+    end
+  end
+
+end

data/test/unit/collection_test.rb

@@ -1,12 +1,6 @@
 require 'test/test_helper'
 
-class CollectionTest < Test::Unit::TestCase
-
-  class MockDB < DB
-    def connect_to_master
-      true
-    end
-  end
+class ConnectionTest < Test::Unit::TestCase
 
   context "Basic operations: " do 
     setup do 
@@ -14,36 +8,40 @@ class CollectionTest < Test::Unit::TestCase
     end
 
     should "send update message" do 
-      @db = MockDB.new("testing", ['localhost', 27017], :logger => @logger)
+      @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
+      @db   = @conn['testing']
       @coll = @db.collection('books')
-      @db.expects(:send_message_with_operation).with do |op, msg, log| 
+      @conn.expects(:send_message).with do |op, msg, log| 
         op == 2001 && log.include?("db.books.update")
       end
       @coll.update({}, {:title => 'Moby Dick'})
     end
 
     should "send insert message" do 
-      @db = MockDB.new("testing", ['localhost', 27017], :logger => @logger)
+      @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
+      @db   = @conn['testing']
       @coll = @db.collection('books')
-      @db.expects(:send_message_with_operation).with do |op, msg, log| 
+      @conn.expects(:send_message).with do |op, msg, log| 
         op == 2002 && log.include?("db.books.insert")
       end
       @coll.insert({:title => 'Moby Dick'})
     end
 
     should "send safe update message" do
-      @db = MockDB.new("testing", ['localhost', 27017], :logger => @logger)
+      @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
+      @db   = @conn['testing']
       @coll = @db.collection('books')
-      @db.expects(:send_message_with_safe_check).with do |op, msg, log|
+      @conn.expects(:send_message_with_safe_check).with do |op, msg, db_name, log|
         op == 2001 && log.include?("db.books.update")
       end
       @coll.update({}, {:title => 'Moby Dick'}, :safe => true)
     end
 
     should "send safe insert message" do
-      @db = MockDB.new("testing", ['localhost', 27017], :logger => @logger)
+      @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
+      @db   = @conn['testing']
       @coll = @db.collection('books')
-      @db.expects(:send_message_with_safe_check).with do |op, msg, log|
+      @conn.expects(:send_message_with_safe_check).with do |op, msg, db_name, log|
         op == 2001 && log.include?("db.books.update")
       end
       @coll.update({}, {:title => 'Moby Dick'}, :safe => true)

data/test/unit/connection_test.rb

@@ -0,0 +1,122 @@
+require 'test/test_helper'
+
+class ConnectionTest < Test::Unit::TestCase
+
+  def new_mock_socket
+    socket = Object.new
+    socket.stubs(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+    socket
+  end
+
+  def new_mock_db
+    db = Object.new
+  end
+
+  # Make a few methods public for these tests.
+  class Mongo::Connection
+    public :checkin, :checkout, :clear_stale_cached_connections!
+  end
+
+  context "Initialization: " do
+
+    context "given a single node" do
+      setup do
+        TCPSocket.stubs(:new).returns(new_mock_socket)
+        @conn = Connection.new('localhost', 27107, :connect => false)
+
+        admin_db = new_mock_db
+        admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
+        @conn.expects(:[]).with('admin').returns(admin_db)
+        @conn.connect_to_master
+      end
+
+      should "set localhost and port to master" do
+        assert_equal 'localhost', @conn.host
+        assert_equal 27017, @conn.port
+      end
+
+      should "set connection pool to 1" do
+        assert_equal 1, @conn.size
+      end
+
+      should "default slave_ok to false" do
+        assert !@conn.slave_ok?
+      end
+    end
+  end
+
+  context "Connection pooling: " do
+    setup do
+      TCPSocket.stubs(:new).returns(new_mock_socket)
+      @conn = Connection.new('localhost', 27107, :connect => false,
+                                   :pool_size => 3)
+
+      admin_db = new_mock_db
+      admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
+      @conn.expects(:[]).with('admin').returns(admin_db)
+      @conn.connect_to_master
+    end
+
+    should "check out a new connection" do
+      socket = @conn.checkout
+      assert @conn.reserved_connections.keys.include?(Thread.current.object_id)
+    end
+
+    context "with multiple threads" do
+      setup do
+        @thread1 = Object.new
+        @thread2 = Object.new
+        @thread3 = Object.new
+        @thread4 = Object.new
+
+        Thread.stubs(:current).returns(@thread1)
+        @socket1 = @conn.checkout
+        Thread.stubs(:current).returns(@thread2)
+        @socket2 = @conn.checkout
+        Thread.stubs(:current).returns(@thread3)
+        @socket3 = @conn.checkout
+      end
+
+      should "add each thread to the reserved pool" do
+        assert @conn.reserved_connections.keys.include?(@thread1.object_id)
+        assert @conn.reserved_connections.keys.include?(@thread2.object_id)
+        assert @conn.reserved_connections.keys.include?(@thread3.object_id)
+      end
+
+      should "only add one socket per thread" do
+        @conn.reserved_connections.values do |socket|
+          assert [@socket1, @socket2, @socket3].include?(socket)
+        end
+      end
+
+      should "check out all sockets" do
+        assert_equal @conn.sockets.size, @conn.checked_out.size
+        @conn.sockets.each do |sock|
+          assert @conn.checked_out.include?(sock)
+        end
+      end
+
+      should "raise an error if no more sockets can be checked out" do
+        # This can't be tested with mock threads.
+        # Will test in integration tests.
+      end
+
+      context "when releasing dead threads" do
+        setup do
+          @thread1.expects(:alive?).returns(false)
+          @thread2.expects(:alive?).returns(true)
+          @thread3.expects(:alive?).returns(true)
+          Thread.expects(:list).returns([@thread1, @thread2, @thread3])
+          @conn.clear_stale_cached_connections!
+        end
+
+        should "return connections for dead threads" do
+          assert !@conn.checked_out.include?(@socket1)
+          assert_nil @conn.reserved_connections[@thread1.object_id]
+        end
+      end
+
+    end
+  end
+end
+