monga 0.0.3 → 0.0.4

data/.gitignore

@@ -11,7 +11,6 @@ doc/
 lib/bundler/man
 pkg
 rdoc
-benchmarks
 spec/reports
 test/tmp
 test/version_tmp

data/README.md

@@ -1,65 +1,107 @@
 [![Build Status](https://travis-ci.org/fl00r/monga.png?branch=master)](https://travis-ci.org/fl00r/monga)
 
-# Monga
+This client is under development. You can try 
+
+  * [em-mongo](https://github.com/bcg/em-mongo) with Eventmachine inside
+  * Official [mongo-ruby-driver](https://github.com/mongodb/mongo-ruby-driver) from 10gen
+  * [Moped](http://mongoid.org/en/moped/) from Mongoid guys
 
-[MongoDB](http://www.mongodb.org/) Ruby Client on [EventMachine](https://github.com/eventmachine/eventmachine). Also it supports synchrony mode ([em-synchrony](https://github.com/igrigorik/em-synchrony)).
+# Monga
 
-This client is under development. You can try [em-mongo](https://github.com/bcg/em-mongo).
+Yet another [MongoDB](http://www.mongodb.org/) Ruby Client.
 
-Client supports MongoDB 2.4. Some features won't work in lower versions.
+It supports three kind of interfaces:
 
-# Introduction
+  * Asynchronous over [EventMachine](https://github.com/eventmachine/eventmachine)
+  * Synchronous (on Fibers)
+  * Blocking (over TCPSocket, [kgio](http://bogomips.org/kgio/) actually)
 
-Monga supports asynchronous (over EventMachine), synchronous (Fibers) and blocking (TCPSocket) interfaces.
+## Introduction
 
-API will be familiar to Node.js developers: it returns `err, response` into callback.
+Asynchronous API will be familiar to Node.js developers. Instead of Deferrable Object you will receive `err, response` into callback.
 
 ```ruby
-# Async mode
 EM.run do
-  connection = Monga::Client.new(host: "127.0.0.1", port: 27017, type: :em)
-  db = connection["dbTest"]
+  client = Monga::Client.new(type: :em)
+  db = client["testDb"]
   collection = db["testCollection"]
-  collection.safe_insert(title: "Test") do |err, resp|
+
+  # Fire and forget
+  collection.insert(artist: "Madonna", title: "Frozen")
+
+  # Safe method
+  collection.safe_insert(artist: "Madonna", title: "Burning Up") do |err, response|
     if err
-      puts "Error happend: #{err.message}"
+      puts "Ha, an error! #{err.message}"
     else
-      puts "saved!"
-      collection.find.all do |err, docs|
-        if err 
-          puts "Error happend: #{err.message}"
+      puts "Job is done. Let's do more job"
+
+      # Cursor
+      collection.find.batch_size(100).limit(500).each_doc do |err, doc, iter|
+        if iter
+          puts "What have we got here: #{doc['title']}"
+          iter.next
         else
-          puts "Docs fetched: #{docs.size}"
+          puts "No more documents in collection"
+          EM.stop
         end
-        EM.stop
       end
+      # Yes, you should call `iter.next`, welcome to callback world!
     end
   end
 end
+```
+
+Synchronous mode is more simple. It is just like blocking mode, but you can use pool of fibers to make it as fast as lightning.
 
-# Sync mode
+```ruby
 EM.synchrony do
-  connection = Monga::Client.new(host: "127.0.0.1", port: 27017, type: :sync)
-  db = connection["dbTest"]
+  client = Monga::Client.new(type: :sync)
+  db = client["testDb"]
   collection = db["testCollection"]
-  collection.safe_insert(title: "Test")
-  puts "saved"
-  docs = collection.find.all
-  puts "Docs fetched: #{docs.size}"
+
+  # Fire and forget
+  collection.insert(artist: "Madonna", title: "Frozen")
+
+  # Safe method
+  collection.safe_insert(artist: "Madonna", title: "Burning Up")
+  puts "Job is done"
+
+  # Cursor
+  docs = []
+  collection.find.batch_size(100).limit(500).each_doc do |doc|
+    puts "What have we got here: #{doc['title']}"
+    docs << doc
+  end
+  puts "We have got #{docs.size} documents in this pretty array"
+
   EM.stop
 end
+```
+
+Blocking mode is as simple as a potato
 
-# Blocking mode
-connection = Monga::Client.new(host: "127.0.0.1", port: 27017, type: :block)
-db = connection["dbTest"]
+```ruby
+# client = Monga::Client.new(type: :block)
+client = Monga::Client.new
+db = client["testDb"]
 collection = db["testCollection"]
-collection.safe_insert(title: "Test")
-puts "saved"
-docs = collection.find.all
-puts "Docs fetched: #{docs.size}"
-```
 
-README and WIKI is going to be written.
+# Fire and forget
+collection.insert(artist: "Madonna", title: "Frozen")
+
+# Safe method
+collection.safe_insert(artist: "Madonna", title: "Burning Up")
+puts "Job is done"
+
+# Cursor
+docs = []
+collection.find.batch_size(100).limit(500).each_doc do |doc|
+  puts "What have we got here: #{doc['title']}"
+  docs << doc
+end
+puts "We have got #{docs.size} documents in this pretty array"
+```
 
 ## To Do List
 

data/benchmarks/inserts.rb

@@ -0,0 +1,87 @@
+require 'benchmark'
+require 'mongo'
+require 'moped'
+require File.expand_path('../../lib/monga', __FILE__)
+
+include Mongo
+
+Benchmark.bm do |x|
+  total = 10000
+  fetch = 50
+  mongo_collection = MongoClient.new.db("dbTest").collection("testCollection")
+  monga_collection = Monga::Client.new(type: :block).get_database("dbTest").get_collection("testCollection")
+  Monga.logger.level = Logger::ERROR
+  moped_session = Moped::Session.new([ "127.0.0.1:27017" ])
+  moped_session.use "dbTest"
+
+  document = {}
+  document[:title] = "Some title"
+  chars = ('a'..'z').to_a
+  document[:body] = 100.times.map{ chars.sample } * ""
+
+  sleep 0.5
+
+  GC.start
+
+  x.report("Inserting with mongo") do
+    total.times do |i|
+      mongo_collection.insert(document.dup)
+    end
+  end
+
+  GC.start
+
+  x.report("Fetching with mongo") do
+    fetch.times do
+      mongo_collection.find.to_a
+    end
+  end
+  mongo_collection.drop
+
+  sleep 0.5
+
+  GC.start
+
+  x.report("Inserting with monga") do
+    total.times do |i|
+      monga_collection.safe_insert(document.dup)
+    end
+  end
+
+  GC.start
+
+  x.report("Fetching with monga") do
+    fetch.times do
+      monga_collection.find.all
+    end
+  end
+
+  monga_collection.drop
+
+  sleep 0.5
+
+  GC.start
+
+  x.report("Inserting with moped") do
+    moped_session.with(safe: true) do |safe|
+      total.times do |i|
+        safe[:testCollection].insert(document)
+      end
+    end
+  end
+
+  GC.start
+
+  x.report("Fetching with moped") do
+    fetch.times do
+      moped_session[:testCollection].find.to_a
+    end
+  end
+
+  monga_collection.drop
+end
+
+
+
+
+

data/benchmarks/prof.rb

@@ -0,0 +1,26 @@
+require 'ruby-prof'
+require File.expand_path('../../lib/monga', __FILE__)
+require 'mongo'
+include Mongo
+
+total = 100
+# monga_collection = Monga::Client.new(type: :block).get_database("dbTest").get_collection("testCollection")
+mongo_collection = MongoClient.new.db("dbTest").collection("testCollection")
+
+total.times do |i|
+  mongo_collection.insert(title: "Row #{i}")
+end
+RubyProf.start
+mongo_collection.find.to_a
+
+result = RubyProf.stop
+mongo_collection.drop
+
+# Print a flat profile to text
+printer = RubyProf::FlatPrinter.new(result)
+printer.print(STDOUT)
+
+
+
+  mongo_collection = MongoClient.new.db("dbTest").collection("testCollection")
+  mongo_collection.find.to_a

data/lib/monga/clients/replica_set_client.rb

@@ -14,7 +14,7 @@ module Monga::Clients
 
       servers = opts.delete :servers
       @clients = servers.map do |server|
-        case server
+        c = case server
         when Hash
           Monga::Clients::SingleInstanceClient.new(opts.merge(server))
         when String
@@ -22,9 +22,11 @@ module Monga::Clients
           o = { host: h, port: p.to_i }
           Monga::Clients::SingleInstanceClient.new(opts.merge(o))
         end
+        c.force_status!
+        c
       end
 
-      @proxy_connection = Monga::Connection.proxy_connection_class(opts[:type]).new(self)
+      @proxy_connection = Monga::Connection.proxy_connection_class(opts[:type], self)
     end
 
     # Aquires connection due to read_pref option

data/lib/monga/collection.rb

@@ -141,7 +141,7 @@ module Monga
           if Hash === last
             [ :j, :w, :fsync, :wtimeout ].each do |k|
               v = last.delete k
-              opts[k] = v if v
+              opts[k] = v if v != nil
             end
           end
           req = #{meth}(*args)

data/lib/monga/connection.rb

@@ -9,7 +9,7 @@ module Monga
     CONNECTIONS = {
       em: Monga::Connections::EMConnection,
       sync: Monga::Connections::FiberedConnection,
-      block: Monga::Connections::TCPConnection,
+      block: Monga::Connections::KGIOConnection,
     }
     PROXY_CONNECTIONS = {
       em: Monga::Connections::EMProxyConnection,
@@ -41,8 +41,9 @@ module Monga
     end
 
     # Returns name of proxy_connection class
-    def self.proxy_connection_class(type)
-      PROXY_CONNECTIONS[type]
+    def self.proxy_connection_class(type, client)
+      conn_class = PROXY_CONNECTIONS[type]
+      conn_class.new(client) if conn_class
     end
   end
 end

data/lib/monga/connections/buffer.rb

@@ -1,33 +1,80 @@
 module Monga::Connections
   class Buffer
-    include Enumerable
+    # include Enumerable
 
-    attr_reader :buffer
+    attr_reader :buffer, :responses
 
     def initialize
       @buffer = ""
-      @positon = 0
+      @position = 0
+      @docs = []
+      @responses = []
     end
 
     def append(data)
-      @buffer += data
+      @buffer << data
+      @buffer_size = @buffer.bytesize
+      job
+      @buffer
     end
 
-    def each
+    def job
+      parse_meta if @position == 0
+      parse_doc if @position > 0
+    end
+
+    def parse_meta
+      return if @buffer_size < 36
+      @response = []
+      @response << ::BinUtils.get_int32_le(@buffer, @position)
+      @response << ::BinUtils.get_int32_le(@buffer, @position += 4)
+      @response << ::BinUtils.get_int32_le(@buffer, @position += 4)
+      @response << ::BinUtils.get_int32_le(@buffer, @position += 4)
+      @response << ::BinUtils.get_int32_le(@buffer, @position += 4)
+      @response << ::BinUtils.get_int64_le(@buffer, @position += 4)
+      @response << ::BinUtils.get_int32_le(@buffer, @position += 8)
+      @response << (@number_returned = ::BinUtils.get_int32_le(@buffer, @position += 4))
+      @response << []
+
+      @position += 4
+    end
+
+    def parse_doc
       while true
-        size = @buffer.size
-        if size > Monga::HEADER_SIZE
-          msg_length = @buffer[0, 4].unpack("L").first
-          if msg_length && size >= msg_length
-            data = @buffer.slice!(0, msg_length)
-            yield data.unpack("LLLLLQLLa*")
-          else
-            break
-          end
-        else
+        if @number_returned == 0
+          done
+          break
+        end
+        break if @buffer_size < @position + 4
+        doc_length = ::BinUtils.get_int32_le(@buffer, @position)
+        break if @buffer_size < @position + doc_length
+        doc = @buffer[@position, doc_length]
+        @response[-1] << CBson.deserialize(doc)
+        @position += doc_length
+        @number_returned -= 1
+        if @number_returned == 0
+          done
           break
         end
       end
     end
+
+    def each
+      while resp = @responses.shift
+        yield resp
+      end
+    end
+
+    def done
+      @responses << @response
+      @response = nil
+      if @buffer_size == @position
+        @buffer.clear
+      else
+        @buffer = @buffer[@position, @buffer_size-@position]
+      end
+      @buffer_size = @buffer.bytesize
+      @position = 0
+    end
   end
 end

data/lib/monga/connections/em_proxy_connection.rb

@@ -66,14 +66,14 @@ module Monga::Connections
           end
         end
       end
+    end
 
-      # YEEEHA! Send all collected requests back to client
-      def server_found!
-        @pending_timeout = false
-        @requests.keys.each do |request_id|
-          msg, blk = @requests.delete request_id
-          @client.aquire_connection.send_command(msg, request_id, &blk)
-        end
+    # YEEEHA! Send all collected requests back to client
+    def server_found!
+      @pending_timeout = false
+      @requests.keys.each do |request_id|
+        msg, blk = @requests.delete request_id
+        @client.aquire_connection.send_command(msg, request_id, &blk)
       end
     end
   end

data/lib/monga/connections/kgio_connection.rb

@@ -0,0 +1,93 @@
+require 'kgio'
+require 'io/nonblock'
+module Monga::Connections
+  class KGIOConnection
+    def self.connect(host, port, timeout)
+      new(host, port, timeout)
+    end
+
+    def initialize(host, port, timeout)
+      @host, @port, @timout = host, port, timeout
+      @connected = true
+      @buffer = Buffer.new
+    end
+
+    def connected?
+      @connected
+    end
+
+    def socket
+      @socket ||= begin
+        sock = Kgio::TCPSocket.new(@host, @port)
+        sock.kgio_autopush = true
+        @connected = true
+        sock
+      end
+    end
+
+    # Fake answer, as far as we are blocking
+    def responses
+      0
+    end
+
+    def send_command(msg, request_id=nil, &cb)
+      socket.kgio_write msg.to_s
+      if cb
+        read_socket
+
+        message = @buffer.responses.shift
+        rid = message[2]
+
+        fail "Returned Request Id is not equal to sended one (#{rid} != #{request_id}), #{message}" if rid != request_id
+
+        cb.call(message)
+      end
+    rescue Errno::ECONNREFUSED, Errno::EPIPE => e
+      close
+      if cb
+        err = Monga::Exceptions::Disconnected.new("Disconnected from #{@host}:#{@port}, #{e.message}")
+        cb.call(err)
+      end
+    end
+
+    def read_socket
+      torecv = 512
+      length = nil
+      buf = ''.force_encoding('ASCII-8BIT')
+      tmp = ''
+      while torecv > 0
+        resp = socket.kgio_read(torecv, tmp)
+        raise Errno::ECONNREFUSED.new "Nil was return. Closing connection" unless resp
+        buf << resp
+        size = buf.bytesize
+        length ||= ::BinUtils.get_int32_le(buf) if size > 4
+        torecv = length - size if length
+      end
+      @buffer.append(buf)
+    end
+
+    def primary?
+      @primary || false
+    end
+
+    def is_master?
+      req = Monga::Protocol::Query.new(self, "admin", "$cmd", query: {"isMaster" => 1}, limit: 1)
+      command = req.command
+      request_id = req.request_id
+      socket.kgio_write command
+      read_socket
+      message = @buffer.responses.shift
+      @primary = message.last.first["ismaster"]
+      yield @primary ? :primary : :secondary
+    rescue => e
+      close
+      yield nil
+    end
+
+    def close
+      @socket = nil
+      @primary = false
+      @connected = false
+    end
+  end
+end

data/lib/monga/connections/proxy_connection.rb

@@ -1,4 +1,61 @@
+require 'timeout'
+
 module Monga::Connections
   class ProxyConnection
+    # Pause while searching server in seconds
+    WAIT = 0.1
+    
+    def initialize(client)
+      @client = client
+      @timeout = @client.timeout
+      @requests = {}
+    end
+
+    # If timeout is defined then collect request and start timout.
+    # If timout is not defined or zero then return exception.
+    def send_command(msg, request_id = nil, &cb)
+      if @timeout && @timeout > 0 
+        @requests[request_id] = [msg, cb] if cb
+        set_timeout
+      else
+        error = Monga::Exceptions::Disconnected.new "Can't find appropriate server (all disconnected)"
+        cb.call(error) if cb
+      end
+    end
+
+    # If timeout happend send exception to all collected requests.
+    def set_timeout
+      @not_found = true
+      Timeout::timeout(@timeout) do
+        while @not_found
+          find_server!
+          sleep(WAIT)
+        end
+      end
+    end
+
+    # Find server unless server is found
+    def find_server!
+      @client.clients.each do |client|
+        client.force_status! do |status|
+          if status == :primary && [:primary, :primary_preferred, :secondary_preferred].include?(@client.read_pref)
+            @pending_server = false
+            server_found!
+          elsif status == :secondary && [:secondary, :primary_preferred, :secondary_preferred].include?(@client.read_pref)
+            @pending_server = false
+            server_found!
+          end
+        end
+      end
+    end
+
+    # YEEEHA! Send all collected requests back to client
+    def server_found!
+      @not_found = false
+      @requests.keys.each do |request_id|
+        msg, blk = @requests.delete request_id
+        @client.aquire_connection.send_command(msg, request_id, &blk)
+      end
+    end
   end
 end

data/lib/monga/connections/tcp_connection.rb

@@ -22,7 +22,9 @@ module Monga::Connections
     end
 
     def socket
-      @socket ||= TCPSocket.new(@host, @port)
+      @socket ||= begin
+        TCPSocket.new(@host, @port)
+      end
     end
 
     # Fake answer, as far as we are blocking

data/lib/monga/cursor.rb

@@ -154,9 +154,16 @@ module Monga
     end
 
     def each_batch(&blk)
+      iter_more = true
       iterator = Proc.new do
-        next_batch do |err, batch, more|
-          more ? blk.call(err, batch, iterator) : blk.call(err, batch)
+        if iter_more
+          next_batch do |err, batch, more|
+            iter_more = more
+            (more || batch || err) ? blk.call(err, batch, iterator) : blk.call
+          end
+        else
+          # iteration stopped
+          blk.call
         end
       end
       class << iterator
@@ -184,9 +191,16 @@ module Monga
     alias :next_document :next_doc
 
     def each_doc(&blk)
+      iter_more = true
       iterator = Proc.new do
-        next_doc do |err, doc, more|
-          more ? blk.call(err, doc, iterator) : blk.call(err, doc)
+        if iter_more
+          next_doc do |err, doc, more|
+            iter_more = more
+            (more || doc || err) ? blk.call(err, doc, iterator) : blk.call
+          end
+        else
+          # iteration stopped
+          blk.call
         end
       end
       class << iterator
@@ -202,8 +216,8 @@ module Monga
         if err
           block_given? ? yield(err) : raise(err)
         else
-          documents += batch
           if iter
+            documents += batch
             iter.next
           else
             block_given? ? yield(nil, documents) : documents
@@ -231,7 +245,7 @@ module Monga
       end
     end
 
-    def each_batch(&blk)
+    def each_batch
       begin
         batch, more = next_batch
         yield batch
@@ -242,13 +256,11 @@ module Monga
       if doc = @fetched_docs.shift
         [doc, more?]
       else
-        get_more(get_batch_size) do |err, batch, more|
-          raise(err) if err
-          @fetched_docs = batch
-          doc = @fetched_docs.shift
-          m = more || @fetched_docs.any?
-          return [doc, m]
-        end
+        batch, more = next_batch
+        @fetched_docs = batch
+        doc = @fetched_docs.shift
+        m = more || @fetched_docs.any?
+        return [doc, m]
       end
     end
     alias :next_document :next_doc

data/lib/monga/database.rb

@@ -75,7 +75,12 @@ module Monga
       cmd = {}
       cmd[:getLastError] = 1
       cmd[:connection] = connection
-      cmd.merge!(opts)
+
+      cmd[:j] = opts[:j] if opts[:j]
+      cmd[:fsync] = opts[:fsync] if opts[:fsync]
+      cmd[:w] = opts[:w] if opts[:w]
+      cmd[:wtimeout] = opts[:wtimeout] if opts[:wtimeout]
+
       run_cmd(cmd, blk)
     end
 
@@ -170,7 +175,9 @@ module Monga
 
       Monga::CallbackCursor.new(connection, name, "$cmd", options).first do |err, resp|
         res = make_response(err, resp, ret_blk, resp_blk)
-        return res unless ret_blk
+        unless ret_blk
+          return res 
+        end
       end
     end
 

data/lib/monga/protocol/delete.rb

@@ -10,12 +10,11 @@ module Monga::Protocol
       @body ||= begin
         query = @options[:query]
 
-        b = BSON::ByteBuffer.new
-        b.put_int(0)
-        BSON::BSON_RUBY.serialize_cstr(b, full_name)
-        b.put_int(flags)
-        b.append!(BSON::BSON_C.serialize(query).to_s)
-        b
+        msg = ::BinUtils.append_int32_le!(nil, 0)
+        msg << full_name << Monga::NULL_BYTE
+        ::BinUtils.append_int32_le!(msg, flags)
+        msg << BSON::BSON_C.serialize(query).to_s
+        msg
       end
     end
   end

data/lib/monga/protocol/get_more.rb

@@ -7,12 +7,11 @@ module Monga::Protocol
         batch_size = @options[:batch_size] || 0
         cursor_id = @options[:cursor_id]
 
-        b = BSON::ByteBuffer.new
-        b.put_int(0)
-        BSON::BSON_RUBY.serialize_cstr(b, full_name)
-        b.put_int(batch_size)
-        b.put_long(cursor_id)
-        b
+        msg = ::BinUtils.append_int32_le!(nil, 0)
+        msg << full_name << Monga::NULL_BYTE
+        ::BinUtils.append_int32_le!(msg, batch_size)
+        ::BinUtils.append_int64_le!(msg, cursor_id)
+        msg
       end
     end
   end

data/lib/monga/protocol/insert.rb

@@ -10,18 +10,17 @@ module Monga::Protocol
       @body ||= begin
         documents = @options[:documents]
 
-        b = BSON::ByteBuffer.new
-        b.put_int(flags)
-        BSON::BSON_RUBY.serialize_cstr(b, full_name)
+        msg = ::BinUtils.append_int32_le!(nil, flags)
+        msg << full_name << Monga::NULL_BYTE
         case documents
         when Array
           documents.each do |doc|
-            b.append!(BSON::BSON_C.serialize(doc).to_s)
+            msg << BSON::BSON_C.serialize(doc).to_s
           end
         when Hash
-          b.append!(BSON::BSON_C.serialize(documents).to_s)
+          msg << BSON::BSON_C.serialize(documents).to_s
         end
-        b
+        msg
       end
     end
   end

data/lib/monga/protocol/kill_cursors.rb

@@ -12,13 +12,9 @@ module Monga::Protocol
       @body ||= begin
         cursor_ids = @options[:cursor_ids]
 
-        b = BSON::ByteBuffer.new
-        b.put_int(0)
-        b.put_int(cursor_ids.size)
-        cursor_ids.each do |cursor_id|
-          b.put_long(cursor_id)
-        end
-        b
+        msg = ::BinUtils.append_int32_le!(nil, 0, cursor_ids.size)
+        ::BinUtils.append_int64_le!(msg, 0, *cursor_ids)
+        msg
       end
     end
   end

data/lib/monga/protocol/query.rb

@@ -23,14 +23,12 @@ module Monga::Protocol
         query["$orderby"] = @options[:sort] if @options[:sort]
         query["$explain"] = @options[:explain] if @options[:explain]
 
-        b = BSON::ByteBuffer.new
-        b.put_int(flags)
-        BSON::BSON_RUBY.serialize_cstr(b, full_name)
-        b.put_int(skip)
-        b.put_int(limit)
-        b.append!(BSON::BSON_C.serialize(query).to_s)
-        b.append!(BSON::BSON_C.serialize(selector).to_s) if selector.any?
-        b
+        msg = ::BinUtils.append_int32_le!(nil, flags)
+        msg << full_name << Monga::NULL_BYTE
+        ::BinUtils.append_int32_le!(msg, skip, limit)
+        msg << BSON::BSON_C.serialize(query).to_s
+        msg << BSON::BSON_C.serialize(selector).to_s if selector.any?
+        msg
       end
     end
 

data/lib/monga/protocol/update.rb

@@ -12,13 +12,12 @@ module Monga::Protocol
         query = @options[:query]
         update = @options[:update]
 
-        b = BSON::ByteBuffer.new
-        b.put_int(0)
-        BSON::BSON_RUBY.serialize_cstr(b, full_name)
-        b.put_int(flags)
-        b.append!(BSON::BSON_C.serialize(query).to_s)
-        b.append!(BSON::BSON_C.serialize(update).to_s)
-        b
+        msg = ::BinUtils.append_int32_le!(nil, 0)
+        msg << full_name << Monga::NULL_BYTE
+        ::BinUtils.append_int32_le!(msg, flags)
+        msg << BSON::BSON_C.serialize(query).to_s
+        msg << BSON::BSON_C.serialize(update).to_s
+        msg
       end
     end
   end

data/lib/monga/request.rb

@@ -24,16 +24,11 @@ module Monga
     end
 
     def command
-      header.append!(body)
+      header + body
     end
 
     def header
-      headers = BSON::ByteBuffer.new
-      headers.put_int(command_length)
-      headers.put_int(@request_id)
-      headers.put_int(0)
-      headers.put_int(op_code)
-      headers
+      ::BinUtils.append_int32_le!(nil, command_length, @request_id, 0, op_code)
     end
 
     # Fire and Forget
@@ -59,9 +54,7 @@ module Monga
         [data, nil]
       else
         flags = data[4]
-        number = data[7]
-        docs = unpack_docs(data.last, number)
-        data[-1] = docs
+        docs = data.last
         if flags & 2**0 > 0
           Monga::Exceptions::CursorNotFound.new(docs.first)
         elsif flags & 2**1 > 0
@@ -76,14 +69,6 @@ module Monga
 
     private
 
-    def unpack_docs(data, number)
-      number.times.map do
-        size = data.slice(0, 4).unpack("L").first
-        d = data.slice!(0, size)
-        BSON.deserialize(d)
-      end
-    end
-
     def flags
       flags = 0
       self.class::FLAGS.each do |k, byte|

data/lib/monga/utils/constants.rb

@@ -2,4 +2,5 @@ module Monga
   DEFAULT_HOST = "127.0.0.1"
   DEFAULT_PORT = 27017
   HEADER_SIZE  = 16
+  NULL_BYTE    = "\x00".freeze
 end

data/lib/monga.rb

@@ -1,5 +1,6 @@
 require "em-synchrony"
 require "bson"
+require "bin_utils"
 require "logger"
 require "forwardable"
 
@@ -23,6 +24,7 @@ require File.expand_path("../monga/clients/replica_set_client", __FILE__)
 require File.expand_path("../monga/connections/em_connection", __FILE__)
 require File.expand_path("../monga/connections/fibered_connection", __FILE__)
 require File.expand_path("../monga/connections/tcp_connection", __FILE__)
+require File.expand_path("../monga/connections/kgio_connection", __FILE__)
 require File.expand_path("../monga/connections/em_proxy_connection", __FILE__)
 require File.expand_path("../monga/connections/fibered_proxy_connection", __FILE__)
 require File.expand_path("../monga/connections/proxy_connection", __FILE__)

data/monga.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "monga"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["Petr Yanovich"]
   spec.email         = ["fl00r@yandex.ru"]
   spec.description   = %q{MongoDB Ruby Evented Driver on EventMachine}
@@ -19,8 +19,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "kgio"
   spec.add_development_dependency "em-synchrony"
 
   spec.add_dependency "bson"
   spec.add_dependency "bson_ext"
+  spec.add_dependency "bin_utils"
 end

data/spec/helpers/mongodb.rb

@@ -91,8 +91,8 @@ module Fake
     end
 
     def start
+      @sign = EM.start_server('127.0.0.1', @port, Fake::Node, self) unless @connected
       @connected = true
-      @sign = EM.start_server '127.0.0.1', @port, Fake::Node, self
     end
 
     def stop

data/spec/monga/block/cursor_spec.rb

@@ -132,20 +132,20 @@ describe Monga::Cursor do
 
   describe "tailable cursor" do
     before do
+      @capped = @db["testCapped"]
       @db.create_collection("testCapped", capped: true, size: 4*1024)
-      @capped =  @db["testCapped"]
       @capped.safe_insert(title: "Test")
     end
 
     after do
-      @db["testCapped"].drop
+      @capped.drop
     end
 
     it "should be tailable" do
       tailable_cursor = @capped.find.flag(tailable_cursor: true)
       docs = []
       tailable_cursor.each_doc do |doc|
-        @capped.insert(title: "New!")
+        @capped.safe_insert(title: "New!")
         if doc
           docs << doc
           if docs.size == 2

data/spec/monga/block/replica_set_client_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Monga::Clients::ReplicaSetClient do
+  before do
+    @thread = Thread.new do
+      EM.run do
+        @replset = Fake::ReplicaSet.new([29000, 29100, 29200])
+        @replset.start_all
+      end
+    end
+    sleep 0.1
+    @client = Monga::Client.new servers: ['127.0.0.1:29000', '127.0.0.1:29100', '127.0.0.1:29200'], type: :block, timeout: 1
+    @collection = @client["dbTest"]["myCollection"]
+  end
+
+  after do
+    EM.stop if EM.reactor_running?
+    @thread.join
+  end
+
+  it "should fail on disconnect and reconnect when primary is up again" do
+    sleep(0.1)
+    @replset.start_all
+    sleep(0.1)
+    @collection.safe_insert(name: "Peter")
+    @replset.primary.stop
+    proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
+    proc{ @collection.safe_insert(name: "Peter") }.must_raise Timeout::Error
+    proc{ @collection.safe_insert(name: "Peter") }.must_raise Timeout::Error
+    @replset.primary.start
+    sleep(0.1)
+    @collection.safe_insert(name: "Madonna")
+    @collection.safe_insert(name: "Madonna")
+    @collection.safe_insert(name: "Madonna")
+  end
+
+  it "should work even if secondaries down" do
+    sleep(0.1)
+    @replset.start_all
+    @collection.safe_insert(name: "Peter")
+    @collection.safe_insert(name: "Peter")
+    @replset.secondaries.each(&:stop)
+    @collection.safe_insert(name: "Peter")
+    @collection.safe_insert(name: "Peter")
+  end
+
+  it "should find new primary if it is down" do
+    sleep(0.1)
+    @replset.start_all
+    @collection.safe_insert(name: "Peter")
+    @replset.primary.stop
+    proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
+    proc{ @collection.safe_insert(name: "Peter") }.must_raise Timeout::Error
+    proc{ @collection.safe_insert(name: "Peter") }.must_raise Timeout::Error
+    @replset.vote
+    @collection.safe_insert(name: "Madonna")
+  end
+end

data/spec/monga/block/single_instance_client_spec.rb

@@ -2,14 +2,11 @@ require 'spec_helper'
 
 describe Monga::Clients::SingleInstanceClient do
   before do
-    EM.synchrony do
-      @client = Monga::Client.new port: 29000, type: :block
-      @collection = @client["dbTest"]["myCollection"]
-      @instance = Fake::SingleInstance.new(29000)
-      EM.stop
-    end
-    @t = Thread.new do
+    @client = Monga::Client.new port: 28000, type: :block
+    @collection = @client["dbTest"]["myCollection"]
+    @thread = Thread.new do
       EM.run do
+        @instance = Fake::SingleInstance.new(28000)
         @instance.start
       end
     end
@@ -17,10 +14,11 @@ describe Monga::Clients::SingleInstanceClient do
 
   after do
     EM.stop
-    @t.join
+    @thread.join
   end
 
   it "should fail on disconnect and reconnect when instance is up again" do
+    sleep(0.1) # wait till instance started 
     @collection.safe_insert(name: "Peter")
     @instance.stop
     proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected

data/spec/monga/em/cursor_spec.rb

@@ -119,8 +119,8 @@ describe Monga::Cursor do
       EM.run do
         docs = []
         @collection.find.batch_size(2).limit(3).each_batch do |err, batch, iter|
-          docs += batch
           if iter
+            docs += batch
             iter.next
           else
             docs.size.must_equal 3
@@ -157,8 +157,8 @@ describe Monga::Cursor do
       EM.run do
         docs = []
         @collection.find.limit(100).skip(15).batch_size(3).each_doc do |err, doc, iter|
-          docs << doc
           if iter
+            docs << doc
             iter.next
           else
             docs.size.must_equal 5
@@ -172,8 +172,8 @@ describe Monga::Cursor do
       EM.run do
         docs = []
         @collection.find.batch_size(3).each_doc do |err, doc, iter|
-          docs << doc
           if iter
+            docs << doc
             iter.next
           else
             docs.size.must_equal 20
@@ -206,9 +206,9 @@ describe Monga::Cursor do
   describe "tailable cursor" do
     before do
       EM.run do
+        @capped = @db["testCapped"]
         @db.create_collection("testCapped", capped: true, size: 4*1024) do |err, resp|
           raise err if err
-          @capped =  @db["testCapped"]
           @capped.safe_insert(title: "Test") do |err, resp|
             raise err if err
             EM.stop
@@ -219,7 +219,6 @@ describe Monga::Cursor do
 
     after do
       EM.run do
-        @capped = @db["testCapped"]
         @capped.drop do |err, resp|
           raise err if err
           EM.stop
@@ -246,8 +245,6 @@ describe Monga::Cursor do
                 iter.next
               end
             end
-          else
-            EM.stop
           end
         end
       end

data/spec/monga/sync/cursor_spec.rb

@@ -175,8 +175,8 @@ describe Monga::Cursor do
   describe "tailable cursor" do
     before do
       EM.synchrony do
-        @db.create_collection("testCapped", capped: true, size: 4*1024)
         @capped = @db["testCapped"]
+        @db.create_collection("testCapped", capped: true, size: 4*1024)
         @capped.safe_insert(title: "Test")
         EM.stop
       end
@@ -184,7 +184,7 @@ describe Monga::Cursor do
 
     after do
       EM.synchrony do
-        @db["testCapped"].drop
+        @capped.drop
         EM.stop
       end
     end
@@ -194,7 +194,7 @@ describe Monga::Cursor do
         tailable_cursor = @capped.find.flag(tailable_cursor: true)
         docs = []
         tailable_cursor.each_doc do |doc|
-          @capped.insert(title: "New!")
+          @capped.safe_insert(title: "New!")
           if doc
             docs << doc
             if docs.size == 2

data/spec/monga/sync/replica_set_client_spec.rb

@@ -17,10 +17,10 @@ describe Monga::Clients::ReplicaSetClient do
       @replset.primary.stop
       proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
       proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
-      proc{ @collection.safe_insert(name: "Peter") }.must_raise Monga::Exceptions::Disconnected
-      @replset.primary.start
-      @collection.safe_insert(name: "Madonna")
-      @collection.safe_insert(name: "Madonna")
+      EM.add_timer(0.5) do
+        @replset.primary.start
+      end
+      @collection.safe_insert(name: "Peter")
       @collection.safe_insert(name: "Madonna")
       EM.stop
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monga
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +43,22 @@ dependencies:
     none: false
   prerelease: false
   name: rake
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: kgio
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -91,6 +107,22 @@ dependencies:
     none: false
   prerelease: false
   name: bson_ext
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: bin_utils
 description: MongoDB Ruby Evented Driver on EventMachine
 email:
 - fl00r@yandex.ru
@@ -104,6 +136,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/inserts.rb
+- benchmarks/prof.rb
 - lib/monga.rb
 - lib/monga/client.rb
 - lib/monga/clients/master_slave_client.rb
@@ -117,6 +151,7 @@ files:
 - lib/monga/connections/em_proxy_connection.rb
 - lib/monga/connections/fibered_connection.rb
 - lib/monga/connections/fibered_proxy_connection.rb
+- lib/monga/connections/kgio_connection.rb
 - lib/monga/connections/proxy_connection.rb
 - lib/monga/connections/tcp_connection.rb
 - lib/monga/cursor.rb
@@ -135,6 +170,7 @@ files:
 - spec/monga/block/collection_spec.rb
 - spec/monga/block/cursor_spec.rb
 - spec/monga/block/database_spec.rb
+- spec/monga/block/replica_set_client_spec.rb
 - spec/monga/block/single_instance_client_spec.rb
 - spec/monga/em/collection_spec.rb
 - spec/monga/em/cursor_spec.rb
@@ -158,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -1506820029322651348
+      hash: 3881917270092852844
       version: '0'
       segments:
       - 0
@@ -167,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -1506820029322651348
+      hash: 3881917270092852844
       version: '0'
       segments:
       - 0
@@ -183,6 +219,7 @@ test_files:
 - spec/monga/block/collection_spec.rb
 - spec/monga/block/cursor_spec.rb
 - spec/monga/block/database_spec.rb
+- spec/monga/block/replica_set_client_spec.rb
 - spec/monga/block/single_instance_client_spec.rb
 - spec/monga/em/collection_spec.rb
 - spec/monga/em/cursor_spec.rb