thrift 0.8.0 → 0.13.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 6c894aeced9c6d4f7f4e66441472dbe37603b45722cffe89007e6faa1d2771c8
+  data.tar.gz: 3417f5e29c4459b18933e1a6c2eb6575ce0b8c6c073bac4836043742854a8c01
+SHA512:
+  metadata.gz: 4daf374c7752cfd11fb60fa7f1a5323f026bacbff118987f7e4342bfc79e9da8cc80e2872ddf571e2b705a310fe7921bc0c011215ec5f222cee252e0ec9a513f
+  data.tar.gz: 4712fd01cd41fde2877df76808af17ce303656c3a003dcda92c876766aba508cdaf802511e3698ce5f4476064a435057e47493f05a2e4f928c67e16ec7554562

data/ext/binary_protocol_accelerated.c

@@ -22,7 +22,8 @@
 #include <stdint.h>
 #include <constants.h>
 #include <struct.h>
-#include "macros.h"
+#include <macros.h>
+#include <bytes.h>
 
 VALUE rb_thrift_binary_proto_native_qmark(VALUE self) {
   return Qtrue;
@@ -78,8 +79,9 @@ static void write_i64_direct(VALUE trans, int64_t value) {
 
 static void write_string_direct(VALUE trans, VALUE str) {
   if (TYPE(str) != T_STRING) {
-    rb_raise(rb_eStandardError, "Value should be a string");    
+    rb_raise(rb_eStandardError, "Value should be a string");
   }
+  str = convert_to_utf8_byte_buffer(str);
   write_i32_direct(trans, RSTRING_LEN(str));
   rb_funcall(trans, write_method_id, 1, str);
 }
@@ -217,11 +219,21 @@ VALUE rb_thrift_binary_proto_write_string(VALUE self, VALUE str) {
   return Qnil;
 }
 
+VALUE rb_thrift_binary_proto_write_binary(VALUE self, VALUE buf) {
+  CHECK_NIL(buf);
+  VALUE trans = GET_TRANSPORT(self);
+  buf = force_binary_encoding(buf);
+  write_i32_direct(trans, RSTRING_LEN(buf));
+  rb_funcall(trans, write_method_id, 1, buf);
+  return Qnil;
+}
+
 //---------------------------------------
 // interface reading methods
 //---------------------------------------
 
 VALUE rb_thrift_binary_proto_read_string(VALUE self);
+VALUE rb_thrift_binary_proto_read_binary(VALUE self);
 VALUE rb_thrift_binary_proto_read_byte(VALUE self);
 VALUE rb_thrift_binary_proto_read_i32(VALUE self);
 VALUE rb_thrift_binary_proto_read_i16(VALUE self);
@@ -271,27 +283,27 @@ VALUE rb_thrift_binary_proto_read_message_end(VALUE self) {
   return Qnil;
 }
 
-VALUE rb_thift_binary_proto_read_struct_begin(VALUE self) {
+VALUE rb_thrift_binary_proto_read_struct_begin(VALUE self) {
   return Qnil;
 }
 
-VALUE rb_thift_binary_proto_read_struct_end(VALUE self) {
+VALUE rb_thrift_binary_proto_read_struct_end(VALUE self) {
   return Qnil;
 }
 
-VALUE rb_thift_binary_proto_read_field_end(VALUE self) {
+VALUE rb_thrift_binary_proto_read_field_end(VALUE self) {
   return Qnil;
 }
 
-VALUE rb_thift_binary_proto_read_map_end(VALUE self) {
+VALUE rb_thrift_binary_proto_read_map_end(VALUE self) {
   return Qnil;
 }
 
-VALUE rb_thift_binary_proto_read_list_end(VALUE self) {
+VALUE rb_thrift_binary_proto_read_list_end(VALUE self) {
   return Qnil;
 }
 
-VALUE rb_thift_binary_proto_read_set_end(VALUE self) {
+VALUE rb_thrift_binary_proto_read_set_end(VALUE self) {
   return Qnil;
 }
 
@@ -379,6 +391,11 @@ VALUE rb_thrift_binary_proto_read_double(VALUE self) {
 }
 
 VALUE rb_thrift_binary_proto_read_string(VALUE self) {
+  VALUE buffer = rb_thrift_binary_proto_read_binary(self);
+  return convert_to_string(buffer);
+}
+
+VALUE rb_thrift_binary_proto_read_binary(VALUE self) {
   int size = read_i32_direct(self);
   return READ(self, size);
 }
@@ -407,6 +424,7 @@ void Init_binary_protocol_accelerated() {
   rb_define_method(bpa_class, "write_i64",           rb_thrift_binary_proto_write_i64, 1);
   rb_define_method(bpa_class, "write_double",        rb_thrift_binary_proto_write_double, 1);
   rb_define_method(bpa_class, "write_string",        rb_thrift_binary_proto_write_string, 1);
+  rb_define_method(bpa_class, "write_binary",        rb_thrift_binary_proto_write_binary, 1);
   // unused methods
   rb_define_method(bpa_class, "write_message_end", rb_thrift_binary_proto_write_message_end, 0);
   rb_define_method(bpa_class, "write_struct_begin", rb_thrift_binary_proto_write_struct_begin, 1);
@@ -428,14 +446,15 @@ void Init_binary_protocol_accelerated() {
   rb_define_method(bpa_class, "read_i64",            rb_thrift_binary_proto_read_i64, 0);
   rb_define_method(bpa_class, "read_double",         rb_thrift_binary_proto_read_double, 0);
   rb_define_method(bpa_class, "read_string",         rb_thrift_binary_proto_read_string, 0);
+  rb_define_method(bpa_class, "read_binary",         rb_thrift_binary_proto_read_binary, 0);
   // unused methods
   rb_define_method(bpa_class, "read_message_end", rb_thrift_binary_proto_read_message_end, 0);
-  rb_define_method(bpa_class, "read_struct_begin", rb_thift_binary_proto_read_struct_begin, 0);
-  rb_define_method(bpa_class, "read_struct_end", rb_thift_binary_proto_read_struct_end, 0);
-  rb_define_method(bpa_class, "read_field_end", rb_thift_binary_proto_read_field_end, 0);
-  rb_define_method(bpa_class, "read_map_end", rb_thift_binary_proto_read_map_end, 0);
-  rb_define_method(bpa_class, "read_list_end", rb_thift_binary_proto_read_list_end, 0);
-  rb_define_method(bpa_class, "read_set_end", rb_thift_binary_proto_read_set_end, 0);
+  rb_define_method(bpa_class, "read_struct_begin", rb_thrift_binary_proto_read_struct_begin, 0);
+  rb_define_method(bpa_class, "read_struct_end", rb_thrift_binary_proto_read_struct_end, 0);
+  rb_define_method(bpa_class, "read_field_end", rb_thrift_binary_proto_read_field_end, 0);
+  rb_define_method(bpa_class, "read_map_end", rb_thrift_binary_proto_read_map_end, 0);
+  rb_define_method(bpa_class, "read_list_end", rb_thrift_binary_proto_read_list_end, 0);
+  rb_define_method(bpa_class, "read_set_end", rb_thrift_binary_proto_read_set_end, 0);
 
   rbuf_ivar_id = rb_intern("@rbuf");
 }

data/ext/bytes.c

@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include <ruby.h>
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+#endif
+#include <constants.h>
+
+VALUE force_binary_encoding(VALUE buffer) {
+  return rb_funcall(thrift_bytes_module, force_binary_encoding_id, 1, buffer);
+}
+
+VALUE convert_to_utf8_byte_buffer(VALUE string) {
+  return rb_funcall(thrift_bytes_module, convert_to_utf8_byte_buffer_id, 1, string);
+}
+
+VALUE convert_to_string(VALUE utf8_buffer) {
+  return rb_funcall(thrift_bytes_module, convert_to_string_id, 1, utf8_buffer);
+}

data/ext/bytes.h

@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include <ruby.h>
+
+/*
+ * A collection of utilities for working with bytes and byte buffers.
+ *
+ * These methods are the native analogies to some of the methods in
+ * Thrift::Bytes (thrift/bytes.rb).
+ */
+
+VALUE force_binary_encoding(VALUE buffer);
+VALUE convert_to_utf8_byte_buffer(VALUE string);
+VALUE convert_to_string(VALUE utf8_buffer);

data/ext/compact_protocol.c

@@ -20,9 +20,10 @@
 #include <ruby.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "constants.h"
-#include "struct.h"
-#include "macros.h"
+#include <constants.h>
+#include <struct.h>
+#include <macros.h>
+#include <bytes.h>
 
 #define LAST_ID(obj) FIX2INT(rb_ary_pop(rb_ivar_get(obj, last_field_id)))
 #define SET_LAST_ID(obj, val) rb_ary_push(rb_ivar_get(obj, last_field_id), val)
@@ -39,6 +40,7 @@ static ID rbuf_ivar_id;
 static int VERSION;
 static int VERSION_MASK;
 static int TYPE_MASK;
+static int TYPE_BITS;
 static int TYPE_SHIFT_AMOUNT;
 static int PROTOCOL_ID;
 
@@ -166,6 +168,7 @@ static void write_collection_begin(VALUE transport, VALUE elem_type, VALUE size_
 
 VALUE rb_thrift_compact_proto_write_i32(VALUE self, VALUE i32);
 VALUE rb_thrift_compact_proto_write_string(VALUE self, VALUE str);
+VALUE rb_thrift_compact_proto_write_binary(VALUE self, VALUE buf);
 
 VALUE rb_thrift_compact_proto_write_message_end(VALUE self) {
   return Qnil;
@@ -304,9 +307,16 @@ VALUE rb_thrift_compact_proto_write_double(VALUE self, VALUE dub) {
 }
 
 VALUE rb_thrift_compact_proto_write_string(VALUE self, VALUE str) {
+  str = convert_to_utf8_byte_buffer(str);
+  rb_thrift_compact_proto_write_binary(self, str);
+  return Qnil;
+}
+
+VALUE rb_thrift_compact_proto_write_binary(VALUE self, VALUE buf) {
+  buf = force_binary_encoding(buf);
   VALUE transport = GET_TRANSPORT(self);
-  write_varint32(transport, RSTRING_LEN(str));
-  WRITE(transport, RSTRING_PTR(str), RSTRING_LEN(str));
+  write_varint32(transport, RSTRING_LEN(buf));
+  WRITE(transport, StringValuePtr(buf), RSTRING_LEN(buf));
   return Qnil;
 }
 
@@ -317,6 +327,7 @@ VALUE rb_thrift_compact_proto_write_string(VALUE self, VALUE str) {
 #define is_bool_type(ctype) (((ctype) & 0x0F) == CTYPE_BOOLEAN_TRUE || ((ctype) & 0x0F) == CTYPE_BOOLEAN_FALSE)
 
 VALUE rb_thrift_compact_proto_read_string(VALUE self);
+VALUE rb_thrift_compact_proto_read_binary(VALUE self);
 VALUE rb_thrift_compact_proto_read_byte(VALUE self);
 VALUE rb_thrift_compact_proto_read_i32(VALUE self);
 VALUE rb_thrift_compact_proto_read_i16(VALUE self);
@@ -440,7 +451,7 @@ VALUE rb_thrift_compact_proto_read_message_begin(VALUE self) {
     rb_exc_raise(get_protocol_exception(INT2FIX(-1), rb_str_new2(buf)));
   }
   
-  int8_t type = (version_and_type >> TYPE_SHIFT_AMOUNT) & 0x03;
+  int8_t type = (version_and_type >> TYPE_SHIFT_AMOUNT) & TYPE_BITS;
   int32_t seqid = read_varint64(self);
   VALUE messageName = rb_thrift_compact_proto_read_string(self);
   return rb_ary_new3(3, messageName, INT2FIX(type), INT2NUM(seqid));
@@ -545,19 +556,25 @@ VALUE rb_thrift_compact_proto_read_double(VALUE self) {
 }
 
 VALUE rb_thrift_compact_proto_read_string(VALUE self) {
+  VALUE buffer = rb_thrift_compact_proto_read_binary(self);
+  return convert_to_string(buffer);
+}
+
+VALUE rb_thrift_compact_proto_read_binary(VALUE self) {
   int64_t size = read_varint64(self);
   return READ(self, size);
 }
 
 static void Init_constants() {
   thrift_compact_protocol_class = rb_const_get(thrift_module, rb_intern("CompactProtocol"));
-  
+
   VERSION = rb_num2ll(rb_const_get(thrift_compact_protocol_class, rb_intern("VERSION")));
   VERSION_MASK = rb_num2ll(rb_const_get(thrift_compact_protocol_class, rb_intern("VERSION_MASK")));
   TYPE_MASK = rb_num2ll(rb_const_get(thrift_compact_protocol_class, rb_intern("TYPE_MASK")));
+  TYPE_BITS = rb_num2ll(rb_const_get(thrift_compact_protocol_class, rb_intern("TYPE_BITS")));
   TYPE_SHIFT_AMOUNT = FIX2INT(rb_const_get(thrift_compact_protocol_class, rb_intern("TYPE_SHIFT_AMOUNT")));
   PROTOCOL_ID = FIX2INT(rb_const_get(thrift_compact_protocol_class, rb_intern("PROTOCOL_ID")));
-  
+
   last_field_id = rb_intern("@last_field");
   boolean_field_id = rb_intern("@boolean_field");
   bool_value_id = rb_intern("@bool_value");
@@ -580,6 +597,7 @@ static void Init_rb_methods() {
   rb_define_method(thrift_compact_protocol_class, "write_i64",           rb_thrift_compact_proto_write_i64, 1);
   rb_define_method(thrift_compact_protocol_class, "write_double",        rb_thrift_compact_proto_write_double, 1);
   rb_define_method(thrift_compact_protocol_class, "write_string",        rb_thrift_compact_proto_write_string, 1);
+  rb_define_method(thrift_compact_protocol_class, "write_binary",        rb_thrift_compact_proto_write_binary, 1);
 
   rb_define_method(thrift_compact_protocol_class, "write_message_end", rb_thrift_compact_proto_write_message_end, 0);
   rb_define_method(thrift_compact_protocol_class, "write_struct_begin", rb_thrift_compact_proto_write_struct_begin, 1);
@@ -602,6 +620,7 @@ static void Init_rb_methods() {
   rb_define_method(thrift_compact_protocol_class, "read_i64",            rb_thrift_compact_proto_read_i64, 0);
   rb_define_method(thrift_compact_protocol_class, "read_double",         rb_thrift_compact_proto_read_double, 0);
   rb_define_method(thrift_compact_protocol_class, "read_string",         rb_thrift_compact_proto_read_string, 0);
+  rb_define_method(thrift_compact_protocol_class, "read_binary",         rb_thrift_compact_proto_read_binary, 0);
 
   rb_define_method(thrift_compact_protocol_class, "read_message_end", rb_thrift_compact_proto_read_message_end, 0);
   rb_define_method(thrift_compact_protocol_class, "read_struct_begin",  rb_thrift_compact_proto_read_struct_begin, 0);

data/ext/constants.h

@@ -42,19 +42,20 @@ extern ID write_i32_method_id;
 extern ID write_i64_method_id;
 extern ID write_double_method_id;
 extern ID write_string_method_id;
+extern ID write_binary_method_id;
 extern ID write_map_begin_method_id;
 extern ID write_map_end_method_id;
 extern ID write_list_begin_method_id;
 extern ID write_list_end_method_id;
 extern ID write_set_begin_method_id;
 extern ID write_set_end_method_id;
-extern ID size_method_id;
 extern ID read_bool_method_id;
 extern ID read_byte_method_id;
 extern ID read_i16_method_id;
 extern ID read_i32_method_id;
 extern ID read_i64_method_id;
 extern ID read_string_method_id;
+extern ID read_binary_method_id;
 extern ID read_double_method_id;
 extern ID read_map_begin_method_id;
 extern ID read_map_end_method_id;
@@ -67,15 +68,15 @@ extern ID read_struct_end_method_id;
 extern ID read_field_begin_method_id;
 extern ID read_field_end_method_id;
 extern ID keys_method_id;
-extern ID entries_method_id; 
-extern ID name_method_id; 
-extern ID sort_method_id;
+extern ID entries_method_id;
 extern ID write_field_stop_method_id;
 extern ID skip_method_id;
 extern ID write_method_id;
 extern ID read_all_method_id;
 extern ID read_into_buffer_method_id;
-extern ID native_qmark_method_id;
+extern ID force_binary_encoding_id;
+extern ID convert_to_utf8_byte_buffer_id;
+extern ID convert_to_string_id;
 
 extern ID fields_const_id;
 extern ID transport_ivar_id;
@@ -88,9 +89,11 @@ extern VALUE key_sym;
 extern VALUE value_sym;
 extern VALUE element_sym;
 extern VALUE class_sym;
+extern VALUE binary_sym;
 
 extern VALUE rb_cSet;
 extern VALUE thrift_module;
 extern VALUE thrift_types_module;
+extern VALUE thrift_bytes_module;
 extern VALUE class_thrift_protocol;
 extern VALUE protocol_exception_class;

data/ext/extconf.rb

@@ -21,8 +21,12 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
   File.open('Makefile', 'w'){|f| f.puts "all:\n\ninstall:\n" }
 else
   require 'mkmf'
+  require 'rbconfig'
 
-  $CFLAGS = "-g -O2 -Wall -Werror"
+  $ARCH_FLAGS = RbConfig::CONFIG['CFLAGS'].scan( /(-arch )(\S+)/ ).map{|x,y| x + y + ' ' }.join('')
+
+
+  $CFLAGS = "-fsigned-char -g -O2 -Wall -Werror " + $ARCH_FLAGS
 
   have_func("strlcpy", "string.h")
 

data/ext/memory_buffer.c

@@ -19,7 +19,8 @@
 
 #include <ruby.h>
 #include <constants.h>
-#include "macros.h"
+#include <bytes.h>
+#include <macros.h>
 
 ID buf_ivar_id;
 ID index_ivar_id;
@@ -37,7 +38,8 @@ VALUE rb_thrift_memory_buffer_read_into_buffer(VALUE self, VALUE buffer_value, V
 
 VALUE rb_thrift_memory_buffer_write(VALUE self, VALUE str) {
   VALUE buf = GET_BUF(self);
-  rb_str_buf_cat(buf, RSTRING_PTR(str), RSTRING_LEN(str));
+  str = force_binary_encoding(str);
+  rb_str_buf_cat(buf, StringValuePtr(str), RSTRING_LEN(str));
   return Qnil;
 }
 
@@ -93,25 +95,26 @@ VALUE rb_thrift_memory_buffer_read_into_buffer(VALUE self, VALUE buffer_value, V
   int index;
   VALUE buf = GET_BUF(self);
 
+  index = FIX2INT(rb_ivar_get(self, index_ivar_id));
   while (i < size) {
-    index = FIX2INT(rb_ivar_get(self, index_ivar_id));
     if (index >= RSTRING_LEN(buf)) {
       rb_raise(rb_eEOFError, "Not enough bytes remain in memory buffer");
     }
     char byte = RSTRING_PTR(buf)[index++];
 
-    if (index >= GARBAGE_BUFFER_SIZE) {
-      rb_ivar_set(self, buf_ivar_id, rb_funcall(buf, slice_method_id, 2, INT2FIX(index), INT2FIX(RSTRING_LEN(buf) - 1)));
-      index = 0;
-    }
-    rb_ivar_set(self, index_ivar_id, INT2FIX(index));
-
     if (i >= RSTRING_LEN(buffer_value)) {
       rb_raise(rb_eIndexError, "index %d out of string", i);
     }
     ((char*)RSTRING_PTR(buffer_value))[i] = byte;
     i++;
   }
+
+  if (index >= GARBAGE_BUFFER_SIZE) {
+    rb_ivar_set(self, buf_ivar_id, rb_funcall(buf, slice_method_id, 2, INT2FIX(index), INT2FIX(RSTRING_LEN(buf) - 1)));
+    index = 0;
+  }
+  rb_ivar_set(self, index_ivar_id, INT2FIX(index));
+
   return INT2FIX(i);
 }
 

data/ext/protocol.c

@@ -1,185 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <ruby.h>
-#include <protocol.h>
-#include <stdbool.h>
-#include <constants.h>
-#include <struct.h>
-
-static VALUE skip(VALUE self, int ttype) {
-  if (ttype == TTYPE_STOP) {
-    return Qnil;
-  } else if (ttype == TTYPE_BOOL) {
-    rb_funcall(self, read_bool_method_id, 0);
-  } else if (ttype == TTYPE_BYTE) {
-    rb_funcall(self, read_byte_method_id, 0);
-  } else if (ttype == TTYPE_I16) {
-    rb_funcall(self, read_i16_method_id, 0);
-  } else if (ttype == TTYPE_I32) {
-    rb_funcall(self, read_i32_method_id, 0);
-  } else if (ttype == TTYPE_I64) {
-    rb_funcall(self, read_i64_method_id, 0);
-  } else if (ttype == TTYPE_DOUBLE) {
-    rb_funcall(self, read_double_method_id, 0);
-  } else if (ttype == TTYPE_STRING) {
-    rb_funcall(self, read_string_method_id, 0);
-  } else if (ttype == TTYPE_STRUCT) {
-    rb_funcall(self, read_struct_begin_method_id, 0);
-    while (true) {
-      VALUE field_header = rb_funcall(self, read_field_begin_method_id, 0);
-      if (NIL_P(field_header) || FIX2INT(rb_ary_entry(field_header, 1)) == TTYPE_STOP ) {
-        break;
-      } 
-      skip(self, FIX2INT(rb_ary_entry(field_header, 1)));
-      rb_funcall(self, read_field_end_method_id, 0);
-    }
-    rb_funcall(self, read_struct_end_method_id, 0);
-  } else if (ttype == TTYPE_MAP) {
-    int i;
-    VALUE map_header = rb_funcall(self, read_map_begin_method_id, 0);
-    int ktype = FIX2INT(rb_ary_entry(map_header, 0));
-    int vtype = FIX2INT(rb_ary_entry(map_header, 1));
-    int size = FIX2INT(rb_ary_entry(map_header, 2));
-    
-    for (i = 0; i < size; i++) {
-      skip(self, ktype);
-      skip(self, vtype);
-    }
-    rb_funcall(self, read_map_end_method_id, 0);
-  } else if (ttype == TTYPE_LIST || ttype == TTYPE_SET) {
-    int i;
-    VALUE collection_header = rb_funcall(self, ttype == TTYPE_LIST ? read_list_begin_method_id : read_set_begin_method_id, 0);
-    int etype = FIX2INT(rb_ary_entry(collection_header, 0));
-    int size = FIX2INT(rb_ary_entry(collection_header, 1));
-    for (i = 0; i < size; i++) {
-      skip(self, etype);
-    }
-    rb_funcall(self, ttype == TTYPE_LIST ? read_list_end_method_id : read_set_end_method_id, 0);
-  } else {
-    rb_raise(rb_eNotImpError, "don't know how to skip type %d", ttype);
-  }
-
-  return Qnil;
-}
-
-VALUE rb_thrift_protocol_native_qmark(VALUE self) {
-  return Qfalse;
-}
-
-VALUE rb_thrift_protocol_skip(VALUE protocol, VALUE ttype) {
-  return skip(protocol, FIX2INT(ttype));
-}
-
-VALUE rb_thrift_write_message_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_struct_begin(VALUE self, VALUE name) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_struct_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_field_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_map_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_list_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_set_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_read_message_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_struct_begin(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_struct_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_field_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_map_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_list_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_set_end(VALUE self) {
-  return Qnil;
-}
-
-void Init_protocol() {
-  VALUE c_protocol = rb_const_get(thrift_module, rb_intern("BaseProtocol"));
-  
-  rb_define_method(c_protocol, "skip", rb_thrift_protocol_skip, 1);
-  rb_define_method(c_protocol, "write_message_end", rb_thrift_write_message_end, 0);
-  rb_define_method(c_protocol, "write_struct_begin", rb_thrift_write_struct_begin, 1);
-  rb_define_method(c_protocol, "write_struct_end", rb_thrift_write_struct_end, 0);
-  rb_define_method(c_protocol, "write_field_end", rb_thrift_write_field_end, 0);
-  rb_define_method(c_protocol, "write_map_end", rb_thrift_write_map_end, 0);
-  rb_define_method(c_protocol, "write_list_end", rb_thrift_write_list_end, 0);
-  rb_define_method(c_protocol, "write_set_end", rb_thrift_write_set_end, 0);
-  rb_define_method(c_protocol, "read_message_end", rb_thrift_read_message_end, 0);
-  rb_define_method(c_protocol, "read_struct_begin", rb_thift_read_struct_begin, 0);
-  rb_define_method(c_protocol, "read_struct_end", rb_thift_read_struct_end, 0);
-  rb_define_method(c_protocol, "read_field_end", rb_thift_read_field_end, 0);
-  rb_define_method(c_protocol, "read_map_end", rb_thift_read_map_end, 0);
-  rb_define_method(c_protocol, "read_list_end", rb_thift_read_list_end, 0);
-  rb_define_method(c_protocol, "read_set_end", rb_thift_read_set_end, 0);
-  rb_define_method(c_protocol, "native?", rb_thrift_protocol_native_qmark, 0);
-  
-  // native_proto_method_table *npmt;
-  // npmt = ALLOC(native_proto_method_table);
-  // npmt->write_message_end = rb_thrift_write_message_end;
-  // npmt->write_struct_begin = rb_thrift_write_struct_begin;
-  // npmt->write_struct_end = rb_thrift_write_struct_end;
-  // npmt->write_field_end = rb_thrift_write_field_end;
-  // npmt->write_map_end = rb_thrift_write_map_end;
-  // npmt->write_list_end = rb_thrift_write_list_end;
-  // npmt->write_set_end = rb_thrift_write_set_end;
-  // npmt->read_message_end = rb_thrift_read_message_end;
-  // npmt->read_struct_begin = rb_thift_read_struct_begin;
-  // npmt->read_struct_end = rb_thift_read_struct_end;
-  // npmt->read_field_end = rb_thift_read_field_end;
-  // npmt->read_map_end = rb_thift_read_map_end;
-  // npmt->read_list_end = rb_thift_read_list_end;
-  // npmt->read_set_end = rb_thift_read_set_end;
-  // 
-  // VALUE method_table_object = Data_Wrap_Struct(rb_cObject, 0, free, npmt);
-  // rb_const_set(c_protocol, rb_intern("@native_method_table"), method_table_object);
-}