mongo 1.9.2 → 1.10.0.rc0

data/test/functional/collection_writer_test.rb

@@ -0,0 +1,83 @@
+# Copyright (C) 2009-2013 MongoDB, 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.
+
+require 'test_helper'
+
+module Mongo
+  class Collection
+    public :batch_write
+  end
+  class CollectionWriter
+    public :sort_by_first_sym, :ordered_group_by_first
+  end
+end
+
+class CollectionWriterTest < Test::Unit::TestCase
+
+  DATABASE_NAME = 'ruby_test_collection_writer'
+  COLLECTION_NAME = 'test'
+
+  def default_setup
+    @client = MongoClient.new
+    @db = @client[DATABASE_NAME]
+    @collection = @db[COLLECTION_NAME]
+    @collection.drop
+  end
+
+  context "Bulk API Execute" do
+    setup do
+      default_setup
+    end
+
+    should "sort_by_first_sym for grouping unordered ops" do
+      pairs = [
+          [:insert, {:n => 0}],
+          [:update, {:n => 1}], [:update, {:n => 2}],
+          [:delete, {:n => 3}],
+          [:insert, {:n => 5}], [:insert, {:n => 6}], [:insert, {:n => 7}],
+          [:update, {:n => 8}],
+          [:delete, {:n => 9}], [:delete, {:n => 10}]
+      ]
+      result = @collection.command_writer.sort_by_first_sym(pairs)
+      expected = [
+          :delete, :delete, :delete,
+          :insert, :insert, :insert, :insert,
+          :update, :update, :update
+      ]
+      assert_equal expected, result.collect{|first, rest| first}
+    end
+
+    should "calculate ordered_group_by_first" do
+      pairs = [
+          [:insert, {:n => 0}],
+          [:update, {:n => 1}], [:update, {:n => 2}],
+          [:delete, {:n => 3}],
+          [:insert, {:n => 5}], [:insert, {:n => 6}], [:insert, {:n => 7}],
+          [:update, {:n => 8}],
+          [:delete, {:n => 9}], [:delete, {:n => 10}]
+      ]
+      result = @collection.command_writer.ordered_group_by_first(pairs)
+      expected = [
+          [:insert, [{:n => 0}]],
+          [:update, [{:n => 1}, {:n => 2}]],
+          [:delete, [{:n => 3}]],
+          [:insert, [{:n => 5}, {:n => 6}, {:n => 7}]],
+          [:update, [{:n => 8}]],
+          [:delete, [{:n => 9}, {:n => 10}]]
+      ]
+      assert_equal expected, result
+    end
+
+  end
+end

data/test/functional/conversions_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,8 +13,6 @@
 # limitations under the License.
 
 require 'test_helper'
-require 'mongo/exceptions'
-require 'mongo/util/conversions'
 
 class ConversionsTest < Test::Unit::TestCase
   include Mongo::Conversions

data/test/functional/cursor_fail_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,14 +20,14 @@ class CursorFailTest < Test::Unit::TestCase
   include Mongo
 
   @@connection = standard_connection
-  @@db   = @@connection.db(MONGO_TEST_DB)
+  @@db   = @@connection.db(TEST_DB)
   @@coll = @@db.collection('test')
   @@version = @@connection.server_version
 
   def setup
     @@coll.remove({})
     @@coll.insert({'a' => 1})     # collection not created until it's used
-    @@coll_full_name = "#{MONGO_TEST_DB}.test"
+    @@coll_full_name = "#{TEST_DB}.test"
   end
 
   def test_refill_via_get_more_alt_coll

data/test/functional/cursor_message_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,14 +20,14 @@ class CursorMessageTest < Test::Unit::TestCase
   include Mongo
 
   @@connection = standard_connection
-  @@db   = @@connection.db(MONGO_TEST_DB)
+  @@db   = @@connection.db(TEST_DB)
   @@coll = @@db.collection('test')
   @@version = @@connection.server_version
 
   def setup
     @@coll.remove
     @@coll.insert('a' => 1)     # collection not created until it's used
-    @@coll_full_name = "#{MONGO_TEST_DB}.test"
+    @@coll_full_name = "#{TEST_DB}.test"
   end
 
   def test_valid_batch_sizes

data/test/functional/cursor_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,14 +20,14 @@ class CursorTest < Test::Unit::TestCase
   include Mongo::Constants
 
   @@connection = standard_connection
-  @@db   = @@connection.db(MONGO_TEST_DB)
+  @@db   = @@connection.db(TEST_DB)
   @@coll = @@db.collection('test')
   @@version = @@connection.server_version
 
   def setup
     @@coll.remove
     @@coll.insert('a' => 1)     # collection not created until it's used
-    @@coll_full_name = "#{MONGO_TEST_DB}.test"
+    @@coll_full_name = "#{TEST_DB}.test"
   end
 
   def test_alive
@@ -91,6 +91,41 @@ class CursorTest < Test::Unit::TestCase
     end
   end
 
