ferret 0.9.1 → 0.9.2

data/ext/except.h

@@ -7,7 +7,6 @@
 #define BODY 0
 #define FINALLY -1
 #define EXCEPTION 1
-#define ERROR 1
 #define IO_ERROR 2
 #define ARG_ERROR 3
 #define EOF_ERROR 4
@@ -29,35 +28,38 @@ RUBY_EXTERN int rb_thread_critical;
 extern xcontext_t *xtop_context;
 
 #define TRY\
-  xcontext_t xcontext;\
-  rb_thread_critical = Qtrue;\
-  xcontext.next = xtop_context;\
-  xtop_context = &xcontext;\
-  xcontext.handled = true;\
-  xcontext.in_finally = false;\
-  switch (setjmp(xcontext.jbuf)) {\
-    case BODY:
+  do {\
+    xcontext_t xcontext;\
+    rb_thread_critical = Qtrue;\
+    xcontext.next = xtop_context;\
+    xtop_context = &xcontext;\
+    xcontext.handled = true;\
+    xcontext.in_finally = false;\
+    switch (setjmp(xcontext.jbuf)) {\
+      case BODY:
 
 
 #define XENDTRY\
-  }\
-  xtop_context = xcontext.next;\
-  if (!xcontext.handled) {\
-    RAISE(xcontext.excode, xcontext.msg);\
-  }\
-  rb_thread_critical = 0;
-
-#define ENDTRY\
-  }\
-  if (!xcontext.in_finally) {\
+    }\
     xtop_context = xcontext.next;\
     if (!xcontext.handled) {\
       RAISE(xcontext.excode, xcontext.msg);\
     }\
-    xcontext.in_finally = 1;\
-    longjmp(xcontext.jbuf, FINALLY);\
-  }\
-  rb_thread_critical = 0;
+    rb_thread_critical = 0;\
+  } while (0);
+
+#define ENDTRY\
+    }\
+    if (!xcontext.in_finally) {\
+      xtop_context = xcontext.next;\
+      if (!xcontext.handled) {\
+        RAISE(xcontext.excode, xcontext.msg);\
+      }\
+      xcontext.in_finally = 1;\
+      longjmp(xcontext.jbuf, FINALLY);\
+    }\
+    rb_thread_critical = 0;\
+  } while (0);
 
 #define XFINALLY default: xcontext.in_finally = 1;
 

data/ext/extconf.rb

@@ -11,5 +11,6 @@ if (/mswin/ =~ RUBY_PLATFORM) and ENV['make'].nil?
   end
 else
   require 'mkmf'
+  $CFLAGS += " -fno-common"
   create_makefile("ferret_ext")
 end

data/ext/ferret.c

@@ -7,6 +7,7 @@ static HshTable *object_map;
 
 /* IDs */
 ID id_new;
+ID id_call;
 
 /* Modules */
 VALUE mFerret;
@@ -48,30 +49,30 @@ object_get(void *key)
 //static int hash_cnt = 0;
 void
 //object_add(void *key, VALUE obj)
-object_add2(void *key, VALUE obj, const char *file, int line, const char *func)
+object_add2(void *key, VALUE obj, const char *file, int line)
 {
   if (h_get(object_map, key))
-    printf("failed adding %d. %s:%d:%s\n", (int)key, file, line, func);
-  //printf("adding %d. now contains %d %s:%d:%s\n", (int)key, ++hash_cnt, file, line, func);
+    printf("failed adding %d. %s:%d\n", (int)key, file, line);
+  //printf("adding %d. now contains %d %s:%d\n", (int)key, ++hash_cnt, file, line);
   h_set(object_map, key, (void *)obj);
 }
 
 void
 //object_set(void *key, VALUE obj)
-object_set2(void *key, VALUE obj, const char *file, int line, const char *func)
+object_set2(void *key, VALUE obj, const char *file, int line)
 {
   //if (!h_get(object_map, key))
-    //printf("seting %d. now contains %d %s:%d:%s\n", (int)key, ++hash_cnt, file, line, func);
+    //printf("seting %d. now contains %d %s:%d\n", (int)key, ++hash_cnt, file, line);
   h_set(object_map, key, (void *)obj);
 }
 
 void
 //object_del(void *key)
