mongo 1.1.4 → 1.1.5

data/mongo.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = true
   s.test_files = Dir['test/**/*.rb']
-  s.test_files -= Dir['test/mongo_bson/*.rb'] # remove these files from the manifest
 
   s.has_rdoc = true
   s.rdoc_options = ['--main', 'README.md', '--inline-source']
@@ -31,5 +30,5 @@ Gem::Specification.new do |s|
   s.email = 'mongodb-dev@googlegroups.com'
   s.homepage = 'http://www.mongodb.org'
 
-  s.add_dependency(%q<bson>, [">= 1.1.1"])
+  s.add_dependency(%q<bson>, [">= #{Mongo::VERSION}"])
 end

data/test/collection_test.rb

@@ -263,13 +263,12 @@ class TestCollection < Test::Unit::TestCase
     @db   = @conn[MONGO_TEST_DB]
     @test = @db['test-safe-remove']
     @test.save({:a => 50})
-    @test.remove({}, :safe => true)
+    assert_equal 1, @test.remove({}, :safe => true)["n"]
     @test.drop
   end
 
   def test_remove_return_value
-    assert_equal 50, @@test.remove({})
-    assert_equal 57, @@test.remove({"x" => 1})
+    assert_equal true, @@test.remove({})
   end
 
   def test_count
@@ -579,13 +578,16 @@ class TestCollection < Test::Unit::TestCase
     @@test.ensure_index([["x", Mongo::ASCENDING]])
     assert @@test.index_information.keys.include? "x_1"
 
+    @@test.ensure_index([["type", 1], ["date", -1]])
+    assert @@test.index_information.keys.include? "type_1_date_-1"
+
     @@test.drop_index("x_1")
-    assert_equal 2, @@test.index_information.keys.count
+    assert_equal 3, @@test.index_information.keys.count
     @@test.drop_index("x_-1")
-    assert_equal 1, @@test.index_information.keys.count
-
-    @@test.ensure_index([["x", Mongo::DESCENDING]], {}) #should work as not cached.
     assert_equal 2, @@test.index_information.keys.count
+
+    @@test.ensure_index([["x", Mongo::DESCENDING]], {})
+    assert_equal 3, @@test.index_information.keys.count
     assert @@test.index_information.keys.include? "x_-1"
 
     # Make sure that drop_index expires cache properly

data/test/connection_test.rb

@@ -49,12 +49,6 @@ class TestConnection < Test::Unit::TestCase
     assert_raise Mongo::InvalidNSName do @conn.db('te st') end
   end
 
-  def test_replica_set_connection_name
-    assert_raise Mongo::ReplicaSetConnectionError do
-      standard_connection(:rs_name => "replica-set-wrong-name")
-    end
-  end
-
   def test_options_passed_to_db
     @pk_mock = Object.new
     db = @conn.db('test', :pk => @pk_mock, :strict => true)

data/test/grid_file_system_test.rb

@@ -9,8 +9,8 @@ class GridFileSystemTest < Test::Unit::TestCase
     end
 
     teardown do
-      @db['fs.files'].remove
-      @db['fs.chunks'].remove
+      @db.drop_collection('fs.files')
+      @db.drop_collection('fs.chunks')
     end
 
     context "When reading:" do

data/test/grid_io_test.rb

@@ -33,6 +33,39 @@ class GridIOTest < Test::Unit::TestCase
       end
     end
 
+    context "Seeking" do
+      setup do
+        @filename = 'test'
+        @mode     = 'w'
+        @data     = "1" * 1024 * 1024
+        @file = GridIO.new(@files, @chunks, @filename, @mode)
+        @file.write(@data)
+        @file.close
+      end
+
+      should "read all data using read_length and then be able to seek" do
+        file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
+        assert_equal @data, file.read(1024 * 1024)
+        file.seek(0)
+        assert_equal @data, file.read
+      end
+
+      should "read all data using read_all and then be able to seek" do
+        file = GridIO.new(@files, @chunks, nil, "r", :query => {:_id => @file.files_id})
+        assert_equal @data, file.read
+        file.seek(0)
+        assert_equal @data, file.read
+        file.seek(1024 * 512)
+        assert_equal 524288, file.file_position
+        assert_equal @data.length / 2, file.read.length
+        assert_equal 1048576, file.file_position
+        assert_nil file.read
+        file.seek(1024 * 512)
+        assert_equal 524288, file.file_position
+      end
+
+    end
+
     context "Grid MD5 check" do
       should "run in safe mode" do
         file = GridIO.new(@files, @chunks, 'smallfile', 'w', :safe => true)
@@ -62,7 +95,6 @@ class GridIOTest < Test::Unit::TestCase
     end
 
     context "Content types" do
