ferret 0.3.2 → 0.9.0

data/test/unit/store/tc_fs_store.rb

@@ -59,57 +59,4 @@ class FSStoreTest < Test::Unit::TestCase
            "this directory should have been removed from the cache") 
   end
 
-  def test_fslock
-    lock_name = "lfile"
-    lock_file_path = make_lock_file_path(lock_name)
-    assert(! File.exists?(lock_file_path), "There should be no lock file")
-    lock = @dir.make_lock(lock_name)
-    assert(! File.exists?(lock_file_path), "There should still be no lock file")
-    assert(! lock.locked?,                 "lock shouldn't be locked yet")
-
-    lock.obtain
-
-    assert(lock.locked?,                   "lock should now be locked")
-    assert(File.exists?(lock_file_path),   "A lock file should have been created")
-
-    assert(! @dir.exists?(lock_file_path),
-           "The lock should be hidden by the FSDirectories directory scan")
-
-    lock.release
-
-    assert(! lock.locked?,                 "lock should be freed again")
-    assert(! File.exists?(lock_file_path), "The lock file should have been deleted")
-  end
-
-#  def make_and_loose_lock
-#    lock = @dir.make_lock("finalizer_lock")
-#    lock.obtain
-#    lock = nil
-#  end
-#
-#  def test_fslock_finalizer
-#    lock_name = "finalizer_lock"
-#    lock_file_path = make_lock_file_path(lock_name)
-#    assert(! File.exists?(lock_file_path), "There should be no lock file")
-#
-#    make_and_loose_lock
-#
-#    #assert(File.exists?(lock_file_path), "There should now be a lock file")
-#
-#    lock = @dir.make_lock(lock_name)
-#    assert(lock.locked?, "lock should now be locked")
-#
-#    GC.start
-#
-#    assert(! lock.locked?, "lock should be freed again")
-#    assert(! File.exists?(lock_file_path), "The lock file should have been deleted")
-#  end
-#
-  def make_lock_file_path(name)
-    lock_file_path = File.join(@dpath, @dir.get_lock_prefix() + name)
-    if File.exists?(lock_file_path) then
-      File.delete(lock_file_path)
-    end
-    return lock_file_path
-  end
 end

data/test/unit/store/tc_ram_store.rb

@@ -12,24 +12,4 @@ class RAMStoreTest < Test::Unit::TestCase
   def teardown
     @dir.close()
   end
-
-  def test_ramlock
-    name = "lfile"
-    lfile = Ferret::Store::Directory::LOCK_PREFIX + name
-    assert(! @dir.exists?(lfile),
-           "There should be no lock file")
-    lock = @dir.make_lock(name)
-    assert(! @dir.exists?(lfile),
-           "There should still be no lock file")
-    assert(! @dir.exists?(lfile),
-           "The lock should be hidden by the FSDirectories directory scan")
-    assert(! lock.locked?, "lock shouldn't be locked yet")
-    lock.obtain
-    assert(lock.locked?, "lock should now be locked")
-    assert(@dir.exists?(lfile), "A lock file should have been created")
-    lock.release
-    assert(! lock.locked?, "lock should be freed again")
-    assert(! @dir.exists?(lfile),
-           "The lock file should have been deleted")
-  end
 end

data/test/unit/store/tm_store.rb

@@ -2,36 +2,6 @@ module StoreTest
   # declare dir so inheritors can access it.
   @dir = nil
 
