mongo 1.0.9 → 1.1

data/HISTORY

@@ -1,3 +1,11 @@
+1.1 2010-10-4
+* Official JRuby support via Java extensons for BSON (beta)
+* Connection#lock! and Connection#unlock! for easy fsync lock
+* Note: BSON::Code is no longer a subclass of String.
+
+1.0.9 2010-9-20
+* Significant performance improvements
+
 1.0.8 2010-8-27
 
 * Cursor#rewind! and more consistent Cursor Enumberable behavior

data/Rakefile

@@ -13,6 +13,29 @@ require 'rbconfig'
 include Config
 ENV['TEST_MODE'] = 'TRUE'
 
+task :java do
+  Rake::Task['build:java'].invoke
+  Rake::Task['test:ruby'].invoke
+end
+
+namespace :build do
+  desc "Build the java extensions."
+  task :java do
+    puts "Building Java extensions..."
+    java_dir  = File.join(File.dirname(__FILE__), 'ext', 'java')
+    jar_dir   = File.join(java_dir, 'jar')
+
+    jruby_jar = File.join(jar_dir, 'jruby.jar')
+    mongo_jar = File.join(jar_dir, 'mongo.jar')
+    bson_jar = File.join(jar_dir, 'bson.jar')
+
+    src_base   = File.join(java_dir, 'src')
+
+    system("javac -Xlint:unchecked -classpath #{jruby_jar}:#{mongo_jar}:#{bson_jar} #{File.join(src_base, 'org', 'jbson', '*.java')}")
+    system("cd #{src_base} && jar cf #{File.join(jar_dir, 'jbson.jar')} #{File.join('.', 'org', 'jbson', '*.class')}")
+  end
+end
+
 desc "Test the MongoDB Ruby driver."
 task :test do
   puts "\nThis option has changed."

data/lib/mongo.rb

@@ -3,7 +3,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.0.9"
+  VERSION = "1.1"
 end
 
 module Mongo

data/lib/mongo/connection.rb

@@ -168,35 +168,6 @@ module Mongo
       end
     end
 
-    # @deprecated
-    #
-    # Initialize a paired connection to MongoDB.
-    #
-    # @param nodes [Array] An array of arrays, each of which specified a host and port.
-    # @param opts Takes the same options as Connection.new
-    #
-    # @example
-    #   Connection.paired([["db1.example.com", 27017],
-    #                   ["db2.example.com", 27017]])
-    #
-    # @example
-    #   Connection.paired([["db1.example.com", 27017],
-    #                   ["db2.example.com", 27017]],
-    #                   :pool_size => 20, :timeout => 5)
-    #
-    # @return [Mongo::Connection]
-    def self.paired(nodes, opts={})
-      warn "Connection.paired is deprecated. Please use Connection.multi instead."
-      unless nodes.length == 2 && nodes.all? {|n| n.is_a? Array}
-        raise MongoArgumentError, "Connection.paired requires that exactly two nodes be specified."
-      end
-      # Block returns an array, the first element being an array of nodes and the second an array
-      # of authorizations for the database.
-      new(nil, nil, opts) do |con|
-        [con.pair_val_to_connection(nodes[0]), con.pair_val_to_connection(nodes[1])]
-      end
-    end
-
     # Initialize a connection to MongoDB using the MongoDB URI spec:
     #
     # @param uri [String]
@@ -211,6 +182,31 @@ module Mongo
       end
     end
 
+    # Fsync, then lock the mongod process against writes. Use this to get
+    # the datafiles in a state safe for snapshotting, backing up, etc.
+    #
+    # @return [BSON::OrderedHash] the command response
+    def lock!
+      cmd = BSON::OrderedHash.new
+      cmd[:fsync] = 1
+      cmd[:lock]  = true
+      self['admin'].command(cmd)
+    end
+
+    # Is this database locked against writes?
+    #
+    # @return [Boolean]
+    def locked?
+      self['admin']['$cmd.sys.inprog'].find_one['fsyncLock'] == 1
+    end
+
+    # Unlock a previously fsync-locked mongod process.
+    #
+    # @return [BSON::OrderedHash] command response
+    def unlock!
+      self['admin']['$cmd.sys.unlock'].find_one
+    end
+
     # Apply each of the saved database authentications.
     #
     # @return [Boolean] returns true if authentications exist and succeeed, false