-object_del2(void *key, const char *file, int line, const char *func)
+object_del2(void *key, const char *file, int line)
 {
   if (object_get(key) == Qnil) 
-    printf("failed deleting %d. %s:%d:%s\n", (int)key, file, line, func);
-  //printf("deleting %d. now contains %d, %s:%d:%s\n", (int)key, --hash_cnt, file, line, func);
+    printf("failed deleting %d. %s:%d\n", (int)key, file, line);
+  //printf("deleting %d. now contains %d, %s:%d\n", (int)key, --hash_cnt, file, line);
   h_del(object_map, key);
 }
 
@@ -136,6 +137,7 @@ Init_ferret_ext(void)
 
   /* IDs */
 	id_new = rb_intern("new");
+	id_call = rb_intern("call");
 
   /* Modules */
   mFerret = rb_define_module("Ferret");

data/ext/ferret.h

@@ -6,6 +6,7 @@
 
 /* IDs */
 extern ID id_new;
+extern ID id_call;
 
 /* Modules */
 extern VALUE mFerret;
@@ -30,14 +31,14 @@ extern void Init_index_io();
 extern void Init_search();
 extern void Init_qparser();
 //extern void object_add(void *key, VALUE obj);
-#define object_add(key, obj) object_add2(key, obj,  __FILE__, __LINE__, __func__)
-extern void object_add2(void *key, VALUE obj, const char *file, int line, const char *func);
+#define object_add(key, obj) object_add2(key, obj,  __FILE__, __LINE__)
+extern void object_add2(void *key, VALUE obj, const char *file, int line);
 //extern void object_set(void *key, VALUE obj);
-#define object_set(key, obj) object_set2(key, obj,  __FILE__, __LINE__, __func__)
-extern void object_set2(void *key, VALUE obj, const char *file, int line, const char *func);
+#define object_set(key, obj) object_set2(key, obj,  __FILE__, __LINE__)
+extern void object_set2(void *key, VALUE obj, const char *file, int line);
 //extern void object_del(void *key);
-#define object_del(key) object_del2(key,  __FILE__, __LINE__, __func__)
-extern void object_del2(void *key, const char *file, int line, const char *func);
+#define object_del(key) object_del2(key,  __FILE__, __LINE__)
+extern void object_del2(void *key, const char *file, int line);
 extern void frt_gc_mark(void *key);
 extern VALUE object_get(void *key);
 extern VALUE frt_data_alloc(VALUE klass);
@@ -51,8 +52,8 @@ extern void frt_deref_free(void *p);
 #define Frt_Wrap_Struct(self,mmark,mfree,mdata)\
   do {\
     ((struct RData *)(self))->data = mdata;\
-    ((struct RData *)(self))->dmark = mmark;\
-    ((struct RData *)(self))->dfree = mfree;\
+    ((struct RData *)(self))->dmark = (RUBY_DATA_FUNC)mmark;\
+    ((struct RData *)(self))->dfree = (RUBY_DATA_FUNC)mfree;\
   } while (0)
 
 #define Frt_Unwrap_Struct(self)\

data/ext/field.c

