java_bin 0.3.2 → 0.3.3

data/.gitignore

@@ -29,3 +29,4 @@ Makefile
 *.lib
 *.pdb
 *.obj
+*.s

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.3.3 (2010/02/01)
+  * fix iterator false bug
+  * performance improve
+  * refactoring
+
 0.3.2 (2010/01/25)
   * windows 1.9.x build
   * fix pure parser bug

data/README.rdoc

@@ -6,37 +6,22 @@ This is an Apache Solr JavaBin format (binary format) implementation for Ruby.
 
 * fast parse(2.5 - 5 times faster than ruby eval), and less network traffic.
  MRI 1.8.7
-  [data1]
-  ruby eval parse. 5000 times. elapsed time 1.282744
-  javabin parse.   5000 times. elapsed time 0.4634
-  2.76811394044022 times
-
-  [data2]  
-  ruby2 eval parse. 5000 times. elapsed time 6.568942
-  javabin2 parse.   5000 times. elapsed time 2.267351
-  2.89718795193157 times
+  [data2]
+  ruby eval parse. 5000 times. elapsed time 6.664981
+  javabin parse.   5000 times. elapsed time 1.472825
+  4.52530409247534 times
 
  REE 1.8.7
-  [data1]
-  ruby eval parse. 5000 times. elapsed time 0.940934
-  javabin parse.   5000 times. elapsed time 0.310581
-  3.02959292422911 times
-
   [data2]
-  ruby2 eval parse. 5000 times. elapsed time 4.708985
-  javabin2 parse.   5000 times. elapsed time 1.482276
-  3.176861124379 times
-
- YARV 1.9.2
-  [data1]
-  ruby eval parse. 5000 times. elapsed time 1.348342119
-  javabin parse.   5000 times. elapsed time 0.367371147
-  3.6702450097421506 times
+  ruby eval parse. 5000 times. elapsed time 4.844482
+  javabin parse.   5000 times. elapsed time 1.059044
+  4.57439162112245 times
 
+ YARV 1.9.2 pre1
   [data2]
-  ruby2 eval parse. 5000 times. elapsed time 6.486995777
-  javabin2 parse.   5000 times. elapsed time 1.73077786
-  3.748023317677521 times
+  ruby eval parse. 5000 times. elapsed time 6.659331328
+  javabin parse.   5000 times. elapsed time 1.261828473
+  5.277525012704322 times
 
 * rsolr/solr-ruby support.
 * pure and c extension code.

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/ext/java_bin/ext/parser.c

@@ -9,40 +9,57 @@ static VALUE rb_cParser;
 
 static ID    i_At; // Time#at用
 #ifdef HAVE_RUBY_ENCODING_H
-static rb_encoding* rb_encUtf8;
+  static rb_encoding* rb_encUtf8;
 #endif
 
+static VALUE jbp_numFound;
+static VALUE jbp_start;
+static VALUE jbp_maxScore;
+static VALUE jbp_docs;
+
+static VALUE jbp_terminator;
+
 /*
  * javabinフォーマット読み込み関数群
  */
