mongo 1.10.0-java → 1.10.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc3ce7b36f61b8784629e34051b56e16aaf9b45
-  data.tar.gz: dcfb781eb48c4e0dc0d175fd51a23beaaaeb286f
+  metadata.gz: ae88c8e129b138162459577c3d5aab3464be2aa5
+  data.tar.gz: c362c3a5f77295bb68227c8263dc9418c26e464d
 SHA512:
-  metadata.gz: b3e5d83a165dfb3fae3d7b79183e8575a3edc8a6cab643d19aeeef414e7fd33f038c5c5a85f58079d20330bc58d6a7e3d856220781bc3555e68c34c89412db5e
-  data.tar.gz: 113ee10195244e9fc19fac38c455b02d0936d781e729394c0ed021a794b0b05613acc05f433910e580439349459e36094cdfb1efa963f69767dfe52e2f03b45d
+  metadata.gz: 83d37ce49373264e0089500c7ae049301bbd29d440a995f86723ffd4a746579f79288d5454212e9305260d35e72b90d929c71b5fa4f6a0ebfdab46f5dde91ec5
+  data.tar.gz: aabe35188da7ba722769546d9344ddb16607098a09d3ef8c585ae18546c858bcfb68e95294914c590531c25b6b818990f0189fa174c047dcabd2e3f0cdaed4a1

data/VERSION

@@ -1 +1 @@
-1.10.0
+1.10.1

data/lib/mongo.rb

@@ -62,9 +62,15 @@ module Mongo
     BAD_VALUE                = 2
     UNKNOWN_ERROR            = 8
     INVALID_BSON             = 22
-    COMMAND_NOT_FOUND        = 59
     WRITE_CONCERN_FAILED     = 64
     MULTIPLE_ERRORS_OCCURRED = 65
+
+    # mongod/s 2.6 and above return code 59 when a command doesn't exist.
+    # mongod versions previous to 2.6 and mongos 2.4.x return no error code
+    # when a command does exist.
+    # mongos versions previous to 2.4.0 return code 13390 when a command
+    # does not exist.
+    COMMAND_NOT_FOUND_CODES  = [nil, 59, 13390]
   end
 end
 

data/lib/mongo/collection.rb

@@ -1130,7 +1130,7 @@ module Mongo
         cmd = BSON::OrderedHash[:createIndexes, @name, :indexes, [selector]]
         @db.command(cmd)
       rescue Mongo::OperationFailure => ex
-        if ex.error_code == Mongo::ErrorCode::COMMAND_NOT_FOUND || ex.error_code.nil?
+        if Mongo::ErrorCode::COMMAND_NOT_FOUND_CODES.include?(ex.error_code)
           selector[:ns] = "#{@db.name}.#{@name}"
           send_write(:insert, nil, selector, false, {:w => 1}, Mongo::DB::SYSTEM_INDEX_COLLECTION)
         else

data/lib/mongo/cursor.rb

@@ -139,7 +139,7 @@ module Mongo
       doc = @cache.shift
 
       if doc && (err = doc['errmsg'] || doc['$err']) # assignment
-        code = doc['code']
+        code = doc['code'] || doc['assertionCode']
 
         # If the server has stopped being the master (e.g., it's one of a
         # pair but it has died or something like that) then we close that

data/lib/mongo/db.rb

@@ -225,7 +225,7 @@ module Mongo
       # 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
-        raise ex unless ex.error_code == Mongo::ErrorCode::COMMAND_NOT_FOUND || ex.error_code.nil?
+        raise ex unless Mongo::ErrorCode::COMMAND_NOT_FOUND_CODES.include?(ex.error_code)
         return legacy_add_user(username, password, read_only, opts)
       end
 
@@ -246,7 +246,7 @@ module Mongo
       begin
         command(:dropUser => username)
       rescue OperationFailure => ex
-        raise ex unless ex.error_code == Mongo::ErrorCode::COMMAND_NOT_FOUND || ex.error_code.nil?
+        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

data/lib/mongo/functional/uri_parser.rb

@@ -125,6 +125,12 @@ module Mongo
       :wtimeoutms           => lambda { |arg| arg.to_i }
     }
 