+  def test_compile_regex_get_more
+    return unless defined?(BSON::BSON_RUBY) && BSON::BSON_CODER == BSON::BSON_RUBY
+    @@coll.remove
+    n_docs = 3
+    n_docs.times { |n| @@coll.insert({ 'n' => /.*/ }) }
+    cursor = @@coll.find({}, :batch_size => (n_docs-1), :compile_regex => false)
+    cursor.expects(:send_get_more)
+    cursor.to_a.each do |doc|
+      assert_kind_of BSON::Regex, doc['n']
+    end
+  end
+
+  def test_server_op_timeout_error
+    cursor = @@coll.find
+    cursor.stubs(:send_initial_query).returns(true)
+
+    cursor.instance_variable_set(:@cache, [{
+      '$err' => 'operation exceeded time limit',
+      'code' => 50
+    }])
+
+    assert_raise ExecutionTimeout do
+      cursor.to_a
+    end
+  end
+
+  def test_server_op_timeout
+    with_forced_timeout(@@connection) do
+      assert_raise ExecutionTimeout do
+        cursor = @@coll.find.server_op_timeout(100)
+        cursor.to_a
+      end
+    end
+  end
+
   def test_exhaust_after_limit_error
     c = Cursor.new(@@coll, :limit => 17)
     assert_raise MongoArgumentError do

data/test/functional/db_api_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ class DBAPITest < Test::Unit::TestCase
   include BSON
 
   @@client = standard_connection
-  @@db   = @@client.db(MONGO_TEST_DB)
+  @@db   = @@client.db(TEST_DB)
   @@coll = @@db.collection('test')
   @@version = @@client.server_version
 
@@ -27,7 +27,7 @@ class DBAPITest < Test::Unit::TestCase
     @@coll.remove
     @r1 = {'a' => 1}
     @@coll.insert(@r1) # collection not created until it's used
-    @@coll_full_name = "#{MONGO_TEST_DB}.test"
+    @@coll_full_name = "#{TEST_DB}.test"
   end
 
   def teardown
@@ -327,12 +327,12 @@ class DBAPITest < Test::Unit::TestCase
     begin
       coll = @@db.create_collection('foobar', :capped => true, :size => 1024)
       options = coll.options
-      assert_equal 'foobar', options['create']
+      assert_equal 'foobar', options['create'] if @@client.server_version < '2.5.5'
       assert_equal true, options['capped']
       assert_equal 1024, options['size']
     rescue => ex
       @@db.drop_collection('foobar')
-      fail "did not expect exception \"#{ex}\""
+      fail "did not expect exception \"#{ex.inspect}\""
     ensure
       @@db.strict = false
     end

data/test/functional/db_connection_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ class DBConnectionTest < Test::Unit::TestCase
   def test_no_exceptions
     host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
     port = ENV['MONGO_RUBY_DRIVER_PORT'] || MongoClient::DEFAULT_PORT
-    db = MongoClient.new(host, port).db(MONGO_TEST_DB)
+    db = MongoClient.new(host, port).db(TEST_DB)
     coll = db.collection('test')
     coll.remove
     db.get_last_error

data/test/functional/db_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,8 +29,7 @@ class DBTest < Test::Unit::TestCase
   include Mongo
 
   @@client  = standard_connection
-  @@db    = @@client.db(MONGO_TEST_DB)
-  @@users = @@db.collection('system.users')
+  @@db    = @@client.db(TEST_DB)
   @@version = @@client.server_version
 
   def test_close
@@ -42,8 +41,7 @@ class DBTest < Test::Unit::TestCase
     rescue => ex
       assert_match(/NilClass/, ex.to_s)
     ensure
-      @@db = standard_connection.db(MONGO_TEST_DB)
-      @@users = @@db.collection('system.users')
+      @@db = standard_connection.db(TEST_DB)
     end
   end
 
@@ -58,7 +56,7 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_get_and_drop_collection
-    db = @@client.db(MONGO_TEST_DB, :strict => true)
+    db = @@client.db(TEST_DB, :strict => true)
     db.create_collection('foo')
     assert db.collection('foo')
     assert db.drop_collection('foo')
@@ -81,7 +79,7 @@ class DBTest < Test::Unit::TestCase
 
   def test_full_coll_name
     coll = @@db.collection('test')
-    assert_equal "#{MONGO_TEST_DB}.test", @@db.full_collection_name(coll.name)
+    assert_equal "#{TEST_DB}.test", @@db.full_collection_name(coll.name)
   end
 
   def test_collection_names
@@ -109,7 +107,7 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_pk_factory
-    db = standard_connection.db(MONGO_TEST_DB, :pk => TestPKFactory.new)
+    db = standard_connection.db(TEST_DB, :pk => TestPKFactory.new)
     coll = db.collection('test')
     coll.remove
 
@@ -133,7 +131,7 @@ class DBTest < Test::Unit::TestCase
 
   def test_pk_factory_reset
     conn = standard_connection
-    db   = conn.db(MONGO_TEST_DB)
+    db   = conn.db(TEST_DB)
     db.pk_factory = Object.new # first time
     begin
       db.pk_factory = Object.new
