bitcask 0.2.1 → 0.2.2

data/bin/bitcask

@@ -165,7 +165,12 @@ EOF
         if h = d.hint_file
           h.each do |e|
             if f[e.key, nil]
-              keys << e.key
+              e = d[e.value_pos, e.value_sz]
+              if e.value == Bitcask::TOMBSTONE
+                keys.delete e.key
+              elsif f[e.key, e.value]
+                keys << e.key
+              end
             end
           end
         else

data/lib/bitcask.rb

@@ -29,6 +29,27 @@ class Bitcask
     @keydir.data_files[index.file_id][index.value_pos, index.value_sz].value
   end
 
+  # Close filehandles and keydir
+  def close
+    close_filehandles
+    close_keydir
+  end
+
+  # Close all filehandles loaded by the keydir.
+  def close_filehandles
+    @keydir.data_files.each do |data_file|
+      data_file.close
+      if h = data_file.instance_variable_get('@hint_file')
+        h.close
+      end
+    end  
+  end
+
+  # Close the keydir.
+  def close_keydir
+    @keydir = nil
+  end
+
   # Returns a list of all data filenames in this bitcask, sorted from oldest
   # to newest.
   def data_file_names

data/lib/bitcask/data_file.rb

@@ -18,6 +18,10 @@ class Bitcask::DataFile
     seek offset
     read size
   end
+
+  def close
+    @file.close
+  end
  
   # Iterates over every entry in this file, yielding an Entry.
   # Options:

data/lib/bitcask/hint_file.rb

@@ -19,7 +19,11 @@ class Bitcask::HintFile
     seek offset
     read
   end
- 
+
+  def close
+    @file.close
+  end
+
   # Iterates over every entry in this file, yielding an Entry.
   # Options:
   #  :rewind (true) - Rewind the file to the beginning, instead of starting

data/lib/bitcask/version.rb

@@ -1,3 +1,3 @@
 class Bitcask
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,72 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bitcask
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.2.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-29 00:00:00 -07:00
-default_executable: 
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: aphyr@aphyr.com
-executables: 
+executables:
 - bitcask
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/bitcask
 - lib/bitcask.rb
-- lib/bitcask/data_file.rb
+- lib/bitcask/keydir.rb
 - lib/bitcask/version.rb
 - lib/bitcask/errors.rb
+- lib/bitcask/data_file.rb
 - lib/bitcask/hint_file.rb
-- lib/bitcask/keydir.rb
 - LICENSE
 - README.markdown
-has_rdoc: true
 homepage: https://github.com/aphyr/bitcask-ruby
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: bitcask
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: An (incomplete) interface to the Bitcask storage system
 test_files: []
-