sekka 0.8.8 → 0.9.0

data/lib/sekka/kvs.rb

@@ -31,19 +31,47 @@
 #
 #  $Id:
 #
-require 'tokyocabinet'
 require 'memcache'
 
-
 class Kvs
   def initialize( dbtype )
+    @tcFlag = true
+    begin
+      require 'tokyocabinet'
+    rescue LoadError
+      @tcFlag = false
+    end
+
+    @dbmFlag = true
+    begin
+      require 'dbm'
+    rescue LoadError
+      @dbmFlag = false
+    end
+
     @dbtype = dbtype
     case dbtype
     when :tokyocabinet
-      @db = TokyoCabinet::HDB.new( )
-      # @db.setxmsiz(512 * 1024 * 1024)  # expand memory
+      if @tcFlag
+        @db = TokyoCabinet::HDB.new( )
+      else
+        raise RuntimeError, "Kvs.new() missed require( 'tokyocabinet' )."
+      end
+
     when :memcache
       # do nothing
+
+    when :dbm
+      if @dbmFlag
+        # do nothing
+      else
+        raise RuntimeError, "Kvs.new() missed require( 'dbm' )."
+      end
+      
+      # do nothing
+
+    when :pure
+      # do nothing
     else
       raise ArgumentError, "Kvs.new() requires reserved DB typename"
     end
@@ -57,6 +85,18 @@ class Kvs
       end
     when :memcache
       @db = MemCache.new( name )
+    when :dbm
+      @db = DBM.new( name )
+    when :pure
+      @name = name
+      if File.exist?( @name )
+        File.open( @name ) {|f|
+          @db = eval( f.read() )
+        }
+        @db
+      else
+        @db = Hash.new
+      end
     else
       raise RuntimeError
     end
@@ -79,10 +119,12 @@ class Kvs
   def pure_put!( key, value, timeout = 0 )
     if 0 < key.size
       case @dbtype
-      when :tokyocabinet
+      when :tokyocabinet, :dbm
         @db[ key.force_encoding("ASCII-8BIT") ] = value.force_encoding("ASCII-8BIT")
       when :memcache
         @db.set( key.force_encoding("ASCII-8BIT"), value.force_encoding("ASCII-8BIT"), timeout )
+      when :pure
+        @db[ key ] = value
       else
         raise RuntimeError
       end
@@ -94,7 +136,7 @@ class Kvs
     if 0 == key.size
       fallback
     else
-      val = @db.get( key )
+      val = @db[ key ]
       if val
         val.force_encoding("UTF-8")
       else
@@ -109,7 +151,7 @@ class Kvs
 
   def clear()
     case @dbtype
-    when :tokyocabinet
+    when :tokyocabinet, :dbm, :pure
       @db.clear
     when :memcache
       # do nothing
@@ -121,12 +163,14 @@ class Kvs
   # return array of key string
   def keys()
     case @dbtype
-    when :tokyocabinet
+    when :tokyocabinet, :dbm
       @db.keys.map { |k|
         k.force_encoding("UTF-8")
       }
     when :memcache
       raise RuntimeError, "Kvs#keys method was not implemented for memcache."
+    when :pure
+      @db.keys
     else
       raise RuntimeError
     end
@@ -140,6 +184,10 @@ class Kvs
       }
     when :memcache
       raise RuntimeError, "Kvs#forward_match_keys method was not implemented for memcache."
+    when :dbm, :pure
+      self.keys( ).select {|key|
+        key.match( "^" + prefix )
+      }
     else
       raise RuntimeError
     end
@@ -147,10 +195,14 @@ class Kvs
 
   def close()
     case @dbtype
-    when :tokyocabinet
+    when :tokyocabinet, :dbm
       @db.close
     when :memcache
       # do nothign
+    when :pure
+      File.open( @name, "w" ) { |f|
+        f.print( @db )
+      }
     else
       raise RuntimeError
     end

data/lib/sekka/sekkaversion.rb

@@ -1,6 +1,6 @@
 class SekkaVersion
   include Singleton
   def self.version
-    "0.8.8"
+    "0.9.0"
   end
 end

data/test/approximate-bench.nnd

@@ -38,7 +38,7 @@
 (use sekka.henkan)
 (load "./test/common.nnd")
 
-(define dbtype (string->symbol (first *argv*)))
+(define dbtype 'tokyocabinet)
 
 (test-start "aprorimate bench")
 ;;===================================================================
@@ -72,12 +72,14 @@
 
 (test-section "bench start 1")
 (require "benchmark")
+
 (.puts Benchmark::CAPTION)
 (.puts (Benchmark.measure
         (&block ()
-          (. (Range.new 0 1000) each
-             (&block (n)
-               (a-search.search "uuuu" kvs "henkan" #f))))))
+          (for-each
+           (lambda (n)
+             (approximate-search     "uuuu" kvs "henkan" "k" 0))
+           (Range.new 0 100)))))
 
 ;;===================================================================
 (test-end)

data/test/henkan-bench.nnd

@@ -0,0 +1,85 @@
+;;-*- mode: nendo; syntax: scheme -*-
+;;;
+;;; approximate-bench.nnd - 漢字変換のベンチマークテスト
+;;;  
+;;;   Copyright (c) 2011  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+;;;   
+;;;   Redistribution and use in source and binary forms, with or without
+;;;   modification, are permitted provided that the following conditions
+;;;   are met:
+;;;   
+;;;   1. Redistributions of source code must retain the above copyright
+;;;      notice, this list of conditions and the following disclaimer.
+;;;  
+;;;   2. Redistributions in binary form must reproduce the above copyright
+;;;      notice, this list of conditions and the following disclaimer in the
+;;;      documentation and/or other materials provided with the distribution.
+;;;  
+;;;   3. Neither the name of the authors nor the names of its contributors
+;;;      may be used to endorse or promote products derived from this
+;;;      software without specific prior written permission.
+;;;  
+;;;   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;;;   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;;;   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+;;;   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+;;;   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+;;;   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+;;;   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+;;;   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;;;   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+;;;   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+;;;   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+;;;  
+;;;  $Id: 
+;;;
+(require "sekka/kvs")
+(require "ruby-prof")
+(require "benchmark")
+(use sekka.henkan)
+(load "./test/common.nnd")
+
+;; ------------------ macro --------------------
+(define bench-task
+  (macro (profile-flag title proc)
+    `(begin
+       (.puts ,title)
+       (.puts Benchmark::CAPTION)
+       ,(if profile-flag
+            `(let* ((result (RubyProf.profile
+                             (&block ()
+                               ,proc)))
+                    (printer (RubyProf::GraphPrinter.new result)))
+               (printer.print STDOUT))
+            `(.puts (Benchmark.measure
+                     (&block ()
+                       ,proc))))
+       (.puts ""))))
+
+
+;;-------------------------------------------------------------------
+(let1 kvs      (Kvs.new     'dbm)
+  (kvs.open    "./test")
+
+  (bench-task #f
+              "henkan-okuri-nashi (DBM)"
+              (for-each
+               (lambda (n)
+                 (henkan-okuri-nashi "uuuu" kvs "henkan" 0))
+               (Range.new 0 100)))
+  (kvs.close))
+
+;;-------------------------------------------------------------------
+(let1 kvs      (Kvs.new     'tokyocabinet)
+  (kvs.open    "./test.tch")
+
+  (bench-task #f
+              "henkan-okuri-nashi (Tokyo Cabinet)"
+              (for-each
+               (lambda (n)
+                 (henkan-okuri-nashi "uuuu" kvs "henkan" 0))
+               (Range.new 0 100)))
+  (kvs.close))
+
+
+;;===================================================================