-
       if defined?(MIME)
         should "determine common content types from the extension" do
           file = GridIO.new(@files, @chunks, 'sample.pdf', 'w')

data/test/grid_test.rb

@@ -18,7 +18,8 @@ class GridTest < Test::Unit::TestCase
       setup do
         @data = "GRIDDATA" * 50000
         @grid = Grid.new(@db, 'test-fs')
-        @id   = @grid.put(@data, :filename => 'sample', :metadata => {'app' => 'photos'})
+        @id   = @grid.put(@data, :filename => 'sample',
+                          :metadata => {'app' => 'photos'})
       end
 
       should "check existence" do
@@ -120,7 +121,8 @@ class GridTest < Test::Unit::TestCase
     context "Storing data with a length of zero" do
       setup do
         @grid = Grid.new(@db, 'test-fs')
-        @id   = @grid.put('', :filename => 'sample', :metadata => {'app' => 'photos'})
+        @id   = @grid.put('', :filename => 'sample',
+                          :metadata => {'app' => 'photos'})
       end
 
       should "return the zero length" do
@@ -129,6 +131,34 @@ class GridTest < Test::Unit::TestCase
       end
     end
 
+    context "Grid streaming: " do
+      setup do
+        @grid = Grid.new(@db, 'test-fs')
+        filename = 'sample_data'
+        @io   = File.open(File.join(File.dirname(__FILE__), 'data', filename), 'r')
+        id    = @grid.put(@io, :filename => filename)
+        @file = @grid.get(id)
+        @io.rewind
+        @data = @io.read
+        if @data.respond_to?(:force_encoding)
+          @data.force_encoding("binary")
+        end
+      end
+
+      should "read the file" do
+        read_data = ""
+        @file.each do |chunk|
+          read_data << chunk
+        end
+        assert_equal @data.length, read_data.length
+      end
+
+      should "read the file if no block is given" do
+        read_data = @file.each
+        assert_equal @data.length, read_data.length
+      end
+    end
+
     context "Streaming: " do || {}
       setup do
         def read_and_write_stream(filename, read_length, opts={})
@@ -158,12 +188,12 @@ class GridTest < Test::Unit::TestCase
         read_and_write_stream('small_data.txt', 1)
       end
 
-      should "put and get a large io object when reading smaller than the chunk size" do
-        read_and_write_stream('sample_file.pdf', 256 * 1024)
+      should "put and get a large io object if reading less than the chunk size" do
+        read_and_write_stream('sample_data', 256 * 1024)
       end
 
-      should "put and get a large io object when reading larger than the chunk size" do
-        read_and_write_stream('sample_file.pdf', 300 * 1024)
+      should "put and get a large io object if reading more than the chunk size" do
+        read_and_write_stream('sample_data', 300 * 1024)
       end
     end
   end

data/test/replica_sets/connect_test.rb

@@ -1,46 +1,84 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'mongo'
-require 'test/unit'
-require './test/test_helper'
+require './test/replica_sets/rs_test_helper'
 
-# NOTE: This test expects a replica set of three nodes to be running on local host.
+# NOTE: This test expects a replica set of three nodes to be running on RS.host,
+# on ports TEST_PORT, RS.ports[1], and TEST + 2.
 class ConnectTest < Test::Unit::TestCase
   include Mongo
 
+  def setup
+    RS.restart_killed_nodes
+  end
+
+  def teardown
+    RS.restart_killed_nodes
+  end
+
+  def test_connect_with_deprecated_multi
+    @conn = Connection.multi([[RS.host, RS.ports[0]], [RS.host, RS.ports[1]]], :name => RS.name)
+    assert @conn.connected?
+    assert @conn.is_a?(ReplSetConnection)
+  end
+
   def test_connect_bad_name
-    assert_raise_error(ReplicaSetConnectionError, "expected 'wrong-repl-set-name'") do
-      Mongo::Connection.multi([['localhost', 27017], ['localhost', 27018], ['localhost', 27019]],
-        :rs_name => "wrong-repl-set-name")
+    assert_raise_error(ReplicaSetConnectionError, "-wrong") do
+      ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+        [RS.host, RS.ports[2]], :rs_name => RS.name + "-wrong")
     end
   end
 
   def test_connect
-    @conn = Mongo::Connection.multi([['localhost', 27017], ['localhost', 27018], ['localhost', 27019]],
-                                    :name => "foo")
+    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+      [RS.host, RS.ports[2]], :name => RS.name)
     assert @conn.connected?
+
+    assert_equal RS.primary, @conn.primary
+    assert_equal RS.secondaries.sort, @conn.secondaries.sort
+    assert_equal RS.arbiters.sort, @conn.arbiters.sort
   end
 
