ferret 0.9.0 → 0.9.1

data/ext/document.c

@@ -7,15 +7,23 @@
  *
  ****************************************************************************/
 
+static char * const INDEX_NO_STORE_NO_MSG = "it doesn't make sense to have a field that is neither indexed nor stored";
+static char * const INDEX_NO_TV_YES_MSG = "cannot store term vector information for a field that is not indexed";
+static char * const INVALID_STORE_VAL_MSG = "Invalid value for store in document field";
+static char * const INVALID_INDEX_VAL_MSG = "Invalid value for index in document field";
+static char * const INVALID_TV_VAL_MSG = "Invalid value for term_vector in document field";
+static char * const BIN_FIELD_STORE_NO_MSG = "It doesn't make sense not to store binary data";
+
+/**
+ * @throws ARG_ERROR
+ */
 inline void df_set(DocField *df, const char *name,
     char *data, int store, int index, int tv)
 {
   if ((index == DF_INDEX_NO) && (store == DF_STORE_NO))
-    eprintf(ARG_ERROR,
-        "it doesn't make sense to have a field that is neither indexed nor stored");
+    RAISE(ARG_ERROR, INDEX_NO_STORE_NO_MSG);
   if ((index == DF_INDEX_NO) && (tv != DF_TERM_VECTOR_NO))
-    eprintf(ARG_ERROR,
-        "cannot store term vector information for a field that is not indexed");
+    RAISE(ARG_ERROR, INDEX_NO_TV_YES_MSG);
   df->name = estrdup(name);
   df->data = data;
   df->blen = strlen(data);
@@ -26,6 +34,9 @@ inline void df_set(DocField *df, const char *name,
   df->boost = 1.0;
 }
 
+/*
+ * @throws ARG_ERROR
+ */
 DocField *df_create(const char *name, char *data, int store, int index, int tv)
 {
   DocField *df = ALLOC(DocField);
@@ -57,6 +68,9 @@ void df_destroy_data(void *p)
   free(p);
 }
 
+/*
+ * @throws ARG_ERROR
+ */
 void df_set_store(DocField *df, int store)
 {
   switch (store) {
@@ -73,10 +87,13 @@ void df_set_store(DocField *df, int store)
       df->is_compressed = true;
       break;
     default:
-      eprintf(ARG_ERROR, "Invalid value %d for store in document field", store);
+      RAISE(ARG_ERROR, INVALID_STORE_VAL_MSG);
   }
 }
 
+/*
+ * @throws ARG_ERROR
+ */
 void df_set_index(DocField *df, int index)
 {
   df->omit_norms = false;
@@ -99,10 +116,13 @@ void df_set_index(DocField *df, int index)
       df->omit_norms = true;
       break;
     default:
-      eprintf(ARG_ERROR, "Invalid value %d for index in document field", index);
+      RAISE(ARG_ERROR, INVALID_INDEX_VAL_MSG);
   }
 }
 
+/*
+ * @throws ARG_ERROR
+ */
 void df_set_term_vector(DocField *df, int tv)
 {
   switch (tv) {
@@ -132,15 +152,17 @@ void df_set_term_vector(DocField *df, int tv)
       df->store_pos = true;
       break;
     default:
-      eprintf(ARG_ERROR,
-          "Invalid value %d for term_vector in document field", tv);
+      RAISE(ARG_ERROR, INVALID_TV_VAL_MSG);
   }
 }
 
