isomorfeus-ferret 0.12.6 → 0.13.1

data/ext/isomorfeus_ferret_ext/frt_ind.c

@@ -2,37 +2,37 @@
 #include "frt_array.h"
 #include <string.h>
 
+#undef close
+
 static const char *NON_UNIQUE_KEY_ERROR_MSG =
     "Tried to use a key that was not unique";
 
-#define INDEX_CLOSE_READER(self) do { \
-    if (self->sea) {                  \
-        frt_searcher_close(self->sea);    \
-        self->sea = NULL;             \
-        self->ir = NULL;              \
-    } else if (self->ir) {            \
-        frt_ir_close(self->ir);           \
-        self->ir = NULL;              \
-    }                                 \
+#define INDEX_CLOSE_READER(self) do {  \
+    if (self->sea) {                   \
+        frt_searcher_close(self->sea); \
+        self->sea = NULL;              \
+        self->ir = NULL;               \
+    } else if (self->ir) {             \
+        frt_ir_close(self->ir);        \
+        self->ir = NULL;               \
+    }                                  \
 } while (0)
 
-#define AUTOFLUSH_IR(self) do {                 \
+#define AUTOFLUSH_IR(self) do {                     \
      if (self->auto_flush) frt_ir_commit(self->ir); \
-    else self->has_writes = true;               \
+    else self->has_writes = true;                   \
 } while(0)
 
 #define AUTOFLUSH_IW(self) do {  \
     if (self->auto_flush) {      \
-        frt_iw_close(self->iw);      \
+        frt_iw_close(self->iw);  \
         self->iw = NULL;         \
     } else {                     \
         self->has_writes = true; \
     }                            \
 } while (0)
 
-FrtIndex *frt_index_new(FrtStore *store, FrtAnalyzer *analyzer, FrtHashSet *def_fields,
-                 bool create)
-{
+FrtIndex *frt_index_new(FrtStore *store, FrtAnalyzer *analyzer, FrtHashSet *def_fields, bool create) {
     FrtIndex *self = FRT_ALLOC_AND_ZERO(FrtIndex);
     FrtHashSetEntry *hse;
     /* FIXME: need to add these to the query parser */
@@ -43,18 +43,18 @@ FrtIndex *frt_index_new(FrtStore *store, FrtAnalyzer *analyzer, FrtHashSet *def_
         FRT_REF(store);
         self->store = store;
     } else {
-        self->store = frt_open_ram_store();
+        self->store = frt_open_ram_store(NULL);
         create = true;
     }
     if (analyzer) {
         self->analyzer = analyzer;
         FRT_REF(analyzer);
     } else {
-        self->analyzer = frt_mb_standard_analyzer_new(true);
+        self->analyzer = frt_standard_analyzer_new(true);
     }
 
     if (create) {
-        FrtFieldInfos *fis = frt_fis_new(FRT_STORE_YES, FRT_INDEX_YES, FRT_TERM_VECTOR_WITH_POSITIONS_OFFSETS);
+        FrtFieldInfos *fis = frt_fis_new(FRT_STORE_YES, FRT_COMPRESSION_NONE, FRT_INDEX_YES, FRT_TERM_VECTOR_WITH_POSITIONS_OFFSETS);
         frt_index_create(self->store, fis);
         frt_fis_deref(fis);
     }
@@ -69,7 +69,7 @@ FrtIndex *frt_index_new(FrtStore *store, FrtAnalyzer *analyzer, FrtHashSet *def_
     FRT_REF(self->analyzer);
     self->qp = frt_qp_new(self->analyzer);
     for (hse = def_fields->first; hse; hse = hse->next) {
-        frt_qp_add_field(self->qp, (FrtSymbol)hse->elem, true, true);
+        frt_qp_add_field(self->qp, (ID)hse->elem, true, true);
     }
     /* Index is a convenience class so set qp convenience options */
     self->qp->allow_any_fields = true;
@@ -99,7 +99,7 @@ void frt_ensure_writer_open(FrtIndex *self)
 
         /* make sure the analzyer isn't deleted by the FrtIndexWriter */
         FRT_REF(self->analyzer);
-        self->iw = frt_iw_open(self->store, self->analyzer, false);
+        self->iw = frt_iw_open(NULL, self->store, self->analyzer, false);
         self->iw->config.use_compound_file = self->config.use_compound_file;
     }
 }
@@ -109,7 +109,7 @@ void frt_ensure_reader_open(FrtIndex *self)
     if (self->ir) {
         if (self->check_latest && !frt_ir_is_latest(self->ir)) {
             INDEX_CLOSE_READER(self);
-            self->ir = frt_ir_open(self->store);
+            self->ir = frt_ir_open(NULL, self->store);
         }
         return;
     }
@@ -117,7 +117,7 @@ void frt_ensure_reader_open(FrtIndex *self)
         frt_iw_close(self->iw);
         self->iw = NULL;
     }
