sekka 0.8.6 → 0.8.7

data/emacs/sekka.el

@@ -1417,7 +1417,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "0.8.6" ;;SEKKA-VERSION
+  "0.8.7" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/jisyo-db.nnd

@@ -179,6 +179,16 @@
                         (obj.open cacheSource)
                         obj)
                       #f)
+      ;; 読み書きできるか調べる
+      (let ([d (. (Date.new 0) to_s)])
+        (if (and (kvs.pure_put! "key_for_ping" d)
+                 (string=? (kvs.get  "key_for_ping") d))
+            (STDERR.puts "Info: database file was clean")
+            ;; 正常に読み書きできないようであれば、データベースを修復する
+            (begin
+              (STDERR.puts "Info: database file was NOT clean. try to fix...")
+              (kvs.fixdb)
+              (STDERR.puts "Info: done."))))
       (to-arr (list kvs cachesv)))))
 ;; Export to Ruby world
 (export-to-ruby openSekkaJisyo)

data/lib/sekka/kvs.rb

@@ -1,22 +1,22 @@
 # kvs.rb  -  "wrapper library for Key-Value-Store"
-#  
+#
 #   Copyright (c) 2010  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
@@ -28,8 +28,8 @@
 #   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: 
+#
+#  $Id:
 #
 require 'tokyocabinet'
 require 'memcache'
@@ -62,9 +62,22 @@ class Kvs
     end
   end
 
+  def fixdb( )
+    if not @db.optimize( )
+      raise RuntimeError, sprintf( "TokyoCabinet::HDB.optimize error: file=%s", name )
+    end
+    true
+  end
+
   def put!( key, value, timeout = 0 )
+    if not self.pure_put!( key, value, timeout )
+      raise RuntimeError sprintf( "put! error: key=%s", key.force_encoding("ASCII-8BIT"))
+    end
+    value
+  end
+
+  def pure_put!( key, value, timeout = 0 )
     if 0 < key.size
-      #p "put! " + key + ":" + value
       case @dbtype
       when :tokyocabinet
         @db[ key.force_encoding("ASCII-8BIT") ] = value.force_encoding("ASCII-8BIT")
@@ -74,6 +87,7 @@ class Kvs
         raise RuntimeError
       end
     end
+    value
   end
 
   def get( key, fallback = false )
@@ -97,7 +111,7 @@ class Kvs
     case @dbtype
     when :tokyocabinet
       @db.clear
-    when :memcache 
+    when :memcache
       # do nothing
     else
       raise RuntimeError
@@ -111,7 +125,7 @@ class Kvs
       @db.keys.map { |k|
         k.force_encoding("UTF-8")
       }
-    when :memcache 
+    when :memcache
       raise RuntimeError, "Kvs#keys method was not implemented for memcache."
     else
       raise RuntimeError
@@ -124,7 +138,7 @@ class Kvs
       @db.fwmkeys( prefix ).each { |k|
         k.force_encoding("UTF-8")
       }
-    when :memcache 
+    when :memcache
       raise RuntimeError, "Kvs#forward_match_keys method was not implemented for memcache."
     else
       raise RuntimeError
@@ -141,7 +155,7 @@ class Kvs
       raise RuntimeError
     end
   end
-  
+
   ## for testing
   def _db()
     @db

data/lib/sekka/roman-lib.nnd

@@ -34,6 +34,8 @@
 ;;;  $Id: 
 ;;;
 (use srfi-1)
+(use util.list)
+(use util.combinations)
 
 ;; 子音が1音だけ入ったテーブル
 ;; このテーブルはruby-romkan から変換し、一部不足を追加した。
@@ -772,17 +774,6 @@
      (gen-hiragana->katakana x))
    (gen-roman->hiragana roman-str roman-method)))
 
