isomorfeus-ferret 0.12.7 → 0.13.0

data/ext/isomorfeus_ferret_ext/frt_bitvector.h

@@ -5,8 +5,7 @@
 
 #define FRT_BV_INIT_CAPA 256
 
-typedef struct FrtBitVector
-{
+typedef struct FrtBitVector {
     /** The bits are held in an array of 32-bit integers */
     frt_u32 *bits;
 
@@ -26,6 +25,7 @@ typedef struct FrtBitVector
 
     bool extends_as_ones : 1;
     int ref_cnt;
+    VALUE rbv;
 } FrtBitVector;
 
 /**
@@ -74,9 +74,7 @@ extern void frt_bv_destroy(FrtBitVector *bv);
  * cause any bugs in this code but could cause problems if users are relying
  * on the fact that size is accurate.
  */
-static FRT_ATTR_ALWAYS_INLINE
-void frt_bv_set_value(FrtBitVector *bv, int bit, bool value)
-{
+static FRT_ATTR_ALWAYS_INLINE void frt_bv_set_value(FrtBitVector *bv, int bit, bool value) {
     frt_u32 *word_p;
     int word = bit >> 5;
     frt_u32 bitmask = 1 << (bit & 31);
@@ -120,9 +118,7 @@ void frt_bv_set_value(FrtBitVector *bv, int bit, bool value)
  * @param bv the FrtBitVector to set the bit in
  * @param index the index of the bit to set
  */
-static FRT_ATTR_ALWAYS_INLINE
-void frt_bv_set(FrtBitVector *bv, int bit)
-{
+static FRT_ATTR_ALWAYS_INLINE void frt_bv_set(FrtBitVector *bv, int bit) {
     frt_bv_set_value(bv, bit, 1);
 }
 
@@ -153,9 +149,7 @@ void frt_bv_set(FrtBitVector *bv, int bit)
  * @param bv the FrtBitVector to set the bit in
  * @param index the index of the bit to set
  */
-static FRT_ATTR_ALWAYS_INLINE
-void frt_bv_set_fast(FrtBitVector *bv, int bit)
-{
+static FRT_ATTR_ALWAYS_INLINE void frt_bv_set_fast(FrtBitVector *bv, int bit) {
     bv->count++;
     bv->size = bit + 1;
     bv->bits[bit >> 5] |= (1 << (bit & 31));
@@ -170,9 +164,7 @@ void frt_bv_set_fast(FrtBitVector *bv, int bit)
  * @param index the index of the bit to check
  * @return 1 if the bit was set, 0 otherwise
  */
-static FRT_ATTR_ALWAYS_INLINE
-int frt_bv_get(FrtBitVector *bv, int bit)
-{
+static FRT_ATTR_ALWAYS_INLINE int frt_bv_get(FrtBitVector *bv, int bit) {
     /* out of range so return 0 because it can't have been set */
     if (unlikely(bit >= bv->size)) {
         return bv->extends_as_ones;
@@ -188,9 +180,7 @@ int frt_bv_get(FrtBitVector *bv, int bit)
  * @param bv the FrtBitVector to unset the bit in
  * @param index the index of the bit to unset
  */
-static FRT_ATTR_ALWAYS_INLINE
-void frt_bv_unset(FrtBitVector *bv, int bit)
-{
+static FRT_ATTR_ALWAYS_INLINE void frt_bv_unset(FrtBitVector *bv, int bit) {
     frt_bv_set_value(bv, bit, 0);
 }
 
@@ -213,9 +203,7 @@ extern void frt_bv_clear(FrtBitVector *bv);
  * @return the number of set bits in the FrtBitVector. FrtBitVector.count is also
  *   set
  */
-static FRT_ATTR_ALWAYS_INLINE
-int frt_bv_recount(FrtBitVector *bv)
-{
+static FRT_ATTR_ALWAYS_INLINE int frt_bv_recount(FrtBitVector *bv) {
     unsigned int extra = ((bv->size & 31) >> 3) + 1;
     unsigned int len   = bv->size >> 5;
     unsigned int idx, count = 0;
@@ -230,8 +218,7 @@ int frt_bv_recount(FrtBitVector *bv)
             case 2: count += frt_count_zeros(bv->bits[idx] | 0xffff00ff);
             case 1: count += frt_count_zeros(bv->bits[idx] | 0xffffff00);
         }
-    }
-    else {
+    } else {
         for (idx = 0; idx < len; ++idx) {
             count += frt_count_ones(bv->bits[idx]);
         }
@@ -263,9 +250,7 @@ extern void frt_bv_scan_reset(FrtBitVector *bv);
  * @param bv the FrtBitVector to scan
  * @return the next set bit's index or -1 if no more bits are set
  */
-static FRT_ATTR_ALWAYS_INLINE
-int frt_bv_scan_next_from(FrtBitVector *bv, const int bit)
-{
+static FRT_ATTR_ALWAYS_INLINE int frt_bv_scan_next_from(FrtBitVector *bv, const int bit) {
     frt_u32 pos  = bit >> 5;
     frt_u32 word = bv->bits[pos];
 
@@ -276,8 +261,7 @@ int frt_bv_scan_next_from(FrtBitVector *bv, const int bit)
     word &= (frt_u32)~0 << (bit & 31);
     if (word) {
         goto done;
-    }
-    else {
+    } else {
         frt_u32 word_size = FRT_TO_WORD(bv->size);
         for (pos++; pos < word_size; ++pos)
         {
@@ -286,7 +270,7 @@ int frt_bv_scan_next_from(FrtBitVector *bv, const int bit)
         }
     }
         return -1;
- done:
+done:
     return bv->curr_bit = (pos << 5) + frt_count_trailing_zeros(word);
 }
 
@@ -313,9 +297,7 @@ int frt_bv_scan_next(FrtBitVector *bv)
  * @param bv the FrtBitVector to scan
  * @return the next unset bit's index or -1 if no more bits are unset
  */
-static FRT_ATTR_ALWAYS_INLINE
-int frt_bv_scan_next_unset_from(FrtBitVector *bv, const int bit)
-{
+static FRT_ATTR_ALWAYS_INLINE int frt_bv_scan_next_unset_from(FrtBitVector *bv, const int bit) {
     frt_u32 pos  = bit >> 5;
     frt_u32 word = bv->bits[pos];
 
@@ -326,8 +308,7 @@ int frt_bv_scan_next_unset_from(FrtBitVector *bv, const int bit)
     word |= (1 << (bit & 31)) - 1;
     if (~word) {
         goto done;
-    }
-    else {
+    } else {
         frt_u32 word_size = FRT_TO_WORD(bv->size);
         for (pos++; pos < word_size; ++pos)
         {
@@ -336,7 +317,7 @@ int frt_bv_scan_next_unset_from(FrtBitVector *bv, const int bit)
         }
     }
     return -1;
- done:
+done:
     return bv->curr_bit = (pos << 5) + frt_count_trailing_ones(word);
 }
 
@@ -372,12 +353,9 @@ extern int frt_bv_eq(FrtBitVector *bv1, FrtBitVector *bv2);
  */
 extern unsigned long long frt_bv_hash(FrtBitVector *bv);
 
-static FRT_ATTR_ALWAYS_INLINE
-void frt_bv_capa(FrtBitVector *bv, int capa, int size)
-{
+static FRT_ATTR_ALWAYS_INLINE void frt_bv_capa(FrtBitVector *bv, int capa, int size) {
     int word_size = FRT_TO_WORD(size);
-    if (bv->capa < capa)
-    {
+    if (bv->capa < capa) {
         FRT_REALLOC_N(bv->bits, frt_u32, capa);
         bv->capa = capa;
         memset(bv->bits + word_size, (bv->extends_as_ones ? 0xFF : 0),
@@ -408,11 +386,11 @@ void frt_bv_capa(FrtBitVector *bv, int capa, int size)
     int i;                                                            \
     int a_wsz = FRT_TO_WORD(a->size);                                 \
     int b_wsz = FRT_TO_WORD(b->size);                                 \
-    int max_size = FRT_MAX(a->size, b->size);                        \
-    int min_size = FRT_MIN(a->size, b->size);                        \
+    int max_size = FRT_MAX(a->size, b->size);                         \
+    int min_size = FRT_MIN(a->size, b->size);                         \
     int max_word_size = FRT_TO_WORD(max_size);                        \
     int min_word_size = FRT_TO_WORD(min_size);                        \
-    int capa = FRT_MAX(frt_round2(max_word_size), 4);                \
+    int capa = FRT_MAX(frt_round2(max_word_size), 4);                 \
                                                                       \
     bv->extends_as_ones = (a->extends_as_ones op b->extends_as_ones); \
     frt_bv_capa(bv, capa, max_size);                                  \
@@ -432,33 +410,22 @@ void frt_bv_capa(FrtBitVector *bv, int capa, int size)
     frt_bv_recount(bv);                                               \
 } while(0)
 
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_and_i(FrtBitVector *bv,
-                           FrtBitVector *a, FrtBitVector *b)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_and_i(FrtBitVector *bv, FrtBitVector *a, FrtBitVector *b) {
     FRT_BV_OP(bv, a, b, &, frt_bv_and_ext);
     return bv;
 }
 
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_or_i(FrtBitVector *bv,
-                          FrtBitVector *a, FrtBitVector *b)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_or_i(FrtBitVector *bv, FrtBitVector *a, FrtBitVector *b) {
     FRT_BV_OP(bv, a, b, |, frt_bv_or_ext);
     return bv;
 }
 
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_xor_i(FrtBitVector *bv,
-                           FrtBitVector *a, FrtBitVector *b)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_xor_i(FrtBitVector *bv, FrtBitVector *a, FrtBitVector *b) {
     FRT_BV_OP(bv, a, b, ^, frt_bv_xor_ext);
     return bv;
 }
 
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_not_i(FrtBitVector *bv, FrtBitVector *bv1)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_not_i(FrtBitVector *bv, FrtBitVector *bv1) {
     int i;
     int word_size = FRT_TO_WORD(bv1->size);
     int capa = FRT_MAX(frt_round2(word_size), 4);
@@ -484,9 +451,7 @@ FrtBitVector *frt_bv_not_i(FrtBitVector *bv, FrtBitVector *bv1)
  * @param bv2 second FrtBitVector to AND
  * @return A FrtBitVector with all bits set that are set in both bv1 and bv2
  */
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_and(FrtBitVector *bv1, FrtBitVector *bv2)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_and(FrtBitVector *bv1, FrtBitVector *bv2) {
     return frt_bv_and_i(frt_bv_new(), bv1, bv2);
 }
 
@@ -498,9 +463,7 @@ FrtBitVector *frt_bv_and(FrtBitVector *bv1, FrtBitVector *bv2)
  * @param bv2 second FrtBitVector to OR
  * @return A FrtBitVector with all bits set that are set in both bv1 and bv2
  */
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_or(FrtBitVector *bv1, FrtBitVector *bv2)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_or(FrtBitVector *bv1, FrtBitVector *bv2) {
     return frt_bv_or_i(frt_bv_new(), bv1, bv2);
 }
 
@@ -513,9 +476,7 @@ FrtBitVector *frt_bv_or(FrtBitVector *bv1, FrtBitVector *bv2)
  * @param bv2 second FrtBitVector to XOR
  * @return A FrtBitVector with all bits set that are equal in bv1 and bv2
  */
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_xor(FrtBitVector *bv1, FrtBitVector *bv2)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_xor(FrtBitVector *bv1, FrtBitVector *bv2) {
     return frt_bv_xor_i(frt_bv_new(), bv1, bv2);
 }
 
@@ -525,9 +486,7 @@ FrtBitVector *frt_bv_xor(FrtBitVector *bv1, FrtBitVector *bv2)
  * @param bv FrtBitVector to flip
  * @return A FrtBitVector with all bits set that are set in both bv1 and bv2
  */
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_not(FrtBitVector *bv)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_not(FrtBitVector *bv) {
     return frt_bv_not_i(frt_bv_new(), bv);
 }
 
@@ -539,9 +498,7 @@ FrtBitVector *frt_bv_not(FrtBitVector *bv)
  * @return A FrtBitVector
  * @return bv1 with all bits set that where set in both bv1 and bv2
  */
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_and_x(FrtBitVector *bv1, FrtBitVector *bv2)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_and_x(FrtBitVector *bv1, FrtBitVector *bv2) {
     return frt_bv_and_i(bv1, bv1, bv2);
 }
 
@@ -552,9 +509,7 @@ FrtBitVector *frt_bv_and_x(FrtBitVector *bv1, FrtBitVector *bv2)
  * @param bv2 second FrtBitVector to OR
  * @return bv1
  */
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_or_x(FrtBitVector *bv1, FrtBitVector *bv2)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_or_x(FrtBitVector *bv1, FrtBitVector *bv2) {
     return frt_bv_or_i(bv1, bv1, bv2);
 }
 
@@ -565,9 +520,7 @@ FrtBitVector *frt_bv_or_x(FrtBitVector *bv1, FrtBitVector *bv2)
  * @param bv2 second FrtBitVector to XOR
  * @return bv1
  */
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_xor_x(FrtBitVector *bv1, FrtBitVector *bv2)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_xor_x(FrtBitVector *bv1, FrtBitVector *bv2) {
     return frt_bv_xor_i(bv1, bv1, bv2);
 }
 
@@ -577,9 +530,7 @@ FrtBitVector *frt_bv_xor_x(FrtBitVector *bv1, FrtBitVector *bv2)
  * @param bv FrtBitVector to flip
  * @return A +bv+ with all it's bits flipped
  */
-static FRT_ATTR_ALWAYS_INLINE
-FrtBitVector *frt_bv_not_x(FrtBitVector *bv)
-{
+static FRT_ATTR_ALWAYS_INLINE FrtBitVector *frt_bv_not_x(FrtBitVector *bv) {
     return frt_bv_not_i(bv, bv);
 }
 

data/ext/isomorfeus_ferret_ext/frt_document.c

@@ -7,39 +7,38 @@
  *
  ****************************************************************************/
 
-FrtDocField *frt_df_new(FrtSymbol name)
-{
+FrtDocField *frt_df_new(ID name) {
     FrtDocField *df = FRT_ALLOC(FrtDocField);
     df->name = name;
     df->size = 0;
     df->capa = FRT_DF_INIT_CAPA;
     df->data = FRT_ALLOC_N(char *, df->capa);
     df->lengths = FRT_ALLOC_N(int, df->capa);
+    df->encodings = FRT_ALLOC_N(rb_encoding *, df->capa);
     df->destroy_data = false;
     df->boost = 1.0f;
     return df;
 }
 
-FrtDocField *frt_df_add_data_len(FrtDocField *df, char *data, int len)
-{
+FrtDocField *frt_df_add_data_len(FrtDocField *df, char *data, int len, rb_encoding *encoding) {
     if (df->size >= df->capa) {
         df->capa <<= 2;
         FRT_REALLOC_N(df->data, char *, df->capa);
         FRT_REALLOC_N(df->lengths, int, df->capa);
+        FRT_REALLOC_N(df->encodings, rb_encoding *, df->capa);
     }
     df->data[df->size] = data;
     df->lengths[df->size] = len;
+    df->encodings[df->size] = encoding;
     df->size++;
     return df;
 }
 
-FrtDocField *frt_df_add_data(FrtDocField *df, char *data)
-{
-    return frt_df_add_data_len(df, data, strlen(data));
+FrtDocField *frt_df_add_data(FrtDocField *df, char *data, rb_encoding *encoding) {
+    return frt_df_add_data_len(df, data, strlen(data), encoding);
 }
 
-void frt_df_destroy(FrtDocField *df)
-{
+void frt_df_destroy(FrtDocField *df) {
     if (df->destroy_data) {
         int i;
         for (i = 0; i < df->size; i++) {
@@ -48,15 +47,16 @@ void frt_df_destroy(FrtDocField *df)
     }
     free(df->data);
     free(df->lengths);
+    free(df->encodings);
     free(df);
 }
 
 /*
  * Format for one item is: name: "data"
  *        for more items : name: ["data", "data", "data"]
+ * internally used for testing, thus encoding can be ignored
  */
-char *frt_df_to_s(FrtDocField *df)
-{
+char *frt_df_to_s(FrtDocField *df) {
     const char *df_name = rb_id2name(df->name);
     int i, len = 0, namelen = strlen(df_name);
     char *str, *s;
@@ -94,8 +94,7 @@ char *frt_df_to_s(FrtDocField *df)
  *
  ****************************************************************************/
 
-FrtDocument *frt_doc_new()
-{
+FrtDocument *frt_doc_new(void) {
     FrtDocument *doc = FRT_ALLOC(FrtDocument);
     doc->field_dict = frt_h_new_ptr((frt_free_ft)&frt_df_destroy);
     doc->size = 0;
@@ -105,8 +104,7 @@ FrtDocument *frt_doc_new()
     return doc;
 }
 
-FrtDocField *frt_doc_add_field(FrtDocument *doc, FrtDocField *df)
-{
+FrtDocField *frt_doc_add_field(FrtDocument *doc, FrtDocField *df) {
     if (!frt_h_set_safe(doc->field_dict, (void *)df->name, df)) {
         FRT_RAISE(FRT_EXCEPTION, "tried to add %s field which alread existed\n",
               rb_id2name(df->name));
@@ -120,15 +118,12 @@ FrtDocField *frt_doc_add_field(FrtDocument *doc, FrtDocField *df)
     return df;
 }
 
-FrtDocField *frt_doc_get_field(FrtDocument *doc, FrtSymbol name)
-{
+FrtDocField *frt_doc_get_field(FrtDocument *doc, ID name) {
     return (FrtDocField *)frt_h_get(doc->field_dict, (void *)name);
 }
 
-void frt_doc_destroy(FrtDocument *doc)
-{
+void frt_doc_destroy(FrtDocument *doc) {
     frt_h_destroy(doc->field_dict);
     free(doc->fields);
     free(doc);
 }
-

data/ext/isomorfeus_ferret_ext/frt_document.h

@@ -3,6 +3,7 @@
 
 #include "frt_global.h"
 #include "frt_hash.h"
+#include <ruby/encoding.h>
 
 /****************************************************************************
  *
@@ -11,21 +12,21 @@
  ****************************************************************************/
 
 #define FRT_DF_INIT_CAPA 1
-typedef struct FrtDocField
-{
-    FrtSymbol name;
+typedef struct FrtDocField {
+    ID name;
     int size;
     int capa;
     int *lengths;
+    rb_encoding **encodings; /* used for processing */
     char **data;
     float boost;
+    FrtCompressionType compression;
     bool destroy_data : 1;
-    bool is_compressed : 1;
 } FrtDocField;
 
-extern FrtDocField *frt_df_new(FrtSymbol name);
-extern FrtDocField *frt_df_add_data(FrtDocField *df, char *data);
-extern FrtDocField *frt_df_add_data_len(FrtDocField *df, char *data, int len);
+extern FrtDocField *frt_df_new(ID name);
+extern FrtDocField *frt_df_add_data(FrtDocField *df, char *data, rb_encoding *encoding);
+extern FrtDocField *frt_df_add_data_len(FrtDocField *df, char *data, int len, rb_encoding *encoding);
 extern void frt_df_destroy(FrtDocField *df);
 extern char *frt_df_to_s(FrtDocField *df);
 
@@ -36,8 +37,7 @@ extern char *frt_df_to_s(FrtDocField *df);
  ****************************************************************************/
 
 #define FRT_DOC_INIT_CAPA 8
-typedef struct FrtDocument
-{
+typedef struct FrtDocument {
     FrtHash *field_dict;
     int size;
     int capa;
@@ -47,7 +47,7 @@ typedef struct FrtDocument
 
 extern FrtDocument *frt_doc_new();
 extern FrtDocField *frt_doc_add_field(FrtDocument *doc, FrtDocField *df);
-extern FrtDocField *frt_doc_get_field(FrtDocument *doc, FrtSymbol name);
+extern FrtDocField *frt_doc_get_field(FrtDocument *doc, ID name);
 extern void frt_doc_destroy(FrtDocument *doc);
 
 #endif

data/ext/isomorfeus_ferret_ext/frt_except.c

@@ -32,13 +32,11 @@ char frt_xmsg_buffer_final[FRT_XMSG_BUFFER_FINAL_SIZE];
 static frt_thread_key_t exception_stack_key;
 static frt_thread_once_t exception_stack_key_once = FRT_THREAD_ONCE_INIT;
 
-static void exception_stack_alloc(void)
-{
+static void exception_stack_alloc(void) {
     frt_thread_key_create(&exception_stack_key, NULL);
 }
 
-void frt_xpush_context(frt_xcontext_t *context)
-{
+void frt_xpush_context(frt_xcontext_t *context) {
     frt_xcontext_t *top_context;
     frt_thread_once(&exception_stack_key_once, *exception_stack_alloc);
     top_context = (frt_xcontext_t *)frt_thread_getspecific(exception_stack_key);
@@ -48,18 +46,14 @@ void frt_xpush_context(frt_xcontext_t *context)
     context->in_finally = false;
 }
 
-static void frt_xraise_context(frt_xcontext_t *context,
-                                    volatile int excode,
-                                    const char *const msg)
-{
+static void frt_xraise_context(frt_xcontext_t *context, volatile int excode, const char *const msg) {
     context->msg = msg;
     context->excode = excode;
     context->handled = false;
     longjmp(context->jbuf, excode);
 }
 
-void frt_xraise(int excode, const char *const msg)
-{
+void frt_xraise(int excode, const char *const msg) {
     frt_xcontext_t *top_context;
     frt_thread_once(&exception_stack_key_once, *exception_stack_alloc);
     top_context = (frt_xcontext_t *)frt_thread_getspecific(exception_stack_key);
@@ -77,8 +71,7 @@ void frt_xraise(int excode, const char *const msg)
     }
 }
 
-void frt_xpop_context()
-{
+void frt_xpop_context(void) {
     frt_xcontext_t *top_cxt, *context;
     frt_thread_once(&exception_stack_key_once, *exception_stack_alloc);
     top_cxt = (frt_xcontext_t *)frt_thread_getspecific(exception_stack_key);

data/ext/isomorfeus_ferret_ext/frt_field_index.c

@@ -1,6 +1,8 @@
 #include <string.h>
 #include "frt_field_index.h"
 
+#undef close
+
 /***************************************************************************
  *
  * FrtFieldIndex
@@ -30,9 +32,7 @@ static void field_index_destroy(void *p)
     free(self);
 }
 
-FrtFieldIndex *frt_field_index_get(FrtIndexReader *ir, FrtSymbol field,
-                            const FrtFieldIndexClass *klass)
-{
+FrtFieldIndex *frt_field_index_get(FrtIndexReader *ir, ID field, const FrtFieldIndexClass *klass) {
     int length = 0;
     FrtTermEnum *volatile te = NULL;
     FrtTermDocEnum *volatile tde = NULL;

data/ext/isomorfeus_ferret_ext/frt_field_index.h

@@ -10,11 +10,11 @@
  ***************************************************************************/
 
 typedef struct FrtStringIndex {
-    int size;
+    int  size;
     long *index;
     char **values;
-    int v_size;
-    int v_capa;
+    int  v_size;
+    int  v_capa;
 } FrtStringIndex;
 
 typedef struct FrtFieldIndexClass FrtFieldIndexClass;
@@ -26,9 +26,9 @@ struct FrtFieldIndexClass {
 };
 
 typedef struct FrtFieldIndex {
-    FrtSymbol field;
+    ID    field;
     const FrtFieldIndexClass *klass;
-    void *index;
+    void  *index;
 } FrtFieldIndex;
 
 extern const FrtFieldIndexClass FRT_INTEGER_FIELD_INDEX_CLASS;
@@ -36,7 +36,6 @@ extern const FrtFieldIndexClass   FRT_FLOAT_FIELD_INDEX_CLASS;
 extern const FrtFieldIndexClass  FRT_STRING_FIELD_INDEX_CLASS;
 extern const FrtFieldIndexClass    FRT_BYTE_FIELD_INDEX_CLASS;
 
-extern FrtFieldIndex *frt_field_index_get(FrtIndexReader *ir, FrtSymbol field,
-                                   const FrtFieldIndexClass *klass);
+extern FrtFieldIndex *frt_field_index_get(FrtIndexReader *ir, ID field, const FrtFieldIndexClass *klass);
 
 #endif