@@ -483,15 +479,6 @@ module Mongo
       raise ConnectionFailure, "failed to connect to any given host:port" unless connected?
     end
 
-    # @deprecated
-    #
-    # Create a new socket and attempt to connect to master.
-    # If successful, sets host and port to master and returns the socket.
-    def connect_to_master
-      warn "Connection#connect_to_master is deprecated. Use Connection#connect instead."
-      connect
-    end
-
     def connected?
       @host && @port
     end

data/lib/mongo/cursor.rb

@@ -39,7 +39,7 @@ module Mongo
       @connection = @db.connection
       @logger     = @connection.logger
 
-      @selector   = convert_selector_for_query(options[:selector])
+      @selector   = options[:selector] || {}
       @fields     = convert_fields_for_query(options[:fields])
       @skip       = options[:skip]     || 0
       @limit      = options[:limit]    || 0
@@ -327,26 +327,6 @@ module Mongo
       end
     end
 
-    # Set the query selector hash. If the selector is a Code or String object,
-    # the selector will be used in a $where clause.
-    # See http://www.mongodb.org/display/DOCS/Server-side+Code+Execution
-    def convert_selector_for_query(selector)
-      case selector
-        when Hash
-         selector
-        when nil
-          {}
-        when BSON::Code
-          warn "Collection#find will no longer take a JavaScript string in future versions. " +
-            "Please specify your $where query explicitly."
-          {"$where" => selector}
-        when String
-          warn "Collection#find will no longer take a JavaScript string in future versions. " +
-            "Please specify your $where query explicitly."
-          {"$where" => BSON::Code.new(selector)}
-      end
-    end
-
     # Return the number of documents remaining for this cursor.
     def num_remaining
       refresh if @cache.length == 0

data/lib/mongo/db.rb

@@ -276,23 +276,6 @@ module Mongo
       ok?(command(:drop => name))
     end
 
-    # @deprecated
-    #
-    # Get the error message from the most recently executed database
-    # operation for this connection.
-    #
-    # @option opts [Boolean] :fsync (false)
-    # @option opts [Integer] :w (nil)
-    # @option opts [Integer] :wtimeout (nil)
-    #
-    # @return [String, Nil] either the text describing an error or nil if no
-    #   error has occurred.
-    def error(opts={})
-      warn "DB#error is deprecated. Please use DB#get_last_error instead"
-      opts.assert_valid_keys(:w, :wtimeout, :fsync)
-      get_last_error(opts)['err']
-    end
-
     # Run the getlasterror command with the specified replication options.
     #
     # @option opts [Boolean] :fsync (false)
@@ -311,16 +294,6 @@ module Mongo
       doc
     end
 
-    # @deprecated
-    #
-    # Get status information from the last operation on this connection.
-    #
-    # @return [Hash] a hash representing the status of the last db op.
-    def last_status
-      warn "DB#last_status is deprecated. Please use the equivalent DB#get_last_error instead"
-      command(:getlasterror => 1)
-    end
-
     # Return +true+ if an error was caused by the most recently executed
     # database operation.
     #

data/test/bson/basic_test.rb