+static inline void JavaBinParser_extend_cache(JAVA_BIN_PARSER* ptr) {
+  int next_size;
 
-static int32_t JavaBinParser_read_v_int(JAVA_BIN_PARSER* ptr) {
+  next_size = ((ptr->cache == NULL) ? 64 : ptr->cache_size * 2);
+  ptr->cache = (VALUE*) realloc(ptr->cache, next_size * sizeof(VALUE));
+  if (!ptr->cache) {
+    rb_raise(rb_eRuntimeError, "JavaBinParser_extend_cache - allocate error");
+  }
+  ptr->cache_size = next_size;
+}
+
+static inline int32_t JavaBinParser_read_v_int(JAVA_BIN_PARSER* ptr) {
   unsigned char byte;
   int32_t result;
   int shift;
   byte = _getbyte(ptr);
   result = byte & 0x7f;
-  for(shift = 7; (byte & 0x80) != 0; shift += 7) {
+  for (shift = 7; (byte & 0x80) != 0; shift += 7) {
     byte = _getbyte(ptr);
     result |= (((int32_t)(byte & 0x7f)) << shift);
   }
   return result;
 }
 
-static int64_t JavaBinParser_read_v_long(JAVA_BIN_PARSER* ptr) {
+static inline int64_t JavaBinParser_read_v_long(JAVA_BIN_PARSER* ptr) {
   unsigned char byte;
   int64_t result;
   int shift;
   byte = _getbyte(ptr);
   result = byte & 0x7f;
-  for(shift = 7; (byte & 0x80) != 0; shift += 7) {
+  for (shift = 7; (byte & 0x80) != 0; shift += 7) {
     byte = _getbyte(ptr);
     result |= (((int64_t)(byte & 0x7f)) << shift);
   }
   return result;
 }
 
-static int JavaBinParser_read_size(JAVA_BIN_PARSER* ptr) {
+static inline int JavaBinParser_read_size(JAVA_BIN_PARSER* ptr) {
   int size;
   size = (ptr->tag_byte & 0x1f);
   if (size == 0x1f) {
@@ -51,7 +68,7 @@ static int JavaBinParser_read_size(JAVA_BIN_PARSER* ptr) {
   return size;
 }
 
-static VALUE JavaBinParser_read_small_int(JAVA_BIN_PARSER* ptr) {
+static inline VALUE JavaBinParser_read_small_int(JAVA_BIN_PARSER* ptr) {
   int32_t result;
   result = ptr->tag_byte & 0x0f;
   if ((ptr->tag_byte & 0x10) != 0) {
@@ -60,7 +77,7 @@ static VALUE JavaBinParser_read_small_int(JAVA_BIN_PARSER* ptr) {
   return INT2NUM(result);
 }
 
-static VALUE JavaBinParser_read_small_long(JAVA_BIN_PARSER* ptr) {
+static inline VALUE JavaBinParser_read_small_long(JAVA_BIN_PARSER* ptr) {
   int64_t result;
   result = ptr->tag_byte & 0x0f;
   if ((ptr->tag_byte & 0x10) != 0) {
@@ -69,12 +86,10 @@ static VALUE JavaBinParser_read_small_long(JAVA_BIN_PARSER* ptr) {
   return LL2NUM(result);
 }
 
-static VALUE JavaBinParser_read_string(JAVA_BIN_PARSER* ptr) {
-  int size;
-  int i;
+static inline VALUE JavaBinParser_read_string(JAVA_BIN_PARSER* ptr) {
+  int size, i;
   int start;
   unsigned char b;
-
   size = JavaBinParser_read_size(ptr);
   start = ptr->current;
   for (i = 0; i < size; i++) {
@@ -90,125 +105,161 @@ static VALUE JavaBinParser_read_string(JAVA_BIN_PARSER* ptr) {
   return _utf8_string((const char*) &ptr->data[start], ptr->current - start); 
 }
 
-static VALUE JavaBinParser_read_byte(JAVA_BIN_PARSER* ptr) {
+static inline VALUE JavaBinParser_read_array(JAVA_BIN_PARSER* ptr) {
+  int size, i;
+  VALUE array;
+  size  = JavaBinParser_read_size(ptr);
+  array = rb_ary_new();
+  for (i = 0; i < size; i++) {
+    rb_ary_push(array,JavaBinParser_read_val(ptr));
+  }
+  return array;
+}
+
+static inline VALUE JavaBinParser_read_extern_string(JAVA_BIN_PARSER* ptr) {
+  int size;
+  VALUE value;
+  size = JavaBinParser_read_size(ptr);
+  if (size == 0) {
+    /* rubyの文字列 */
+    value = JavaBinParser_read_val(ptr);
+    OBJ_FREEZE(value);
+    /* 参照文字列として文字列を保持 */
+    ptr->cache[ptr->cache_index++] = value;
+    /* 必要があれば参照文字列用のcacheを拡張する */
+    if (ptr->cache_size <= ptr->cache_index) {
+      JavaBinParser_extend_cache(ptr);
+    }
+    return value;
+  } else {
+    //return rb_str_new4(ptr->cache[size - 1]);   // freeze共有
+    //return rb_str_new3(ptr->cache[size - 1]); // 共有(変更があったら分裂)
+    return ptr->cache[size - 1];              // 同じ物
+    //return rb_str_dup(ptr->cache[size - 1]);  // コピー
+  }
+}
+
+static inline VALUE JavaBinParser_read_ordered_map(JAVA_BIN_PARSER* ptr) {
+  int size, i;
+  VALUE hash, key, value;
+  size = JavaBinParser_read_size(ptr);
+  hash = rb_hash_new();
+  for (i = 0; i < size; i++) {
+    key   = JavaBinParser_read_val(ptr);
+    value = JavaBinParser_read_val(ptr);
+    rb_hash_aset(hash, key, value);
+  }
+  return hash;
+}
+
+static inline VALUE JavaBinParser_read_byte(JAVA_BIN_PARSER* ptr) {
   int8_t c;
   _readnumeric(ptr, c);
   return INT2FIX(*((int8_t*)&c));
 }
 
-static VALUE JavaBinParser_read_short(JAVA_BIN_PARSER* ptr) {
+static inline VALUE JavaBinParser_read_short(JAVA_BIN_PARSER* ptr) {
   u_int16_t c;
   _readnumeric(ptr, c);
   c = _swap_16(c);
   return INT2FIX(*((int16_t*)&c));
 }
 
-static VALUE JavaBinParser_read_int(JAVA_BIN_PARSER* ptr) {
+static inline VALUE JavaBinParser_read_int(JAVA_BIN_PARSER* ptr) {
   u_int32_t c;
   _readnumeric(ptr, c);
   c = _swap_32(c);
   return INT2NUM(*((int32_t*)&c));
 }
 
-static VALUE JavaBinParser_read_long(JAVA_BIN_PARSER* ptr) {
+static inline VALUE JavaBinParser_read_long(JAVA_BIN_PARSER* ptr) {
   u_int64_t c;
   _readnumeric(ptr, c);
   c = _swap_64(c);
   return LL2NUM(*((int64_t*)&c));
 }
 
-static VALUE JavaBinParser_read_date(JAVA_BIN_PARSER* ptr) {
+static inline VALUE JavaBinParser_read_date(JAVA_BIN_PARSER* ptr) {
   u_int64_t c;
   _readnumeric(ptr, c);
   c = _swap_64(c);
   return rb_funcall(rb_cTime, i_At, 1, ULL2NUM(*((int64_t*)&c) / 1000));
 }
 
-static VALUE JavaBinParser_read_float(JAVA_BIN_PARSER* ptr) {
+static inline VALUE JavaBinParser_read_float(JAVA_BIN_PARSER* ptr) {
   u_int32_t c;
   _readnumeric(ptr, c);
   c = _swap_32(c);
   return rb_float_new((double)*((float*)&c));
 }
 
-static VALUE JavaBinParser_read_double(JAVA_BIN_PARSER* ptr) {
+static inline VALUE JavaBinParser_read_double(JAVA_BIN_PARSER* ptr) {
   u_int64_t c;
   _readnumeric(ptr, c);
   c = _swap_64(c);
   return rb_float_new(*((double*)&c));
 }
 
-static void JavaBinParser_extend_cache(JAVA_BIN_PARSER* ptr) {
-  VALUE* newP;
-  int next_size;
-  if (ptr->cache == NULL) {
-    next_size = 64;
-  } else {
-    next_size = ptr->cache_size * 2;
+static inline VALUE JavaBinParser_read_byte_array(JAVA_BIN_PARSER* ptr) {
+  int size, i;
+  VALUE array;
+  size = JavaBinParser_read_v_int(ptr);
+  array = rb_ary_new();
+  for (i = 0; i < size; i++) {
+    rb_ary_push(array, INT2FIX(_getbyte(ptr)));
   }
+  return array;
+}
 
-  newP = (VALUE*) malloc(next_size * sizeof(VALUE));
-  if (!newP) {
-    rb_raise(rb_eRuntimeError, "JavaBinParser_extend_cache - allocate error");
+static inline VALUE JavaBinParser_read_map(JAVA_BIN_PARSER* ptr) {
+  int size, i;
+  VALUE hash, key, value;
+  size = JavaBinParser_read_v_int(ptr);
+  hash = rb_hash_new();
+  for (i = 0; i < size; i++) {
+    key   = JavaBinParser_read_val(ptr);
+    value = JavaBinParser_read_val(ptr);
+    rb_hash_aset(hash, key, value);
   }
+  return hash;
+}
 
-  if (ptr->cache) {
-    memcpy(newP, ptr->cache, sizeof(VALUE) * ptr->cache_size);
+static inline VALUE JavaBinParser_read_iterator(JAVA_BIN_PARSER* ptr) {
+  VALUE array, value;
+  array = rb_ary_new();
+  while (1) {
+    value = JavaBinParser_read_val(ptr);
+    if (value == END_OBJ) {
+      break;
+    }
+    rb_ary_push(array, value);
   }
-  ptr->cache = newP;
-  ptr->cache_size = next_size;
+  return array;
 }
 
-static VALUE JavaBinParser_read_val(JAVA_BIN_PARSER* ptr) {
-  int size;
-  int i;
-  VALUE key;
-  VALUE value;
-  VALUE array;
-  VALUE hash;
+static inline VALUE JavaBinParser_read_solr_doc_list(JAVA_BIN_PARSER* ptr) {
+  VALUE hash, array;
+  hash = rb_hash_new();
+  array = JavaBinParser_read_val(ptr);
+  rb_hash_aset(hash, jbp_numFound, rb_ary_entry(array, 0));
+  rb_hash_aset(hash, jbp_start,    rb_ary_entry(array, 1));
+  rb_hash_aset(hash, jbp_maxScore, rb_ary_entry(array, 2));
+  rb_hash_aset(hash, jbp_docs,     JavaBinParser_read_val(ptr));
+  return hash;
+}
 
+static VALUE JavaBinParser_read_val(JAVA_BIN_PARSER* ptr) {
   ptr->tag_byte = _getbyte(ptr);
   switch (ptr->tag_byte >> 5) { /* unsignedなので論理シフト */
     case SHIFTED_STR:
       return JavaBinParser_read_string(ptr);
     case SHIFTED_ARR:
-      size = JavaBinParser_read_size(ptr);
-      array = rb_ary_new();
-      for (i = 0; i < size; i++) {
-        value = JavaBinParser_read_val(ptr);
-        rb_ary_push(array, value);
-      }
-      return array;
+      return JavaBinParser_read_array(ptr);
     case SHIFTED_EXTERN_STRING:
-      size = JavaBinParser_read_size(ptr);
-      if(size == 0) {
-        /* rubyの文字列 */
-        value = JavaBinParser_read_val(ptr);
-
-        /* 参照文字列として文字列を保持 */
-        ptr->cache[ptr->cache_index++] = value;
-        /* 参照文字列用のcacheを拡張する */
-        if (ptr->cache_size <= ptr->cache_index) {
-          JavaBinParser_extend_cache(ptr);
-        }
-        return value;
-      } else {
-        return rb_str_new4(ptr->cache[size - 1]);   // freeze共有
-        //return rb_str_new3(ptr->cache[size - 1]); // 共有(変更があったら分裂)
-        
-	//return ptr->cache[size - 1];              // 同じ物
-        //return rb_str_dup(ptr->cache[size - 1]);  // コピー
-      }
+      return JavaBinParser_read_extern_string(ptr);
     case SHIFTED_ORDERED_MAP:
     case SHIFTED_NAMED_LST:
-      size = JavaBinParser_read_size(ptr);
-      hash = rb_hash_new();
-      for (i = 0; i < size; i++) {
-        key   = JavaBinParser_read_val(ptr);
-        value = JavaBinParser_read_val(ptr);
-        rb_hash_aset(hash, key, value);
-      }
-      return hash;
+      return JavaBinParser_read_ordered_map(ptr);
     case SHIFTED_SINT:
       return JavaBinParser_read_small_int(ptr);
     case SHIFTED_SLONG:
@@ -231,12 +282,7 @@ static VALUE JavaBinParser_read_val(JAVA_BIN_PARSER* ptr) {
     case DATE:
       return JavaBinParser_read_date(ptr);
     case BYTEARR:
-      size = JavaBinParser_read_v_int(ptr);
-      array = rb_ary_new();
-      for (i = 0; i < size; i++) {
-        rb_ary_push(array, INT2FIX(_getbyte(ptr)));
-      }
-      return array;
+      return JavaBinParser_read_byte_array(ptr);
     case NULL_MARK:
       return Qnil;
     case BOOL_TRUE:
@@ -244,65 +290,20 @@ static VALUE JavaBinParser_read_val(JAVA_BIN_PARSER* ptr) {
     case BOOL_FALSE:
       return Qfalse;
     case MAP:
-      size = JavaBinParser_read_v_int(ptr);
-      hash = rb_hash_new();
-      for (i = 0; i < size; i++) {
-        key   = JavaBinParser_read_val(ptr);
-        value = JavaBinParser_read_val(ptr);
-        rb_hash_aset(hash, key, value);
-      }
-      return hash;
-   case ITERATOR:
-      array = rb_ary_new();
-      while (1) {
-        value = JavaBinParser_read_val(ptr);
-        if (value == END_OBJ) {
-          break;
-        }
-        rb_ary_push(array, value);
-      }
-      return array;
+      return JavaBinParser_read_map(ptr);
+    case ITERATOR:
+      return JavaBinParser_read_iterator(ptr);
     case END:
       return END_OBJ; 
     case SOLRDOC:
       return JavaBinParser_read_val(ptr);
     case SOLRDOCLST:
-      hash = rb_hash_new();
-      value = JavaBinParser_read_val(ptr);
-      // TODO キーのfreeze
-      rb_hash_aset(hash, rb_str_new2("numFound"), rb_ary_entry(value, 0));
-      rb_hash_aset(hash, rb_str_new2("start"),    rb_ary_entry(value, 1));
-      rb_hash_aset(hash, rb_str_new2("maxScore"), rb_ary_entry(value, 2));
-      rb_hash_aset(hash, rb_str_new2("docs"),     JavaBinParser_read_val(ptr));
-      return hash;
+      return JavaBinParser_read_solr_doc_list(ptr);
     default:
       rb_raise(rb_eRuntimeError, "JavaBinParser_read_val - unknown tag type");
   }
 }
 
-static void JavaBinParser_free(JAVA_BIN_PARSER* ptr) {
-  if (ptr) {
-    //free(ptr->data);
-    if (ptr->cache) {
-      free(ptr->cache);
-    }
-    free(ptr);
-  }
-}
-
-static void JavaBinParser_mark(JAVA_BIN_PARSER* ptr) {
-  int i;
-  if (ptr) {
-    for (i = 0; i < ptr->cache_index; i++) {
-      rb_gc_mark_maybe(ptr->cache[i]);
-    }
-  }
-}
-
-static VALUE JavaBinParser_alloc(VALUE klass) {
-  return Data_Wrap_Struct(klass, JavaBinParser_mark, JavaBinParser_free, NULL);
-}
-
 /*
  * rubyメソッド
  */
@@ -327,11 +328,6 @@ static VALUE rb_cParser_parse(VALUE self, VALUE data) {
     rb_raise(rb_eRuntimeError, "rb_cParser_parse - data is empty.");
   }
 
-  //ptr->data = (unsigned char*) malloc(dataLen);
-  //if (!ptr->data) {
-  //  rb_raise(rb_eRuntimeError, "rb_cParser_parse - allocate error");
-  //}
-  //memcpy(ptr->data, ptrData, dataLen);
   ptr->data = (unsigned char*)ptrData;
   ptr->data_len = dataLen;
 
@@ -344,17 +340,13 @@ static VALUE rb_cParser_parse(VALUE self, VALUE data) {
   ptr->tag_byte = 0;
 
   /*
-   * 参照文字列既に確保している場合は解放
-   * HINT. インスタンスを使いまわす時に発生する
+   * 参照文字列保持、既に確保している場合は使いまわす。
+   * 確保していない場合は初回分を確保
    */
-  if (ptr->cache) {
-    free(ptr->cache);
-  }
-
-  /* 参照文字列の準備 */
-  ptr->cache = NULL;
   ptr->cache_index = 0;
-  JavaBinParser_extend_cache(ptr);
+  if (!ptr->cache) {
+    JavaBinParser_extend_cache(ptr);
+  }
  
   return JavaBinParser_read_val(ptr);
 }
@@ -369,13 +361,36 @@ static VALUE rb_cParser_initialize(VALUE self) {
   }
   DATA_PTR(self) = ptr;
 
-  /* 参照文字列の準備(ここでも初期化しておかないと、たまにsegvしちゃいますruby 1.8.7) */
+  /* 参照文字列の準備 */
   ptr->cache = NULL;
+  ptr->cache_size = 0;
   ptr->cache_index = 0;
  
   return self;
 }
 
+static void JavaBinParser_free(JAVA_BIN_PARSER* ptr) {
+  if (ptr) {
+    if (ptr->cache) {
+      free(ptr->cache);
+    }
+    free(ptr);
+  }
+}
+
+static void JavaBinParser_mark(JAVA_BIN_PARSER* ptr) {
+  int i;
+  if (ptr) {
+    for (i = 0; i < ptr->cache_index; i++) {
+      rb_gc_mark_maybe(ptr->cache[i]);
+    }
+  }
+}
+
+static VALUE JavaBinParser_alloc(VALUE klass) {
+  return Data_Wrap_Struct(klass, JavaBinParser_mark, JavaBinParser_free, NULL);
+}
+
 /*
  * エントリーポイント
  */
@@ -389,12 +404,31 @@ void Init_parser(void) {
   rb_mJavaBin = rb_define_module("JavaBin");
   rb_mExt     = rb_define_module_under(rb_mJavaBin, "Ext");
   rb_cParser  = rb_define_class_under(rb_mExt, "Parser", rb_cObject);
-  
+ 
   /* メモリーアロケーター設定 */
   rb_define_alloc_func(rb_cParser, JavaBinParser_alloc);
   /* コンストラクタ */
   rb_define_method(rb_cParser, "initialize", rb_cParser_initialize, 0);
   /* parseメソッド*/
   rb_define_method(rb_cParser, "parse", rb_cParser_parse, 1);
+
+  /* 繰り返し使うので変数&定数化 */
+  /* HINT 定数にするとGCの対象にならないっぽいので */
+  rb_define_const(rb_cParser, "NUM_FOUND", rb_str_new2("numFound"));
+  jbp_numFound = rb_const_get(rb_cParser, rb_intern("NUM_FOUND"));
+  rb_define_const(rb_cParser, "START", rb_str_new2("start"));
+  jbp_start    = rb_const_get(rb_cParser, rb_intern("START")); 
+  rb_define_const(rb_cParser, "MAX_SCORE", rb_str_new2("maxScore"));
+  jbp_maxScore = rb_const_get(rb_cParser, rb_intern("MAX_SCORE"));
+  rb_define_const(rb_cParser, "DOCS", rb_str_new2("docs"));
+  jbp_docs     = rb_const_get(rb_cParser, rb_intern("DOCS"));
+  OBJ_FREEZE(jbp_numFound);
+  OBJ_FREEZE(jbp_start);
+  OBJ_FREEZE(jbp_maxScore);
+  OBJ_FREEZE(jbp_docs);
+ 
+  rb_define_const(rb_cParser, "TERMINATOR", rb_str_new2("terminator")); // iterator終端用のオブジェクト
+  jbp_terminator = rb_const_get(rb_cParser, rb_intern("TERMINATOR"));
+  OBJ_FREEZE(jbp_terminator);
 }
 

data/ext/java_bin/ext/parser.h

@@ -44,7 +44,7 @@
 #define  EXTERN_STRING   (7U << 5)
 
 /* HINT. 終端判定用オブジェクト */
-#define END_OBJ ((int) NULL)
+#define END_OBJ (jbp_terminator)
 
 /* HINT. 先に計算しておく(unsignedなので論理シフト) */
 #define  SHIFTED_STR             (STR >> 5)
@@ -114,24 +114,35 @@ typedef struct java_bin_parser {
   typedef unsigned __int64 u_int64_t;
 #endif
 
-static int32_t JavaBinParser_read_v_int(JAVA_BIN_PARSER* ptr);
-static int64_t JavaBinParser_read_v_long(JAVA_BIN_PARSER* ptr);
-static int JavaBinParser_read_size(JAVA_BIN_PARSER* ptr);
-static VALUE JavaBinParser_read_small_int(JAVA_BIN_PARSER* ptr);
-static VALUE JavaBinParser_read_small_long(JAVA_BIN_PARSER* ptr);
-static VALUE JavaBinParser_read_string(JAVA_BIN_PARSER* ptr);
-static VALUE JavaBinParser_read_byte(JAVA_BIN_PARSER* ptr);
-static VALUE JavaBinParser_read_short(JAVA_BIN_PARSER* ptr);
-static VALUE JavaBinParser_read_int(JAVA_BIN_PARSER* ptr);
-static VALUE JavaBinParser_read_long(JAVA_BIN_PARSER* ptr);
-static VALUE JavaBinParser_read_date(JAVA_BIN_PARSER* ptr);
-static VALUE JavaBinParser_read_float(JAVA_BIN_PARSER* ptr);
-static VALUE JavaBinParser_read_double(JAVA_BIN_PARSER* ptr);
+//static void JavaBinParser_extend_cache(JAVA_BIN_PARSER* ptr);
+
+//static int32_t JavaBinParser_read_v_int(JAVA_BIN_PARSER* ptr);
+//static int64_t JavaBinParser_read_v_long(JAVA_BIN_PARSER* ptr);
+//static int JavaBinParser_read_size(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_small_int(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_small_long(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_string(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_array(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_extern_string(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_ordered_map(JAVA_BIN_PARSER* ptr); 
+//static VALUE JavaBinParser_read_byte(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_short(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_int(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_long(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_date(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_float(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_double(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_byte_array(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_map(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_iterator(JAVA_BIN_PARSER* ptr);
+//static VALUE JavaBinParser_read_solr_doc_list(JAVA_BIN_PARSER* ptr);
+
 static VALUE JavaBinParser_read_val(JAVA_BIN_PARSER* ptr);
+
 static void JavaBinParser_free(JAVA_BIN_PARSER* ptr);
 static void JavaBinParser_mark(JAVA_BIN_PARSER* ptr);
 static VALUE JavaBinParser_alloc(VALUE klass);
-static void JavaBinParser_extend_cache(JAVA_BIN_PARSER* ptr);
+
 static VALUE rb_cParser_parse(VALUE self, VALUE data);
 static VALUE rb_cParser_initialize(VALUE self);
 

data/java_bin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{java_bin}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kennyj"]
-  s.date = %q{2010-01-26}
+  s.date = %q{2010-02-02}
   s.description = %q{Apache Solr JavaBin format (binary format) implementation for Ruby.}
   s.email = %q{kennyj@gmail.com}
   s.extensions = ["ext/java_bin/ext/extconf.rb"]

data/test/test_java_bin_parser.rb

@@ -193,7 +193,7 @@ class TestJavaBinParser < Test::Unit::TestCase
   end
 
   def test_iterator
-    assert_equal([0, 127, nil, true], @parser.parse([1, 14, 3, 0, 3, 127, 0, 1,15].pack("C*")))
+    assert_equal([0, 127, nil, true, false], @parser.parse([1, 14, 3, 0, 3, 127, 0, 1, 2, 15].pack("C*")))
   end
 
 #  def test_term

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: java_bin
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - kennyj
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +09:00
+date: 2010-02-02 00:00:00 +09:00
 default_executable: 
 dependencies: []