-  # test the basic file manipulation methods;
-  # - exists?
-  # - touch
-  # - delete
-  # - file_count
-  def test_basic_file_ops
-    assert_equal(0, @dir.file_count(), "directory should be empty")
-    assert(! @dir.exists?('filename'), "File should not exist")
-    @dir.touch('tmpfile1')
-    assert_equal(1, @dir.file_count(), "directory should have one file")
-    @dir.touch('tmpfile2')
-    assert_equal(2, @dir.file_count(), "directory should have two files")
-    assert(@dir.exists?('tmpfile1'), "'tmpfile1' should exist")
-    @dir.delete('tmpfile1')
-    assert(! @dir.exists?('tmpfile1'), "'tmpfile1' should no longer exist")
-    assert_equal(1, @dir.file_count(), "directory should have one file")
-  end
-  
-  def test_rename
-    @dir.touch("from")
-    assert(@dir.exists?('from'), "File should exist")
-    assert(! @dir.exists?('to'), "File should not exist")
-    cnt_before = @dir.file_count()
-    @dir.rename('from', 'to')
-    cnt_after = @dir.file_count()
-    assert_equal(cnt_before, cnt_after, "the number of files shouldn't have changed")
-    assert(@dir.exists?('to'), "File should now exist")
-    assert(! @dir.exists?('from'), "File should no longer exist")
-  end
-
   def test_modified
     # difficult to test this one but as file mtime is only stored to the nearest second.
     # we can assume this test will happen in less than a few seconds. (I hope)

data/test/unit/store/tm_store_lock.rb

@@ -1,68 +1,2 @@
 module StoreLockTest
-  class Switch
-    @@counter = 0
-    def Switch.counter() return @@counter end
-    def Switch.counter=(counter) @@counter = counter end
-  end
-
-  def test_locking()
-    lock_time_out = 0.001 # we want this test to run quickly
-    lock1 = @dir.make_lock("l.lck")
-    lock2 = @dir.make_lock("l.lck")
-
-    assert(!lock2.locked?)
-    assert(lock1.obtain(lock_time_out))
-    assert(lock2.locked?)
-
-    assert(! obtain_lock_true_false(lock2))
-
-    exception_thrown = false
-    begin
-      lock2.while_locked(lock_time_out) do
-        assert(false, "lock should not have been obtained")
-      end
-    rescue
-      exception_thrown = true
-    ensure
-      assert(exception_thrown)
-    end
-
-    lock1.release()
-    assert(lock2.obtain(lock_time_out))
-    lock2.release()
-
-    t = Thread.new() do
-      lock1.while_locked(lock_time_out) do
-        Switch.counter = 1
-        # make sure lock2 obtain test was run
-        while Switch.counter < 2
-        end
-        Switch.counter = 3
-      end
-    end
-    t.run()
-
-    #make sure thread has started and lock been obtained
-    while Switch.counter < 1
-    end
-    
-    assert(! obtain_lock_true_false(lock2))
-
-    Switch.counter = 2
-    while Switch.counter < 3
-    end
-    
-    assert(lock2.obtain(lock_time_out))
-    lock2.release()
-  end
-
-  def obtain_lock_true_false(lock)
-    lock_time_out = 0.001 # we want this test to run quickly
-    begin
-      lock.obtain(lock_time_out)
-      return true
-    rescue
-    end
-    return false
-  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ferret
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
-date: 2005-12-16 00:00:00 +09:00
+  version: 0.9.0
+date: 2006-03-19 00:00:00 +09:00
 summary: Ruby indexing library.
 require_paths: 
   - lib
@@ -35,27 +35,72 @@ files:
   - MIT-LICENSE
   - TODO
   - TUTORIAL
-  - ext/Makefile
-  - ext/index_io.c
-  - ext/term_buffer.c
-  - ext/ram_directory.c
-  - ext/priority_queue.c
-  - ext/string_helper.c
-  - ext/segment_merge_queue.c
-  - ext/extconf.rb
+  - CHANGELOG
   - ext/ferret.c
+  - ext/lang.c
+  - ext/r_analysis.c
+  - ext/r_doc.c
+  - ext/r_index_io.c
+  - ext/r_qparser.c
+  - ext/r_search.c
+  - ext/r_store.c
+  - ext/r_term.c
+  - ext/extconf.rb
+  - ext/inc
+  - ext/analysis.c
+  - ext/document.c
+  - ext/compound_io.c
+  - ext/index_rw.c
+  - ext/termdocs.c
+  - ext/vector.c
+  - ext/field.c
   - ext/term.c
