thrift 0.2.0.4 → 0.4.0

data/CHANGELOG

@@ -1,13 +1 @@
-v0.2.0.4 Support Rubinius properly (tritonrc).
-
-v0.2.0.3 Support JRuby properly (tritonrc).
-
-v0.2.0.2 Remove -Werror from compile.
-
-v0.2.0. Update version to Thrift release 0.2.0. No actual code changes.
-
-v0.0.820831. Update to Thrift trunk 820831.
-
-v0.0.810255.1. Fixes for Ruby 1.9.
-
-v0.0.789419. Initial release
+v0.0.1. Initial release

data/Manifest

@@ -1,14 +1,11 @@
 CHANGELOG
-Makefile.am
 Manifest
-README
 Rakefile
-benchmark/Benchmark.thrift
+README
+setup.rb
 benchmark/benchmark.rb
+benchmark/Benchmark.thrift
 benchmark/client.rb
-benchmark/gen-rb/BenchmarkService.rb
-benchmark/gen-rb/Benchmark_constants.rb
-benchmark/gen-rb/Benchmark_types.rb
 benchmark/server.rb
 benchmark/thin_server.rb
 ext/binary_protocol_accelerated.c
@@ -28,31 +25,26 @@ ext/thrift_native.c
 lib/thrift.rb
 lib/thrift/client.rb
 lib/thrift/core_ext.rb
-lib/thrift/core_ext/fixnum.rb
 lib/thrift/exceptions.rb
 lib/thrift/processor.rb
+lib/thrift/struct.rb
+lib/thrift/struct_union.rb
+lib/thrift/union.rb
+lib/thrift/thrift_native.rb
+lib/thrift/types.rb
+lib/thrift/core_ext/fixnum.rb
 lib/thrift/protocol/base_protocol.rb
 lib/thrift/protocol/binary_protocol.rb
 lib/thrift/protocol/binary_protocol_accelerated.rb
-lib/thrift/protocol/binaryprotocol.rb
-lib/thrift/protocol/binaryprotocolaccelerated.rb
 lib/thrift/protocol/compact_protocol.rb
-lib/thrift/protocol/tbinaryprotocol.rb
-lib/thrift/protocol/tprotocol.rb
 lib/thrift/serializer/deserializer.rb
 lib/thrift/serializer/serializer.rb
 lib/thrift/server/base_server.rb
-lib/thrift/server/httpserver.rb
 lib/thrift/server/mongrel_http_server.rb
 lib/thrift/server/nonblocking_server.rb
-lib/thrift/server/nonblockingserver.rb
 lib/thrift/server/simple_server.rb
 lib/thrift/server/thread_pool_server.rb
 lib/thrift/server/threaded_server.rb
-lib/thrift/server/thttpserver.rb
-lib/thrift/server/tserver.rb
-lib/thrift/struct.rb
-lib/thrift/thrift_native.rb
 lib/thrift/transport/base_server_transport.rb
 lib/thrift/transport/base_transport.rb
 lib/thrift/transport/buffered_transport.rb
@@ -64,12 +56,9 @@ lib/thrift/transport/server_socket.rb
 lib/thrift/transport/socket.rb
 lib/thrift/transport/unix_server_socket.rb
 lib/thrift/transport/unix_socket.rb
-lib/thrift/types.rb
 script/proto_benchmark.rb
 script/read_struct.rb
 script/write_struct.rb
-setup.rb
-spec/ThriftSpec.thrift
 spec/base_protocol_spec.rb
 spec/base_transport_spec.rb
 spec/binary_protocol_accelerated_spec.rb
@@ -78,9 +67,6 @@ spec/binary_protocol_spec_shared.rb
 spec/client_spec.rb
 spec/compact_protocol_spec.rb
 spec/exception_spec.rb
-spec/gen-rb/NonblockingService.rb
-spec/gen-rb/ThriftSpec_constants.rb
-spec/gen-rb/ThriftSpec_types.rb
 spec/http_client_spec.rb
 spec/mongrel_http_server_spec.rb
 spec/nonblocking_server_spec.rb
@@ -92,5 +78,7 @@ spec/socket_spec.rb
 spec/socket_spec_shared.rb
 spec/spec_helper.rb
 spec/struct_spec.rb
+spec/union_spec.rb
+spec/ThriftSpec.thrift
 spec/types_spec.rb
 spec/unix_socket_spec.rb

data/Rakefile

@@ -77,20 +77,22 @@ begin
   require 'echoe'
 
   Echoe.new('thrift') do |p|
-    p.author = ['Kevin Ballard', 'Kevin Clark', 'Mark Slee', 'Evan Weaver']
-    p.project = "fauna"
+    p.author = ['Kevin Ballard', 'Kevin Clark', 'Mark Slee']
+    p.email = ['kevin@sb.org', 'kevin.clark@gmail.com', 'mcslee@facebook.com']
     p.summary = "Ruby libraries for Thrift (a language-agnostic RPC system)"