+/*
+ * @throws ARG_ERROR
+ */
 DocField *df_create_binary(char *name, char *data, int blen, int store)
 {
   if (store == DF_STORE_NO) {
-    eprintf(ARG_ERROR, "It doesn't make sense not to store binary data\n");
+    RAISE(ARG_ERROR, BIN_FIELD_STORE_NO_MSG);
   }
   DocField *df = df_create(name, data, store, DF_INDEX_NO, DF_TERM_VECTOR_NO);
   df->is_binary = true;
@@ -200,7 +222,13 @@ Document *doc_create_keep_data()
 
 void doc_destroy(void *p)
 {
+  int i;
   Document *doc = (Document *)p;
+  if (doc->free_data) {
+    for (i = 0; i < doc->dfcnt; i++) {
+      doc->free_data(doc->df_arr[i]);
+    }
+  }
   free(doc->field_arr);
   free(doc->df_arr);
   h_destroy(doc->fields);
@@ -209,15 +237,15 @@ void doc_destroy(void *p)
 
 void doc_add_field(Document *doc, DocField *df)
 {
-  Array *field_ga = (Array *)h_get(doc->fields, df->name);
-  if (field_ga == NULL) {
-    field_ga = ary_create(1, doc->free_data);
-    h_set(doc->fields, estrdup(df->name), field_ga);
+  Array *fields = (Array *)h_get(doc->fields, df->name);
+  if (fields == NULL) {
+    fields = ary_create(1, NULL);
+    h_set(doc->fields, estrdup(df->name), fields);
     doc->fcnt++;
     REALLOC_N(doc->field_arr, Array *, doc->fcnt);
-    doc->field_arr[doc->fcnt-1] = field_ga;
+    doc->field_arr[doc->fcnt-1] = fields;
   }
-  ary_append(field_ga, df);
+  ary_append(fields, df);
   doc->dfcnt++;
   REALLOC_N(doc->df_arr, DocField *, doc->dfcnt);
   doc->df_arr[doc->dfcnt-1] = df;
@@ -225,9 +253,9 @@ void doc_add_field(Document *doc, DocField *df)
 
 DocField *doc_get_field(Document *doc, const char *fname)
 {
-  Array *field_ga = (Array *)h_get(doc->fields, fname);
-  if (field_ga) {
-    return field_ga->elems[0];
+  Array *fields = (Array *)h_get(doc->fields, fname);
+  if (fields) {
+    return fields->elems[0];
   } else {
     return NULL;
   }
@@ -246,20 +274,20 @@ Array *doc_get_fields(Document *doc, const char *fname)
  */
 Array *doc_remove_fields(Document *doc, const char *fname)
 {
-  Array *field_ga = (Array *)h_rem(doc->fields, fname, true);
-  if (field_ga) {
+  Array *fields = (Array *)h_rem(doc->fields, fname, true);
+  if (fields) {
     int i, j;
     doc->fcnt--;
     for (i = 0; i < doc->fcnt; i++) {
-      if (field_ga == doc->field_arr[i]) {
+      if (fields == doc->field_arr[i]) {
         memmove(&doc->field_arr[i],
                 &doc->field_arr[i+1],
                 sizeof(void *) * (doc->fcnt - i));
         break;
       }
     }
-    for (i = 0, j = 0; i < doc->dfcnt && j < field_ga->size;) {
-      if (field_ga->elems[j] == doc->df_arr[i]) {
+    for (i = 0, j = 0; i < doc->dfcnt && j < fields->size;) {
+      if (fields->elems[j] == doc->df_arr[i]) {
         memmove(&doc->df_arr[i],
                 &doc->df_arr[i+1],
                 sizeof(void *) * (doc->dfcnt - i - 1));
@@ -269,7 +297,8 @@ Array *doc_remove_fields(Document *doc, const char *fname)
         i++;
       }
     }
-    return field_ga;
+    fields->free_elem = doc->free_data;
+    return fields;
   } else {
     return NULL;
   }
@@ -283,6 +312,7 @@ DocField *doc_remove_field(Document *doc, const char *fname)
     df = ary_remove(dfs, 0);
     if (dfs->size == 0) {
       Array *fields = doc_remove_fields(doc, fname);
+      fields->free_elem = doc->free_data;
       ary_destroy(fields);
     } else {
       int i;
@@ -302,14 +332,14 @@ DocField *doc_remove_field(Document *doc, const char *fname)
 
 bool doc_delete_fields(Document *doc, const char *fname)
 {
-  Array *field_ga = doc_remove_fields(doc, fname);
-  if (field_ga) {
-    ary_destroy(field_ga);
+  Array *fields = doc_remove_fields(doc, fname);
+  if (fields) {
+    fields->free_elem = doc->free_data;
+    ary_destroy(fields);
     return true;
   } else {
     return false;
   }
-  return h_del(doc->fields, fname);
 }
 
 char *doc_to_s(Document *doc)

data/ext/except.c

@@ -0,0 +1,59 @@
+#include "global.h"
+#include "except.h"
+
+char * const UNSUPPORTED_ERROR_MSG = "Unsupported operation";
+char * const EOF_ERROR_MSG = "Read past end of file";
+
+static thread_key_t exception_stack_key;
+static thread_once_t exception_stack_key_once = THREAD_ONCE_INIT;
+
+void exception_stack_alloc()
+{
+  thread_key_create(&exception_stack_key, NULL);
+}
+
+void xpush_context(xcontext_t *context)
+{
+  xcontext_t *top_context;
+  thread_once(&exception_stack_key_once, *exception_stack_alloc);
+  top_context = thread_getspecific(exception_stack_key); 
+  context->next = top_context;
+  thread_setspecific(exception_stack_key, context);
+  context->handled = true;
+  context->in_finally = false;
+}
+
+static inline void xraise_context(xcontext_t *context, int excode, char *msg)
+{
+  context->msg = msg;
+  context->excode = excode;
+  context->handled = false;
+  longjmp(context->jbuf, excode);
+}
+
+void xraise(int excode, char *msg)
+{
+  xcontext_t *top_context;
+  top_context = thread_getspecific(exception_stack_key); 
+  if (!top_context) {
+    eprintf(EXCEPTION_CODE, "Error: exception %d not handled: %s", excode, msg);
+  } else if (!top_context->in_finally) {
+    xraise_context(top_context, excode, msg);
+  } else if (top_context->handled) {
+    top_context->msg = msg;
+    top_context->excode = excode;
+    top_context->handled = false;
+  }
+}
+
+void xpop_context()
+{
+  xcontext_t *top_context, *context;
+  thread_once(&exception_stack_key_once, *exception_stack_alloc);
+  top_context = thread_getspecific(exception_stack_key); 
+  context = top_context->next;
+  thread_setspecific(exception_stack_key, context);
+  if (!top_context->handled) {
+    xraise_context(context, top_context->excode, top_context->msg);
+  }
+}

data/ext/except.h

@@ -0,0 +1,88 @@
+#ifndef FRT_EXCEPT_H
+#define FRT_EXCEPT_H
+
+#include <setjmp.h>
+#include <ruby.h>
+
+#define BODY 0
+#define FINALLY -1
+#define EXCEPTION 1
+#define ERROR 1
+#define IO_ERROR 2
+#define ARG_ERROR 3
+#define EOF_ERROR 4
+#define UNSUPPORTED_ERROR 5
+#define STATE_ERROR 6
+#define PARSE_ERROR 7
+#define MEM_ERROR 8
+
+typedef struct xcontext_t {
+  jmp_buf jbuf;
+  struct xcontext_t *next;
+  char *msg;
+  volatile int excode;
+  int handled : 1;
+  int in_finally : 1;
+} xcontext_t;
+
+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:
+
+
+#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;
+
+#define XFINALLY default: xcontext.in_finally = 1;
+
+#define XCATCHALL break; default: xcontext.in_finally = 1;
+
+//fprintf(stderr,"Error occured in %s, %d: %s\n", __FILE__, __LINE__, __func__);
+#define RAISE(xexcode, xmsg) \
+  do {\
+    if (!xtop_context) {\
+      eprintf(EXCEPTION_CODE, "Error: exception %d not handled: %s", xexcode, xmsg);\
+    } else if (!xtop_context->in_finally) {\
+      xtop_context->msg = xmsg;\
+      xtop_context->excode = xexcode;\
+      xtop_context->handled = false;\
+      longjmp(xtop_context->jbuf, xexcode);\
+    } else if (xtop_context->handled) {\
+      xtop_context->msg = xmsg;\
+      xtop_context->excode = xexcode;\
+      xtop_context->handled = false;\
+    }\
+  } while (0)
+
+#define HANDLED() xcontext.handled = 1 /* true */
+
+extern char * const UNSUPPORTED_ERROR_MSG;
+extern char * const EOF_ERROR_MSG;
+
+#endif

data/ext/ferret.c

@@ -1,4 +1,5 @@
 #include "ferret.h"
+#include "except.h"
 #include "hash.h"
 
 /* Object Map */
@@ -22,15 +23,16 @@ VALUE mSpans;
 /*
 */
 
+xcontext_t *xtop_context = NULL;
 
 unsigned int
-object_hash(const void *key)
+value_hash(const void *key)
 {
   return (unsigned int)key;
 }
 
 int
-object_eq(const void *key1, const void *key2)
+value_eq(const void *key1, const void *key2)
 {
   return key1 == key2;
 }
@@ -54,6 +56,15 @@ object_add2(void *key, VALUE obj, const char *file, int line, const char *func)
   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)
+{
+  //if (!h_get(object_map, key))
+    //printf("seting %d. now contains %d %s:%d:%s\n", (int)key, ++hash_cnt, file, line, func);
+  h_set(object_map, key, (void *)obj);
+}
+
 void
 //object_del(void *key)
 object_del2(void *key, const char *file, int line, const char *func)
@@ -84,11 +95,44 @@ frt_deref_free(void *p)
   object_del(p);
 }
 
+void
+frt_thread_once(int *once_control, void (*init_routine) (void))
+{
+  if (*once_control) {
+    init_routine();
+    *once_control = 0;
+  }
+}
+
+void
+frt_thread_key_create(thread_key_t *key, void (*destr_function) (void *))
+{
+  *key = h_new(&value_hash, &value_eq, NULL, destr_function);
+}
+
+void
+frt_thread_key_delete(thread_key_t key)
+{
+  h_destroy(key);
+}
+
+void
+frt_thread_setspecific(thread_key_t key, const void *pointer)
+{
+  h_set(key, (void *)rb_thread_current(), (void *)pointer);
+}
+
+void *
+frt_thread_getspecific(thread_key_t key)
+{
+  return h_get(key, (void *)rb_thread_current());
+}
+
 void
 Init_ferret_ext(void)
 {
   /* initialize object map */
-  object_map = h_new(&object_hash, &object_eq, NULL, NULL);
+  object_map = h_new(&value_hash, &value_eq, NULL, NULL);
 
   /* IDs */
 	id_new = rb_intern("new");

data/ext/ferret.h

@@ -32,6 +32,9 @@ 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);
+//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);
 //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);