-  def test_connect_with_first_node_down
-    puts "Please kill the node at 27017."
-    gets
+  def test_connect_with_primary_node_killed
+    node = RS.kill_primary
 
-    @conn = Mongo::Connection.multi([['localhost', 27017], ['localhost', 27018], ['localhost', 27019]])
+    # Becuase we're killing the primary and trying to connect right away,
+    # this is going to fail right away.
+    assert_raise_error(ConnectionFailure, "Failed to connect to primary node") do
+      @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+        [RS.host, RS.ports[2]])
+    end
+
+    # This allows the secondary to come up as a primary
+    rescue_connection_failure do
+      @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+        [RS.host, RS.ports[2]])
+    end
+    assert @conn.connected?
+  end
+
+  def test_connect_with_secondary_node_killed
+    node = RS.kill_secondary
+
+    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+      [RS.host, RS.ports[2]])
     assert @conn.connected?
   end
 
-  def test_connect_with_second_node_down
-    puts "Please kill the node at 27018."
-    gets
+  def test_connect_with_third_node_killed
+    RS.kill(RS.get_node_from_port(RS.ports[2]))
 
-    @conn = Mongo::Connection.multi([['localhost', 27017], ['localhost', 27018], ['localhost', 27019]])
+    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+      [RS.host, RS.ports[2]])
     assert @conn.connected?
   end
 
-  def test_connect_with_third_node_down
-    puts "Please kill the node at 27019."
-    gets
+  def test_connect_with_primary_stepped_down
+    RS.step_down_primary
 
-    @conn = Mongo::Connection.multi([['localhost', 27017], ['localhost', 27018], ['localhost', 27019]])
+    rescue_connection_failure do
+      @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+        [RS.host, RS.ports[2]])
+    end
     assert @conn.connected?
   end
+
 end

data/test/replica_sets/count_test.rb

@@ -1,7 +1,5 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'mongo'
-require 'test/unit'
-require './test/test_helper'
+require './test/replica_sets/rs_test_helper'
 
 # NOTE: This test expects a replica set of three nodes to be running
 # on the local host.
@@ -9,18 +7,22 @@ class ReplicaSetCountTest < Test::Unit::TestCase
   include Mongo
 
   def setup
-    @conn = Mongo::Connection.multi([['localhost', 27017], ['localhost', 27018], ['localhost', 27019]])
+    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]], [RS.host, RS.ports[2]])
     @db = @conn.db(MONGO_TEST_DB)
     @db.drop_collection("test-sets")
     @coll = @db.collection("test-sets")
   end
 
+  def teardown
+    RS.restart_killed_nodes
+  end
+
   def test_correct_count_after_insertion_reconnect
-    @coll.insert({:a => 20})#, :safe => {:w => 3, :wtimeout => 10000})
+    @coll.insert({:a => 20}, :safe => {:w => 2, :wtimeout => 10000})
     assert_equal 1, @coll.count
 
-    puts "Please disconnect the current master."
-    gets
+    # Kill the current master node
+    @node = RS.kill_primary
 
     rescue_connection_failure do
       @coll.insert({:a => 30}, :safe => true)

data/test/replica_sets/insert_test.rb

@@ -1,7 +1,5 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'mongo'
-require 'test/unit'
-require './test/test_helper'
+require './test/replica_sets/rs_test_helper'
 
 # NOTE: This test expects a replica set of three nodes to be running
 # on the local host.
@@ -9,16 +7,20 @@ class ReplicaSetInsertTest < Test::Unit::TestCase
   include Mongo
 
   def setup
-    @conn = Mongo::Connection.multi([['localhost', 27017], ['localhost', 27018], ['localhost', 27019]])
+    @conn = ReplSetConnection.new([TEST_HOST, RS.ports[0]], [TEST_HOST, RS.ports[1]], [TEST_HOST, RS.ports[2]])
     @db = @conn.db(MONGO_TEST_DB)
     @db.drop_collection("test-sets")
     @coll = @db.collection("test-sets")
   end
 
+  def teardown
+    RS.restart_killed_nodes
+  end
+
   def test_insert
     @coll.save({:a => 20}, :safe => true)
-    puts "Please disconnect the current master."
-    gets
+
+    RS.kill_primary
 
     rescue_connection_failure do
       @coll.save({:a => 30}, :safe => true)
@@ -29,9 +31,9 @@ class ReplicaSetInsertTest < Test::Unit::TestCase
     @coll.save({:a => 60}, :safe => true)
     @coll.save({:a => 70}, :safe => true)
 
-    puts "Please reconnect the old master to make sure that the new master " +
-         "has synced with the previous master. Note: this may have happened already."
-    gets
+    # Restart the old master and wait for sync
+    RS.restart_killed_nodes
+    sleep(1)
     results = []
 
     rescue_connection_failure do

