ferret 0.10.3 → 0.10.4

data/Rakefile

@@ -96,6 +96,7 @@ EXT_SRC.each do |fn|
   dest_fn = File.join("ext", File.basename(fn))
   file dest_fn => fn do |t|
     begin
+      raise "copy for release" if ENV["REL"]
       ln_s File.join("..", fn), dest_fn
     rescue Exception => e
       cp File.expand_path(fn), dest_fn

data/ext/q_multi_term.c

@@ -290,7 +290,7 @@ static void multi_tsc_destroy(Scorer *self)
         tdew_destroy(tdew_a[i]);
     }
     free(tdew_a);
-    pq_destroy(MTSc(self)->tdew_pq);
+    if (MTSc(self)->tdew_pq) pq_destroy(MTSc(self)->tdew_pq);
     scorer_destroy_i(self);
 }
 

data/lib/ferret_version.rb

@@ -1,3 +1,3 @@
 module Ferret
-  VERSION = '0.10.3'
+  VERSION = '0.10.4'
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ferret
 version: !ruby/object:Gem::Version 
-  version: 0.10.3
+  version: 0.10.4
 date: 2006-09-09 00:00:00 +09:00
 summary: Ruby indexing library.
 require_paths: 
@@ -69,7 +69,6 @@ files:
 - ext/q_multi_term.c
 - ext/q_parser.c
 - ext/q_span.c
-- ext/ind.c
 - ext/term_vectors.c
 - ext/priorityqueue.h
 - ext/defines.h
@@ -90,7 +89,6 @@ files:
 - ext/search.h
 - ext/mem_pool.h
 - ext/array.h
-- ext/ind.h
 - ext/lang.h
 - ext/stem_UTF_8_norwegian.c
 - ext/stem_UTF_8_danish.c

data/ext/ind.c