-    self->ir = frt_ir_open(self->store);
+    self->ir = frt_ir_open(NULL, self->store);
 }
 
 void frt_ensure_searcher_open(FrtIndex *self)
@@ -172,7 +172,7 @@ static void index_del_doc_with_key_i(FrtIndex *self, FrtDocument *doc,
     FrtHashSetEntry *hse;
 
     if (key->size == 1) {
-        FrtSymbol field = (FrtSymbol)key->first->elem;
+        ID field = (ID)key->first->elem;
         frt_ensure_writer_open(self);
         df = frt_doc_get_field(doc, field);
         if (df) {
@@ -185,7 +185,7 @@ static void index_del_doc_with_key_i(FrtIndex *self, FrtDocument *doc,
     frt_ensure_searcher_open(self);
 
     for (hse = key->first; hse; hse = hse->next) {
-        FrtSymbol field = (FrtSymbol)hse->elem;
+        ID field = (ID)hse->elem;
         df = frt_doc_get_field(doc, field);
         if (!df) continue;
         frt_bq_add_query(q, frt_tq_new(field, df->data[0]), FRT_BC_MUST);
@@ -220,7 +220,7 @@ void frt_index_add_doc(FrtIndex *self, FrtDocument *doc)
     frt_mutex_unlock(&self->mutex);
 }
 
-FrtQuery *frt_index_get_query(FrtIndex *self, char *qstr)
+FrtQuery *frt_index_get_query(FrtIndex *self, char *qstr, rb_encoding *encoding)
 {
     int i;
     FrtFieldInfos *fis;
@@ -229,16 +229,16 @@ FrtQuery *frt_index_get_query(FrtIndex *self, char *qstr)
     for (i = fis->size - 1; i >= 0; i--) {
         frt_hs_add(self->qp->all_fields, (void *)fis->fields[i]->name);
     }
-    return qp_parse(self->qp, qstr);
+    return qp_parse(self->qp, qstr, encoding);
 }
 
 FrtTopDocs *frt_index_search_str(FrtIndex *self, char *qstr, int first_doc,
                           int num_docs, FrtFilter *filter, FrtSort *sort,
-                          FrtPostFilter *post_filter)
+                          FrtPostFilter *post_filter, rb_encoding *encoding)
 {
     FrtQuery *query;
     FrtTopDocs *td;
-    query = frt_index_get_query(self, qstr); /* will ensure_searcher is open */
+    query = frt_index_get_query(self, qstr, encoding); /* will ensure_searcher is open */
     td = frt_searcher_search(self->sea, query, first_doc, num_docs,
                          filter, sort, post_filter);
     frt_q_deref(query);
@@ -264,9 +264,7 @@ FrtDocument *frt_index_get_doc_ts(FrtIndex *self, int doc_num)
     return doc;
 }
 
-FrtDocument *frt_index_get_doc_term(FrtIndex *self, FrtSymbol field,
-                             const char *term)
-{
+FrtDocument *frt_index_get_doc_term(FrtIndex *self, ID field, const char *term) {
     FrtDocument *doc = NULL;
     FrtTermDocEnum *tde;
     frt_mutex_lock(&self->mutex);
@@ -298,8 +296,7 @@ void frt_index_delete(FrtIndex *self, int doc_num)
     frt_mutex_unlock(&self->mutex);
 }
 
-void frt_index_delete_term(FrtIndex *self, FrtSymbol field, const char *term)
-{
+void frt_index_delete_term(FrtIndex *self, ID field, const char *term) {
     FrtTermDocEnum *tde;
     frt_mutex_lock(&self->mutex);
     {
@@ -345,9 +342,9 @@ void frt_index_delete_query(FrtIndex *self, FrtQuery *q, FrtFilter *f,
 }
 
 void frt_index_delete_query_str(FrtIndex *self, char *qstr, FrtFilter *f,
-                            FrtPostFilter *post_filter)
+                            FrtPostFilter *post_filter, rb_encoding *encoding)
 {
-    FrtQuery *q = frt_index_get_query(self, qstr);
+    FrtQuery *q = frt_index_get_query(self, qstr, encoding);
     frt_index_delete_query(self, q, f, post_filter);
     frt_q_deref(q);
 }

data/ext/isomorfeus_ferret_ext/frt_ind.h

@@ -3,6 +3,7 @@
 
 #include "frt_search.h"
 #include "frt_index.h"
+#include <ruby/encoding.h>
 
 /***************************************************************************
  *
@@ -10,8 +11,7 @@
  *
  ***************************************************************************/
 
-typedef struct FrtIndex
-{
+typedef struct FrtIndex {
     FrtConfig config;
     frt_mutex_t mutex;
     FrtStore *store;
@@ -21,8 +21,8 @@ typedef struct FrtIndex
     FrtSearcher *sea;
     FrtQParser *qp;
     FrtHashSet *key;
-    FrtSymbol id_field;
-    FrtSymbol def_field;
+    ID id_field;
+    ID def_field;
     /* for FrtIndexWriter */
     bool auto_flush : 1;
     bool has_writes : 1;
@@ -35,17 +35,17 @@ extern int frt_index_size(FrtIndex *self);
 extern void frt_index_optimize(FrtIndex *self);
 extern bool frt_index_is_deleted(FrtIndex *self, int doc_num);
 extern void frt_index_add_doc(FrtIndex *self, FrtDocument *doc);
-extern FrtTopDocs *frt_index_search_str(FrtIndex *self, char *query, int first_doc, int num_docs, FrtFilter *filter, FrtSort *sort, FrtPostFilter *post_filter);
-extern FrtQuery *frt_index_get_query(FrtIndex *self, char *qstr);
+extern FrtTopDocs *frt_index_search_str(FrtIndex *self, char *query, int first_doc, int num_docs, FrtFilter *filter, FrtSort *sort, FrtPostFilter *post_filter, rb_encoding *encoding);
+extern FrtQuery *frt_index_get_query(FrtIndex *self, char *qstr, rb_encoding *encoding);
 extern FrtDocument *frt_index_get_doc(FrtIndex *self, int doc_num);
 extern FrtDocument *frt_index_get_doc_ts(FrtIndex *self, int doc_num);
 extern FrtDocument *frt_index_get_doc_id(FrtIndex *self, const char *id);
-extern FrtDocument *frt_index_get_doc_term(FrtIndex *self, FrtSymbol field, const char *term);
+extern FrtDocument *frt_index_get_doc_term(FrtIndex *self, ID field, const char *term);
 extern void frt_index_delete(FrtIndex *self, int doc_num);
-extern void frt_index_delete_term(FrtIndex *self, FrtSymbol field, const char *term);
+extern void frt_index_delete_term(FrtIndex *self, ID field, const char *term);
 extern void frt_index_delete_id(FrtIndex *self, const char *id);
 extern void frt_index_delete_query(FrtIndex *self, FrtQuery *q, FrtFilter *f, FrtPostFilter *pf);
-extern void frt_index_delete_query_str(FrtIndex *self, char *qstr,FrtFilter *f, FrtPostFilter *pf);
+extern void frt_index_delete_query_str(FrtIndex *self, char *qstr,FrtFilter *f, FrtPostFilter *pf, rb_encoding *encoding);
 
 extern void frt_ensure_searcher_open(FrtIndex *self);
 extern void frt_ensure_reader_open(FrtIndex *self);