+    OPT_CASE_SENSITIVE = [ :authsource,
+                           :gssapiservicename,
+                           :replicaset,
+                           :w
+                         ]
+
     attr_reader :auths,
                 :authmechanism,
                 :authsource,
@@ -348,7 +354,8 @@ module Mongo
 
       opts = CGI.parse(string_opts).inject({}) do |memo, (key, value)|
         value = value.first
-        memo[key.downcase.to_sym] = value.strip.downcase
+        key_sym = key.downcase.to_sym
+        memo[key_sym] = OPT_CASE_SENSITIVE.include?(key_sym) ? value.strip : value.strip.downcase
         memo
       end
 

data/lib/mongo/mongo_replica_set_client.rb

@@ -471,7 +471,8 @@ module Mongo
     end
 
     def max_write_batch_size
-      local_manager && local_manager.primary_pool && local_manager.primary_pool.node.max_write_batch_size
+      local_manager && local_manager.primary_pool && local_manager.primary_pool.node.max_write_batch_size ||
+        DEFAULT_MAX_WRITE_BATCH_SIZE
     end
 
     private

data/lib/mongo/networking.rb

@@ -100,7 +100,7 @@ module Mongo
         if error && error.include?("not master")
           close
           raise ConnectionFailure.new(docs[0]['code'].to_s + ': ' + error, docs[0]['code'], docs[0])
-        elsif (note = docs[0]['jnote'] || docs[0]['wnote']) # assignment
+        elsif (!error.nil? && note = docs[0]['jnote'] || docs[0]['wnote']) # assignment
           code = docs[0]['code'] || Mongo::ErrorCode::BAD_VALUE # as of server version 2.5.5
           raise WriteConcernError.new(code.to_s + ': ' + note, code, docs[0])
         elsif error

data/test/functional/collection_test.rb

@@ -855,11 +855,12 @@ class CollectionTest < Test::Unit::TestCase
       end
     end
 
-    def test_wnote_raises_exception
+    def test_wnote_raises_exception_with_err_not_nil
       ex = assert_raise Mongo::WriteConcernError do
         @@test.insert({:foo => 1}, :w => 2)
       end
       result = ex.result
+      assert_not_nil result["err"]
       assert_true result.has_key?("wnote")
     end
   end

data/test/functional/db_test.rb

@@ -189,7 +189,7 @@ class DBTest < Test::Unit::TestCase
       @@db.command(command)
     rescue => ex
       raised = true
-      assert ex.message.include?("forced error"),
+      assert ex.message.include?("forced error") || ex.result.has_key?("assertion") && ex.result["assertion"].include?("forced error"),
         "error message does not contain 'forced error'"
       assert_equal 10038, ex.error_code
 
@@ -319,16 +319,18 @@ class DBTest < Test::Unit::TestCase
     end
 
     should "return profiling info" do
-      @db.profiling_level = :all
-      @coll.find()
-      @db.profiling_level = :off
-
-      info = @db.profiling_info
-      assert_kind_of Array, info
-      assert info.length >= 1
-      first = info.first
-      assert_kind_of Time, first['ts']
-      assert_kind_of Numeric, first['millis']
+      if @@version >= "2.2"
+        @db.profiling_level = :all
+        @coll.find()
+        @db.profiling_level = :off
+
+        info = @db.profiling_info
+        assert_kind_of Array, info
+        assert info.length >= 1
+        first = info.first
+        assert_kind_of Time, first['ts']
+        assert_kind_of Numeric, first['millis']
+      end
     end
 
     should "validate collection" do

data/test/functional/uri_test.rb

@@ -327,4 +327,16 @@ class URITest < Test::Unit::TestCase
     assert_equal true, parser.auths.first[:extra][:canonicalize_host_name]
   end
 
+  def test_opts_case_sensitivity
+    # options gssapiservicename, authsource, replicaset, w should be case sensitive
+    uri = "mongodb://localhost?gssapiServiceName=MongoDB;" +
+            "authSource=FooBar;" +
+            "replicaSet=Foo;" +
+            "w=Majority"
+    parser = Mongo::URIParser.new(uri)
+    assert_equal 'MongoDB', parser.gssapiservicename
+    assert_equal 'FooBar',  parser.authsource
+    assert_equal 'Foo',     parser.replicaset
+    assert_equal :Majority, parser.w
+  end
 end

