mongo 1.7.1 → 1.8.0

data/docs/WRITE_CONCERN.md

@@ -1,31 +0,0 @@
-# Write Concern in Ruby
-
-## Setting the write concern
-
-Write concern is set using the `:safe` option. There are several possible options:
-
-    @collection.save({:doc => 'foo'}, :safe => true)
-    @collection.save({:doc => 'foo'}, :safe => {:w => 2})
-    @collection.save({:doc => 'foo'}, :safe => {:w => 2, :wtimeout => 200})
-    @collection.save({:doc => 'foo'}, :safe => {:w => 2, :wtimeout => 200, :j => true})
-
-The first, `true`, simply indicates that we should request a response from the server to ensure that no errors have occurred. The second, `{:w => 2}`, forces the server to wait until at least two servers have recorded the write. The third does the same but will time out if the replication can't be completed in 200 milliseconds.
-Setting a value for `wtimeout` is encouraged.
-
-Finally, the fourth example forces the journal to sync to disk if journaling is enabled.
-
-## Write concern inheritance
-
-The Ruby driver allows you to set write concern on each of four levels: the connection, database, collection, and write operation.
-Objects will inherit the default write concern from their parents. Thus, if you set a write concern of `{:w => 1}` when creating
-a new connection, then all databases and collections created from that connection will inherit the same setting. See this code example:
-
-    @con = Mongo::Connection.new('localhost', 27017, :safe => {:w => 2})
-    @db  = @con['test']
-    @collection = @db['foo']
-    @collection.save({:name => 'foo'})
-
-    @collection.save({:name => 'bar'}, :safe => false)
-
-Here, the first call to Collection#save will use the inherited write concern, `{:w => 2}`. But notice that the second call
-to Collection#save overrides this setting.

data/lib/mongo/gridfs/grid_io_fix.rb

@@ -1,38 +0,0 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2011 10gen Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ++
-
-module Mongo
-  class GridIO
-
-    # This fixes a comparson issue in JRuby 1.9
-    def get_md5
-      md5_command            = BSON::OrderedHash.new
-      md5_command['filemd5'] = @files_id
-      md5_command['root']    = @fs_name
-      @server_md5 = @files.db.command(md5_command)['md5']
-      if @safe
-        @client_md5 = @local_md5.hexdigest
-        if @local_md5.to_s != @server_md5.to_s
-          raise GridMD5Failure, "File on server failed MD5 check"
-        end
-      else
-        @server_md5
-      end
-    end
-  end
-end

data/lib/mongo/version.rb

@@ -1,3 +0,0 @@
-module Mongo
-  VERSION = "1.7.1"
-end

data/test/bson/test_helper.rb

@@ -1,30 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'bson')
-require 'rubygems' if RUBY_VERSION < '1.9.0'
-gem 'test-unit'
-require 'test/unit'
-
-def silently
-  warn_level = $VERBOSE
-  $VERBOSE = nil
-  result = yield
-  $VERBOSE = warn_level
-  result
-end
-
-require 'bson_ext/cbson' if !(RUBY_PLATFORM =~ /java/) && ENV['C_EXT']
-
-class Test::Unit::TestCase
-  include BSON
-
-  def assert_raise_error(klass, message)
-    begin
-      yield
-    rescue => e
-      assert_equal klass, e.class
-      assert e.message.include?(message), "#{e.message} does not include #{message}."
-    else
-      flunk "Expected assertion #{klass} but none was raised."
-    end
-  end
-
-end

data/test/replica_sets/basic_test.rb

