ferret 0.10.6 → 0.10.7

data/ext/r_search.c

@@ -2234,7 +2234,7 @@ typedef struct CWrappedFilter
 } CWrappedFilter;
 #define CWF(filt) ((CWrappedFilter *)(filt))
 
-static ulong
+static unsigned long
 cwfilt_hash(Filter *filt)
 {
     return NUM2ULONG(rb_funcall(CWF(filt)->rfilter, id_hash, 0));
@@ -2676,6 +2676,10 @@ frt_ms_init(int argc, VALUE *argv, VALUE self)
  *
  ****************************************************************************/
 
+/* rdochack
+cTopDocs = rb_define_class_under(mSearch, "TopDocs", rb_cObject);
+*/
+
 /*
  *  Document-class: Ferret::Search::Hit
  *
@@ -2691,6 +2695,9 @@ static void
 Init_Hit(void)
 {
     const char *hit_class = "Hit";
+    /* rdochack
+    cHit = rb_define_class_under(mSearch, "Hit", rb_cObject);
+    */
     cHit = rb_struct_define(hit_class, "doc", "score", NULL);
     rb_set_class_path(cHit, mSearch, hit_class);
     rb_const_set(mSearch, rb_intern(hit_class), cHit);
@@ -2720,6 +2727,9 @@ static void
 Init_TopDocs(void)
 {
     const char *td_class = "TopDocs";
+    /* rdochack
+    cTopDocs = rb_define_class_under(mSearch, "TopDocs", rb_cObject);
+    */
     cTopDocs = rb_struct_define(td_class,
                                 "total_hits",
                                 "hits",

data/ext/r_store.c

@@ -1,6 +1,7 @@
 #include "ferret.h"
 #include "store.h"
 
+static ID id_ref_cnt;
 VALUE cLock;
 VALUE cLockError;
 VALUE cDirectory;
@@ -13,16 +14,26 @@ VALUE cFSDirectory;
  *
  ****************************************************************************/
 
+void
+frt_unwrap_locks(Store *store)
+{
+    int i;
+    for (i = 0; i < store->locks->size; i++) {
+        void *lock = store->locks->elems[i];
+        VALUE rlock = object_get(lock);
+        object_del(lock);
+        if (rlock != Qnil) {
+            Frt_Unwrap_Struct(rlock);
+        }
+    }
+}
+
 void
 frt_lock_free(void *p)
 {
     Lock *lock = (Lock *)p;
-    if (object_get(lock->store) != Qnil) {
-        lock->store->close_lock(lock);
-    } else {
-        free(lock->name);
-        free(lock);
-    }
+    object_del(p);
+    close_lock(lock);
 }
 
 void
@@ -141,11 +152,11 @@ frt_lock_release(VALUE self)
 void
 frt_dir_free(Store *store)
 {
+    frt_unwrap_locks(store);
     object_del(store);
     store_deref(store);
 }
 
-#define GET_STORE(store, self) Data_Get_Struct(self, Store, store)
 /*
  *  call-seq:
  *     dir.close() -> nil
@@ -157,13 +168,15 @@ frt_dir_free(Store *store)
 static VALUE
 frt_dir_close(VALUE self)
 {
-    /*
-     * No need to do anything here. Leave it to the garbage collector
-     GET_STORE;
-     Frt_Unwrap_Struct(self);
-     object_del(store);
-     store_deref(store);
-     */
+    Store *store = DATA_PTR(self);
+    int ref_cnt = FIX2INT(rb_ivar_get(self, id_ref_cnt)) - 1;
+    rb_ivar_set(self, id_ref_cnt, INT2FIX(ref_cnt));
+    if (ref_cnt < 0) {
+        Frt_Unwrap_Struct(self);
+        object_del(store);
+        frt_unwrap_locks(store);
+        store_deref(store);
+    }
     return Qnil;
 }
 
@@ -176,8 +189,7 @@ frt_dir_close(VALUE self)
 static VALUE
 frt_dir_exists(VALUE self, VALUE rfname)
 {
-    Store *store;
-    GET_STORE(store, self);
+    Store *store = DATA_PTR(self);
     StringValue(rfname);
     return store->exists(store, RSTRING(rfname)->ptr) ? Qtrue : Qfalse;
 }
@@ -191,8 +203,7 @@ frt_dir_exists(VALUE self, VALUE rfname)
 static VALUE
 frt_dir_touch(VALUE self, VALUE rfname)
 {
-    Store *store;
-    GET_STORE(store, self);
+    Store *store = DATA_PTR(self);
     StringValue(rfname);
     store->touch(store, RSTRING(rfname)->ptr);
     return Qnil;
@@ -207,8 +218,7 @@ frt_dir_touch(VALUE self, VALUE rfname)
 static VALUE
 frt_dir_delete(VALUE self, VALUE rfname)
 {
-    Store *store;
-    GET_STORE(store, self);
+    Store *store = DATA_PTR(self);
     StringValue(rfname);
     return (store->remove(store, RSTRING(rfname)->ptr) == 0) ? Qtrue : Qfalse;
 }
@@ -222,8 +232,7 @@ frt_dir_delete(VALUE self, VALUE rfname)
 static VALUE
 frt_dir_file_count(VALUE self)
 {
-    Store *store;
-    GET_STORE(store, self);
+    Store *store = DATA_PTR(self);
     return INT2FIX(store->count(store));
 }
 
@@ -236,8 +245,7 @@ frt_dir_file_count(VALUE self)
 static VALUE
 frt_dir_refresh(VALUE self)
 {
-    Store *store;
-    GET_STORE(store, self);
+    Store *store = DATA_PTR(self);
     store->clear_all(store);
     return self;
 }
@@ -252,8 +260,7 @@ frt_dir_refresh(VALUE self)
 static VALUE
 frt_dir_rename(VALUE self, VALUE rfrom, VALUE rto)
 {
-    Store *store;
-    GET_STORE(store, self);
+    Store *store = DATA_PTR(self);
     StringValue(rfrom);
     StringValue(rto);
     store->rename(store, RSTRING(rfrom)->ptr, RSTRING(rto)->ptr);
@@ -272,11 +279,14 @@ frt_dir_rename(VALUE self, VALUE rfrom, VALUE rto)
 static VALUE
 frt_dir_make_lock(VALUE self, VALUE rlock_name)
 {
-    Store *store;
-    GET_STORE(store, self);
+    VALUE rlock;
+    Lock *lock;
+    Store *store = DATA_PTR(self);
     StringValue(rlock_name);
-    return Data_Wrap_Struct(cLock, &frt_lock_mark, &frt_lock_free,
-                            store->open_lock(store, RSTRING(rlock_name)->ptr));
+    lock = open_lock(store, RSTRING(rlock_name)->ptr);
+    rlock = Data_Wrap_Struct(cLock, &frt_lock_mark, &frt_lock_free, lock);
+    object_add(lock, rlock);
+    return rlock;
 }
 
 /****************************************************************************
@@ -311,8 +321,9 @@ frt_ramdir_init(int argc, VALUE *argv, VALUE self)
                 }
         default: store = open_ram_store();
     }
-    Frt_Wrap_Struct(self, NULL, frt_dir_free, store);
+    Frt_Wrap_Struct(self, NULL, &frt_dir_free, store);
     object_add(store, self);
+    rb_ivar_set(self, id_ref_cnt, INT2FIX(0));
     return self;
 }
 
@@ -350,16 +361,20 @@ frt_fsdir_new(int argc, VALUE *argv, VALUE klass)
         frt_create_dir(rpath);
     }
     if (!rb_funcall(rb_cFile, id_is_directory, 1, rpath)) {
-        rb_raise(rb_eIOError, "There is no directory: %s. Use create = true to "
-                 "create one.", RSTRING(rpath)->ptr);
+        rb_raise(rb_eIOError, "No directory <%s> found. Use :create => true"
+                 " to create one.", RSTRING(rpath)->ptr);
     }
     store = open_fs_store(RSTRING(rpath)->ptr);
     if (create) store->clear_all(store);
     if ((self = object_get(store)) == Qnil) {
         self = Data_Wrap_Struct(klass, NULL, &frt_dir_free, store);
         object_add(store, self);
-    } else {
-        store_deref(store);
+        rb_ivar_set(self, id_ref_cnt, INT2FIX(0));
+    }
+    else {
+        int ref_cnt = FIX2INT(rb_ivar_get(self, id_ref_cnt)) + 1;
+        rb_ivar_set(self, id_ref_cnt, INT2FIX(ref_cnt));
+        DEREF(store);
     }
     return self;
 }
@@ -489,6 +504,7 @@ extern VALUE mFerret = rb_define_module("Ferret");
 void
 Init_Store(void)
 {
+    id_ref_cnt = rb_intern("@id_ref_cnt");
     mStore = rb_define_module_under(mFerret, "Store");
     Init_Directory();
     Init_Lock();

data/ext/ram_store.c

@@ -389,7 +389,7 @@ static void ram_lock_release(Lock *lock)
     ram_remove(lock->store, lock->name);
 }
 
-static Lock *ram_open_lock(Store *store, char *lockname)
+static Lock *ram_open_lock_i(Store *store, char *lockname)
 {
     Lock *lock = ALLOC(Lock);
     char lname[100];
@@ -402,7 +402,7 @@ static Lock *ram_open_lock(Store *store, char *lockname)
     return lock;
 }
 
-static void ram_close_lock(Lock *lock)
+static void ram_close_lock_i(Lock *lock)
 {
     free(lock->name);
     free(lock);
@@ -413,22 +413,22 @@ Store *open_ram_store()
 {
     Store *new_store = store_new();
 
-    new_store->dir.ht = h_new_str(NULL, rf_close);
-    new_store->touch = &ram_touch;
-    new_store->exists = &ram_exists;
-    new_store->remove = &ram_remove;
-    new_store->rename = &ram_rename;
-    new_store->count = &ram_count;
-    new_store->clear = &ram_clear;
-    new_store->clear_all = &ram_clear_all;
-    new_store->clear_locks = &ram_clear_locks;
-    new_store->length = &ram_length;
-    new_store->each = &ram_each;
-    new_store->new_output = &ram_new_output;
-    new_store->open_input = &ram_open_input;
-    new_store->open_lock = &ram_open_lock;
-    new_store->close_lock = &ram_close_lock;
-    new_store->close_i = &ram_close_i;
+    new_store->dir.ht       = h_new_str(NULL, rf_close);
+    new_store->touch        = &ram_touch;
+    new_store->exists       = &ram_exists;
+    new_store->remove       = &ram_remove;
+    new_store->rename       = &ram_rename;
+    new_store->count        = &ram_count;
+    new_store->clear        = &ram_clear;
+    new_store->clear_all    = &ram_clear_all;
+    new_store->clear_locks  = &ram_clear_locks;
+    new_store->length       = &ram_length;
+    new_store->each         = &ram_each;
+    new_store->new_output   = &ram_new_output;
+    new_store->open_input   = &ram_open_input;
+    new_store->open_lock_i  = &ram_open_lock_i;
+    new_store->close_lock_i = &ram_close_lock_i;
+    new_store->close_i      = &ram_close_i;
     return new_store;
 }
 

data/ext/search.c

@@ -413,7 +413,7 @@ Query *q_combine(Query **queries, int q_cnt)
     return ret_q;
 }
 
-ulong q_hash(Query *self)
+unsigned long q_hash(Query *self)
 {
     return (self->hash(self) << 5) | self->type;
 }

data/ext/search.h

@@ -99,14 +99,14 @@ extern char *td_to_s(TopDocs *td);
 
 typedef struct Filter
 {
-    char       *name;
-    HashTable  *cache;
-    BitVector  *(*get_bv_i)(struct Filter *self, IndexReader *ir);
-    char       *(*to_s)(struct Filter *self);
-    ulong       (*hash)(struct Filter *self);
-    int         (*eq)(struct Filter *self, struct Filter *o);
-    void        (*destroy_i)(struct Filter *self);
-    int         ref_cnt;
+    char           *name;
+    HashTable      *cache;
+    BitVector      *(*get_bv_i)(struct Filter *self, IndexReader *ir);
+    char           *(*to_s)(struct Filter *self);
+    unsigned long   (*hash)(struct Filter *self);
+    int             (*eq)(struct Filter *self, struct Filter *o);
+    void            (*destroy_i)(struct Filter *self);
+    int             ref_cnt;
 } Filter;
 
 #define filt_new(type) filt_create(sizeof(type), #type)
@@ -114,7 +114,7 @@ extern Filter *filt_create(size_t size, const char *name);
 extern BitVector *filt_get_bv(Filter *filt, IndexReader *ir);
 extern void filt_destroy_i(Filter *filt);
 extern void filt_deref(Filter *filt);
-extern ulong filt_hash(Filter *filt);
+extern unsigned long filt_hash(Filter *filt);
 extern int filt_eq(Filter *filt, Filter *o);
 
 /***************************************************************************
@@ -196,18 +196,18 @@ enum QUERY_TYPE
 
 struct Query
 {
-    int          ref_cnt;
-    float        boost;
-    Weight       *weight;
-    Query       *(*rewrite)(Query *self, IndexReader *ir);
-    void         (*extract_terms)(Query *self, HashSet *terms);
-    Similarity  *(*get_similarity)(Query *self, Searcher *searcher);
-    char        *(*to_s)(Query *self, const char *field);
-    ulong        (*hash)(Query *self);
-    int          (*eq)(Query *self, Query *o);
-    void         (*destroy_i)(Query *self);
-    Weight      *(*create_weight_i)(Query *self, Searcher *searcher);
-    MatchVector *(*get_matchv_i)(Query *self, MatchVector *mv, TermVector *tv);
+    int           ref_cnt;
+    float         boost;
+    Weight        *weight;
+    Query        *(*rewrite)(Query *self, IndexReader *ir);
+    void          (*extract_terms)(Query *self, HashSet *terms);
+    Similarity   *(*get_similarity)(Query *self, Searcher *searcher);
+    char         *(*to_s)(Query *self, const char *field);
+    unsigned long (*hash)(Query *self);
+    int           (*eq)(Query *self, Query *o);
+    void          (*destroy_i)(Query *self);
+    Weight       *(*create_weight_i)(Query *self, Searcher *searcher);
+    MatchVector  *(*get_matchv_i)(Query *self, MatchVector *mv, TermVector *tv);
     enum QUERY_TYPE type;
 };
 
@@ -220,7 +220,7 @@ extern void q_deref(Query *self);
 extern const char *q_get_query_name(enum QUERY_TYPE type);
 extern Weight *q_weight(Query *self, Searcher *searcher);
 extern Query *q_combine(Query **queries, int q_cnt);
-extern ulong q_hash(Query *self);
+extern unsigned long q_hash(Query *self);
 extern int q_eq(Query *self, Query *o);
 extern Query *q_create(size_t size);
 #define q_new(type) q_create(sizeof(type))
@@ -825,9 +825,11 @@ typedef struct QParser
     HashSet *fields_buf;
     HashSet *def_fields;
     HashSet *all_fields;
+    HashSet *tokenized_fields;
     Analyzer *analyzer;
     HashTable *ts_cache;
     Query *result;
+    TokenStream *non_tokenizer;
     bool or_default : 1;
     bool wild_lower : 1;
     bool clean_str : 1;
@@ -837,7 +839,7 @@ typedef struct QParser
 } QParser;
 
 extern QParser *qp_new(HashSet *all_fields, HashSet *def_fields,
-                       Analyzer *analyzer);
+                       HashSet *tokenized_fields, Analyzer *analyzer);
 extern void qp_destroy(QParser *self);
 extern Query *qp_parse(QParser *self, char *qstr);
 extern char *qp_clean_str(char *str);

data/ext/similarity.c

@@ -33,7 +33,7 @@ int term_eq(const void *t1, const void *t2)
         (strcmp(((Term *)t1)->field, ((Term *)t2)->field) == 0);
 }
 
-ulong term_hash(const void *t)
+unsigned long term_hash(const void *t)
 {
     return str_hash(((Term *)t)->text) * str_hash(((Term *)t)->field);
 }

data/ext/sort.c

@@ -8,7 +8,7 @@
  *
  ***************************************************************************/
 
-ulong sort_field_hash(const void *p)
+unsigned long sort_field_hash(const void *p)
 {
     SortField *self = (SortField *)p;
     return str_hash(self->field) ^ (self->type*37);

data/ext/store.c

@@ -22,19 +22,19 @@ void with_lock(Lock *lock, void (*func)(void *arg), void *arg)
 void with_lock_name(Store *store, char *lock_name,
                     void (*func)(void *arg), void *arg)
 {
-    Lock *lock = store->open_lock(store, lock_name);
+    Lock *lock = store->open_lock_i(store, lock_name);
     if (!lock->obtain(lock)) {
         RAISE(LOCK_ERROR, "couldn't obtain lock \"%s\"", lock->name);
     }
     func(arg);
     lock->release(lock);
-    store->close_lock(lock);
+    store->close_lock_i(lock);
 }
 
 void store_deref(Store *store)
 {
     mutex_lock(&store->mutex_i);
-    if (--store->ref_cnt == 0) {
+    if (--store->ref_cnt <= 0) {
         store->close_i(store);
     }
     else {
@@ -42,6 +42,23 @@ void store_deref(Store *store)
     }
 }
 
+Lock *open_lock(Store *store, char *lockname)
+{
+    Lock *lock = store->open_lock_i(store, lockname);
+    hs_add(store->locks, lock);
+    return lock;
+}
+
+void close_lock(Lock *lock)
+{
+    hs_del(lock->store->locks, lock);
+}
+
+void close_lock_i(Lock *lock)
+{
+    lock->store->close_lock_i(lock);
+}
+
 /**
  * Create a store struct initializing the mutex.
  */
@@ -51,6 +68,7 @@ Store *store_new()
     store->ref_cnt = 1;
     mutex_init(&store->mutex_i, NULL);
     mutex_init(&store->mutex, NULL);
+    store->locks = hs_new(ptr_hash, ptr_eq, (free_ft)&close_lock_i);
     return store;
 }
 
@@ -63,6 +81,7 @@ void store_destroy(Store *store)
 {
     mutex_destroy(&store->mutex_i);
     mutex_destroy(&store->mutex);
+    hs_destroy(store->locks);
     free(store);
 }