data/test/helpers/test_unit.rb

@@ -306,6 +306,13 @@ class Test::Unit::TestCase
   def batch_commands?(wire_version)
     wire_version >= Mongo::MongoClient::BATCH_COMMANDS
   end
+
+  def subject_to_server_4754?(client)
+    # Until SERVER-4754 is resolved, profiling info is not collected
+    # when mongod is started with --auth in versions < 2.2
+    cmd_line_args = client['admin'].command({ :getCmdLineOpts => 1 })['parsed']
+    client.server_version < '2.2' && cmd_line_args.include?('auth')
+  end
 end
 
 # Before and after hooks for the entire test run

data/test/replica_set/basic_test.rb

@@ -100,6 +100,20 @@ class ReplicaSetBasicTest < Test::Unit::TestCase
     end
   end
 
+  def test_wnote_does_not_raise_exception_with_err_nil
+    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :name => @rs.repl_set_name)
+    if @client.server_version < '2.5.5'
+      @coll = @client[TEST_DB]['test-wnote']
+      begin
+        result = @coll.remove({:foo => 1}, :w => 2)
+      rescue => ex
+        assert(false, "should not raise an exception for a wnote response field from a remove that does not match any documents")
+      end
+      assert_nil result["err"]
+      assert_true result.has_key?("wnote")
+    end
+  end
+
   context "Socket pools" do
     context "checking out writers" do
       setup do

data/test/replica_set/client_test.rb

@@ -206,7 +206,11 @@ class ReplicaSetClientTest < Test::Unit::TestCase
       assert ['localhost:29999'] != @client.primary
       assert !@client.secondaries.include?('localhost:29999')
     ensure
-      Process.kill("KILL", hung_node.pid) if hung_node
+      begin
+        Process.kill("KILL", hung_node.pid) if hung_node
+      rescue
+        # the process ended, was killed already, or the system doesn't support nc
+      end
     end
   end
 

data/test/replica_set/cursor_test.rb

@@ -132,6 +132,7 @@ class ReplicaSetCursorTest < Test::Unit::TestCase
   # batch from send_initial_query is 101 documents
   # check that you get n_docs back from the query, with the same port
   def cursor_get_more_test(read=:primary)
+    return if subject_to_server_4754?(@client)
     set_read_client_and_tag(read)
     10.times do
       # assert that the query went to the correct member
@@ -152,6 +153,7 @@ class ReplicaSetCursorTest < Test::Unit::TestCase
 
   # batch from get_more can be huge, so close after send_initial_query
   def kill_cursor_test(read=:primary)
+    return if subject_to_server_4754?(@client)
     set_read_client_and_tag(read)
     10.times do
       # assert that the query went to the correct member
@@ -171,6 +173,7 @@ class ReplicaSetCursorTest < Test::Unit::TestCase
   end
 
   def assert_cursors_on_members(read=:primary)
+    return if subject_to_server_4754?(@client)
     set_read_client_and_tag(read)
     # assert that the query went to the correct member
     route_query(read)

data/test/replica_set/max_values_test.rb

@@ -141,5 +141,11 @@ class MaxValuesTest < Test::Unit::TestCase
     @client.local_manager.primary_pool.node.stubs(:max_write_batch_size).returns(999)
     assert_equal 999, @client.max_write_batch_size
   end
+
+  def test_max_write_batch_size_no_manager
+    # Simulate no local manager being set yet - RUBY-759
+    @client.stubs(:local_manager).returns(nil)
+    assert_equal Mongo::MongoClient::DEFAULT_MAX_WRITE_BATCH_SIZE, @client.max_write_batch_size
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: java
 authors:
 - Emily Stolfo
@@ -34,7 +34,7 @@ cert_chain:
   JrZM8w8wGbIOeLtoQqa7HB/jOYbTahH7KMNh2LHAbOR93hNIJxVRa4iwxiMQ75tN
   9WUIAJ4AEtjwRg1Bz0OwDo3aucPCBpx77+/FWhv7JYY=
   -----END CERTIFICATE-----
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -42,12 +42,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
   prerelease: false
   type: :runtime
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.