-;; This function port from Gauche-0.9's util.combinations.
-(define (cartesian-product lol)
-  (if (null? lol)
-      (list '())
-      (let ((l (car lol))
-            (rest (cartesian-product (cdr lol))))
-        (append-map
-         (lambda (x)
-           (map (lambda (sub-prod) (cons x sub-prod)) rest))
-         l))))
-
 
 (define (patterns->roman-list patterns)
   (uniq

data/lib/sekka/sekkaversion.rb

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

data/lib/sekka/util.nnd

@@ -33,6 +33,8 @@
 ;;;  
 ;;;  $Id: 
 ;;;
+(use util.list)
+
 (define (string-drop str n)
   (or (str.slice n (str.size))
       ""))
@@ -55,10 +57,4 @@
           (. (line.slice index (line.size)) strip))
     #f))
 
-(define (take* lst limit)
-  (let1 len (length lst)
-    (if (< len limit)
-        lst
-        (take lst limit))))
-
 

data/lib/sekkaconfig.rb

@@ -2,24 +2,24 @@
 # -*- coding: utf-8 -*-
 #
 # sekkaconfig.rb  -  "a config info class"
-#  
+#
 #   Copyright (c) 2010  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
@@ -31,15 +31,15 @@
 #   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: 
+#
+#  $Id:
 #
 require 'singleton'
 
 module SekkaServer
   class Config
     include Singleton
-    
+
     def self.setup( dictSource, cacheSource = false, listenPort, proxyHost, proxyPort )
       @@dictSource  = dictSource
       @@cacheSource = cacheSource
@@ -47,11 +47,11 @@ module SekkaServer
       @@proxyHost   = proxyHost
       @@proxyPort   = proxyPort
     end
-    
+
     def self.dictSource
       @@dictSource
     end
-    
+
     def self.cacheSource
       @@cacheSource
     end

data/lib/sekkaserver.rb

@@ -2,24 +2,24 @@
 # -*- coding: utf-8 -*-
 #
 # sekkaserver.rb  -  "a sekka server"
-#  
+#
 #   Copyright (c) 2010  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
@@ -31,8 +31,8 @@
 #   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: 
+#
+#  $Id:
 #
 require 'rack'
 require 'nendo'
@@ -83,8 +83,8 @@ module SekkaServer
                   @mutex.synchronize {
                     case command
                     when 'r' # register
-                      dictline = 
-                        if 4 == arr.size 
+                      dictline =
+                        if 4 == arr.size
                           arr[2] + " " + arr[3]
                         else
                           ";; comment"
@@ -127,7 +127,7 @@ module SekkaServer
                   }
                 }
               end
-            end          
+            end
           }
         end
         @thread.run

data/test/henkan-main.nnd

@@ -52,7 +52,7 @@
  ((eq? dbtype 'tokyocabinet)
   (set! target "./test.tch"))
  ((eq? dbtype 'memcache)
-  (set! target "localhost:11211"))
+  (error "memcached interface is obsolute."))
  (else
   (errorf "Unsupported db type [%s]" (symbol->string dbtype))))
 
@@ -107,8 +107,7 @@
   (kvs.open target)
   (require "tokyocabinet"))
  ((eq? dbtype 'memcache)
-  (kvs.open target)
-  (require "memcache"))
+  (error "memcached interface is obsolute."))
  (else
   (errorf "Unsupported db type [%s]" (symbol->string dbtype))))
 

data/test/memcache.nnd

@@ -0,0 +1,101 @@
+;;-*- mode: nendo; syntax: scheme -*-
+;;;
+;;; memcache.nnd - memcacheアクセスのテスト
+;;;  
+;;;   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")
+(use nendo.test)
+(load "./test/common.nnd")
+
+(define dbtype   'memcache)
+(define userid   "temp")
+(define cachesv (Kvs.new dbtype))
+(cachesv.open "localhost:11211")
+
+(test-start "memcached I/F")
+;;===================================================================
+
+;;-------------------------------------------------------------------
+(test-section "memcached access")
+
+(test* "db store 1"
+       "one"
+       (cachesv.put! "temp::1" "one"))
+
+(test* "db fetch  1"
+       "one"
+       (cachesv.get "temp::1"))
+
+(test* "db fetch  fallback"
+       false
+       (cachesv.get "temp::none" false))
+
+
+;;-------------------------------------------------------------------
+(test-section "memcached access heavily")
+
+(test* "db rw"
+       10000
+       (let1 count 0
+         (for-each
+          (lambda (n)
+            (let1 str (sprintf "%06d" n)
+              (cachesv.put! (+ "temp::" str) str)
+              (when (string=?
+                     str
+                     (cachesv.get (+ "temp::" str) str))
+                (set! count (+ count 1)))))
+          (range 10000))
+         count))
+
+
+(test-section "memcached expire data")
+(test* "db expire time 1"
+       "now"
+       (cachesv.put! "temp::1" "now" 2))
+
+(test* "db expire time 2"
+       "now"
+       (cachesv.get "temp::1" "now"))
+
+(test* "db expire time 3"
+       "miss"
+       (begin
+         (.sleep 3)
+         (cachesv.get "temp::1" "miss")))
+
+
+;;===================================================================
+
+
+(test-end)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 6
-  version: 0.8.6
+  - 7
+  version: 0.8.7
 platform: ruby
 authors: 
 - Kiyoka Nishiyama
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +09:00
+date: 2011-06-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,9 +92,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 4
+        - 5
         - 1
-        version: 0.4.1
+        version: 0.5.1
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -167,6 +167,7 @@ files:
 - test/google-ime.nnd
 - test/henkan-main.nnd
 - test/jisyo.nnd
+- test/memcache.nnd
 - test/roman-lib.nnd
 - test/sharp-number.nnd
 - test/skk-azik-table.nnd