data/test/replica_sets/pooled_insert_test.rb

@@ -1,7 +1,5 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'mongo'
-require 'test/unit'
-require './test/test_helper'
+require './test/replica_sets/rs_test_helper'
 
 # NOTE: This test expects a replica set of three nodes to be running
 # on the local host.
@@ -9,18 +7,22 @@ class ReplicaSetPooledInsertTest < Test::Unit::TestCase
   include Mongo
 
   def setup
-    @conn = Mongo::Connection.multi([['localhost', 27017], ['localhost', 27018], ['localhost', 27019]],
-       :pool_size => 10, :timeout => 5)
+    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+      [RS.host, RS.ports[2]], :pool_size => 10, :timeout => 5)
     @db = @conn.db(MONGO_TEST_DB)
     @db.drop_collection("test-sets")
     @coll = @db.collection("test-sets")
   end
 
+  def teardown
+    RS.restart_killed_nodes
+  end
+
   def test_insert
     expected_results = [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
     @coll.save({:a => -1}, :safe => true)
-    puts "Please disconnect the current master."
-    gets
+
+    RS.kill_primary
 
     threads = []
     10.times do |i|
@@ -31,12 +33,9 @@ class ReplicaSetPooledInsertTest < Test::Unit::TestCase
       end
     end
 
-    puts "Please reconnect the old master to make sure that the new master " +
-         "has synced with the previous master. Note: this may have happened already." +
-         "Note also that when connection with multiple threads, you may need to wait a few seconds" +
-         "after restarting the old master so that all the data has had a chance to sync." +
-         "This is a case of eventual consistency."
-    gets
+    # Restart the old master and wait for sync
+    RS.restart_killed_nodes
+    sleep(1)
     results = []
 
     rescue_connection_failure do

data/test/replica_sets/query_secondaries.rb

@@ -1,7 +1,5 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'mongo'
-require 'test/unit'
-require './test/test_helper'
+require './test/replica_sets/rs_test_helper'
 
 # NOTE: This test expects a replica set of three nodes to be running
 # on the local host.
@@ -9,13 +7,24 @@ class ReplicaSetQuerySecondariesTest < Test::Unit::TestCase
   include Mongo
 
   def setup
-    @conn = Mongo::Connection.multi([['localhost', 27018]], :read_secondaries => true)
+    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], :read_secondary => true)
     @db = @conn.db(MONGO_TEST_DB)
     @db.drop_collection("test-sets")
-    @coll = @db.collection("test-sets", :safe => {:w => 2, :wtimeout => 100})
   end
 
-  def test_query
+  def teardown
+    RS.restart_killed_nodes
+  end
+
+  def test_con
+    assert @conn.primary_pool, "No primary pool!"
+    assert @conn.read_pool, "No read pool!"
+    assert @conn.primary_pool.port != @conn.read_pool.port,
+      "Primary port and read port at the same!"
+  end
+
+  def test_query_secondaries
+    @coll = @db.collection("test-sets", :safe => {:w => 3, :wtimeout => 10000})
     @coll.save({:a => 20})
     @coll.save({:a => 30})
     @coll.save({:a => 40})
@@ -25,8 +34,7 @@ class ReplicaSetQuerySecondariesTest < Test::Unit::TestCase
     assert results.include?(30)
     assert results.include?(40)
 
-    puts "Please disconnect the current master."
-    gets
+    RS.kill_primary
 
     results = []
     rescue_connection_failure do
@@ -37,4 +45,36 @@ class ReplicaSetQuerySecondariesTest < Test::Unit::TestCase
     end
   end
 
+  def test_kill_primary
+    @coll = @db.collection("test-sets", :safe => {:w => 3, :wtimeout => 10000})
+    @coll.save({:a => 20})
+    @coll.save({:a => 30})
+    assert_equal 2, @coll.find.to_a.length
+
+    # Should still be able to read immediately after killing master node
+    RS.kill_primary
+    assert_equal 2, @coll.find.to_a.length
+  end
+
+  def test_kill_secondary
+    @coll = @db.collection("test-sets", {:safe => {:w => 3, :wtimeout => 10000}})
+    @coll.save({:a => 20})
+    @coll.save({:a => 30})
+    assert_equal 2, @coll.find.to_a.length
+
+    read_node = RS.get_node_from_port(@conn.read_pool.port)
+    RS.kill(read_node)
+
+    # Should fail immediately on next read
+    assert_raise ConnectionFailure do
+      @coll.find.to_a.length
+    end
+
+    # Should eventually reconnect and be able to read
+    rescue_connection_failure do
+      length = @coll.find.to_a.length
+      assert_equal 2, length
+    end
+  end
+
 end