-  - ext/ferret.h
-  - ext/util.c
-  - ext/token.c
-  - ext/tags
+  - ext/q_parser.c
+  - ext/q_const_score.c
+  - ext/q_boolean.c
+  - ext/q_match_all.c
+  - ext/q_phrase.c
+  - ext/q_fuzzy.c
+  - ext/search.c
+  - ext/ind.c
   - ext/dummy.exe
-  - ext/segment_term_enum.c
-  - ext/terminfo.c
-  - ext/ferret_ext.so
-  - ext/term_infos_reader.c
+  - ext/q_multi_phrase.c
+  - ext/q_wildcard.c
+  - ext/q_range.c
+  - ext/q_prefix.c
+  - ext/q_span.c
+  - ext/filter.c
   - ext/similarity.c
+  - ext/sort.c
+  - ext/q_term.c
+  - ext/index_io.c
+  - ext/fs_store.c
+  - ext/ram_store.c
+  - ext/store.c
+  - ext/hashset.c
+  - ext/array.c
+  - ext/bitvector.c
+  - ext/helper.c
+  - ext/global.c
+  - ext/hash.c
+  - ext/priorityqueue.c
+  - ext/document.h
+  - ext/store.h
+  - ext/array.h
+  - ext/priorityqueue.h
+  - ext/hashset.h
+  - ext/helper.h
+  - ext/global.h
+  - ext/bitvector.h
+  - ext/analysis.h
+  - ext/hash.h
+  - ext/search.h
+  - ext/lang.h
+  - ext/ferret.h
+  - ext/index.h
+  - ext/inc/lang.h
   - lib/ferret.rb
+  - lib/rferret.rb
   - lib/ferret/analysis.rb
   - lib/ferret/document.rb
   - lib/ferret/index.rb
@@ -135,7 +180,6 @@ files:
   - lib/ferret/search/query_filter.rb
   - lib/ferret/search/wildcard_query.rb
   - lib/ferret/search/wildcard_term_enum.rb
-  - lib/ferret/search/match_all_docs_query.rb
   - lib/ferret/search/phrase_query.rb
   - lib/ferret/search/exact_phrase_scorer.rb
   - lib/ferret/search/sloppy_phrase_scorer.rb
@@ -147,6 +191,7 @@ files:
   - lib/ferret/search/sort_comparator.rb
   - lib/ferret/search/range_filter.rb
   - lib/ferret/search/field_cache.rb
+  - lib/ferret/search/match_all_query.rb
   - lib/ferret/search/spans/near_spans_enum.rb
   - lib/ferret/search/spans/span_first_query.rb
   - lib/ferret/search/spans/spans_enum.rb
@@ -202,6 +247,7 @@ files:
   - test/unit/analysis/tc_analyzer.rb
   - test/unit/analysis/tc_standard_analyzer.rb
   - test/unit/analysis/tc_white_space_tokenizer.rb
+  - test/unit/analysis/c_token.rb
   - test/unit/index/tc_segment_term_docs.rb
   - test/unit/index/tc_term_infos_io.rb
   - test/unit/index/tc_fields_io.rb
@@ -209,32 +255,39 @@ files:
   - test/unit/index/tc_segment_infos.rb
   - test/unit/index/tc_segment_term_vector.rb
   - test/unit/index/tc_term_vectors_io.rb
-  - test/unit/index/tc_index_writer.rb
-  - test/unit/index/tc_term.rb
   - test/unit/index/th_doc.rb
   - test/unit/index/tc_compound_file_io.rb
-  - test/unit/index/tc_term_vector_offset_info.rb
   - test/unit/index/tc_segment_term_enum.rb
   - test/unit/index/tc_field_infos.rb
   - test/unit/index/tc_term_info.rb
