daybreak 0.2.4 → 0.3.0

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
+  - 2.0.0
   - ruby-head
   - jruby-18mode
   - jruby-19mode

data/README

@@ -5,7 +5,7 @@
 
 Daybreak is a simple key value store for ruby. It has user defined persistence,
 and all data is stored in a table in memory so ruby niceties are available.
-Daybreak is faster than any other ruby options like pstore or dbm.
+Daybreak is faster than other ruby options like pstore or dbm.
 
 $ gem install daybreak
 

data/lib/daybreak/db.rb

@@ -20,7 +20,7 @@ module Daybreak
     # @yieldparam [String] key the key to be stored.
     def initialize(file, options = {}, &block)
       @serializer = (options[:serializer] || Serializer::Default).new
-      @table = Hash.new &method(:hash_default)
+      @table = Hash.new(&method(:hash_default))
       @journal = Journal.new(file, (options[:format] || Format).new, @serializer) do |record|
         if !record
           @table.clear
@@ -201,7 +201,7 @@ module Daybreak
     # @yieldparam [DB] db
     # @return result of the block
     def lock
-      @mutex.synchronize { @journal.lock { yield self } }
+      synchronize { @journal.lock { yield self } }
     end
 
     # Synchronize access to the database from multiple threads

data/lib/daybreak/format.rb

@@ -32,14 +32,24 @@ module Daybreak
       data << crc32(data)
     end
 
-    # Deserialize record from buffer
+    # Deserialize records from buffer, and yield them.
     # @param [String] buf the buffer to read from
-    # @return [Array] deserialized record [key, value] or [key] if the record is deleted
+    # @yield [Array] blk deserialized record [key, value] or [key] if the record is deleted
+    # @return [Fixnum] number of records
     def parse(buf)
-      key_size, value_size = buf[0, 8].unpack('NN')
-      data = buf.slice!(0, 8 + key_size + (value_size == DELETE ? 0 : value_size))
-      raise 'CRC mismatch: your data might be corrupted!' unless buf.slice!(0, 4) == crc32(data)
-      value_size == DELETE ? [data[8, key_size]] : [data[8, key_size], data[8 + key_size, value_size]]
+      n, count = 0, 0
+      while n < buf.size
+        key_size, value_size = buf[n, 8].unpack('NN')
+        data_size = key_size + 8
+        data_size += value_size if value_size != DELETE
+        data = buf[n, data_size]
+        n += data_size
+        raise 'CRC mismatch: your data might be corrupted!' unless buf[n, 4] == crc32(data)
+        n += 4
+        yield(value_size == DELETE ? [data[8, key_size]] : [data[8, key_size], data[8 + key_size, value_size]])
+        count += 1
+      end
+      count
     end
 
     protected

data/lib/daybreak/journal.rb

@@ -91,10 +91,7 @@ module Daybreak
     # Emit records as we parse them
     def replay
       buf = read
-      until buf.empty?
-        @emit.call(@format.parse(buf))
-        @size += 1
-      end
+      @size += @format.parse(buf, &@emit)
     end
 
     # Open or reopen file

data/lib/daybreak/version.rb

@@ -1,5 +1,5 @@
 module Daybreak
   # Version string updated using SemVer
   # @api public
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

data/script/bench

@@ -106,3 +106,11 @@ db = Daybreak::DB.new DB_PATH
 run db, 'bulk updates, synced' do
   db.update! hash
 end
+
+# reads
+puts "Read performance"
+db = Daybreak::DB.new DB_PATH
+DATA.each {|i| db[i] = i }
+report RUNS.times.map { Benchmark.measure { db1 = Daybreak::DB.new DB_PATH; db1.close }.real * 1000 }
+db.clear
+db.close

data/test/test.rb

@@ -404,6 +404,13 @@ describe Daybreak::DB do
     db.close
   end
 
+  it 'should keep the same format' do
+    db = Daybreak::DB.new DB_PATH, :serializer => Daybreak::Serializer::None
+    10.times {|i| db[i.to_s] = i.to_s }
+    db.close
+    assert_equal File.read(DB_PATH), File.read(File.join(HERE, 'mock.db-test'))
+  end
+
   after do
     @db.clear
     @db.close

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: daybreak
 version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.4
 platform: ruby
 authors:
 - Jeff Larson
@@ -10,40 +10,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rake
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: minitest
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: Incredibly fast pure-ruby key-value store
 email:
 - thejefflarson@gmail.com
@@ -72,6 +72,7 @@ files:
 - lib/daybreak/version.rb
 - script/bench
 - script/converter
+- test/mock.db-test
 - test/prof.rb
 - test/test.rb
 - test/test_helper.rb
@@ -83,25 +84,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Daybreak provides an incredibly fast pure-ruby in memory key-value store,
   which is multi-process safe and uses a journal log to store the data.
 test_files:
+- test/mock.db-test
 - test/prof.rb
 - test/test.rb
 - test/test_helper.rb