+    p.url = "http://incubator.apache.org/thrift/"
     p.include_rakefile = true
-    p.url = "http://blog.evanweaver.com/files/doc/fauna/thrift/"
-    p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
+    p.version = "0.4.0"
+    p.rubygems_version = ">= 1.2.0"
   end
 
   task :install => [:check_site_lib]
 
   require 'rbconfig'
   task :check_site_lib do
-    file = File.join(Config::CONFIG['sitelibdir'], 'thrift')    
-    fail "Thrift is already installed in site_ruby: #{file}*\nPlease remove it if you want to continue." if File.exist?(file)
+    if File.exist?(File.join(Config::CONFIG['sitelibdir'], 'thrift.rb'))
+      fail "thrift is already installed in site_ruby"
+    end
   end
 rescue LoadError
   [:install, :package].each do |t|

data/ext/binary_protocol_accelerated.c

@@ -374,15 +374,15 @@ VALUE rb_thrift_binary_proto_read_string(VALUE self) {
 
 void Init_binary_protocol_accelerated() {
   VALUE thrift_binary_protocol_class = rb_const_get(thrift_module, rb_intern("BinaryProtocol"));
-  
+
   VERSION_1 = rb_num2ll(rb_const_get(thrift_binary_protocol_class, rb_intern("VERSION_1")));
   VERSION_MASK = rb_num2ll(rb_const_get(thrift_binary_protocol_class, rb_intern("VERSION_MASK")));
   TYPE_MASK = rb_num2ll(rb_const_get(thrift_binary_protocol_class, rb_intern("TYPE_MASK")));
-  
+
   VALUE bpa_class = rb_define_class_under(thrift_module, "BinaryProtocolAccelerated", thrift_binary_protocol_class);
-  
+
   rb_define_method(bpa_class, "native?", rb_thrift_binary_proto_native_qmark, 0);
-  
+
   rb_define_method(bpa_class, "write_message_begin", rb_thrift_binary_proto_write_message_begin, 3);
   rb_define_method(bpa_class, "write_field_begin",   rb_thrift_binary_proto_write_field_begin, 3);
   rb_define_method(bpa_class, "write_field_stop",    rb_thrift_binary_proto_write_field_stop, 0);
@@ -404,8 +404,6 @@ void Init_binary_protocol_accelerated() {
   rb_define_method(bpa_class, "write_map_end", rb_thrift_binary_proto_write_map_end, 0);
   rb_define_method(bpa_class, "write_list_end", rb_thrift_binary_proto_write_list_end, 0);
   rb_define_method(bpa_class, "write_set_end", rb_thrift_binary_proto_write_set_end, 0);
-  
-
 
   rb_define_method(bpa_class, "read_message_begin",  rb_thrift_binary_proto_read_message_begin, 0);
   rb_define_method(bpa_class, "read_field_begin",    rb_thrift_binary_proto_read_field_begin, 0);
@@ -427,51 +425,4 @@ void Init_binary_protocol_accelerated() {
   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);
-
-  // set up native method table
-  native_proto_method_table *npmt;
-  npmt = ALLOC(native_proto_method_table);
-
-  npmt->write_field_begin = rb_thrift_binary_proto_write_field_begin;
-  npmt->write_field_stop = rb_thrift_binary_proto_write_field_stop;
-  npmt->write_map_begin = rb_thrift_binary_proto_write_map_begin;
-  npmt->write_list_begin = rb_thrift_binary_proto_write_list_begin;
-  npmt->write_set_begin = rb_thrift_binary_proto_write_set_begin;
-  npmt->write_byte = rb_thrift_binary_proto_write_byte;
-  npmt->write_bool = rb_thrift_binary_proto_write_bool;
-  npmt->write_i16 = rb_thrift_binary_proto_write_i16;
-  npmt->write_i32 = rb_thrift_binary_proto_write_i32;
-  npmt->write_i64 = rb_thrift_binary_proto_write_i64;
-  npmt->write_double = rb_thrift_binary_proto_write_double;
-  npmt->write_string = rb_thrift_binary_proto_write_string;
-  npmt->write_message_end = rb_thrift_binary_proto_write_message_end;
-  npmt->write_struct_begin = rb_thrift_binary_proto_write_struct_begin;
-  npmt->write_struct_end = rb_thrift_binary_proto_write_struct_end;
-  npmt->write_field_end = rb_thrift_binary_proto_write_field_end;
-  npmt->write_map_end = rb_thrift_binary_proto_write_map_end;
-  npmt->write_list_end = rb_thrift_binary_proto_write_list_end;
-  npmt->write_set_end = rb_thrift_binary_proto_write_set_end;
-
-  npmt->read_message_begin = rb_thrift_binary_proto_read_message_begin;
-  npmt->read_field_begin = rb_thrift_binary_proto_read_field_begin;
-  npmt->read_map_begin = rb_thrift_binary_proto_read_map_begin;
-  npmt->read_list_begin = rb_thrift_binary_proto_read_list_begin;
-  npmt->read_set_begin = rb_thrift_binary_proto_read_set_begin;
-  npmt->read_byte = rb_thrift_binary_proto_read_byte;
-  npmt->read_bool = rb_thrift_binary_proto_read_bool;
-  npmt->read_i16 = rb_thrift_binary_proto_read_i16;
-  npmt->read_i32 = rb_thrift_binary_proto_read_i32;
-  npmt->read_i64 = rb_thrift_binary_proto_read_i64;
-  npmt->read_double = rb_thrift_binary_proto_read_double;
-  npmt->read_string = rb_thrift_binary_proto_read_string;
-  npmt->read_message_end = rb_thrift_binary_proto_read_message_end;
-  npmt->read_struct_begin = rb_thift_binary_proto_read_struct_begin;
-  npmt->read_struct_end = rb_thift_binary_proto_read_struct_end;
-  npmt->read_field_end = rb_thift_binary_proto_read_field_end;
-  npmt->read_map_end = rb_thift_binary_proto_read_map_end;
-  npmt->read_list_end = rb_thift_binary_proto_read_list_end;
-  npmt->read_set_end = rb_thift_binary_proto_read_set_end;
-  
-  VALUE method_table_object = Data_Wrap_Struct(rb_cObject, 0, free, npmt);
-  rb_const_set(bpa_class, rb_intern("@native_method_table"), method_table_object);
 }

data/ext/compact_protocol.c

@@ -20,8 +20,8 @@
 #include <ruby.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <constants.h>
-#include <struct.h>
+#include "constants.h"
+#include "struct.h"
 #include "macros.h"
 
 #define LAST_ID(obj) FIX2INT(rb_ary_pop(rb_ivar_get(obj, last_field_id)))
@@ -458,6 +458,7 @@ VALUE rb_thrift_compact_proto_read_field_begin(VALUE self) {
     
     if (modifier == 0) {
       // not a delta. look ahead for the zigzag varint field id.
+      (void) LAST_ID(self);
       field_id = read_i16(self);
     } else {
       // has a delta. add the delta to the last read field id.
@@ -608,58 +609,7 @@ static void Init_rb_methods() {
   rb_define_method(thrift_compact_protocol_class, "read_set_end",       rb_thrift_compact_proto_read_set_end, 0);
 }
 
-static void Init_npmt() {
-  native_proto_method_table *npmt;
-  npmt = ALLOC(native_proto_method_table);
-  
-  npmt->write_field_begin   =  rb_thrift_compact_proto_write_field_begin;
-  npmt->write_field_stop    =  rb_thrift_compact_proto_write_field_stop;
-  npmt->write_map_begin     =  rb_thrift_compact_proto_write_map_begin;
-  npmt->write_list_begin    =  rb_thrift_compact_proto_write_list_begin;
-  npmt->write_set_begin     =  rb_thrift_compact_proto_write_set_begin;
-  npmt->write_byte          =  rb_thrift_compact_proto_write_byte;
-  npmt->write_bool          =  rb_thrift_compact_proto_write_bool;
-  npmt->write_i16           =  rb_thrift_compact_proto_write_i16;
-  npmt->write_i32           =  rb_thrift_compact_proto_write_i32;
-  npmt->write_i64           =  rb_thrift_compact_proto_write_i64;
-  npmt->write_double        =  rb_thrift_compact_proto_write_double;
-  npmt->write_string        =  rb_thrift_compact_proto_write_string;
-  npmt->write_message_end   =  rb_thrift_compact_proto_write_message_end;
-  npmt->write_struct_begin  =  rb_thrift_compact_proto_write_struct_begin;
-  npmt->write_struct_end    =  rb_thrift_compact_proto_write_struct_end;
-  npmt->write_field_end     =  rb_thrift_compact_proto_write_field_end;
-  npmt->write_map_end       =  rb_thrift_compact_proto_write_map_end;
-  npmt->write_list_end      =  rb_thrift_compact_proto_write_list_end;
-  npmt->write_set_end       =  rb_thrift_compact_proto_write_set_end;
-  
-  npmt->read_message_begin  =  rb_thrift_compact_proto_read_message_begin;
-  npmt->read_field_begin    =  rb_thrift_compact_proto_read_field_begin;
-  npmt->read_map_begin      =  rb_thrift_compact_proto_read_map_begin;
-  npmt->read_list_begin     =  rb_thrift_compact_proto_read_list_begin;
-  npmt->read_set_begin      =  rb_thrift_compact_proto_read_set_begin;
-  npmt->read_byte           =  rb_thrift_compact_proto_read_byte;
-  npmt->read_bool           =  rb_thrift_compact_proto_read_bool;
-  npmt->read_i16            =  rb_thrift_compact_proto_read_i16;
-  npmt->read_i32            =  rb_thrift_compact_proto_read_i32;
-  npmt->read_i64            =  rb_thrift_compact_proto_read_i64;
-  npmt->read_double         =  rb_thrift_compact_proto_read_double;
-  npmt->read_string         =  rb_thrift_compact_proto_read_string;
-  npmt->read_message_end    =  rb_thrift_compact_proto_read_message_end;
-  npmt->read_struct_begin   =  rb_thrift_compact_proto_read_struct_begin;
-  npmt->read_struct_end     =  rb_thrift_compact_proto_read_struct_end;
-  npmt->read_field_end      =  rb_thrift_compact_proto_read_field_end;
-  npmt->read_map_end        =  rb_thrift_compact_proto_read_map_end;
-  npmt->read_list_end       =  rb_thrift_compact_proto_read_list_end;
-  npmt->read_set_end        =  rb_thrift_compact_proto_read_set_end;
-  
-  VALUE method_table_object = Data_Wrap_Struct(rb_cObject, 0, free, npmt);
-  rb_const_set(thrift_compact_protocol_class, rb_intern("@native_method_table"), method_table_object);
-}
-
-
-
 void Init_compact_protocol() {
   Init_constants();
   Init_rb_methods();
-  Init_npmt();
 }

data/ext/extconf.rb

@@ -17,24 +17,10 @@
 # under the License.
 # 
 
-unless defined?(JRUBY_VERSION)
-  require 'mkmf'
+require 'mkmf'
 
-  $CFLAGS = "-g -O2 -Wall " + $CFLAGS
+$CFLAGS = "-g -O2 -Wall -Werror"
 
-  have_func("strlcpy", "string.h")
+have_func("strlcpy", "string.h")
 
-  create_makefile 'thrift_native'
-else
-  # RubyGems Gem::Ext::ExtConfBuilder is looking for a Makefile
-  # so make a dummy Makefile to appease it
-  File.open(File.expand_path('../Makefile', __FILE__), 'w') do |f|
-    f.write <<-EOS
-      all:
-      static:
-      clean:
-      distclean:
-      install:
-    EOS
-  end
-end
+create_makefile 'thrift_native'

data/ext/struct.c

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include <struct.h>
-#include <constants.h>
+#include "struct.h"
+#include "constants.h"
 #include "macros.h"
 
 #ifndef HAVE_STRLCPY
@@ -40,34 +40,25 @@ strlcpy (char *dst, const char *src, size_t dst_sz)
       *(dst - 1) = '\0';
     return n + strlen (src);
 }
-
+#else
+/*
+   Ruby 1.9.x includes the OpenBSD implementation of strlcpy.
+   See missing/strlcpy.c in Ruby 1.9 source
+ */
+extern size_t strlcpy(char *, const char *, size_t);
 #endif
 
-static native_proto_method_table *mt;
-static native_proto_method_table *default_mt;
-// static VALUE last_proto_class = Qnil;
+VALUE thrift_union_class;
+
+ID setfield_id;
+ID setvalue_id;
+
+ID to_s_method_id;
+ID name_to_id_method_id;
 
 #define IS_CONTAINER(ttype) ((ttype) == TTYPE_MAP || (ttype) == TTYPE_LIST || (ttype) == TTYPE_SET)
 #define STRUCT_FIELDS(obj) rb_const_get(CLASS_OF(obj), fields_const_id)
 
-// static void set_native_proto_function_pointers(VALUE protocol) {
-//   VALUE method_table_object = rb_const_get(CLASS_OF(protocol), rb_intern("@native_method_table"));
-//   // TODO: check nil?
-//   Data_Get_Struct(method_table_object, native_proto_method_table, mt);
-// }
-
-// static void check_native_proto_method_table(VALUE protocol) {
-//   VALUE protoclass = CLASS_OF(protocol);
-//   if (protoclass != last_proto_class) {
-//     last_proto_class = protoclass;
-//     if (rb_funcall(protocol, native_qmark_method_id, 0) == Qtrue) {
-//       set_native_proto_function_pointers(protocol);
-//     } else {
-//       mt = default_mt;
-//     }
-//   }
-// }
-
 //-------------------------------------------
 // Writing section
 //-------------------------------------------
@@ -232,106 +223,65 @@ VALUE default_read_struct_end(VALUE protocol) {
   return rb_funcall(protocol, read_struct_end_method_id, 0);
 }
 
-static void set_default_proto_function_pointers() {
-  default_mt = ALLOC(native_proto_method_table);
-
-  default_mt->write_field_begin = default_write_field_begin;
-  default_mt->write_field_stop = default_write_field_stop;
-  default_mt->write_map_begin = default_write_map_begin;
-  default_mt->write_map_end = default_write_map_end;
-  default_mt->write_list_begin = default_write_list_begin;
-  default_mt->write_list_end = default_write_list_end;
-  default_mt->write_set_begin = default_write_set_begin;
-  default_mt->write_set_end = default_write_set_end;
-  default_mt->write_byte = default_write_byte;
-  default_mt->write_bool = default_write_bool;
-  default_mt->write_i16 = default_write_i16;
-  default_mt->write_i32 = default_write_i32;
-  default_mt->write_i64 = default_write_i64;
-  default_mt->write_double = default_write_double;
-  default_mt->write_string = default_write_string;
-  default_mt->write_struct_begin = default_write_struct_begin;
-  default_mt->write_struct_end = default_write_struct_end;
-  default_mt->write_field_end = default_write_field_end;
-
-  default_mt->read_struct_begin = default_read_struct_begin;
-  default_mt->read_struct_end = default_read_struct_end;
-  default_mt->read_field_begin = default_read_field_begin;
-  default_mt->read_field_end = default_read_field_end;
-  default_mt->read_map_begin = default_read_map_begin;
-  default_mt->read_map_end = default_read_map_end;
-  default_mt->read_list_begin = default_read_list_begin;
-  default_mt->read_list_end = default_read_list_end;
-  default_mt->read_set_begin = default_read_set_begin;
-  default_mt->read_set_end = default_read_set_end;
-  default_mt->read_byte = default_read_byte;
-  default_mt->read_bool = default_read_bool;
-  default_mt->read_i16 = default_read_i16;
-  default_mt->read_i32 = default_read_i32;
-  default_mt->read_i64 = default_read_i64;
-  default_mt->read_double = default_read_double;
-  default_mt->read_string = default_read_string;
-}
-
 // end default protocol methods
 
-
+static VALUE rb_thrift_union_write (VALUE self, VALUE protocol);
 static VALUE rb_thrift_struct_write(VALUE self, VALUE protocol);
 static void write_anything(int ttype, VALUE value, VALUE protocol, VALUE field_info);
 
 VALUE get_field_value(VALUE obj, VALUE field_name) {
   char name_buf[RSTRING_LEN(field_name) + 1];
-  
+
   name_buf[0] = '@';
   strlcpy(&name_buf[1], RSTRING_PTR(field_name), sizeof(name_buf));
 
   VALUE value = rb_ivar_get(obj, rb_intern(name_buf));
-  
+
   return value;
 }
 
 static void write_container(int ttype, VALUE field_info, VALUE value, VALUE protocol) {
   int sz, i;
-  
+
   if (ttype == TTYPE_MAP) {
     VALUE keys;
     VALUE key;
     VALUE val;
 
     Check_Type(value, T_HASH);
-    
+
     VALUE key_info = rb_hash_aref(field_info, key_sym);
     VALUE keytype_value = rb_hash_aref(key_info, type_sym);
     int keytype = FIX2INT(keytype_value);
-    
+
     VALUE value_info = rb_hash_aref(field_info, value_sym);
     VALUE valuetype_value = rb_hash_aref(value_info, type_sym);
     int valuetype = FIX2INT(valuetype_value);
-    
+
     keys = rb_funcall(value, keys_method_id, 0);
-    
+
     sz = RARRAY_LEN(keys);
-    
-    mt->write_map_begin(protocol, keytype_value, valuetype_value, INT2FIX(sz));
-    
+
+    default_write_map_begin(protocol, keytype_value, valuetype_value, INT2FIX(sz));
+
     for (i = 0; i < sz; i++) {
       key = rb_ary_entry(keys, i);
       val = rb_hash_aref(value, key);
-      
+
       if (IS_CONTAINER(keytype)) {
         write_container(keytype, key_info, key, protocol);
       } else {
         write_anything(keytype, key, protocol, key_info);
       }
-      
+
       if (IS_CONTAINER(valuetype)) {
         write_container(valuetype, value_info, val, protocol);
       } else {
         write_anything(valuetype, val, protocol, value_info);
       }
     }
-    
-    mt->write_map_end(protocol);
+
+    default_write_map_end(protocol);
   } else if (ttype == TTYPE_LIST) {
     Check_Type(value, T_ARRAY);
 
@@ -340,8 +290,8 @@ static void write_container(int ttype, VALUE field_info, VALUE value, VALUE prot
     VALUE element_type_info = rb_hash_aref(field_info, element_sym);
     VALUE element_type_value = rb_hash_aref(element_type_info, type_sym);
     int element_type = FIX2INT(element_type_value);
-    
-    mt->write_list_begin(protocol, element_type_value, INT2FIX(sz));
+
+    default_write_list_begin(protocol, element_type_value, INT2FIX(sz));
     for (i = 0; i < sz; ++i) {
       VALUE val = rb_ary_entry(value, i);
       if (IS_CONTAINER(element_type)) {
@@ -350,7 +300,7 @@ static void write_container(int ttype, VALUE field_info, VALUE value, VALUE prot
         write_anything(element_type, val, protocol, element_type_info);
       }
     }
-    mt->write_list_end(protocol);
+    default_write_list_end(protocol);
   } else if (ttype == TTYPE_SET) {
     VALUE items;
 
@@ -370,9 +320,9 @@ static void write_container(int ttype, VALUE field_info, VALUE value, VALUE prot
     VALUE element_type_info = rb_hash_aref(field_info, element_sym);
     VALUE element_type_value = rb_hash_aref(element_type_info, type_sym);
     int element_type = FIX2INT(element_type_value);
-    
-    mt->write_set_begin(protocol, element_type_value, INT2FIX(sz));
-    
+
+    default_write_set_begin(protocol, element_type_value, INT2FIX(sz));
+
     for (i = 0; i < sz; i++) {
       VALUE val = rb_ary_entry(items, i);
       if (IS_CONTAINER(element_type)) {
@@ -381,8 +331,8 @@ static void write_container(int ttype, VALUE field_info, VALUE value, VALUE prot
         write_anything(element_type, val, protocol, element_type_info);
       }
     }
-    
-    mt->write_set_end(protocol);
+
+    default_write_set_end(protocol);
   } else {
     rb_raise(rb_eNotImpError, "can't write container of type: %d", ttype);
   }
@@ -390,23 +340,27 @@ static void write_container(int ttype, VALUE field_info, VALUE value, VALUE prot
 
 static void write_anything(int ttype, VALUE value, VALUE protocol, VALUE field_info) {
   if (ttype == TTYPE_BOOL) {
-    mt->write_bool(protocol, value);
+    default_write_bool(protocol, value);
   } else if (ttype == TTYPE_BYTE) {
-    mt->write_byte(protocol, value);
+    default_write_byte(protocol, value);
   } else if (ttype == TTYPE_I16) {
-    mt->write_i16(protocol, value);
+    default_write_i16(protocol, value);
   } else if (ttype == TTYPE_I32) {
-    mt->write_i32(protocol, value);
+    default_write_i32(protocol, value);
   } else if (ttype == TTYPE_I64) {
-    mt->write_i64(protocol, value);
+    default_write_i64(protocol, value);
   } else if (ttype == TTYPE_DOUBLE) {
-    mt->write_double(protocol, value);
+    default_write_double(protocol, value);
   } else if (ttype == TTYPE_STRING) {
-    mt->write_string(protocol, value);
+    default_write_string(protocol, value);
   } else if (IS_CONTAINER(ttype)) {
     write_container(ttype, field_info, value, protocol);
   } else if (ttype == TTYPE_STRUCT) {
-    rb_thrift_struct_write(value, protocol);
+    if (rb_obj_is_kind_of(value, thrift_union_class)) {
+      rb_thrift_union_write(value, protocol);
+    } else {
+      rb_thrift_struct_write(value, protocol);
+    }
   } else {
     rb_raise(rb_eNotImpError, "Unknown type for binary_encoding: %d", ttype);
   }
@@ -416,39 +370,40 @@ static VALUE rb_thrift_struct_write(VALUE self, VALUE protocol) {
   // call validate
   rb_funcall(self, validate_method_id, 0);
 
-  // check_native_proto_method_table(protocol);
-
   // write struct begin
-  mt->write_struct_begin(protocol, rb_class_name(CLASS_OF(self)));
+  default_write_struct_begin(protocol, rb_class_name(CLASS_OF(self)));
 
   // iterate through all the fields here
   VALUE struct_fields = STRUCT_FIELDS(self);
+
   VALUE struct_field_ids_unordered = rb_funcall(struct_fields, keys_method_id, 0);
   VALUE struct_field_ids_ordered = rb_funcall(struct_field_ids_unordered, sort_method_id, 0);
 
   int i = 0;
   for (i=0; i < RARRAY_LEN(struct_field_ids_ordered); i++) {
     VALUE field_id = rb_ary_entry(struct_field_ids_ordered, i);
+
     VALUE field_info = rb_hash_aref(struct_fields, field_id);
 
     VALUE ttype_value = rb_hash_aref(field_info, type_sym);
     int ttype = FIX2INT(ttype_value);
     VALUE field_name = rb_hash_aref(field_info, name_sym);
+
     VALUE field_value = get_field_value(self, field_name);
 
     if (!NIL_P(field_value)) {
-      mt->write_field_begin(protocol, field_name, ttype_value, field_id);
-      
+      default_write_field_begin(protocol, field_name, ttype_value, field_id);
+
       write_anything(ttype, field_value, protocol, field_info);
-      
-      mt->write_field_end(protocol);
+
+      default_write_field_end(protocol);
     }
   }
 
-  mt->write_field_stop(protocol);
+  default_write_field_stop(protocol);
 
   // write struct end
-  mt->write_struct_end(protocol);
+  default_write_struct_end(protocol);
 
   return Qnil;
 }
@@ -457,6 +412,7 @@ static VALUE rb_thrift_struct_write(VALUE self, VALUE protocol) {
 // Reading section
 //-------------------------------------------
 
+static VALUE rb_thrift_union_read(VALUE self, VALUE protocol);
 static VALUE rb_thrift_struct_read(VALUE self, VALUE protocol);
 
 static void set_field_value(VALUE obj, VALUE field_name, VALUE value) {
@@ -472,27 +428,32 @@ static VALUE read_anything(VALUE protocol, int ttype, VALUE field_info) {
   VALUE result = Qnil;
 
   if (ttype == TTYPE_BOOL) {
-    result = mt->read_bool(protocol);
+    result = default_read_bool(protocol);
   } else if (ttype == TTYPE_BYTE) {
-    result = mt->read_byte(protocol);
+    result = default_read_byte(protocol);
   } else if (ttype == TTYPE_I16) {
-    result = mt->read_i16(protocol);
+    result = default_read_i16(protocol);
   } else if (ttype == TTYPE_I32) {
-    result = mt->read_i32(protocol);
+    result = default_read_i32(protocol);
   } else if (ttype == TTYPE_I64) {
-    result = mt->read_i64(protocol);
+    result = default_read_i64(protocol);
   } else if (ttype == TTYPE_STRING) {
-    result = mt->read_string(protocol);
+    result = default_read_string(protocol);
   } else if (ttype == TTYPE_DOUBLE) {
-    result = mt->read_double(protocol);
+    result = default_read_double(protocol);
   } else if (ttype == TTYPE_STRUCT) {
     VALUE klass = rb_hash_aref(field_info, class_sym);
     result = rb_class_new_instance(0, NULL, klass);
-    rb_thrift_struct_read(result, protocol);
+
+    if (rb_obj_is_kind_of(result, thrift_union_class)) {
+      rb_thrift_union_read(result, protocol);
+    } else {
+      rb_thrift_struct_read(result, protocol);
+    }
   } else if (ttype == TTYPE_MAP) {
     int i;
 
-    VALUE map_header = mt->read_map_begin(protocol);
+    VALUE map_header = default_read_map_begin(protocol);
     int key_ttype = FIX2INT(rb_ary_entry(map_header, 0));
     int value_ttype = FIX2INT(rb_ary_entry(map_header, 1));
     int num_entries = FIX2INT(rb_ary_entry(map_header, 2));
@@ -511,11 +472,11 @@ static VALUE read_anything(VALUE protocol, int ttype, VALUE field_info) {
       rb_hash_aset(result, key, val);
     }
 
-    mt->read_map_end(protocol);
+    default_read_map_end(protocol);
   } else if (ttype == TTYPE_LIST) {
     int i;
 
-    VALUE list_header = mt->read_list_begin(protocol);
+    VALUE list_header = default_read_list_begin(protocol);
     int element_ttype = FIX2INT(rb_ary_entry(list_header, 0));
     int num_elements = FIX2INT(rb_ary_entry(list_header, 1));
     result = rb_ary_new2(num_elements);
@@ -524,13 +485,12 @@ static VALUE read_anything(VALUE protocol, int ttype, VALUE field_info) {
       rb_ary_push(result, read_anything(protocol, element_ttype, rb_hash_aref(field_info, element_sym)));
     }
 
-
-    mt->read_list_end(protocol);
+    default_read_list_end(protocol);
   } else if (ttype == TTYPE_SET) {
     VALUE items;
     int i;
 
-    VALUE set_header = mt->read_set_begin(protocol);
+    VALUE set_header = default_read_set_begin(protocol);
     int element_ttype = FIX2INT(rb_ary_entry(set_header, 0));
     int num_elements = FIX2INT(rb_ary_entry(set_header, 1));
     items = rb_ary_new2(num_elements);
@@ -539,8 +499,7 @@ static VALUE read_anything(VALUE protocol, int ttype, VALUE field_info) {
       rb_ary_push(items, read_anything(protocol, element_ttype, rb_hash_aref(field_info, element_sym)));
     }
 
-
-    mt->read_set_end(protocol);
+    default_read_set_end(protocol);
 
     result = rb_class_new_instance(1, &items, rb_cSet);
   } else {
@@ -551,16 +510,14 @@ static VALUE read_anything(VALUE protocol, int ttype, VALUE field_info) {
 }
 
 static VALUE rb_thrift_struct_read(VALUE self, VALUE protocol) {
-  // check_native_proto_method_table(protocol);
-
   // read struct begin
-  mt->read_struct_begin(protocol);
+  default_read_struct_begin(protocol);
 
   VALUE struct_fields = STRUCT_FIELDS(self);
 
   // read each field
   while (true) {
-    VALUE field_header = mt->read_field_begin(protocol);
+    VALUE field_header = default_read_field_begin(protocol);
     VALUE field_type_value = rb_ary_entry(field_header, 1);
     int field_type = FIX2INT(field_type_value);
 
@@ -585,15 +542,102 @@ static VALUE rb_thrift_struct_read(VALUE self, VALUE protocol) {
     }
 
     // read field end
-    mt->read_field_end(protocol);
+    default_read_field_end(protocol);
+  }
+
+  // read struct end
+  default_read_struct_end(protocol);
+
+  // call validate
+  rb_funcall(self, validate_method_id, 0);
+
+  return Qnil;
+}
+
+
+// --------------------------------
+// Union section
+// --------------------------------
+
+static VALUE rb_thrift_union_read(VALUE self, VALUE protocol) {
+  // read struct begin
+  default_read_struct_begin(protocol);
+
+  VALUE struct_fields = STRUCT_FIELDS(self);
+
+  VALUE field_header = default_read_field_begin(protocol);
+  VALUE field_type_value = rb_ary_entry(field_header, 1);
+  int field_type = FIX2INT(field_type_value);
+
+  // make sure we got a type we expected
+  VALUE field_info = rb_hash_aref(struct_fields, rb_ary_entry(field_header, 2));
+
+  if (!NIL_P(field_info)) {
+    int specified_type = FIX2INT(rb_hash_aref(field_info, type_sym));
+    if (field_type == specified_type) {
+      // read the value
+      VALUE name = rb_hash_aref(field_info, name_sym);
+      rb_iv_set(self, "@setfield", ID2SYM(rb_intern(RSTRING_PTR(name))));
+      rb_iv_set(self, "@value", read_anything(protocol, field_type, field_info));
+    } else {
+      rb_funcall(protocol, skip_method_id, 1, field_type_value);
+    }
+  } else {
+    rb_funcall(protocol, skip_method_id, 1, field_type_value);
   }
 
+  // read field end
+  default_read_field_end(protocol);
+
+  field_header = default_read_field_begin(protocol);
+  field_type_value = rb_ary_entry(field_header, 1);
+  field_type = FIX2INT(field_type_value);
+
+  if (field_type != TTYPE_STOP) {
+    rb_raise(rb_eRuntimeError, "too many fields in union!");
+  }
+
+  // read field end
+  default_read_field_end(protocol);
+
   // read struct end
-  mt->read_struct_end(protocol);
+  default_read_struct_end(protocol);
+
+  // call validate
+  rb_funcall(self, validate_method_id, 0);
+
+  return Qnil;
+}
 
+static VALUE rb_thrift_union_write(VALUE self, VALUE protocol) {
   // call validate
   rb_funcall(self, validate_method_id, 0);
 
+  // write struct begin
+  default_write_struct_begin(protocol, rb_class_name(CLASS_OF(self)));
+
+  VALUE struct_fields = STRUCT_FIELDS(self);
+
+  VALUE setfield = rb_ivar_get(self, setfield_id);
+  VALUE setvalue = rb_ivar_get(self, setvalue_id);
+  VALUE field_id = rb_funcall(self, name_to_id_method_id, 1, rb_funcall(setfield, to_s_method_id, 0));
+
+  VALUE field_info = rb_hash_aref(struct_fields, field_id);
+
+  VALUE ttype_value = rb_hash_aref(field_info, type_sym);
+  int ttype = FIX2INT(ttype_value);
+
+  default_write_field_begin(protocol, setfield, ttype_value, field_id);
+
+  write_anything(ttype, setvalue, protocol, field_info);
+
+  default_write_field_end(protocol);
+
+  default_write_field_stop(protocol);
+
+  // write struct end
+  default_write_struct_end(protocol);
+
   return Qnil;
 }
 
@@ -603,7 +647,14 @@ void Init_struct() {
   rb_define_method(struct_module, "write", rb_thrift_struct_write, 1);
   rb_define_method(struct_module, "read", rb_thrift_struct_read, 1);
 
-  set_default_proto_function_pointers();
-  mt = default_mt;
-}
+  thrift_union_class = rb_const_get(thrift_module, rb_intern("Union"));
+
+  rb_define_method(thrift_union_class, "write", rb_thrift_union_write, 1);
+  rb_define_method(thrift_union_class, "read", rb_thrift_union_read, 1);
 
+  setfield_id = rb_intern("@setfield");
+  setvalue_id = rb_intern("@value");
+
+  to_s_method_id = rb_intern("to_s");
+  name_to_id_method_id = rb_intern("name_to_id");
+}