fts_lite 0.0.1 → 0.0.2

data/README.md

@@ -1,11 +1,6 @@
 # FtsLite
 
-simple full text search index.
-
-## Dependency
-
-    Ruby >= 1.9.2
-    SQLite3 >= 3.7.7 (FTS4 REPLACE support)
+full text search index.
 
 ## Installation
 
@@ -32,24 +27,9 @@ Or install it yourself as:
     sort_value = "2012-08-01"
     
     db.transaction do
-      db.insert_or_replace(docid, text, sort_value)
-      db.batch_insert_or_replace([
-        {:docid => 30, :text => "hoge hoge", :sort_value => '2012-08-01'},
-        {:docid => 40, :text => "piyo piyo", :sort_value => '2012-08-02'}
-      ])
+      db.update(docid, text, sort_value)
     end
     
     db.search('piyo', :order => :desc, :limit => 10).each do |docid|
       p docid
     end
-    
-    
-    db.batch_update_sort_value([
-      {:docid => 30, :sort_value => '2012-07-01'},
-      {:docid => 40, :sort_value => '2012-07-02'}
-    ])
-    
-    db.search('piyo', :order => :desc, :limit => 10).each do |docid|
-      p docid
-    end
-

data/lib/fts_lite/database.rb

@@ -6,7 +6,14 @@ module FtsLite
     DEFAULT_JURNAL_MODE = "MEMORY"
     DEFAULT_TEMP_STORE = "MEMORY"
     DEFAULT_CACHE_SIZE = 32000
+    SQLITE_HAVE_FT4_REPLACE = SQLite3.libversion >= 3007007
     
+    def self.have_ft4_replace
+      SQLITE_HAVE_FT4_REPLACE
+    end
+    def self.sqlite3_version
+      SQLite3.libversion
+    end
     class RuntimeError < ::RuntimeError
     end
     
@@ -17,20 +24,30 @@ module FtsLite
       set_db_param(options)
       @tokenizer = Tokenizer.create(options[:tokenizer] || DEFAULT_TOKENIZER)
     end
-    def tokenize(text)
-      @tokenizer.vector(text).split(" ")
-    end
     def close
       @db.close
     end
+    def tokenize(text)
+      @tokenizer.vector(text).split(" ")
+    end
     def transaction(&block)
       @db.transaction do
         block.call
       end
     end
