daybreak 0.1.2 → 0.1.3

data/lib/daybreak.rb

@@ -4,8 +4,6 @@ require 'fcntl'
 require 'zlib'
 
 require 'daybreak/version'
-require 'daybreak/locking'
 require 'daybreak/record'
 require 'daybreak/writer'
-require 'daybreak/reader'
 require 'daybreak/db'

data/lib/daybreak/db.rb

@@ -16,7 +16,6 @@ module Daybreak
     def initialize(file, default=nil, &blk)
       @table  = {}
       @file_name = file
-      @reader = Reader.new(@file_name)
       @writer = Writer.new(@file_name)
       @default = block_given? ? blk : default
       read!
@@ -162,7 +161,13 @@ module Daybreak
     # Read all values from the log file. If you want to check for changed data
     # call this again.
     def read!
-      @reader.read do |(key, data, deleted)|
+      buf = nil
+      File.open(@file_name, 'rb') do |fd|
+        fd.flock(File::LOCK_SH)
+        buf = fd.read
+      end
+      until buf.empty?
+        key, data, deleted = Record.deserialize(buf)
         if deleted
           @table.delete key
         else

data/lib/daybreak/record.rb

@@ -9,7 +9,6 @@ module Daybreak
     class CorruptDataError < Exception; end
 
     extend self
-    extend Locking
 
     # The mask a record uses to check for deletion.
     DELETION_MASK = 1 << 31
@@ -28,20 +27,17 @@ module Daybreak
 
     # Create a new record to read from IO.
     # @param [#read] io an IO instance to read from
-    def read(io)
-      lock io do
-        record = []
-        masked = read32(io)
-        # Read the record's key bytes
-        record << io.read(masked & (DELETION_MASK - 1)) <<
-          # Read the record's value bytes
-          io.read(read32(io)) <<
-          # Set the deletion flag
-          ((masked & DELETION_MASK) != 0)
-        crc = io.read(4)
-        raise CorruptDataError, 'CRC mismatch' unless crc == crc_string(key_data_string(record))
-        record
-      end
+    def deserialize(buf)
+      record = []
+      masked = read32(buf)
+      # Read the record's key bytes
+      record << buf.slice!(0, masked & (DELETION_MASK - 1)) <<
+        # Read the record's value bytes
+        buf.slice!(0, read32(buf)) <<
+        # Set the deletion flag
+        ((masked & DELETION_MASK) != 0)
+      raise CorruptDataError, 'CRC mismatch' unless buf.slice!(0, 4) == crc_string(key_data_string(record))
+      record
     end
 
     private
@@ -59,9 +55,8 @@ module Daybreak
       [length].pack('N') << data
     end
 
-    def read32(io)
-      raw = io.read(4)
-      raw.unpack('N')[0]
+    def read32(buf)
+      buf.slice!(0, 4).unpack('N')[0]
     end
   end
 end

data/lib/daybreak/version.rb

@@ -1,4 +1,4 @@
 module Daybreak
   # Updated using SemVer
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/daybreak/writer.rb

@@ -40,8 +40,7 @@ module Daybreak
     private
 
     def open!
-      @fd = File.open @file, 'a'
-      @fd.binmode
+      @fd = File.open @file, 'ab'
 
       if defined?(Fcntl::O_NONBLOCK)
         f = @fd.fcntl(Fcntl::F_GETFL, 0)
@@ -52,8 +51,6 @@ module Daybreak
     # Workers handle the actual fiddly bits of asynchronous io and
     # and handle background writes.
     class Worker
-      include Locking
-
       def initialize(fd)
         @queue  = Queue.new
         @fd     = fd
@@ -69,41 +66,50 @@ module Daybreak
       # Loop and block if we don't have work to do or if
       # the file isn't ready for another write just yet.
       def work
-        buf = ''
-        loop do
+        buf, finished = '', false
+        until finished && buf.empty?
           record = @queue.pop
-          unless record
-            @fd.flush
-            break
+          if record
+            buf << Record.serialize(record)
+          else
+            finished = true
           end
-          buf << Record.serialize(record)
           read, write = IO.select [], [@fd]
           if write and fd = write.first
-            lock(fd, File::LOCK_EX) { buf = try_write fd, buf }
+            lock(fd) { buf = try_write fd, buf }
           end
         end
+        @fd.flush
       end
 
       # Try and write the buffer to the file via non blocking file writes.
       # If the write fails try again.
       def try_write(fd, buf)
-        begin
-          if defined?(Fcntl::O_NONBLOCK)
-            s = fd.write_nonblock(buf)
-          else
-            s = fd.write(buf)
-          end
-          if s < buf.length
-            buf = buf[s..-1] # didn't finish
-          else
-            buf = ''
-          end
-        rescue Errno::EAGAIN
-          buf = buf # try this again
+        if defined?(Fcntl::O_NONBLOCK)
+          s = fd.write_nonblock(buf)
+        else
+          s = fd.write(buf)
         end
+        if s < buf.length
+          buf = buf[s..-1] # didn't finish
+        else
+          buf = ""
+        end
+        buf
+      rescue Errno::EAGAIN
         buf
       end
 
+      # Lock a file with the type <tt>lock</tt>
+      def lock(fd)
+        fd.flock File::LOCK_EX
+        begin
+          yield
+        ensure
+          fd.flock File::LOCK_UN
+        end
+      end
+
       # finish! and start up another worker thread.
       def flush!
         finish!

metadata

@@ -1,61 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: daybreak
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Jeff Larson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-07 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple dimple key-value store for ruby.
-email: 
+email:
 - thejefflarson@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -67,8 +61,6 @@ files:
 - daybreak.gemspec
 - lib/daybreak.rb
 - lib/daybreak/db.rb
-- lib/daybreak/locking.rb
-- lib/daybreak/reader.rb
 - lib/daybreak/record.rb
 - lib/daybreak/version.rb
 - lib/daybreak/writer.rb
@@ -77,43 +69,36 @@ files:
 - test/prof.rb
 - test/test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://propublica.github.com/daybreak/
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Daybreak provides an in memory key-value store that is easily enumerable in ruby.
-test_files: 
+summary: Daybreak provides an in memory key-value store that is easily enumerable
+  in ruby.
+test_files:
 - test/bench.rb
 - test/compare.rb
 - test/prof.rb
 - test/test.rb
 - test/test_helper.rb
+has_rdoc: 

data/lib/daybreak/locking.rb

@@ -1,14 +0,0 @@
-module Daybreak
-  # File locking mixin
-  module Locking
-    # Lock a file with the type <tt>lock</tt>
-    def lock(fd, lock=File::LOCK_SH)
-      fd.flock lock
-      begin
-        yield
-      ensure
-        fd.flock File::LOCK_UN
-      end
-    end
-  end
-end

data/lib/daybreak/reader.rb

@@ -1,26 +0,0 @@
-module Daybreak
-  # Class for building out the table, you shouldn't need to access this
-  # class directly. Readers are responsible for reading each record in
-  # the file and yeilding the parsed records.
-  class Reader
-    # @param [String] file the file to read from
-    def initialize(file)
-      @file_name = file
-    end
-
-    # Read all values from the aof file.
-    #
-    # Right now this is really expensive, every call to read will
-    # close and reread the whole db file, but since cross process
-    # consistency is handled by the user, this should be fair warning.
-    def read
-      File.open(@file_name, 'r') do |fd|
-        fd.binmode
-        fd.advise(:sequential) if fd.respond_to? :advise
-        while !fd.eof?
-          yield Record.read(fd)
-        end
-      end
-    end
-  end
-end