isomorfeus-ferret 0.17.2 → 0.17.4

data/ext/isomorfeus_ferret_ext/frb_index.c

@@ -208,8 +208,7 @@ static VALUE frb_fis_add(VALUE self, VALUE rfi) {
  *  of the available properties.
  */
 static VALUE
-frb_fis_add_field(int argc, VALUE *argv, VALUE self)
-{
+frb_fis_add_field(int argc, VALUE *argv, VALUE self) {
     FrtFieldInfos *fis = (FrtFieldInfos *)DATA_PTR(self);
     FrtFieldInfo *fi;
     unsigned int bits = fis->bits;
@@ -233,8 +232,7 @@ frb_fis_add_field(int argc, VALUE *argv, VALUE self)
  *  Iterate through the FieldInfo objects.
  */
 static VALUE
-frb_fis_each(VALUE self)
-{
+frb_fis_each(VALUE self) {
     int i;
     FrtFieldInfos *fis = (FrtFieldInfos *)DATA_PTR(self);
 
@@ -251,8 +249,7 @@ frb_fis_each(VALUE self)
  *  Return a string representation of the FieldInfos object.
  */
 static VALUE
-frb_fis_to_s(VALUE self)
-{
+frb_fis_to_s(VALUE self) {
     FrtFieldInfos *fis = (FrtFieldInfos *)DATA_PTR(self);
     char *fis_s = frt_fis_to_s(fis);
     VALUE rfis_s = rb_str_new2(fis_s);
@@ -291,6 +288,7 @@ static VALUE frb_fis_create_index(VALUE self, VALUE rdir) {
         StringValue(rdir);
         frb_create_dir(rdir);
         store = frt_open_mdbx_store(rs2s(rdir));
+        store->create_folder(store, segm_idx_name);
         frt_index_create(store, fis);
         frt_store_close(store);
     }
@@ -306,8 +304,7 @@ static VALUE frb_fis_create_index(VALUE self, VALUE rdir) {
  *  index.
  */
 static VALUE
-frb_fis_get_fields(VALUE self)
-{
+frb_fis_get_fields(VALUE self) {
     FrtFieldInfos *fis = (FrtFieldInfos *)DATA_PTR(self);
     VALUE rfield_names = rb_ary_new();
     int i;
@@ -325,8 +322,7 @@ frb_fis_get_fields(VALUE self)
  *  in the index.
  */
 static VALUE
-frb_fis_get_tk_fields(VALUE self)
-{
+frb_fis_get_tk_fields(VALUE self) {
     FrtFieldInfos *fis = (FrtFieldInfos *)DATA_PTR(self);
     VALUE rfield_names = rb_ary_new();
     int i;
@@ -657,21 +653,14 @@ static VALUE frb_tde_seek_te(VALUE self, VALUE rterm_enum) {
     return self;
 }
 
-/*
- *  call-seq:
- *     term_doc_enum.doc -> doc_id
- *
- *  Returns the current document number pointed to by the +term_doc_enum+.
+/*  Returns the current document number pointed to by the +term_doc_enum+.
  */
-static VALUE frb_tde_doc(VALUE self) {
+static VALUE frb_tde_doc_num(VALUE self) {
     FrtTermDocEnum *tde = (FrtTermDocEnum *)DATA_PTR(self);
     return INT2FIX(tde->doc_num(tde));
 }
 
 /*
- *  call-seq:
- *     term_doc_enum.doc -> doc_id
- *
  *  Returns the frequency of the current document pointed to by the
  *  +term_doc_enum+.
  */
@@ -680,11 +669,7 @@ static VALUE frb_tde_freq(VALUE self) {
     return INT2FIX(tde->freq(tde));
 }
 
-/*
- *  call-seq:
- *     term_doc_enum.doc -> doc_id
- *
- *  Move forward to the next document in the enumeration. Returns +true+ if
+/*  Move forward to the next document in the enumeration. Returns +true+ if
  *  there is another document or +false+ otherwise.
  */
 static VALUE frb_tde_next(VALUE self) {
@@ -692,11 +677,7 @@ static VALUE frb_tde_next(VALUE self) {
     return tde->next(tde) ? Qtrue : Qfalse;
 }
 
-/*
- *  call-seq:
- *     term_doc_enum.doc -> doc_id
- *
- *  Move forward to the next document in the enumeration. Returns +true+ if
+/*  Move forward to the next document in the enumeration. Returns +true+ if
  *  there is another document or +false+ otherwise.
  */
 static VALUE frb_tde_next_position(VALUE self) {
@@ -713,7 +694,7 @@ static VALUE frb_tde_next_position(VALUE self) {
 
 /*
  *  call-seq:
- *     term_doc_enum.each {|doc_id, freq| do_something() } -> doc_count
+ *     term_doc_enum.each {|doc_num, freq| do_something() } -> doc_count
  *
  *  Iterate through the documents and document frequencies in the
  *  +term_doc_enum+.
@@ -777,16 +758,13 @@ static VALUE frb_tde_to_json(int argc, VALUE *argv, VALUE self) {
     if (do_positions) {
         if (argc == 0) {
             format = "{\"document\":%d,\"frequency\":%d,\"positions\":[";
-        }
-        else {
+        } else {
             format = "[%d,%d,[";
         }
-    }
-    else {
+    } else {
         if (argc == 0) {
             format = "{\"document\":%d,\"frequency\":%d},";
-        }
-        else {
+        } else {
             format = "[%d,%d],";
         }
     }
@@ -828,8 +806,8 @@ static VALUE frb_tde_to_json(int argc, VALUE *argv, VALUE self) {
  *  used within the each method. For example, to print the terms documents and
  *  positions;
  *
- *    tde.each do |doc_id, freq|
- *      puts "term appeared #{freq} times in document #{doc_id}:"
+ *    tde.each do |doc_num, freq|
+ *      puts "term appeared #{freq} times in document #{doc_num}:"
  *      positions = []
  *      tde.each_position {|pos| positions << pos}
  *      puts "  #{positions.join(', ')}"
@@ -1039,6 +1017,7 @@ static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
                 StringValue(rval);
                 frb_create_dir(rval);
                 store = frt_open_mdbx_store(rs2s(rval));
+                store->create_folder(store, segm_idx_name);
             }
 
             if ((rval = rb_hash_aref(roptions, sym_analyzer)) != Qnil) {
@@ -1060,8 +1039,9 @@ static VALUE frb_iw_init(int argc, VALUE *argv, VALUE self) {
         }
         if (NULL == store) {
             store = frt_open_ram_store(NULL);
+            store->create_folder(store, segm_idx_name);
         }
-        if (!create && create_if_missing && !store->exists(store, "segments")) {
+        if (!create && create_if_missing && !store->exists(store, segm_idx_name, "segments")) {
             create = true;
         }
         if (create) {
@@ -1130,8 +1110,7 @@ frb_iw_get_doc_count(VALUE self) {
 }
 
 static int
-frb_hash_to_doc_i(VALUE key, VALUE value, VALUE arg)
-{
+frb_hash_to_doc_i(VALUE key, VALUE value, VALUE arg) {
     if (key == Qundef) {
         return ST_CONTINUE;
     } else {
@@ -1151,20 +1130,18 @@ frb_hash_to_doc_i(VALUE key, VALUE value, VALUE arg)
             case T_ARRAY:
                 {
                     int i;
-                    df->destroy_data = true;
                     for (i = 0; i < RARRAY_LEN(value); i++) {
                         val = rb_obj_as_string(RARRAY_PTR(value)[i]);
-                        frt_df_add_data_len(df, rstrdup(val), RSTRING_LEN(val), rb_enc_get(val));
+                        frt_df_add_data_len(df, RSTRING_PTR(val), RSTRING_LEN(val), rb_enc_get(val));
                     }
                 }
                 break;
             case T_STRING:
-                frt_df_add_data_len(df, rs2s(value), RSTRING_LEN(value), rb_enc_get(value));
+                frt_df_add_data_len(df, RSTRING_PTR(value), RSTRING_LEN(value), rb_enc_get(value));
                 break;
             default:
                 val = rb_obj_as_string(value);
-                df->destroy_data = true;
-                frt_df_add_data_len(df, rstrdup(val), RSTRING_LEN(val), rb_enc_get(val));
+                frt_df_add_data_len(df, RSTRING_PTR(val), RSTRING_LEN(val), rb_enc_get(val));
                 break;
         }
         FRT_TRY
@@ -1181,8 +1158,7 @@ frb_hash_to_doc_i(VALUE key, VALUE value, VALUE arg)
 }
 
 static FrtDocument *
-frb_get_doc(VALUE rdoc)
-{
+frb_get_doc(VALUE rdoc) {
     VALUE val;
     FrtDocument *doc = frt_doc_new();
     FrtDocField *df;
@@ -1199,27 +1175,25 @@ frb_get_doc(VALUE rdoc)
             {
                 int i;
                 df = frt_df_new(fsym_content);
-                df->destroy_data = true;
                 for (i = 0; i < RARRAY_LEN(rdoc); i++) {
                     val = rb_obj_as_string(RARRAY_PTR(rdoc)[i]);
-                    frt_df_add_data_len(df, rstrdup(val), RSTRING_LEN(val), rb_enc_get(val));
+                    frt_df_add_data_len(df, RSTRING_PTR(val), RSTRING_LEN(val), rb_enc_get(val));
                 }
                 frt_doc_add_field(doc, df);
             }
             break;
         case T_SYMBOL:
             /* TODO: clean up this ugly cast */
-            df = frt_df_add_data(frt_df_new(fsym_content), (char *)rb_id2name(SYM2ID(rdoc)), rb_enc_get(rdoc));
+            df = frt_df_add_data(frt_df_new(fsym_content), rb_id2name(SYM2ID(rdoc)), rb_enc_get(rdoc));
             frt_doc_add_field(doc, df);
             break;
         case T_STRING:
-            df = frt_df_add_data_len(frt_df_new(fsym_content), rs2s(rdoc), RSTRING_LEN(rdoc), rb_enc_get(rdoc));
+            df = frt_df_add_data_len(frt_df_new(fsym_content), RSTRING_PTR(rdoc), RSTRING_LEN(rdoc), rb_enc_get(rdoc));
             frt_doc_add_field(doc, df);
             break;
         default:
             val = rb_obj_as_string(rdoc);
-            df = frt_df_add_data_len(frt_df_new(fsym_content), rstrdup(val), RSTRING_LEN(val), rb_enc_get(val));
-            df->destroy_data = true;
+            df = frt_df_add_data_len(frt_df_new(fsym_content), RSTRING_PTR(val), RSTRING_LEN(val), rb_enc_get(val));
             frt_doc_add_field(doc, df);
             break;
     }
@@ -1439,8 +1413,7 @@ static VALUE frb_iw_field_infos(VALUE self) {
  *  to use the same analyzer in a QueryParser.
  */
 static VALUE
-frb_iw_get_analyzer(VALUE self)
-{
+frb_iw_get_analyzer(VALUE self) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     return frb_get_analyzer(iw->analyzer);
 }
@@ -1454,8 +1427,7 @@ frb_iw_get_analyzer(VALUE self)
  *  same analyzer will be used for all documents during search.
  */
 static VALUE
-frb_iw_set_analyzer(VALUE self, VALUE ranalyzer)
-{
+frb_iw_set_analyzer(VALUE self, VALUE ranalyzer) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
 
     frt_a_deref(iw->analyzer);
@@ -1470,8 +1442,7 @@ frb_iw_set_analyzer(VALUE self, VALUE ranalyzer)
  *  Returns the current version of the index writer.
  */
 static VALUE
-frb_iw_version(VALUE self)
-{
+frb_iw_version(VALUE self) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     return ULL2NUM(iw->sis->version);
 }
@@ -1483,8 +1454,7 @@ frb_iw_version(VALUE self)
  *  Return the current value of chunk_size
  */
 static VALUE
-frb_iw_get_chunk_size(VALUE self)
-{
+frb_iw_get_chunk_size(VALUE self) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.chunk_size);
 }
@@ -1496,8 +1466,7 @@ frb_iw_get_chunk_size(VALUE self)
  *  Set the chunk_size parameter
  */
 static VALUE
-frb_iw_set_chunk_size(VALUE self, VALUE rval)
-{
+frb_iw_set_chunk_size(VALUE self, VALUE rval) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     iw->config.chunk_size = FIX2INT(rval);
     return rval;
@@ -1510,8 +1479,7 @@ frb_iw_set_chunk_size(VALUE self, VALUE rval)
  *  Return the current value of max_buffer_memory
  */
 static VALUE
-frb_iw_get_max_buffer_memory(VALUE self)
-{
+frb_iw_get_max_buffer_memory(VALUE self) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.max_buffer_memory);
 }
@@ -1523,8 +1491,7 @@ frb_iw_get_max_buffer_memory(VALUE self)
  *  Set the max_buffer_memory parameter
  */
 static VALUE
-frb_iw_set_max_buffer_memory(VALUE self, VALUE rval)
-{
+frb_iw_set_max_buffer_memory(VALUE self, VALUE rval) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     iw->config.max_buffer_memory = FIX2INT(rval);
     return rval;
@@ -1537,8 +1504,7 @@ frb_iw_set_max_buffer_memory(VALUE self, VALUE rval)
  *  Return the current value of term_index_interval
  */
 static VALUE
-frb_iw_get_index_interval(VALUE self)
-{
+frb_iw_get_index_interval(VALUE self) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.index_interval);
 }
@@ -1550,8 +1516,7 @@ frb_iw_get_index_interval(VALUE self)
  *  Set the term_index_interval parameter
  */
 static VALUE
-frb_iw_set_index_interval(VALUE self, VALUE rval)
-{
+frb_iw_set_index_interval(VALUE self, VALUE rval) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     iw->config.index_interval = FIX2INT(rval);
     return rval;
@@ -1564,8 +1529,7 @@ frb_iw_set_index_interval(VALUE self, VALUE rval)
  *  Return the current value of doc_skip_interval
  */
 static VALUE
-frb_iw_get_skip_interval(VALUE self)
-{
+frb_iw_get_skip_interval(VALUE self) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.skip_interval);
 }
@@ -1577,8 +1541,7 @@ frb_iw_get_skip_interval(VALUE self)
  *  Set the doc_skip_interval parameter
  */
 static VALUE
-frb_iw_set_skip_interval(VALUE self, VALUE rval)
-{
+frb_iw_set_skip_interval(VALUE self, VALUE rval) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     iw->config.skip_interval = FIX2INT(rval);
     return rval;
@@ -1591,8 +1554,7 @@ frb_iw_set_skip_interval(VALUE self, VALUE rval)
  *  Return the current value of merge_factor
  */
 static VALUE
-frb_iw_get_merge_factor(VALUE self)
-{
+frb_iw_get_merge_factor(VALUE self) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.merge_factor);
 }
@@ -1604,8 +1566,7 @@ frb_iw_get_merge_factor(VALUE self)
  *  Set the merge_factor parameter
  */
 static VALUE
-frb_iw_set_merge_factor(VALUE self, VALUE rval)
-{
+frb_iw_set_merge_factor(VALUE self, VALUE rval) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     iw->config.merge_factor = FIX2INT(rval);
     return rval;
@@ -1618,8 +1579,7 @@ frb_iw_set_merge_factor(VALUE self, VALUE rval)
  *  Return the current value of max_buffered_docs
  */
 static VALUE
-frb_iw_get_max_buffered_docs(VALUE self)
-{
+frb_iw_get_max_buffered_docs(VALUE self) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.max_buffered_docs);
 }
@@ -1631,8 +1591,7 @@ frb_iw_get_max_buffered_docs(VALUE self)
  *  Set the max_buffered_docs parameter
  */
 static VALUE
-frb_iw_set_max_buffered_docs(VALUE self, VALUE rval)
-{
+frb_iw_set_max_buffered_docs(VALUE self, VALUE rval) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     iw->config.max_buffered_docs = FIX2INT(rval);
     return rval;
@@ -1645,8 +1604,7 @@ frb_iw_set_max_buffered_docs(VALUE self, VALUE rval)
  *  Return the current value of max_merge_docs
  */
 static VALUE
-frb_iw_get_max_merge_docs(VALUE self)
-{
+frb_iw_get_max_merge_docs(VALUE self) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.max_merge_docs);
 }
@@ -1658,8 +1616,7 @@ frb_iw_get_max_merge_docs(VALUE self)
  *  Set the max_merge_docs parameter
  */
 static VALUE
-frb_iw_set_max_merge_docs(VALUE self, VALUE rval)
-{
+frb_iw_set_max_merge_docs(VALUE self, VALUE rval) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     iw->config.max_merge_docs = FIX2INT(rval);
     return rval;
@@ -1672,8 +1629,7 @@ frb_iw_set_max_merge_docs(VALUE self, VALUE rval)
  *  Return the current value of max_field_length
  */
 static VALUE
-frb_iw_get_max_field_length(VALUE self)
-{
+frb_iw_get_max_field_length(VALUE self) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     return INT2FIX(iw->config.max_field_length);
 }
@@ -1685,8 +1641,7 @@ frb_iw_get_max_field_length(VALUE self)
  *  Set the max_field_length parameter
  */
 static VALUE
-frb_iw_set_max_field_length(VALUE self, VALUE rval)
-{
+frb_iw_set_max_field_length(VALUE self, VALUE rval) {
     FrtIndexWriter *iw = (FrtIndexWriter *)DATA_PTR(self);
     iw->config.max_field_length = FIX2INT(rval);
     return rval;
@@ -1766,6 +1721,7 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                     case T_STRING:
                         frb_create_dir(rdir);
                         store = frt_open_mdbx_store(rs2s(rdir));
+                        store->create_folder(store, segm_idx_name);
                         break;
                     default:
                         FRT_RAISE(FRT_ARG_ERROR, "%s isn't a valid directory "
@@ -1787,6 +1743,7 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
                 case T_STRING:
                     frb_create_dir(rdir);
                     store = frt_open_mdbx_store(rs2s(rdir));
+                    store->create_folder(store, segm_idx_name);
                     break;
                 default:
                     FRT_RAISE(FRT_ARG_ERROR, "%s isn't a valid directory argument. "
@@ -1824,20 +1781,20 @@ static VALUE frb_ir_init(VALUE self, VALUE rdir) {
 
 /*
  *  call-seq:
- *     index_reader.set_norm(doc_id, field, val)
+ *     index_reader.set_norm(doc_num, field, val)
  *
- *  Expert: change the boost value for a +field+ in document at +doc_id+.
+ *  Expert: change the boost value for a +field+ in document at +doc_num+.
  *  +val+ should be an integer in the range 0..255 which corresponds to an
  *  encoded float value.
  */
 static VALUE
-frb_ir_set_norm(VALUE self, VALUE rdoc_id, VALUE rfield, VALUE rval) {
+frb_ir_set_norm(VALUE self, VALUE rdoc_num, VALUE rfield, VALUE rval) {
     int ex_code = 0;
     const char *msg = NULL;
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
 
     FRT_TRY
-        frt_ir_set_norm(ir, FIX2INT(rdoc_id), frb_field(rfield), (frt_uchar)NUM2CHR(rval));
+        frt_ir_set_norm(ir, FIX2INT(rdoc_num), frb_field(rfield), (frt_uchar)NUM2CHR(rval));
     FRT_XCATCHALL
         ex_code = xcontext.excode;
         msg = xcontext.msg;
@@ -1860,13 +1817,12 @@ frb_ir_set_norm(VALUE self, VALUE rdoc_id, VALUE rfield, VALUE rval) {
  *  could have null bytes.
  */
 static VALUE
-frb_ir_norms(VALUE self, VALUE rfield)
-{
+frb_ir_norms(VALUE self, VALUE rfield) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     frt_uchar *norms;
     norms = frt_ir_get_norms(ir, frb_field(rfield));
     if (norms) {
-        return rb_str_new((char *)norms, ir->max_doc(ir));
+        return rb_str_new((char *)norms, ir->max_doc_num(ir));
     } else {
         return Qnil;
     }
@@ -1879,17 +1835,16 @@ frb_ir_norms(VALUE self, VALUE rfield)
  *  Expert: Get the norm values into a string +buffer+ starting at +offset+.
  */
 static VALUE
-frb_ir_get_norms_into(VALUE self, VALUE rfield, VALUE rnorms, VALUE roffset)
-{
+frb_ir_get_norms_into(VALUE self, VALUE rfield, VALUE rnorms, VALUE roffset) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     int offset;
     offset = FIX2INT(roffset);
     Check_Type(rnorms, T_STRING);
-    if (RSTRING_LEN(rnorms) < offset + ir->max_doc(ir)) {
+    if (RSTRING_LEN(rnorms) < offset + ir->max_doc_num(ir)) {
         rb_raise(rb_eArgError, "supplied a string of length:%ld to "
                  "IndexReader#get_norms_into but needed a string of length "
                  "offset:%d + maxdoc:%d",
-                 RSTRING_LEN(rnorms), offset, ir->max_doc(ir));
+                 RSTRING_LEN(rnorms), offset, ir->max_doc_num(ir));
     }
 
     frt_ir_get_norms_into(ir, frb_field(rfield),
@@ -1935,8 +1890,7 @@ frb_ir_commit(VALUE self) {
  *  errors.
  */
 static VALUE
-frb_ir_close(VALUE self)
-{
+frb_ir_close(VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     ((struct RData *)(self))->data = NULL;
     ((struct RData *)(self))->dmark = NULL;
@@ -1953,28 +1907,26 @@ frb_ir_close(VALUE self)
  *  IndexReader or committed by any other IndexReader.
  */
 static VALUE
-frb_ir_has_deletions(VALUE self)
-{
+frb_ir_has_deletions(VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     return ir->has_deletions(ir) ? Qtrue : Qfalse;
 }
 
-/*
- *  call-seq:
- *     index_reader.delete(doc_id) -> index_reader
+/*  call-seq:
+ *     index_reader.delete(doc_num) -> index_reader
  *
- *  Delete document referenced internally by document id +doc_id+. The
+ *  Delete document referenced internally by document id +doc_num+. The
  *  document_id is the number used to reference documents in the index and is
  *  returned by search methods.
  */
 static VALUE
-frb_ir_delete(VALUE self, VALUE rdoc_id) {
+frb_ir_delete(VALUE self, VALUE rdoc_num) {
     int ex_code = 0;
     const char *msg = NULL;
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
 
     FRT_TRY
-        frt_ir_delete_doc(ir, FIX2INT(rdoc_id));
+        frt_ir_delete_doc(ir, FIX2INT(rdoc_num));
     FRT_XCATCHALL
         ex_code = xcontext.excode;
         msg = xcontext.msg;
@@ -1988,33 +1940,30 @@ frb_ir_delete(VALUE self, VALUE rdoc_id) {
     return self;
 }
 
-/*
- *  call-seq:
- *     index_reader.deleted?(doc_id) -> bool
+/* call-seq:
+ *     index_reader.deleted?(doc_num) -> bool
  *
- *  Returns true if the document at +doc_id+ has been deleted.
+ *  Returns true if the document at +doc_num+ has been deleted.
  */
 static VALUE
-frb_ir_is_deleted(VALUE self, VALUE rdoc_id)
-{
+frb_ir_is_deleted(VALUE self, VALUE rdoc_num) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
-    return ir->is_deleted(ir, FIX2INT(rdoc_id)) ? Qtrue : Qfalse;
+    return ir->is_deleted(ir, FIX2INT(rdoc_num)) ? Qtrue : Qfalse;
 }
 
-/*
- *  call-seq:
+/*  call-seq:
  *     index_reader.max_doc -> number
  *
  *  Returns 1 + the maximum document id in the index. It is the
  *  document_id that will be used by the next document added to the index. If
  *  there are no deletions, this number also refers to the number of documents
  *  in the index.
+ *  TODO: Rename to next_doc_num?
  */
 static VALUE
-frb_ir_max_doc(VALUE self)
-{
+frb_ir_max_doc_num(VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
-    return INT2FIX(ir->max_doc(ir));
+    return INT2FIX(ir->max_doc_num(ir));
 }
 
 /*
@@ -2026,8 +1975,7 @@ frb_ir_max_doc(VALUE self)
  *  deleted from the index.
  */
 static VALUE
-frb_ir_num_docs(VALUE self)
-{
+frb_ir_num_docs(VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     return INT2FIX(ir->num_docs(ir));
 }
@@ -2042,31 +1990,43 @@ frb_ir_num_docs(VALUE self)
  *  effect on these documents.
  */
 static VALUE
-frb_ir_undelete_all(VALUE self)
-{
+frb_ir_undelete_all(VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     frt_ir_undelete_all(ir);
     return self;
 }
 
 static VALUE
-frb_get_doc_range(FrtIndexReader *ir, int pos, int len, int max)
-{
+frb_get_doc_range(FrtIndexReader *ir, int pos, int len, int max) {
+    int ex_code = 0;
+    const char *msg = NULL;
     VALUE ary;
     int i;
     max = FRT_MIN(max, pos+len);
     len = max - pos;
     ary = rb_ary_new2(len);
-    for (i = 0; i < len; i++) {
-      rb_ary_store(ary, i, frb_get_lazy_doc(ir->get_lazy_doc(ir, i + pos)));
+
+    FRT_TRY
+        for (i = 0; i < len; i++) {
+            rb_ary_store(ary, i, frb_get_lazy_doc(ir->get_lazy_doc(ir, i + pos)));
+        }
+    FRT_XCATCHALL
+        ex_code = xcontext.excode;
+        msg = xcontext.msg;
+        FRT_HANDLED();
+    FRT_XENDTRY
+
+    if (ex_code && msg) {
+        frb_raise(ex_code, msg);
     }
+
     return ary;
 }
 
 /*
  *  call-seq:
- *     index_reader.get_document(doc_id) -> LazyDoc
- *     index_reader[doc_id] -> LazyDoc
+ *     index_reader.get_document(doc_num) -> LazyDoc
+ *     index_reader[doc_num] -> LazyDoc
  *
  *  Retrieve a document from the index. See LazyDoc for more details on the
  *  document returned. Documents are referenced internally by document ids
@@ -2077,7 +2037,7 @@ frb_ir_get_doc(int argc, VALUE *argv, VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     VALUE arg1, arg2;
     long pos, len;
-    long max = ir->max_doc(ir);
+    long max = ir->max_doc_num(ir);
     rb_scan_args(argc, argv, "11", &arg1, &arg2);
     if (argc == 1) {
         if (FIXNUM_P(arg1)) {
@@ -2087,7 +2047,24 @@ frb_ir_get_doc(int argc, VALUE *argv, VALUE self) {
                 rb_raise(rb_eArgError, "index %ld is out of range [%d..%ld] for "
                          "IndexReader#[]", pos, 0, max);
             }
-            return frb_get_lazy_doc(ir->get_lazy_doc(ir, pos));
+            
+            int ex_code = 0;
+            const char *msg = NULL;
+            VALUE ld = Qnil;
+            
+            FRT_TRY
+                ld = frb_get_lazy_doc(ir->get_lazy_doc(ir, pos));
+            FRT_XCATCHALL
+                ex_code = xcontext.excode;
+                msg = xcontext.msg;
+                FRT_HANDLED();
+            FRT_XENDTRY
+
+            if (ex_code && msg) {
+                frb_raise(ex_code, msg);
+            }
+
+            return ld;
         }
 
         /* check if idx is Range */
@@ -2118,55 +2095,48 @@ frb_ir_get_doc(int argc, VALUE *argv, VALUE self) {
  *  index to search the latest documents added to the index.
  */
 static VALUE
-frb_ir_is_latest(VALUE self)
-{
+frb_ir_is_latest(VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     return frt_ir_is_latest(ir) ? Qtrue : Qfalse;
 }
 
-/*
- *  call-seq:
- *     index_reader.term_vector(doc_id, field) -> TermVector
+/*  call-seq:
+ *     index_reader.term_vector(doc_num, field) -> TermVector
  *
- *  Return the TermVector for the field +field+ in the document at +doc_id+ in
+ *  Return the TermVector for the field +field+ in the document at +doc_num+ in
  *  the index. Return nil if no such term_vector exists. See TermVector.
  */
 static VALUE
-frb_ir_term_vector(VALUE self, VALUE rdoc_id, VALUE rfield)
-{
+frb_ir_term_vector(VALUE self, VALUE rdoc_num, VALUE rfield) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     FrtTermVector *tv;
     VALUE rtv;
-    tv = ir->term_vector(ir, FIX2INT(rdoc_id), frb_field(rfield));
+    tv = ir->term_vector(ir, FIX2INT(rdoc_num), frb_field(rfield));
     if (tv) {
         rtv = frb_get_tv(tv);
         frt_tv_destroy(tv);
         return rtv;
-    }
-    else {
+    } else {
         return Qnil;
     }
 }
 
 static void
-frb_add_each_tv(void *key, void *value, void *rtvs)
-{
+frb_add_each_tv(void *key, void *value, void *rtvs) {
     rb_hash_aset((VALUE)rtvs, ID2SYM((ID)key), frb_get_tv(value));
 }
 
-/*
- *  call-seq:
- *     index_reader.term_vectors(doc_id) -> hash of TermVector
+/*  call-seq:
+ *     index_reader.term_vectors(doc_num) -> hash of TermVector
  *
- *  Return the TermVectors for the document at +doc_id+ in the index. The
+ *  Return the TermVectors for the document at +doc_num+ in the index. The
  *  value returned is a hash of the TermVectors for each field in the document
  *  and they are referenced by field names (as symbols).
  */
 static VALUE
-frb_ir_term_vectors(VALUE self, VALUE rdoc_id)
-{
+frb_ir_term_vectors(VALUE self, VALUE rdoc_num) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
-    FrtHash *tvs = ir->term_vectors(ir, FIX2INT(rdoc_id));
+    FrtHash *tvs = ir->term_vectors(ir, FIX2INT(rdoc_num));
     VALUE rtvs = rb_hash_new();
     frt_h_each(tvs, &frb_add_each_tv, (void *)rtvs);
     frt_h_destroy(tvs);
@@ -2182,8 +2152,7 @@ frb_ir_term_vectors(VALUE self, VALUE rdoc_id)
  *  See TermDocEnum for more info.
  */
 static VALUE
-frb_ir_term_docs(VALUE self)
-{
+frb_ir_term_docs(VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     return frb_get_tde(self, ir->term_docs(ir));
 }
@@ -2196,8 +2165,7 @@ frb_ir_term_docs(VALUE self)
  *  term +term+ in the field +field+. See TermDocEnum for more info.
  */
 static VALUE
-frb_ir_term_docs_for(VALUE self, VALUE rfield, VALUE rterm)
-{
+frb_ir_term_docs_for(VALUE self, VALUE rfield, VALUE rterm) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     return frb_get_tde(self, ir_term_docs_for(ir,
                                               frb_field(rfield),
@@ -2213,8 +2181,7 @@ frb_ir_term_docs_for(VALUE self, VALUE rfield, VALUE rterm)
  *  more info.
  */
 static VALUE
-frb_ir_term_positions(VALUE self)
-{
+frb_ir_term_positions(VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     return frb_get_tde(self, ir->term_positions(ir));
 }
@@ -2228,8 +2195,7 @@ frb_ir_term_positions(VALUE self)
  *  TermDocEnum for more info.
  */
 static VALUE
-frb_ir_t_pos_for(VALUE self, VALUE rfield, VALUE rterm)
-{
+frb_ir_t_pos_for(VALUE self, VALUE rfield, VALUE rterm) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     return frb_get_tde(self, frt_ir_term_positions_for(ir,
                                                    frb_field(rfield),
@@ -2244,8 +2210,7 @@ frb_ir_t_pos_for(VALUE self, VALUE rfield, VALUE rterm)
  *  field +field+.
  */
 static VALUE
-frb_ir_doc_freq(VALUE self, VALUE rfield, VALUE rterm)
-{
+frb_ir_doc_freq(VALUE self, VALUE rfield, VALUE rterm) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     return INT2FIX(frt_ir_doc_freq(ir,
                                frb_field(rfield),
@@ -2260,8 +2225,7 @@ frb_ir_doc_freq(VALUE self, VALUE rfield, VALUE rterm)
  *  terms in the field +field+ in the index.
  */
 static VALUE
-frb_ir_terms(VALUE self, VALUE rfield)
-{
+frb_ir_terms(VALUE self, VALUE rfield) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     return frb_get_te(self, frt_ir_terms(ir, frb_field(rfield)));
 }
@@ -2274,8 +2238,7 @@ frb_ir_terms(VALUE self, VALUE rfield)
  *  at term +term+.
  */
 static VALUE
-frb_ir_terms_from(VALUE self, VALUE rfield, VALUE rterm)
-{
+frb_ir_terms_from(VALUE self, VALUE rfield, VALUE rterm) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     return frb_get_te(self, frt_ir_terms_from(ir,
                                           frb_field(rfield),
@@ -2289,8 +2252,7 @@ frb_ir_terms_from(VALUE self, VALUE rfield, VALUE rterm)
  *  Same return a count of the number of terms in the field
  */
 static VALUE
-frb_ir_term_count(VALUE self, VALUE rfield)
-{
+frb_ir_term_count(VALUE self, VALUE rfield) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     FrtTermEnum *te = frt_ir_terms(ir, frb_field(rfield));
     int count = 0;
@@ -2311,8 +2273,7 @@ frb_ir_term_count(VALUE self, VALUE rfield)
  *  gathered from the FieldInfos object.
  */
 static VALUE
-frb_ir_fields(VALUE self)
-{
+frb_ir_fields(VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     FrtFieldInfos *fis = ir->fis;
     VALUE rfield_names = rb_ary_new();
@@ -2345,8 +2306,7 @@ static VALUE frb_ir_field_infos(VALUE self) {
  *  of field names can also be gathered from the FieldInfos object.
  */
 static VALUE
-frb_ir_tk_fields(VALUE self)
-{
+frb_ir_tk_fields(VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     FrtFieldInfos *fis = ir->fis;
     VALUE rfield_names = rb_ary_new();
@@ -2377,14 +2337,28 @@ static VALUE frb_ir_to_enum(VALUE self) {
 static VALUE frb_ir_each(VALUE self) {
     FrtIndexReader *ir = (FrtIndexReader *)DATA_PTR(self);
     if (rb_block_given_p()) {
+        int ex_code = 0;
+        const char *msg = NULL;
         long i;
-        long max_doc = ir->max_doc(ir);
+        int max_doc_num = ir->max_doc_num(ir);
         VALUE rld;
-        for (i = 0; i < max_doc; i++) {
-            if (ir->is_deleted(ir, i)) continue;
-            rld = frb_get_lazy_doc(ir->get_lazy_doc(ir, i));
-            rb_yield(rld);
+
+        FRT_TRY
+            for (i = 0; i < max_doc_num; i++) {
+                if (ir->is_deleted(ir, i)) continue;
+                rld = frb_get_lazy_doc(ir->get_lazy_doc(ir, i));
+                rb_yield(rld);
+            }
+        FRT_XCATCHALL
+            ex_code = xcontext.excode;
+            msg = xcontext.msg;
+            FRT_HANDLED();
+        FRT_XENDTRY
+
+        if (ex_code && msg) {
+            frb_raise(ex_code, msg);
         }
+
         return self;
     } else {
         return frb_ir_to_enum(self);
@@ -2511,8 +2485,8 @@ Init_TermEnum(void) {
  *
  *    tde = index_reader.term_docs_for(:content, "fox")
  *
- *    tde.each do |doc_id, freq|
- *      puts "fox appeared #{freq} times in document #{doc_id}:"
+ *    tde.each do |doc_num, freq|
+ *      puts "fox appeared #{freq} times in document #{doc_num}:"
  *      positions = []
  *      tde.each_position {|pos| positions << pos}
  *      puts "  #{positions.join(', ')}"
@@ -2537,7 +2511,7 @@ static void Init_TermDocEnum(void) {
     rb_define_alloc_func(cTermDocEnum, frb_tde_alloc);
     rb_define_method(cTermDocEnum, "seek",           frb_tde_seek, 2);
     rb_define_method(cTermDocEnum, "seek_term_enum", frb_tde_seek_te, 1);
-    rb_define_method(cTermDocEnum, "doc",            frb_tde_doc, 0);
+    rb_define_method(cTermDocEnum, "doc_num",        frb_tde_doc_num, 0);
     rb_define_method(cTermDocEnum, "freq",           frb_tde_freq, 0);
     rb_define_method(cTermDocEnum, "next?",          frb_tde_next, 0);
     rb_define_method(cTermDocEnum, "next_position",  frb_tde_next_position, 0);
@@ -2606,7 +2580,7 @@ static void Init_TVTerm(void) {
  *
  *  == Example
  *
- *    tv = index_reader.term_vector(doc_id, :content)
+ *    tv = index_reader.term_vector(doc_num, :content)
  *    tv_term = tv.find {|tvt| tvt.term == "fox"}
  *
  *    # get the term frequency
@@ -2832,7 +2806,7 @@ void Init_IndexReader(void) {
     rb_define_method(cIndexReader, "has_deletions?", frb_ir_has_deletions, 0);
     rb_define_method(cIndexReader, "delete",         frb_ir_delete,        1);
     rb_define_method(cIndexReader, "deleted?",       frb_ir_is_deleted,    1);
-    rb_define_method(cIndexReader, "max_doc",        frb_ir_max_doc,       0);
+    rb_define_method(cIndexReader, "max_doc_num",    frb_ir_max_doc_num,   0);
     rb_define_method(cIndexReader, "num_docs",       frb_ir_num_docs,      0);
     rb_define_method(cIndexReader, "undelete_all",   frb_ir_undelete_all,  0);
     rb_define_method(cIndexReader, "latest?",        frb_ir_is_latest,     0);