@@ -1,418 +0,0 @@
-#include "ind.h"
-#include "array.h"
-#include <string.h>
-
-
-static char * const NON_UNIQUE_KEY_ERROR_MSG = "Tried to use a key that was not unique";
-
-static const char *ID_STRING = "id";
-
-#define INDEX_CLOSE_READER(self) do {\
-    if (self->sea) {\
-        searcher_close(self->sea);\
-        self->sea = NULL;\
-        self->ir = NULL;\
-    } else if (self->ir) {\
-        ir_close(self->ir);\
-        self->ir = NULL;\
-    }\
-} while (0)
-
-#define AUTOFLUSH_IR if (self->auto_flush) ir_commit(self->ir);\
-    else self->has_writes = true
-
-#define AUTOFLUSH_IW \
-    if (self->auto_flush) {\
-        iw_close(self->iw);\
-        self->iw = NULL;\
-    } else self->has_writes = true
-
-void index_auto_flush_ir(Index *self)
-{
-    AUTOFLUSH_IR;
-}
-
-void index_auto_flush_iw(Index *self)
-{
-    AUTOFLUSH_IW;
-}
-
-Index *index_new(Store *store, Analyzer *analyzer, HashSet *def_fields,
-                 bool create)
-{
-    HashSet *all_fields = hs_new_str(&free);
-    Index *self = ALLOC_AND_ZERO(Index);
-    self->config = default_config;
-    mutex_init(&self->mutex, NULL);
-    self->has_writes = false;
-    if (store) {
-        self->store = store;
-        REF(store);
-    } else {
-        self->store = open_ram_store();
-        create = true;
-    }
-    if (analyzer) {
-        self->analyzer = analyzer;
-        REF(analyzer);
-    } else {
-        self->analyzer = mb_standard_analyzer_new(true);
-    }
-
-    if (create) {
-        FieldInfos *fis = fis_new(STORE_YES, INDEX_YES,
-                                  TERM_VECTOR_WITH_POSITIONS_OFFSETS);
-        index_create(store, fis);
-        fis_deref(fis);
-    }
-
-    /* options */
-    self->key = NULL;
-    self->id_field = estrdup(ID_STRING);
-    self->def_field = estrdup(ID_STRING);
-    self->auto_flush = false;
-    self->check_latest = true;
-
-    REF(self->analyzer);
-    self->qp = qp_new(all_fields, def_fields, self->analyzer);
-    /* Index is a convenience class so set qp convenience options */
-    self->qp->allow_any_fields = true;
-    self->qp->clean_str = true;
-    self->qp->handle_parse_errors = true;
-
-    return self;
-}
-
-void index_destroy(Index *self)
-{
-    mutex_destroy(&self->mutex);
-    INDEX_CLOSE_READER(self);
-    if (self->iw) iw_close(self->iw);
-    store_deref(self->store);
-    a_deref(self->analyzer);
-    if (self->qp) qp_destroy(self->qp);
-    if (self->key) hs_destroy(self->key);
-    free(self->id_field);
-    free(self->def_field);
-    free(self);
-}
-
-void index_flush(Index *self)
-{
-    if (self->ir) {
-        ir_commit(self->ir);
-    } else if (self->iw) {
-        iw_close(self->iw);
-        self->iw = NULL;
-    }
-    self->has_writes = false;
-}
-
-__inline void ensure_writer_open(Index *self)
-{
-    if (!self->iw) {
-        INDEX_CLOSE_READER(self);
-
-        /* make sure the analzyer isn't deleted by the IndexWriter */
-        REF(self->analyzer);
-        self->iw = iw_open(self->store, self->analyzer, false);
-        self->iw->config.use_compound_file = self->config.use_compound_file;
-    } else if (self->analyzer != self->iw->analyzer) {
-        a_deref(self->iw->analyzer);
-        REF(self->analyzer);
-        self->iw->analyzer = self->analyzer; /* in case it has changed */
-    }
-}
-
-__inline void ensure_reader_open(Index *self)
-{
-    if (self->ir) {
-        if (self->check_latest && !ir_is_latest(self->ir)) {
-            INDEX_CLOSE_READER(self);
-            self->ir = ir_open(self->store);
-        }
-    } else {
-        if (self->iw) {
-            iw_close(self->iw);
-            self->iw = NULL;
-        }
-        self->ir = ir_open(self->store);
-    }
-}
-
-__inline void ensure_searcher_open(Index *self)
-{
-    ensure_reader_open(self);
-    if (!self->sea) {
-        self->sea = isea_new(self->ir);
-    }
-}
-
-int index_size(Index *self)
-{
-    int size;
-    mutex_lock(&self->mutex);
-    ensure_reader_open(self);
-    size = self->ir->num_docs(self->ir);
-    mutex_unlock(&self->mutex);
-    return size;
-}
-
-void index_optimize(Index *self)
-{
-    mutex_lock(&self->mutex);
-    ensure_writer_open(self);
-    iw_optimize(self->iw);
-    AUTOFLUSH_IW;
-    mutex_unlock(&self->mutex);
-}
-
-bool index_has_del(Index *self)
-{
-    bool has_del;
-    mutex_lock(&self->mutex);
-    ensure_reader_open(self);
-    has_del = self->ir->has_deletions(self->ir);
-    mutex_unlock(&self->mutex);
-    return has_del;
-}
-
-bool index_is_deleted(Index *self, int doc_num)
-{
-    bool is_del;
-    mutex_lock(&self->mutex);
-    ensure_reader_open(self);
-    is_del = self->ir->is_deleted(self->ir, doc_num);
-    mutex_unlock(&self->mutex);
-    return is_del;
-}
-
-static __inline void index_add_doc_i(Index *self, Document *doc)
-{
-    /* If there is a key specified delete the document with the same key */
-    if (self->key) {
-        int i;
-        char *field;
-        DocField *df;
-        if (self->key->size == 1) {
-            ensure_writer_open(self);
-            field = self->key->elems[0];
-            df = doc_get_field(doc, field);
-            if (df) {
-                iw_delete_term(self->iw, field, df->data[0]);
-            }
-        } else {
-            Query *q = bq_new(false);
-            TopDocs *td;
-            ensure_searcher_open(self);
-            for (i = 0; i < self->key->size; i++) {
-                field = self->key->elems[i];
-                df = doc_get_field(doc, field);
-                if (!df) continue;
-                bq_add_query(q, tq_new(field, df->data[0]), BC_MUST);
-            }
-            td = searcher_search(self->sea, q, 0, 1, NULL, NULL, NULL);
-            if (td->total_hits > 1) {
-                td_destroy(td);
-                RAISE(ARG_ERROR, NON_UNIQUE_KEY_ERROR_MSG);
-            } else if (td->total_hits == 1) {
-                ir_delete_doc(self->ir, td->hits[0]->doc);
-            }
-            q_deref(q);
-            td_destroy(td);
-        }
-    }
-    ensure_writer_open(self);
-    iw_add_doc(self->iw, doc);
-    AUTOFLUSH_IW;
-}
-
-void index_add_doc_a(Index *self, Document *doc, Analyzer *analyzer)
-{
-    Analyzer *tmp_analyzer;
-    mutex_lock(&self->mutex);
-    if (analyzer != self->analyzer) {
-        REF(analyzer);
-        tmp_analyzer = self->analyzer;
-        self->analyzer = analyzer;
-        index_add_doc_i(self, doc);
-        self->analyzer = tmp_analyzer;
-        a_deref(analyzer);
-    } else {
-        index_add_doc_i(self, doc);
-    }
-    mutex_unlock(&self->mutex);
-}
-
-void index_add_doc(Index *self, Document *doc)
-{
-    mutex_lock(&self->mutex);
-    index_add_doc_i(self, doc);
-    mutex_unlock(&self->mutex);
-}
-
-void index_add_string(Index *self, char *str, Analyzer *analyzer)
-{
-    Document *doc = doc_new();
-    doc_add_field(doc, df_add_data(df_new(self->def_field), estrdup(str)));
-    if (analyzer) index_add_doc_a(self, doc, analyzer);
-    else index_add_doc(self, doc);
-    doc_destroy(doc);
-}
-
-void index_add_array(Index *self, char **fields, Analyzer *analyzer)
-{
-    int i;
-    Document *doc = doc_new();
-    for (i = 0; i < ary_size(fields); i++) {
-        doc_add_field(doc, df_add_data(df_new(self->def_field),
-                                       estrdup(fields[i])));
-    }
-    if (analyzer) index_add_doc_a(self, doc, analyzer);
-    else index_add_doc(self, doc);
-    doc_destroy(doc);
-}
-
-Query *index_get_query(Index *self, char *qstr)
-{
-    int i;
-    FieldInfos *fis;
-    ensure_searcher_open(self);
-    fis = self->ir->fis;
-    for (i = fis->size - 1; i >= 0; i--) {
-        char *field = fis->fields[i]->name;
-        hs_add(self->qp->all_fields, estrdup(field));
-    }
-    return qp_parse(self->qp, qstr);
-}
-
-TopDocs *index_search_str(Index *self, char *qstr, int first_doc,
-                          int num_docs, Filter *filter, Sort *sort,
-                          filter_ft filter_func)
-{
-    Query *query;
-    TopDocs *td;
-    query = index_get_query(self, qstr); /* will ensure_searcher is open */
-    td = searcher_search(self->sea, query, first_doc, num_docs,
-                         filter, sort, filter_func);
-    q_deref(query);
-    return td;
-}
-
-Document *index_get_doc(Index *self, int doc_num)
-{
-    Document *doc;
-    ensure_reader_open(self);
-    doc = self->ir->get_doc(self->ir, doc_num);
-    return doc;
-}
-
-Document *index_get_doc_ts(Index *self, int doc_num)
-{
-    Document *doc;
-    mutex_lock(&self->mutex);
-    doc = index_get_doc(self, doc_num);
-    mutex_unlock(&self->mutex);
-    return doc;
-}
-
-int index_term_id(Index *self, const char *field, const char *term)
-{
-    TermDocEnum *tde;
-    int doc_num = -1;
-    ensure_reader_open(self);
-    tde = ir_term_docs_for(self->ir, field, term);
-    if (tde->next(tde)) {
-        doc_num = tde->doc_num(tde);
-    }
-    tde->close(tde);
-    return doc_num;
-}
-
-Document *index_get_doc_term(Index *self, const char *field,
-                             const char *term)
-{
-    Document *doc = NULL;
-    TermDocEnum *tde;
-    mutex_lock(&self->mutex);
-    ensure_reader_open(self);
-    tde = ir_term_docs_for(self->ir, field, term);
-    if (tde->next(tde)) {
-        doc = index_get_doc(self, tde->doc_num(tde));
-    }
-    tde->close(tde);
-    mutex_unlock(&self->mutex);
-    return doc;
-}
-
-Document *index_get_doc_id(Index *self, const char *id)
-{
-    return index_get_doc_term(self, self->id_field, id);
-}
-
-void index_delete(Index *self, int doc_num)
-{
-    mutex_lock(&self->mutex);
-    ensure_reader_open(self);
-    ir_delete_doc(self->ir, doc_num);
-    AUTOFLUSH_IR;
-    mutex_unlock(&self->mutex);
-}
-
-void index_delete_term(Index *self, const char *field, const char *term)
-{
-    TermDocEnum *tde;
-    mutex_lock(&self->mutex);
-    if (self->ir) {
-        tde = ir_term_docs_for(self->ir, field, term);
-        TRY
-            while (tde->next(tde)) {
-                ir_delete_doc(self->ir, tde->doc_num(tde));
-                AUTOFLUSH_IR;
-            }
-        XFINALLY
-            tde->close(tde);
-        XENDTRY
-    } else {
-        ensure_writer_open(self);
-        iw_delete_term(self->iw, field, term);
-    }
-    mutex_unlock(&self->mutex);
-}
-
-void index_delete_id(Index *self, const char *id)
-{
-    index_delete_term(self, self->id_field, id);
-}
-
-static void index_qdel_i(Searcher *sea, int doc_num, float score, void *arg)
-{
-    (void)score; (void)arg;
-    ir_delete_doc(((IndexSearcher *)sea)->ir, doc_num);
-}
-
-void index_delete_query(Index *self, Query *q, Filter *f, filter_ft ff)
-{
-    mutex_lock(&self->mutex);
-    ensure_searcher_open(self);
-    searcher_search_each(self->sea, q, f, ff, &index_qdel_i, NULL);
-    AUTOFLUSH_IR;
-    mutex_unlock(&self->mutex);
-}
-
-void index_delete_query_str(Index *self, char *qstr, Filter *f, filter_ft ff)
-{
-    Query *q = index_get_query(self, qstr);
-    index_delete_query(self, q, f, ff);
-    q_deref(q);
-}
-
-Explanation *index_explain(Index *self, Query *q, int doc_num)
-{
-    Explanation *expl;
-    mutex_lock(&self->mutex);
-    ensure_searcher_open(self);
-    expl = searcher_explain(self->sea, q, doc_num);
-    mutex_unlock(&self->mutex);
-    return expl;
-}