-  - test/unit/index/tc_index.rb
-  - test/unit/index/tc_index_reader.rb
+  - test/unit/index/c_index.rb
+  - test/unit/index/c_index_reader.rb
   - test/unit/index/tc_multiple_term_doc_pos_enum.rb
+  - test/unit/index/c_index_writer.rb
+  - test/unit/index/c_term.rb
+  - test/unit/index/c_term_voi.rb
   - test/unit/store/tc_ram_store.rb
   - test/unit/store/tm_store_lock.rb
   - test/unit/store/tc_fs_store.rb
   - test/unit/store/tm_store.rb
-  - test/unit/document/tc_document.rb
+  - test/unit/store/c_fs_store.rb
+  - test/unit/store/c_ram_store.rb
+  - test/unit/store/m_store_lock.rb
+  - test/unit/store/m_store.rb
+  - test/unit/document/c_field.rb
   - test/unit/document/tc_field.rb
+  - test/unit/document/c_document.rb
   - test/unit/query_parser/tc_query_parser.rb
-  - test/unit/search/tc_sort.rb
+  - test/unit/query_parser/c_query_parser.rb
   - test/unit/search/tc_similarity.rb
-  - test/unit/search/tc_index_searcher.rb
-  - test/unit/search/tc_fuzzy_query.rb
-  - test/unit/search/tc_search_and_sort.rb
   - test/unit/search/tc_sort_field.rb
-  - test/unit/search/tc_filter.rb
-  - test/unit/search/tc_spans.rb
+  - test/unit/search/c_filter.rb
+  - test/unit/search/c_fuzzy_query.rb
+  - test/unit/search/c_index_searcher.rb
+  - test/unit/search/c_search_and_sort.rb
+  - test/unit/search/c_sort_field.rb
+  - test/unit/search/c_sort.rb
+  - test/unit/search/c_spans.rb
   - test/longrunning/tc_numbertools.rb
   - test/longrunning/tm_store.rb
   - test/benchmark/tb_rw_vint.rb

data/ext/Makefile

@@ -1,140 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /usr/lib/ruby/1.8/i486-linux
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/usr
-exec_prefix = $(prefix)
-sitedir = $(DESTDIR)/usr/local/lib/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-datadir = $(prefix)/share
-includedir = $(prefix)/include
-infodir = $(prefix)/info
-sysconfdir = $(DESTDIR)/etc
-mandir = $(datadir)/man
-libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-sitearchdir = $(sitelibdir)/$(sitearch)
-bindir = $(exec_prefix)/bin
-localstatedir = $(DESTDIR)/var
-sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
-
-CC = gcc
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-
-CFLAGS   =  -fPIC -Wall -g -O2  -fPIC 
-CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)  
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS =   
-LDSHARED = $(CC) -shared
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby1.8
-RUBY_SO_NAME = ruby1.8
-arch = i486-linux
-sitearch = i486-linux
-ruby_version = 1.8
-ruby = /usr/bin/ruby1.8
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = $(libdir)
-LIBPATH =  -L"$(libdir)"
-DEFFILE = 
-
-CLEANFILES = 
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lcrypt -lm   -lc
-SRCS = index_io.c term_buffer.c ram_directory.c priority_queue.c string_helper.c segment_merge_queue.c ferret.c term.c util.c token.c segment_term_enum.c terminfo.c term_infos_reader.c similarity.c
-OBJS = index_io.o term_buffer.o ram_directory.o priority_queue.o string_helper.o segment_merge_queue.o ferret.o term.o util.o token.o segment_term_enum.o terminfo.o term_infos_reader.o similarity.o
-TARGET = ferret_ext
-DLLIB = $(TARGET).so
-STATIC_LIB = 
-
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile extconf.h conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb pre-install-rb-default: $(RUBYLIBDIR)
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-$(RUBYLIBDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
-
-.c.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-
-$(DLLIB): $(OBJS)
-	@-$(RM) $@
-	$(LDSHARED) $(DLDFLAGS) $(LIBPATH) -o $@ $(OBJS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h