@@ -205,6 +203,24 @@ class DBTest < Test::Unit::TestCase
     end
   end
 
+  def test_arbitrary_command_opts
+    with_forced_timeout(@@client) do
+      assert_raise ExecutionTimeout do
+        cmd = OrderedHash.new
+        cmd[:ping] = 1
+        cmd[:maxTimeMS] = 100
+        @@db.command(cmd)
+      end
+    end
+  end
+
+  def test_command_with_bson
+    normal_response = @@db.command({:buildInfo => 1})
+    bson = BSON::BSON_CODER.serialize({:buildInfo => 1}, false, false)
+    bson_response = @@db.command({:bson => bson})
+    assert_equal normal_response, bson_response
+  end
+
   def test_last_status
     @@db['test'].remove
     @@db['test'].save("i" => 1)
@@ -218,7 +234,7 @@ class DBTest < Test::Unit::TestCase
 
   def test_text_port_number_raises_no_errors
     client = standard_connection
-    db   = client[MONGO_TEST_DB]
+    db   = client[TEST_DB]
     db.collection('users').remove
   end
 
@@ -236,6 +252,14 @@ class DBTest < Test::Unit::TestCase
     assert_equal 'hello', @@db['system'].find_one['_id']
   end
 
+  def test_eval_nolock
+    function = "db.system.save({_id:'hello', value: function(string) { print(string); } })"
+    @@db.expects(:command).with do |selector, opts|
+        selector[:nolock] == true
+    end.returns({ 'ok' => 1, 'retval' => 1 })
+    @@db.eval(function, 'hello', :nolock => true)
+  end
+
   if @@version >= "1.3.5"
     def test_db_stats
       stats = @@db.stats
@@ -246,7 +270,7 @@ class DBTest < Test::Unit::TestCase
 
   context "database profiling" do
     setup do
-      @db  = @@client[MONGO_TEST_DB]
+      @db  = @@client[TEST_DB]
       @coll = @db['test']
       @coll.remove
       @r1 = @coll.insert('a' => 1) # collection not created until it's used

data/test/functional/grid_file_system_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ class GridFileSystemTest < Test::Unit::TestCase
   context "GridFileSystem:" do
     setup do
       @con = standard_connection
-      @db  = @con.db(MONGO_TEST_DB)
+      @db  = @con.db(TEST_DB)
     end
 
     teardown do

data/test/functional/grid_io_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ class GridIOTest < Test::Unit::TestCase
 
   context "GridIO" do
     setup do
-      @db = standard_connection.db(MONGO_TEST_DB)
+      @db = standard_connection.db(TEST_DB)
       @files  = @db.collection('fs.files')
       @chunks = @db.collection('fs.chunks')
       @chunks.create_index([['files_id', Mongo::ASCENDING], ['n', Mongo::ASCENDING]])

data/test/functional/grid_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ end
 class GridTest < Test::Unit::TestCase
   context "Tests:" do
     setup do
-      @db = standard_connection.db(MONGO_TEST_DB)
+      @db = standard_connection.db(TEST_DB)
       @files  = @db.collection('test-fs.files')
       @chunks = @db.collection('test-fs.chunks')
     end

data/test/functional/pool_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,14 +13,13 @@
 # limitations under the License.
 
 require 'test_helper'
-require 'thread'
 
 class PoolTest < Test::Unit::TestCase
   include Mongo
 
   def setup
     @client    ||= standard_connection({:pool_size => 15, :pool_timeout => 5})
-    @db         = @client.db(MONGO_TEST_DB)
+    @db         = @client.db(TEST_DB)
     @collection = @db.collection("pool_test")
   end
 

data/test/functional/safe_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ class SafeTest < Test::Unit::TestCase
   context "Safe mode propogation: " do
     setup do
       @connection = standard_connection({:safe => true}, true) # Legacy
-      @db         = @connection[MONGO_TEST_DB]
+      @db         = @connection[TEST_DB]
       @collection = @db['test-safe']
       @collection.create_index([[:a, 1]], :unique => true)
       @collection.remove
@@ -73,7 +73,7 @@ class SafeTest < Test::Unit::TestCase
   context "Safe error objects" do
     setup do
       @connection = standard_connection({:safe => true}, true) # Legacy
-      @db         = @connection[MONGO_TEST_DB]
+      @db         = @connection[TEST_DB]
       @collection = @db['test']
       @collection.remove
       @collection.insert({:a => 1})
@@ -85,8 +85,8 @@ class SafeTest < Test::Unit::TestCase
       response = @collection.update({:a => 1}, {"$set" => {:a => 2}},
                              :multi => true)
 
-      assert response['updatedExisting']
-      assert_equal 3, response['n']
+      assert(response['updatedExisting'] || @db.connection.wire_version_feature?(Mongo::MongoClient::BATCH_COMMANDS)) # TODO - review new write command return values
+      assert(response['n'] == 3 || @db.connection.wire_version_feature?(Mongo::MongoClient::BATCH_COMMANDS)) # TODO - update command top pending
     end
 
     should "return object on remove" do