@@ -1,4 +1,4 @@
-#include <index.h>
+#include "index.h"
 #include <string.h>
 
 /****************************************************************************
@@ -21,9 +21,8 @@ FieldInfo *fi_create(char *name, int number, bool is_indexed,
   return fi;
 }
 
-void fi_destroy(void *p)
+void fi_destroy(FieldInfo *fi)
 {
-  FieldInfo *fi = (FieldInfo *)p;
   free(fi->name);
   free(fi);
 }
@@ -55,10 +54,9 @@ FieldInfos *fis_open(Store *store, char *filename)
   return fis;
 }
 
-void fis_destroy(void *p)
+void fis_destroy(FieldInfos *fis)
 {
   int i;
-  FieldInfos *fis = (FieldInfos *)p;
   for (i = 0; i < fis->fcnt; i++) {
     fi_destroy(fis->by_number[i]);
   }
@@ -130,11 +128,11 @@ FieldInfo *fis_get_fi(FieldInfos *fis, char *name)
   return (FieldInfo *)ht_get(fis->by_name, name);
 }
 
-unsigned long long fis_get_number(FieldInfos *fis, char *name)
+ullong fis_get_number(FieldInfos *fis, char *name)
 {
   FieldInfo *fi = (FieldInfo *)ht_get(fis->by_name, name);
   if (fi == NULL)
-    return 0xFFFFFFFFull; // to be compatible with Jave version
+    return NOT_A_FIELD;
   else
     return fi->number;
 }
@@ -166,9 +164,11 @@ void fis_write(FieldInfos *fis, Store *store, char *segment, char *ext)
   int i;
   FieldInfo *fi;
   char fname[SEGMENT_NAME_MAX_LENGTH];
+  OutStream *os;
+  
   strcpy(fname, segment);
   strcat(fname, ext);
-  OutStream *os = store->create_output(store, fname);
+  os = store->create_output(store, fname);
   TRY
     os_write_vint(os, fis->fcnt);
     for (i = 0; i < fis->fcnt; i++) {
@@ -183,7 +183,7 @@ void fis_write(FieldInfos *fis, Store *store, char *segment, char *ext)
 
 FieldInfos *fis_read(FieldInfos *fis, InStream *is)
 {
-  int i, size = is_read_vint(is); //read in the size
+  int i, size = (int)is_read_vint(is); /* read in the size */
   int bits, is_indexed, store_tv, store_pos, store_offset, omit_norms;
   char *name;
   for (i = 0; i < size; i++) {
@@ -221,11 +221,12 @@ FieldInfos *fis_add_doc(FieldInfos *fis, Document *doc)
 
 FieldsWriter *fw_open(Store *store, char *segment, FieldInfos *fis)
 {
+  FieldsWriter *fw = ALLOC(FieldsWriter);
   char buf[SEGMENT_NAME_MAX_LENGTH];
-  int slen = strlen(segment);
+  int slen = (int)strlen(segment);
+
   strcpy(buf, segment);
 
-  FieldsWriter *fw = ALLOC(FieldsWriter);
   fw->fis = fis;
   strcpy(buf+slen, ".fdt");
   fw->fields_out = store->create_output(store, buf);
@@ -250,12 +251,13 @@ void save_data(OutStream *fout, char *data, int dlen)
 void fw_add_doc(FieldsWriter *fw, Document *doc)
 {
   int i, bits;
-  OutStream *fout = fw->fields_out, *iout = fw->index_out;
-  os_write_long(iout, os_pos(fout));
   DocField *df;
   char *data;
-
   int stored_count = 0;
+  OutStream *fout = fw->fields_out, *iout = fw->index_out;
+
+  os_write_long(iout, os_pos(fout));
+
   for (i = 0; i < doc->dfcnt; i++) {
     if (doc->df_arr[i]->is_stored)
       stored_count++;
@@ -303,16 +305,17 @@ void fw_add_doc(FieldsWriter *fw, Document *doc)
 
 FieldsReader *fr_open(Store *store, char *segment, FieldInfos *fis)
 {
+  FieldsReader *fr = ALLOC(FieldsReader);
+  InStream *iin;
   char buf[100];
-  int slen = strlen(segment);
+  int slen = (int)strlen(segment);
   strcpy(buf, segment);
 
-  FieldsReader *fr = ALLOC(FieldsReader);
   fr->fis = fis;
   strcpy(buf+slen, ".fdt");
   fr->fields_in = store->open_input(store, buf);
   strcpy(buf+slen, ".fdx");
-  InStream *iin = fr->index_in = store->open_input(store, buf);
+  iin = fr->index_in = store->open_input(store, buf);
   fr->len = iin->length_internal(iin)/8;
   return fr;
 }
@@ -327,21 +330,22 @@ void fr_close(FieldsReader *fr)
 Document *fr_get_doc(FieldsReader *fr, int doc_num)
 {
   int i, bits, dlen;
+  FieldInfo *fi;
   char *data;
   int store, index, stv;
   int is_compressed, is_tokenized, is_binary;
+  int position, field_cnt, field_number;
   Document *doc = doc_create();
   InStream *iin = fr->index_in;
   InStream *fin = fr->fields_in;
+  
   is_seek(iin, doc_num * 8);
-  int position = is_read_long(iin);
+  position = (int)is_read_long(iin);
   is_seek(fin, position);
-  int field_cnt = is_read_vint(fin);
-  int field_number;
-  FieldInfo *fi;
-
+  field_cnt = (int)is_read_vint(fin);
+  
   for (i = 0; i < field_cnt; i++) {
-    field_number = is_read_vint(fin);
+    field_number = (int)is_read_vint(fin);
     fi = fr->fis->by_number[field_number];
 
     bits = is_read_byte(fin);
@@ -351,7 +355,7 @@ Document *fr_get_doc(FieldsReader *fr, int doc_num)
     is_binary = (bits & FIELD_IS_BINARY) != 0;
     
     if (is_binary) {
-      dlen = is_read_vint(fin);
+      dlen = (int)is_read_vint(fin);
       data = ALLOC_N(char, dlen);
       is_read_bytes(fin, (uchar *)data, 0, dlen);
       if (is_compressed) {
@@ -373,7 +377,7 @@ Document *fr_get_doc(FieldsReader *fr, int doc_num)
       data = NULL;
       if (is_compressed) {
         store = DF_STORE_COMPRESS;
-        dlen = is_read_vint(fin);
+        dlen = (int)is_read_vint(fin);
         data = ALLOC_N(char, (dlen + 1));
         data[dlen] = '\0';
         is_read_bytes(fin, (uchar *)data, 0, dlen);

data/ext/filter.c

@@ -1,5 +1,5 @@
-#include <string.h>
 #include "search.h"
+#include <string.h>
 
 /***************************************************************************
  *
@@ -7,9 +7,8 @@
  *
  ***************************************************************************/
 
-void filt_destroy(void *p)
+void filt_destroy(Filter *self)
 {
-  Filter *self = (Filter *)p;
   h_destroy(self->cache);
   free(self->name);
   free(self);
@@ -25,26 +24,51 @@ BitVector *filt_get_bv(Filter *self, IndexReader *ir)
     }
     bv = self->get_bv(self, ir);
     co = co_create(self->cache, ir->cache, self, ir,
-        &bv_destroy, (void *)bv);
+        (free_ft)&bv_destroy, (void *)bv);
   }
   return (BitVector *)co->obj;
 }
 
-char *filt_to_s(Filter *self)
+char *filt_to_s_i(Filter *self)
 {
   return estrdup(self->name);
 }
 
+uint filt_hash_dflt(Filter *self)
+{
+  return 0;
+}
+
+int filt_eq_dflt(Filter *self, Filter *o)
+{
+  return false;
+}
+
 Filter *filt_create(char *name)
 {
   Filter *self = ALLOC(Filter);
   self->cache = co_hsh_create();
   self->name = estrdup(name);
-  self->to_s = &filt_to_s;
+  self->to_s = &filt_to_s_i;
+  self->hash = &filt_hash_dflt;
+  self->eq = &filt_eq_dflt;
   self->destroy = &filt_destroy;
   return self;
 }
 
+uint filt_hash(Filter *self)
+{
+  return str_hash(self->name) ^ self->hash(self);
+}
+
+int filt_eq(Filter *self, Filter *o)
+{
+  return ((self == o) ||
+      ((strcmp(self->name, o->name) == 0) &&
+       (self->eq == o->eq) &&
+       (self->eq(self, o))));
+}
+
 /***************************************************************************
  *
  * QueryFilter
@@ -56,7 +80,7 @@ char *qfilt_to_s(Filter *self)
   QueryFilter *qf = (QueryFilter *)self->data;
   Query *query = (Query *)qf->query;
   char *query_str = query->to_s(query, "");
-  char *filter_str = strfmt("QueryFilter(%s)", query_str);
+  char *filter_str = strfmt("QueryFilter< %s >", query_str);
   free(query_str);
   return filter_str;
 }
@@ -74,18 +98,30 @@ BitVector *qfilt_get_bv(Filter *filt, IndexReader *ir)
     }
     scorer->destroy(scorer);
   }
+  weight->destroy(weight);
   free(sea);
   return bv;
 }
 
-void qfilt_destroy(void *p)
+uint qfilt_hash(Filter *self)
+{
+  Query *query = (Query *)((QueryFilter *)self->data)->query;
+  return q_hash(query);
+}
+
+int qfilt_eq(Filter *self, Filter *o)
+{
+  Query *query1 = (Query *)((QueryFilter *)self->data)->query;
+  Query *query2 = (Query *)((QueryFilter *)o->data)->query;
+  return q_eq(query1, query2);
+}
+
+void qfilt_destroy(Filter *self)
 {
-  Filter *filt = (Filter *)p;
-  QueryFilter *qfilt = filt->data;
-  /* caller is responsible for closing the query */
-  /* if (qfilt->query) qfilt->query->destroy(qfilt->query); */
-  free(qfilt);
-  filt_destroy(filt);
+  Query *query = (Query *)((QueryFilter *)self->data)->query;
+  q_deref(query);
+  free(self->data);
+  filt_destroy(self);
 }
 
 Filter *qfilt_create(Query *query)
@@ -97,6 +133,8 @@ Filter *qfilt_create(Query *query)
   self = filt_create("QueryFilter");
   self->data = qfilt;
   self->get_bv = &qfilt_get_bv;
+  self->hash = &qfilt_hash;
+  self->eq = &qfilt_eq;
   self->to_s = &qfilt_to_s;
   self->destroy = &qfilt_destroy;
   return self;