@@ -0,0 +1,99 @@
+# encoding:utf-8
+require './test/test_helper'
+require 'complex'
+require 'bigdecimal'
+require 'rational'
+require 'benchmark'
+
+MEDIUM = {
+  'integer' => 5,
+  'number' => 5.05,
+  'boolean' => false,
+  'array' => ['test', 'benchmark']
+}
+
+
+LARGE = {
+  'base_url' => 'http://www.example.com/test-me',
+  'total_word_count' => 6743,
+  'access_time' => Time.now,
+  'meta_tags' => {
+    'description' => 'i am a long description string',
+    'author' => 'Holly Man',
+    'dynamically_created_meta_tag' => 'who know\n what'
+  },
+  'page_structure' => {
+    'counted_tags' => 3450,
+    'no_of_js_attached' => 10,
+    'no_of_images' => 6
+  },
+  'harvested_words' => ['10gen','web','open','source','application','paas',
+                        'platform-as-a-service','technology','helps',
+                        'developers','focus','building','mongodb','mongo'] * 20
+}
+
+
+
+begin
+  require 'active_support/core_ext'
+  require 'active_support/hash_with_indifferent_access'
+  Time.zone = "Pacific Time (US & Canada)"
+  Zone = Time.zone.now
+rescue LoadError
+  warn 'Could not test BSON with HashWithIndifferentAccess.'
+  module ActiveSupport
+    class TimeWithZone
+    end
+  end
+  Zone = ActiveSupport::TimeWithZone.new
+end
+
+class BSONTest < Test::Unit::TestCase
+  include BSON
+
+  def test_string
+    doc = {'doc' => 'hello, world'}
+    bson = bson = BSON::BSON_CODER.serialize(doc)
+    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
+  end
+
+  def test_object
+    doc = {'doc' => {'age' => 42, 'name' => 'Spongebob', 'shoe_size' => 9.5}}
+    bson = BSON::BSON_CODER.serialize(doc)
+    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
+  end
+
+  def test_oid
+    doc = {'doc' => ObjectID.new}
+    bson = BSON::BSON_CODER.serialize(doc)
+    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
+  end
+
+  def test_array
+    doc = {'doc' => [1, 2, "a", "b"]}
+    bson = BSON::BSON_CODER.serialize(doc)
+    assert_equal doc, BSON::BSON_CODER.deserialize(bson)
+  end
+
+  def test_speed
+
+  Benchmark.bm do |x|
+    x.report('serialize obj') do
+      1000.times do
+        BSON::BSON_CODER.serialize(LARGE)
+      end
+    end
+  end
+
+
+
+  Benchmark.bm do |x|
+        b = BSON::BSON_CODER.serialize(LARGE)
+    x.report('deserialize obj') do
+      1000.times do
+        BSON::BSON_CODER.deserialize(b)
+      end
+    end
+  end
+  end
+end

data/test/bson/bench_test.rb