@@ -1,119 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require './test/replica_sets/rs_test_helper'
-
-class BasicTest < Test::Unit::TestCase
-  
-  def setup
-    ensure_rs
-  end
-
-  def teardown
-    @rs.restart_killed_nodes
-    @conn.close if defined?(@conn) && @conn
-  end
-
-  def test_connect
-    @conn = ReplSetConnection.new(build_seeds(3), :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
-
-    @conn = ReplSetConnection.new(["#{@rs.host}:#{@rs.ports[1]}","#{@rs.host}:#{@rs.ports[0]}"],
-      :name => @rs.name)
-    assert @conn.connected?
-  end
-
-  def test_multiple_concurrent_replica_set_connection
-    @conn1 = ReplSetConnection.new(build_seeds(3), :name => @rs.name)
-    @conn2 = ReplSetConnection.new(build_seeds(3), :name => @rs.name)
-    assert @conn1.connected?
-    assert @conn2.connected?
-
-    assert @conn1.manager != @conn2.manager
-    assert @conn1.local_manager != @conn2.local_manager
-  end
-
-  def test_cache_original_seed_nodes
-    seeds = build_seeds(3) << "#{@rs.host}:19356"
-    @conn = ReplSetConnection.new(seeds, :name => @rs.name)
-    assert @conn.connected?
-    assert @conn.seeds.include?([@rs.host, 19356]), "Original seed nodes not cached!"
-    assert_equal [@rs.host, 19356], @conn.seeds.last, "Original seed nodes not cached!"
-  end
-
-  def test_accessors
-    seeds = build_seeds(3)
-    args = {:name => @rs.name}
-    @conn = ReplSetConnection.new(seeds, args)
-
-    assert_equal @conn.host, @rs.primary[0]
-    assert_equal @conn.port, @rs.primary[1]
-    assert_equal @conn.host, @conn.primary_pool.host
-    assert_equal @conn.port, @conn.primary_pool.port
-    assert_equal 2, @conn.secondaries.length
-    assert_equal 0, @conn.arbiters.length
-    assert_equal 2, @conn.secondary_pools.length
-    assert_equal @rs.name, @conn.replica_set_name
-    assert @conn.secondary_pools.include?(@conn.read_pool(:secondary))
-    assert_equal 90, @conn.refresh_interval
-    assert_equal @conn.refresh_mode, false
-  end
-
-  context "Socket pools" do
-    context "checking out writers" do
-      setup do
-        seeds = build_seeds(3)
-        args = {:name => @rs.name}
-        @con = ReplSetConnection.new(seeds, args)
-        @coll = @con[MONGO_TEST_DB]['test-connection-exceptions']
-      end
-
-      should "close the connection on send_message for major exceptions" do
-        @con.expects(:checkout_writer).raises(SystemStackError)
-        @con.expects(:close)
-        begin
-          @coll.insert({:foo => "bar"})
-        rescue SystemStackError
-        end
-      end
-
-      should "close the connection on send_message_with_safe_check for major exceptions" do
-        @con.expects(:checkout_writer).raises(SystemStackError)
-        @con.expects(:close)
-        begin
-          @coll.insert({:foo => "bar"}, :safe => true)
-        rescue SystemStackError
-        end
-      end
-
-      should "close the connection on receive_message for major exceptions" do
-        @con.expects(:checkout_reader).raises(SystemStackError)
-        @con.expects(:close)
-        begin
-          @coll.find({}, :read => :primary).next
-        rescue SystemStackError
-        end
-      end
-    end
-    
-    context "checking out readers" do
-      setup do
-        seeds = build_seeds(3)
-        args = {:name => @rs.name}
-        @con = ReplSetConnection.new(seeds, args)
-        @coll = @con[MONGO_TEST_DB]['test-connection-exceptions']
-      end
-      
-      should "close the connection on receive_message for major exceptions" do
-        @con.expects(:checkout_reader).raises(SystemStackError)
-        @con.expects(:close)
-        begin
-          @coll.find({}, :read => :secondary).next
-        rescue SystemStackError
-        end
-      end
-    end
-  end
-end

data/test/replica_sets/complex_connect_test.rb

@@ -1,57 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require './test/replica_sets/rs_test_helper'
-
-class ComplexConnectTest < Test::Unit::TestCase
-  
-  def setup
-    ensure_rs
-  end
-
-  def teardown
-    @rs.restart_killed_nodes
-    @conn.close if defined?(@conn) && @conn
-  end
-
-  def test_complex_connect
-    primary = Connection.new(@rs.host, @rs.ports[0])
-
-    @conn = ReplSetConnection.new([
-      "#{@rs.host}:#{@rs.ports[2]}",
-      "#{@rs.host}:#{@rs.ports[1]}",
-      "#{@rs.host}:#{@rs.ports[0]}",
-    ])
-
-    version = @conn.server_version
-
-    @conn['test']['foo'].insert({:a => 1})
-    assert @conn['test']['foo'].find_one
-
-    config = primary['local']['system.replset'].find_one
-    config['version'] += 1
-    config['members'].delete_if do |member|
-      member['host'].include?(@rs.ports[2].to_s)
-    end
-
-    assert_raise ConnectionFailure do
-      primary['admin'].command({:replSetReconfig => config})
-    end
-    @rs.ensure_up
-
-    force_stepdown = BSON::OrderedHash.new
-    force_stepdown[:replSetStepDown] = 1
-    force_stepdown[:force] = true
-
-    assert_raise ConnectionFailure do
-      primary['admin'].command(force_stepdown)
-    end
-
-    # isMaster is currently broken in 2.1+ when called on removed nodes
-    if version < "2.1"
-      rescue_connection_failure do
-        assert @conn['test']['foo'].find_one
-      end
-
-      assert @conn['test']['foo'].find_one
-    end
-  end
-end

data/test/replica_sets/complex_read_preference_test.rb

@@ -1,237 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require './test/replica_sets/rs_test_helper'
-require 'logger'
-
-# Tags for members:
-# 0 => {"dc" => "ny", "rack" => "a", "db" => "main"}
-# 1 => {"dc" => "ny", "rack" => "b", "db" => "main"}
-# 2 => {"dc" => "sf", "rack" => "a", "db" => "main"}
-
-class ComplexReadPreferenceTest < Test::Unit::TestCase
-  def setup
-    ensure_rs
-
-    # Insert data
-    conn = Connection.new(@rs.host, @rs.primary[1])
-    db = conn.db(MONGO_TEST_DB)
-    coll = db.collection("test-sets")
-    coll.save({:a => 20}, :safe => {:w => 2})
-  end
-
-  def test_primary_with_tags
-    # Test specifying a tag set with default read preference of primary throws and error
-    conn = make_connection({:tag_sets => {"rack" => "a"}})
-    assert_raise_error MongoArgumentError, "Read preferecy :primary cannot be combined with tags" do
-      conn.read_pool
-    end
-  end
-
-  def test_tags
-    return true if @rs.version < "2.1"
-
-    assert_read_pool(:primary, {}, 0)
-    assert_read_pool(:primary_preferred, {}, 0)
-    assert_read_pool(:secondary, {}, [1,2])
-    assert_read_pool(:secondary_preferred, {}, [1,2])
-
-    # Test tag_sets are ignored on primary
-    assert_read_pool(:primary_preferred,
-      {"rack" => "b"}, 0)
-
-    # Test single tag
-    assert_read_pool(:secondary,
-      {"rack" => "a"}, 2)
-    assert_read_pool(:secondary,
-      {"rack" => "b"}, 1)
-    assert_read_pool(:secondary,
-      {"db" => "main"}, [1, 2])
-
-    # Test multiple tags
-    assert_read_pool(:secondary,
-      {"db" => "main", "rack" => "a"}, 2)
-    assert_read_pool(:secondary,
-      {"dc" => "ny", "rack" => "b", "db" => "main"}, 1)
-
-    # Test multiple tags failing
-    assert_fail_pool(:secondary,
-      {"dc" => "ny", "rack" => "a"})
-    assert_fail_pool(:secondary,
-      {"dc" => "ny", "rack" => "b", "db" => "main", "xtra" => "?"})
-
-    # Test symbol is converted to string for key
-    assert_read_pool(:secondary,
-      {:db => "main", "rack" => "b"}, 1)
-    assert_read_pool(:secondary,
-      {:db => "main", :rack => "b"}, 1)
-    assert_read_pool(:secondary,
-      {"db" => "main", :rack => "b"}, 1)
-
-    # Test secondary_preferred
-    assert_read_pool(:secondary_preferred,
-      {"dc" => "ny"}, 1)
-    assert_read_pool(:secondary_preferred,
-      {"dc" => "sf"}, 2)
-    assert_read_pool(:secondary_preferred,
-      {"dc" => "china"}, 0)
-
-    # Test secondary_preferred with no matching member
-    assert_read_pool(:secondary_preferred,
-      {"dc" => "bad"}, 0)
-    assert_read_pool(:secondary_preferred,
-      {"db" => "main", "dc" => "china"}, 0)
-    assert_read_pool(:secondary_preferred,
-      {"db" => "ny", "rack" => "a"}, 0)
-  end
-
-  def test_tag_sets
-    return true if @rs.version < "2.1"
-
-    # Test primary_preferred overrides any tags when primary is available
-    assert_read_pool(:primary_preferred, [
-      {"dc" => "sf"}
-    ], 0)
-
-    # Test first tag_set takes priority over the second
-    assert_read_pool(:secondary, [
-      {"dc" => "sf"},
-      {"dc" => "ny"}
-    ], 2)
-    assert_read_pool(:secondary, [
-      {"dc" => "ny"},
-      {"dc" => "sf"}
-    ], 1)
-    assert_read_pool(:secondary_preferred, [
-      {"dc" => "sf"},
-      {"dc" => "ny"}
-    ], 2)
-    assert_read_pool(:secondary_preferred, [
-      {"dc" => "ny"},
-      {"dc" => "sf"}
-    ], 1)
-
-    # Test tags not matching any member throw an error
-    assert_fail_pool(:secondary, [
-      {"dc" => "ny", "rack" => "a"},
-      {"dc" => "sf", "rack" => "b"},
-    ])
-
-    # Test bad tags get skipped over
-    assert_read_pool(:secondary_preferred, [
-      {"bad" => "tag"},
-      {"dc" => "sf"}
-    ], 2)
-
-    # Test less selective tags
-    assert_read_pool(:secondary, [
-      {"dc" => "ny", "rack" => "b", "db" => "alt"},
-      {"dc" => "ny", "rack" => "a"},
-      {"dc" => "sf"}
-    ], 2)
-    assert_read_pool(:secondary_preferred, [
-      {"dc" => "ny", "rack" => "b", "db" => "alt"},
-      {"dc" => "ny", "rack" => "a"},
-      {"dc" => "sf"}
-    ], 2)
-    assert_read_pool(:secondary_preferred, [
-      {"dc" => "ny", "rack" => "a"},
-      {"dc" => "sf", "rack" => "b"},
-      {"db" => "main"}
-    ], [1,2])
-
-    # Test secondary preferred gives primary if no tags match
-    assert_read_pool(:secondary_preferred, [
-      {"dc" => "ny", "rack" => "a"},
-      {"dc" => "sf", "rack" => "b"}
-    ], 0)
-    assert_read_pool(:secondary_preferred, [
-      {"dc" => "ny", "rack" => "a"},
-      {"dc" => "sf", "rack" => "b"},
-      {"dc" => "ny", "rack" => "b"},
-    ], 1)
-
-    # Basic nearest test
-    assert_read_pool(:nearest, [
-      {"dc" => "ny", "rack" => "a"},
-      {"dc" => "sf", "rack" => "b"},
-      {"db" => "main"}
-    ], [0,1,2])
-  end
-
-  def test_nearest
-    # Test refresh happens on connection after interval has passed
-    conn = make_connection(
-      :read => :secondary_preferred,
-      :refresh_mode => :sync,
-      :refresh_interval => 1,
-      :secondary_acceptable_latency_ms => 10
-    )
-    pools = conn.manager.pools
-
-    # Connection should select node with 110 ping every time
-    set_pings(pools, [100,110,130])
-    sleep(2)
-
-    assert conn.read_pool == pools[1]
-
-    # Connection should select node with 100 ping every time
-    set_pings(pools, [100,120,100])
-    sleep(2)
-
-    assert conn.read_pool == pools[2]
-  end
-
-  def test_tags_and_nearest
-    return true if @rs.version < "2.1"
-
-    # Test connection's read pool matches tags
-    assert_read_pool(:secondary_preferred, {"dc" => "sf"}, 2, [100,110,130])
-
-    # Test connection's read pool picks near pool (both match tags)
-    assert_read_pool(:secondary_preferred, {"db" => "main"}, 1, [100,110,130])
-    assert_read_pool(:secondary_preferred, {"db" => "main"}, 2, [100,130,110])
-    assert_read_pool(:secondary_preferred, {"db" => "fake"}, 0, [100,130,110])
-  end
-
-  private
-
-  def set_pings(pools, pings)
-    pools.sort! { |a,b| a.port <=> b.port }
-    pools.each_with_index do |pool, index|
-      pool.stubs(:ping_time).returns(pings[index])
-    end
-  end
-
-  def make_connection(opts = {})
-    ReplSetConnection.new(build_seeds(3), opts)
-  end
-
-  def assert_read_pool(mode=:primary, tags=[], node_nums=[0], pings=[], latency=10)
-    if pings.empty?
-      conn = make_connection({:read => mode, :tag_sets => tags})
-    else
-      conn = make_connection({
-        :read => mode,
-        :tag_sets => tags,
-        :refresh_mode => :sync,
-        :refresh_interval => 1,
-        :secondary_acceptable_latency_ms => latency
-      })
-
-      set_pings(conn.manager.pools, pings)
-      sleep(2)
-    end
-
-    assert conn[MONGO_TEST_DB]['test-sets'].find_one
-
-    target_ports = [*node_nums].collect {|num| @rs.ports[num]}
-
-    assert target_ports.member?(conn.read_pool.port)
-  end
-
-  def assert_fail_pool(mode=:primary, tags={})
-    assert_raise_error ConnectionFailure, "No replica set member available for query " +
-      "with read preference matching mode #{mode} and tags matching #{tags}." do
-      make_connection({:read => mode, :tag_sets => tags}).read_pool
-    end
-  end
-end