sekka 0.8.1 → 0.8.2

data/bin/sekka-benchmark

@@ -0,0 +1,135 @@
+#!/usr/bin/env ruby
+# -*- mode: nendo; syntax: scheme ; coding: utf-8 -*-
+require 'nendo'
+$LOAD_PATH.push( File.dirname(__FILE__) + "/../lib" )
+core = Nendo::Core.new()
+core.setArgv( ARGV )
+core.loadInitFile
+core.evalStr( <<";;END-OF-SCRIPT" )
+;;;
+;;; sekka-benchmark - 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
+;;;   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 "benchmark")
+(define (bench-block title block)
+  (print  "----------------------------------------")
+  (printf "[%s]\n" title )
+  (.puts Benchmark::CAPTION)
+  (.puts (Benchmark.measure
+          (&block ()
+            (block)))))
+
+
+(define (gen-curl-command-string keyword limit)
+  (let ((host "localhost"))
+    (sprintf "curl --silent --show-error  --max-time 60  --insecure  --header 'Content-Type: application/x-www-form-urlencoded' http://%s:12929/henkan --data 'format=sexp' --data 'yomi=%s' --data 'limit=%d' --data 'method=normal' --data 'userid=%s' > /dev/null" host keyword limit "benchuser")))
+
+
+(define (henkan-with-same-keyword limit)
+  (let1 cmd (gen-curl-command-string "Kanji" limit)
+    (bench-block
+     (sprintf "Samekey limit=%d  (all request hits memcached)" limit)
+     (lambda ()
+       (for-each
+        (lambda (x)
+          (display ".")
+          (.system cmd))
+        (range 100))
+       (newline)))))
+
+(define (henkan-with-uniq-keyword limit)
+  (let1 keylist
+      '(
+        "Aimai" "Ao" "Aoumigame" "Akakeitou"
+        "Bangou" "Bankai" "Banninkyoutuu" "Banouyaku"
+        "Chance"
+        "Dangai"   "Daiichihousoku" "Daigakuin" "Daidokoro"
+        "Enjin"    "Eigyoukatudou"  "Eiseikidou" "Ebisu"
+        "Fantaji-"
+        "Goukaku"  "Gakkou" "Gaikoku" "Gakki" "Gamenkeishiki" "Gamensaizu" "Garapagosu" "Gankyuu"
+        "Hinode" "Hi-ro-" "Hiroshima" "Hinjaku" "Hakari" "Ha-monika" "Haru"
+        "Iwanami" "Ikimono" "Inarizushi" "Iso" "Ishi" "Ima" "Imi" "Inu"
+        "Jinkoumondai" "Jinkoueisei" "Jiken" "Jiko" "Jirou" "Jakouneko"
+        "Kousei" "Kaisen" "Kiso" "Kisokenkyuu" "Kisoshikkan" "Kenkyuukikan" "Kenkyuunaiyou"
+        "London" "Lonly" "Load" "Love" "Listen" "List"
+        "Manyousyuu"
+        "Nouzei" "Namae" "Nakanaka" "Nihongohenkan" "Nihongo" "Nishi"
+        "Okinawa" "Oudanhodou"
+        "Painappuru" "Pa-sonaru"
+        "Quizu"
+        "Rokuon" "Rasenkaidan" "Risoku" "Risuku"
+        "Sougouhyouka" "Sougou" "Son" "Soro"
+        "Tuuka" "Tuika" "Taiyou" "Taiou" "Tamatama"
+        "Umi" "Ushiro" "Utagoe" "Uso" "Ukai"
+        "World" "Watagashi" "Watarigani"
+        "Yamagataken" "Yamai" "Yu-suke-su"
+        "Zonbi" "Zou" "Zanshin" "Zannen"
+        )
+
+    (bench-block
+     (sprintf "Uniqkey limit=%d" limit)
+     (lambda ()
+       (for-each
+        (lambda (x)
+          (let1 cmd (gen-curl-command-string x limit)
+            (display ".")
+            (.system cmd)))
+        keylist)
+       (newline)))))
+
+
+(define (display-help)
+  (print "Usage : ")
+  (print "  sekka-benchmark samekey0  .... henkan 100 times with same keyword  [Kanji]        (get N candidate)")
+  (print "  sekka-benchmark samekey1  .... henkan 100 times with same keyword  [Kanji]        (get 1 candidate)")
+  (print "  sekka-benchmark uniqkey0  .... henkan 100 times with uniq keywords [Aimai Ao ...] (get N candidate)"))
+
+            
+(define (main argv)
+  (cond
+   ((= 0 (length argv))
+    (display-help))
+   (else
+    (let1 command (string->symbol (first argv))
+      (cond
+       ((eq? 'samekey0 command)
+        (henkan-with-same-keyword 0))
+       ((eq? 'samekey1 command)
+        (henkan-with-same-keyword 1))
+       ((eq? 'uniqkey0 command)
+        (henkan-with-uniq-keyword 0))
+       (else
+        (errorf "Error: no such command [%s] \n" command )))))))
+
+(main *argv*)
+;;END-OF-SCRIPT

data/emacs/sekka.el

@@ -55,11 +55,6 @@
   :type  'string
   :group 'sekka)
 
-(defcustom sekka-use-viper nil
-  "*Non-nil であれば、VIPER に対応する"
-  :type 'boolean
-  :group 'sekka)
-
 (defcustom sekka-realtime-guide-running-seconds 30
   "リアルタイムガイド表示の継続時間(秒数)・ゼロでガイド表示機能が無効になる"
   :type  'integer
@@ -369,14 +364,17 @@
 ;; ユーザー語彙をサーバーに登録する。
 ;;
 (defun sekka-register-userdict-internal ()
-  (let ((str (sekka-get-jisyo-str "~/.sekka-jisyo")))
-    (when str
-      (message "Requesting to sekka server...")
-      (sekka-debug-print (format "register [%s]\n" str))
-      (let ((result (sekka-rest-request "register" `((dict . ,str)))))
-	(sekka-debug-print (format "register-result:%S\n" result))
-	(message result)
-	t))))
+  (let* ((str      (sekka-get-jisyo-str "~/.sekka-jisyo"))
+	 (str-lst  (sekka-divide-into-few-line str)))
+    (mapcar
+     (lambda (x)
+       ;;(message "Requesting to sekka server...")
+       (sekka-debug-print (format "register [%s]\n" x))
+       (let ((result (sekka-rest-request "register" `((dict . ,x)))))
+	 (sekka-debug-print (format "register-result:%S\n" result))
+	 (message result)))
+     str-lst)
+    t))
 
 
 ;;
@@ -392,17 +390,52 @@
     t))
 
 
+;; str = "line1 \n line2 \n line3 \n line4 \n line5 \n "
+;; result:
+;;     '(
+;;        ("line1 \n line2 \n line3 \n ")
+;;        ("line4 \n line5 \n ")
+;;      )
+;;
+;; for-testing:
+;;   (sekka-divide-into-few-line 
+;;     "line1 \n line2 \n line3 \n line4 \n line5 \n line6 \n line7 \n line8 \n line9 \n line10 \n  line11 \n  line12 \n")
+;;
+(defun sekka-divide-into-few-line (str)
+  (if (stringp str)
+      (let ((str-lst (split-string str "\n"))
+	    (result '()))
+	(while (< 0 (length str-lst))
+	  (push 
+	   (concat
+	    (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" 
+	    (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" 
+
+	    (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" 
+	    (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" 
+
+	    (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" 
+	    (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" 
+
+	    (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" 
+	    (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" 
+
+	    (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" 
+	    (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" (pop str-lst) "\n" 
+	    )
+	   result))
+	(reverse result))
+    '()))
+
 (defun sekka-get-jisyo-str (file &optional nomsg)
-  "FILE を開いて SKK 辞書バッファを作り、バッファを返す。
-オプション引数の NOMSG を指定するとファイル読み込みの際のメッセージを表示しな
-い。"
+  "FILE を開いて Sekka辞書バッファを作り、バッファ1行1文字列のリストで返す"
   (when file
     (let* ((file (or (car-safe file)
 		     file))
 	   (file (expand-file-name file)))
       (if (not (file-exists-p file))
 	  (progn
-	    (message (format "SKK 辞書 %s が存在しません..." file))
+	    (message (format "Sekka辞書 %s が存在しません..." file))
 	    nil)
 	(let ((str "")
 	      (buf-name (file-name-nondirectory file)))
@@ -410,12 +443,10 @@
 	    (find-file-read-only file)
 	    (setq str (with-current-buffer (get-buffer buf-name)
 			(buffer-substring-no-properties (point-min) (point-max))))
-	    (message (format "SKK 辞書 %s を開いています...完了！" (file-name-nondirectory file)))
+	    (message (format "Sekka辞書 %s を開いています...完了！" (file-name-nondirectory file)))
 	    (kill-buffer-if-not-modified (get-buffer buf-name)))
 	  str)))))
 
-;;(sekka-get-jisyo-str "~/.sekka-jisyo")
-
 
 ;; ポータブル文字列置換( EmacsとXEmacsの両方で動く )
 (defun sekka-replace-regexp-in-string (regexp replace str)
@@ -998,36 +1029,6 @@
 	     (point))
 	  result)))))
 
-  
-;;;
-;;; with viper
-;;;
-;; code from skk-viper.el
-(defun sekka-viper-normalize-map ()
-  (let ((other-buffer
-	 (if (featurep 'xemacs)
-	     (local-variable-p 'minor-mode-map-alist nil t)
-	   (local-variable-if-set-p 'minor-mode-map-alist))))
-    ;; for current buffer and buffers to be created in the future.
-    ;; substantially the same job as viper-harness-minor-mode does.
-    (viper-normalize-minor-mode-map-alist)
-    (setq-default minor-mode-map-alist minor-mode-map-alist)
-    (when other-buffer
-      ;; for buffers which are already created and have
-      ;; the minor-mode-map-alist localized by Viper.
-      (dolist (buf (buffer-list))
-	(with-current-buffer buf
-	  (unless (assq 'sekka-mode minor-mode-map-alist)
-	    (setq minor-mode-map-alist
-		  (append (list (cons 'sekka-mode sekka-mode-map)
-				(cons 'sekka-select-mode
-				      sekka-select-mode-map))
-			  minor-mode-map-alist)))
-	  (viper-normalize-minor-mode-map-alist))))))
-
-(defun sekka-viper-init-function ()
-  (sekka-viper-normalize-map)
-  (remove-hook 'sekka-mode-hook 'sekka-viper-init-function))
 
 (defun sekka-sticky-shift-init-function ()
   ;; sticky-shift
@@ -1156,8 +1157,6 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 	(sekka-kill-sekka-mode))
     (setq sekka-mode (if (null arg) (not sekka-mode)
 			(> (prefix-numeric-value arg) 0))))
-  (when sekka-use-viper
-    (add-hook 'sekka-mode-hook 'sekka-viper-init-function))
   (when sekka-sticky-shift
     (add-hook 'sekka-mode-hook 'sekka-sticky-shift-init-function))
   (when sekka-mode (run-hooks 'sekka-mode-hook)))
@@ -1199,7 +1198,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "0.8.1" ;;SEKKA-VERSION
+  "0.8.2" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/kvs.rb

@@ -41,6 +41,7 @@ class Kvs
     case dbtype
     when :tokyocabinet
       @db = TokyoCabinet::HDB.new( )
+      # @db.setxmsiz(512 * 1024 * 1024)  # expand memory
     when :memcache
       # do nothing
     else

data/lib/sekka/sekkaversion.rb

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

data/lib/sekkaserver.rb

@@ -39,6 +39,7 @@ require 'nendo'
 require 'eventmachine'
 require 'syslog'
 require 'uri'
+require 'date'
 require './lib/sekkaconfig'
 require './lib/sekka/sekkaversion'
 
@@ -67,15 +68,22 @@ module SekkaServer
         @thread = Thread.new do
           Thread.pass
           EventMachine::run {
+            d = DateTime.now
             EventMachine::PeriodicTimer.new( 5 ) do
               while not @queue.empty?
-                @queue.pop { |word| 
+                @queue.pop { |word|
                   arr = word.split( /[ ]+/ )
                   userid   = arr[0]
-                  dictline = arr[1] + " " + arr[2]
+                  dictline = 
+                  if 3 == arr.size 
+                    arr[1] + " " + arr[2]
+                  else
+                    ";; comment"
+                  end
                   registered = @core.registerUserJisyo(userid, @kvs, dictline)
                   if registered
-                    puts "Info: added to dict                      userid[" + userid + "] dictline[" + dictline + "]"
+                    str = d.strftime( "%D %X" )
+                    puts "Info: [" + str + "]added to dict                      userid[" + userid + "] dictline[" + dictline + "]"
                     @core.flushCacheServer( @cachesv )
                   else
                     puts "Info: ignored (already added or comment) userid[" + userid + "] dictline[" + dictline + "]"
@@ -110,14 +118,14 @@ module SekkaServer
                when "/register"
                  dict    = URI.decode( req.params['dict'].force_encoding( "UTF-8" ) ).split( "\n" )
                  dict.each { |x| @queue.push( userid + " " + x ) }
-                 sprintf( "register request successful (%s) words", dict.size )
+                 sprintf( "sekka-server:register request (%s) words added, current-queue-size (%s)", dict.size, @queue.size )
                when "/flush"
                  @core.flushCacheServer( @cachesv )
                  n = @core.flushUserJisyo( userid, @kvs )
                  printf( "info : flush [%s] user's dict %d entries.", userid, n )
-                 sprintf( "flush request successful. flush (%d) entries.", n )
+                 sprintf( "sekka-server:flush request successful. flush (%d) entries.", n )
                else
-                 sprintf( "unknown path name. [%s]", req.path )
+                 sprintf( "sekka-server:unknown path name. [%s]", req.path )
                end
              else
                "no message."

data/test/approximate-bench.nnd

@@ -36,7 +36,7 @@
 (require "sekka/kvs")
 (use nendo.test)
 (use sekka.henkan)
-(load "test/common.nnd")
+(load "./test/common.nnd")
 
 (define dbtype (string->symbol (first *argv*)))
 

data/test/azik-verification.nnd

@@ -36,7 +36,7 @@
 (use nendo.test)
 (use sekka.roman-lib)
 (test-start "roman-lib")
-(load "test/skk-azik-table")
+(load "./test/skk-azik-table.nnd")
 
 ;;===================================================================
 (define skk-azik-roman->kana-alist

data/test/henkan-main.nnd

@@ -37,7 +37,7 @@
 (use nendo.test)
 (use sekka.convert-jisyo)
 (use sekka.henkan)
-(load "test/common.nnd")
+(load "./test/common.nnd")
 
 (define dbtype   (string->symbol (first *argv*)))
 (define userid   "dummy")

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sekka
 version: !ruby/object:Gem::Version 
-  hash: 61
   prerelease: false
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Kiyoka Nishiyama
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +09:00
+date: 2010-12-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,7 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -82,7 +77,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -96,7 +90,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -110,7 +103,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 4
@@ -126,7 +118,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -140,7 +131,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -149,6 +139,7 @@ dependencies:
 description: Sekka is a SKK like input method. Sekka server provides REST Based API. If you are SKK user, let's try it.
 email: kiyoka@sumibi.org
 executables: 
+- sekka-benchmark
 - sekka-jisyo
 - sekka-server
 extensions: []
@@ -158,6 +149,7 @@ extra_rdoc_files:
 files: 
 - COPYING
 - README
+- bin/sekka-benchmark
 - bin/sekka-jisyo
 - bin/sekka-server
 - emacs/http-cookies.el
@@ -198,7 +190,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 49
       segments: 
       - 1
       - 9
@@ -209,7 +200,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"