data/ext/ind.h

@@ -1,68 +0,0 @@
-#ifndef FRT_IND_H
-#define FRT_IND_H
-
-#include "search.h"
-#include "index.h"
-
-/***************************************************************************
- *
- * Index
- *
- ***************************************************************************/
-
-typedef struct Index
-{
-    Config config;
-    mutex_t mutex;
-    Store *store;
-    Analyzer *analyzer;
-    IndexReader *ir;
-    IndexWriter *iw;
-    Searcher *sea;
-    QParser *qp;
-    HashSet *key;
-    char *id_field;
-    char *def_field;
-    /* for IndexWriter */
-    bool auto_flush : 1;
-    bool has_writes : 1;
-    bool check_latest : 1;
-} Index;
-
-extern Index *index_new(Store *store, Analyzer *analyzer,
-                        HashSet *def_fields, bool create);
-extern void index_destroy(Index *self);
-extern void index_flush(Index *self);
-extern int index_size(Index *self);
-extern void index_optimize(Index *self);
-extern bool index_has_del(Index *self);
-extern bool index_is_deleted(Index *self, int doc_num);
-extern void index_add_doc(Index *self, Document *doc);
-extern void index_add_doc_a(Index *self, Document *doc, Analyzer *analyzer);
-extern void index_add_string(Index *self, char *str, Analyzer *analyzer);
-extern void index_add_array(Index *self, char **ary, Analyzer *analyzer);
-extern TopDocs *index_search_str(Index *self, char *query, int first_doc,
-                                 int num_docs, Filter *filter,
-                                 Sort *sort, filter_ft filter_func);
-extern Query *index_get_query(Index *self, char *qstr);
-extern Document *index_get_doc(Index *self, int doc_num);
-extern Document *index_get_doc_ts(Index *self, int doc_num);
-extern Document *index_get_doc_id(Index *self, const char *id);
-extern Document *index_get_doc_term(Index *self, const char *field,
-                                    const char *term);
-extern void index_delete(Index *self, int doc_num);
-extern void index_delete_term(Index *self, const char *field, const char *term);
-extern void index_delete_id(Index *self, const char *id);
-extern void index_delete_query(Index *self, Query *q, Filter *f, filter_ft ff);
-extern void index_delete_query_str(Index *self, char *qstr,
-                                   Filter *f, filter_ft ff);
-extern int index_term_id(Index *self, const char *field, const char *term);
-extern Explanation *index_explain(Index *self, Query *q, int doc_num);
-extern void index_auto_flush_ir(Index *self);
-extern void index_auto_flush_iw(Index *self);
-
-extern __inline void ensure_searcher_open(Index *self);
-extern __inline void ensure_reader_open(Index *self);
-extern __inline void ensure_writer_open(Index *self);
-
-#endif