-    def insert_or_replace(docid, text, sort_value = nil)
-      @db.execute("INSERT OR REPLACE INTO #{@table_name} (docid, text, sort_value) VALUES(?, ?, ?);",
-                  [docid, @tokenizer.vector(text), sort_value])
+    def update(docid, text, sort_value = nil)
+      if (SQLITE_HAVE_FT4_REPLACE)
+        @db.execute("INSERT OR REPLACE INTO #{@table_name} (docid, text, sort_value) VALUES(?, ?, ?);",
+                    [docid, @tokenizer.vector(text), sort_value])
+      else
+        begin
+          @db.execute("INSERT INTO #{@table_name} (docid, text, sort_value) VALUES(?, ?, ?);",
+                      [docid, @tokenizer.vector(text), sort_value])
+        rescue SQLite3::ConstraintException
+          @db.execute("UPDATE #{@table_name} SET text = ?, sort_value = ? WHERE docid = ?;",
+                      [@tokenizer.vector(text), sort_value, docid])
+        end
+      end
     end
     def update_sort_value(docid, sort_value)
       @db.execute("UPDATE #{@table_name} SET sort_value = ? WHERE docid = ?;",
@@ -68,27 +85,6 @@ module FtsLite
     def delete_all
       @db.execute("DELETE FROM #{@table_name} ;")
     end
-    def batch_insert(records)
-      @db.prepare("INSERT INTO #{@table_name} (docid, text, sort_value) VALUES(?, ?, ?);") do |stmt|
-        records.each do |rec|
-          stmt.execute([rec[:docid], @tokenizer.vector(rec[:text]), rec[:sort_value]])
-        end
-      end
-    end
-    def batch_insert_or_replace(records)
-      @db.prepare("INSERT OR REPLACE INTO #{@table_name} (docid, text, sort_value) VALUES(?, ?, ?);") do |stmt|
-        records.each do |rec|
-          stmt.execute([rec[:docid], @tokenizer.vector(rec[:text]), rec[:sort_value]])
-        end
-      end
-    end
-    def batch_update_sort_value(records)
-      @db.prepare("UPDATE #{@table_name} SET sort_value = ? WHERE docid = ?;") do |stmt|
-        records.each do |rec|
-          stmt.execute([rec[:sort_value], rec[:docid]])
-        end
-      end
-    end
     def drop_table!
       if (table_exist?)
         @db.execute("DROP TABLE #{@table_name};")

data/lib/fts_lite/version.rb

@@ -1,3 +1,3 @@
 module FtsLite
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/fts_lite_test.rb

@@ -3,6 +3,9 @@ require 'test_helper'
 
 class FtsLiteTest < Test::Unit::TestCase
   DB_FILE = File.expand_path(File.join(File.dirname(__FILE__), "test.sqlite3"))
+  puts "RUBY_VERSION => #{RUBY_VERSION}"
+  puts "SQLITE3_VERSION => #{FtsLite::Database.sqlite3_version}"
+  puts "SQLITE_HAVE_FT4_REPLACE => #{FtsLite::Database.have_ft4_replace}"
   def setup
     if (File.exist?(DB_FILE))
       File.unlink(DB_FILE)
@@ -10,13 +13,36 @@ class FtsLiteTest < Test::Unit::TestCase
   end
   def teardown
   end
+  def test_update
+    db = FtsLite::Database.new(DB_FILE, :tokenizer => :bigram)
+    db.transaction do 
+      db.delete_all
+
+      assert_equal db.search("赤い").size, 0
+      db.update(1, "なぜナポリタンは赤いのだろうか ？", 2)
+      db.update(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
+      
+      assert_equal db.search("赤い").size, 1
+      assert_equal db.search("ナポリタン", :order => :desc).size, 2
+      assert_equal db.search("ナポリタン", :order => :desc)[0], 1
+      assert_equal db.search("ナポリタン", :order => :desc)[1], 2
+      
+      db.update(1, "なぜナポリタンは青いのだろうか ？", 0)
+      assert_equal db.search("赤い").size, 0
+      assert_equal db.search("青い").size, 1
+
+      assert_equal db.search("ナポリタン", :order => :desc).size, 2
+      assert_equal db.search("ナポリタン", :order => :desc)[0], 2
+      assert_equal db.search("ナポリタン", :order => :desc)[1], 1
+    end
+  end
   def test_bigram
     db = FtsLite::Database.new(DB_FILE, :tokenizer => :bigram)
     db.transaction do 
       db.delete_all
       p db.tokenize("なぜナポリタンは赤いのだろうか ？")
-      db.insert_or_replace(1, "なぜナポリタンは赤いのだろうか ？", 2)
-      db.insert_or_replace(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
+      db.update(1, "なぜナポリタンは赤いのだろうか ？", 2)
+      db.update(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
       
       assert_equal db.search("赤い").size, 1
       assert_equal db.search("赤い")[0], 1
@@ -50,8 +76,8 @@ class FtsLiteTest < Test::Unit::TestCase
     db.transaction do 
       db.delete_all
       p db.tokenize("なぜナポリタンは赤いのだろうか ？")
-      db.insert_or_replace(1, "なぜナポリタンは赤いのだろうか ？", 2)
-      db.insert_or_replace(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
+      db.update(1, "なぜナポリタンは赤いのだろうか ？", 2)
+      db.update(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
       
       assert_equal db.search("赤い").size, 0
       
@@ -84,15 +110,9 @@ class FtsLiteTest < Test::Unit::TestCase
     db.transaction do 
       db.delete_all
       p db.tokenize("なぜナポリタンは赤いのだろうか ？")
-      db.batch_insert([{ :docid => 1,
-                         :text => "なぜナポリタンは赤いのだろうか ？",
-                         :sort_value => 2
-                       },
-                       { :docid => 2,
-                         :text => "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ",
-                         :sort_value => 1
-                       }
-                      ])
+      db.update(1, "なぜナポリタンは赤いのだろうか ？", 2)
+      db.update(2, "昼飯のスパゲティナポリタンを眺めながら、積年の疑問を考えていた。 ", 1)
+      
       assert_equal db.search("赤い").size, 1
       assert_equal db.search("赤い")[0], 1
       

data/test/test_helper.rb

@@ -1,10 +1,3 @@
-if (RUBY_VERSION < "1.9.0")
-  $KCODE = 'u'
-  begin
-    require 'rubygems'
-  rescue LoadError
-  end
-end
 require 'test/unit'
 
 $LOAD_PATH.unshift(File.expand_path(File.join('..', 'lib')))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fts_lite
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bimyou_segmenter