@@ -0,0 +1,172 @@
+# encoding:utf-8
+require './test/test_helper'
+require 'complex'
+require 'bigdecimal'
+require 'rational'
+require 'benchmark'
+
+MEDIUM = {
+  'integer' => 5,
+  'number' => 5.05,
+  'boolean' => false,
+  'array' => ['test', 'benchmark']
+}
+
+
+LARGE = {
+  'base_url' => 'http://www.example.com/test-me',
+  'total_word_count' => 6743,
+  'access_time' => 1,# Time.now,
+  'meta_tags' => {
+    'description' => 'i am a long description string',
+    'author' => 'Holly Man',
+    'dynamically_created_meta_tag' => 'who know\n what'
+  },
+  'page_structure' => {
+    'counted_tags' => 3450,
+    'no_of_js_attached' => 10,
+    'no_of_images' => 6
+  },
+  'harvested_words' => ['10gen','web','open','source','application','paas',
+                        'platform-as-a-service','technology','helps',
+                        'developers','focus','building','mongodb','mongo'] * 20
+}
+
+
+
+begin
+  require 'active_support/core_ext'
+  require 'active_support/hash_with_indifferent_access'
+  Time.zone = "Pacific Time (US & Canada)"
+  Zone = Time.zone.now
+rescue LoadError
+  warn 'Could not test BSON with HashWithIndifferentAccess.'
+  module ActiveSupport
+    class TimeWithZone
+    end
+  end
+  Zone = ActiveSupport::TimeWithZone.new
+end
+
+class BSONTest < Test::Unit::TestCase
+  include BSON
+
+  def setup
+    @encoder = BSON::BSON_RUBY
+    @decoder = BSON::BSON_RUBY
+    @con = Mongo::Connection.new
+  end
+
+  def assert_doc_pass(doc, options={})
+    bson = @encoder.serialize(doc)
+    if options[:debug]
+      puts "DEBUGGIN DOC:"
+      p bson.to_a
+      puts "DESERIALIZES TO:"
+      p @decoder.deserialize(bson)
+    end
+    assert_equal @decoder.serialize(doc).to_a, bson.to_a
+    assert_equal doc, @decoder.deserialize(bson)
+  end
+
+#  def test_bench_big_string
+#    t0 = Time.now
+#    @con['foo']['bar'].remove
+#    doc = {'doc' => 'f' * 2_000_000}
+#    10.times do
+#      @con['foo']['bar'].save({'d' => doc})
+#      @con['foo']['bar'].find.to_a
+#    end
+#    puts "Big String"
+#    puts Time.now - t0
+#  end
+#
+#  def test_big_array
+#    t0 = Time.now
+#    @con['foo']['bar'].remove
+#    doc = {'doc' => 'f' * 2_000_000}
+#    10.times do
+#      @con['foo']['bar'].save({'d' => doc})
+#      @con['foo']['bar'].find.to_a
+#    end
+#    puts "Big String"
+#    puts Time.now - t0
+#  end
+#
+#  def test_string
+#    doc = {'doc' => "Hello world!", 'awesome' => true, 'a' => 1, 'b' => 4_333_433_232, 'c' => 2.33, 'd' => nil,
+#    'f' => BSON::Code.new("function"), 'g' => BSON::ObjectId.new, 'h' => [1, 2, 3]}
+#    bson = @encoder.serialize(doc)
+#    d = @encoder.deserialize(bson)
+#    puts "Array"
+#    puts d
+#    puts d['h']
+#    puts "End Array"
+#    puts d['h'][0]
+#    puts d['h'][1]
+#    puts (d['h'][2] + 100).class
+#    puts "ObjecId Info"
+#    bson2 = @encoder.serialize(d)
+#    doc2 = @encoder.deserialize(bson2)
+#    assert_equal doc2, @encoder.deserialize(bson)
+#  end
+#
+
+  def test_eval
+    code = BSON::Code.new('f')
+    oh = BSON::OrderedHash.new
+    oh[:$eval] = code
+    oh[:args]  = [1]
+
+    assert_equal BSON::BSON_RUBY.serialize(oh).to_a, BSON::BSON_JAVA.serialize(oh).to_a
+    assert_equal 3, @con['admin'].eval('function (x) {return x;}', 3)
+  end
+
+#  def test_oid
+#    b = Java::OrgBsonTypes::ObjectId.new.toByteArray
+#    o = ObjectId.new(b)
+#    p o
+#  end
+#
+  def test_speed
+    @con['foo']['bar'].remove
+
+    puts "Test OID"
+    t0 = Time.now
+    5000.times do
+      ids = [BSON::ObjectId.new] * 1000
+      @encoder.serialize({'doc' => BSON::ObjectId.new})
+    end
+    puts Time.now - t0
+
+    puts "Decode OID"
+    ids = [BSON::ObjectId.new] * 1000
+    doc = {'doc' => ids}
+    bson = @encoder.serialize(doc)
+    t0 = Time.now
+    50.times do
+      @encoder.deserialize(bson)
+    end
+    puts Time.now - t0
+
+
+    puts "Test insert"
+    t0 = Time.now
+    1000.times do |n|
+      if n % 1000 == 0
+        puts Time.now - t0
+        t0 = Time.now
+      end
+      @con['foo']['bar'].insert({'doc' => MEDIUM})
+    end
+    puts Time.now - t0
+
+    puts "Test query / deserialize"
+    t0 = Time.now
+    @con['foo']['bar'].find.to_a
+    t1 = Time.now
+    puts t1 - t0
+  end
+
+
+end