thrift 0.6.0 → 0.7.0

data/debug_proto_test/gen-rb/empty_service.rb

@@ -0,0 +1,24 @@
+#
+# Autogenerated by Thrift Compiler (0.7.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'debug_proto_test_types'
+
+module EmptyService
+  class Client
+    include ::Thrift::Client
+
+  end
+
+  class Processor
+    include ::Thrift::Processor
+
+  end
+
+  # HELPER FUNCTIONS AND STRUCTURES
+
+end
+

data/debug_proto_test/gen-rb/inherited.rb

@@ -0,0 +1,79 @@
+#
+# Autogenerated by Thrift Compiler (0.7.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'srv'
+require 'debug_proto_test_types'
+
+module Inherited
+  class Client < Srv::Client 
+    include ::Thrift::Client
+
+    def identity(arg)
+      send_identity(arg)
+      return recv_identity()
+    end
+
+    def send_identity(arg)
+      send_message('identity', Identity_args, :arg => arg)
+    end
+
+    def recv_identity()
+      result = receive_message(Identity_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'identity failed: unknown result')
+    end
+
+  end
+
+  class Processor < Srv::Processor 
+    include ::Thrift::Processor
+
+    def process_identity(seqid, iprot, oprot)
+      args = read_args(iprot, Identity_args)
+      result = Identity_result.new()
+      result.success = @handler.identity(args.arg)
+      write_result(result, oprot, 'identity', seqid)
+    end
+
+  end
+
+  # HELPER FUNCTIONS AND STRUCTURES
+
+  class Identity_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    ARG = 1
+
+    FIELDS = {
+      ARG => {:type => ::Thrift::Types::I32, :name => 'arg'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Identity_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+end
+

data/debug_proto_test/gen-rb/reverse_order_service.rb

@@ -0,0 +1,82 @@
+#
+# Autogenerated by Thrift Compiler (0.7.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'debug_proto_test_types'
+
+module ReverseOrderService
+  class Client
+    include ::Thrift::Client
+
+    def myMethod(first, second, third, fourth)
+      send_myMethod(first, second, third, fourth)
+      recv_myMethod()
+    end
+
+    def send_myMethod(first, second, third, fourth)
+      send_message('myMethod', MyMethod_args, :first => first, :second => second, :third => third, :fourth => fourth)
+    end
+
+    def recv_myMethod()
+      result = receive_message(MyMethod_result)
+      return
+    end
+
+  end
+
+  class Processor
+    include ::Thrift::Processor
+
+    def process_myMethod(seqid, iprot, oprot)
+      args = read_args(iprot, MyMethod_args)
+      result = MyMethod_result.new()
+      @handler.myMethod(args.first, args.second, args.third, args.fourth)
+      write_result(result, oprot, 'myMethod', seqid)
+    end
+
+  end
+
+  # HELPER FUNCTIONS AND STRUCTURES
+
+  class MyMethod_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    FIRST = 4
+    SECOND = 3
+    THIRD = 2
+    FOURTH = 1
+
+    FIELDS = {
+      FIRST => {:type => ::Thrift::Types::STRING, :name => 'first'},
+      SECOND => {:type => ::Thrift::Types::I16, :name => 'second'},
+      THIRD => {:type => ::Thrift::Types::I32, :name => 'third'},
+      FOURTH => {:type => ::Thrift::Types::I64, :name => 'fourth'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class MyMethod_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+end
+

data/debug_proto_test/gen-rb/service_for_exception_with_a_map.rb

@@ -0,0 +1,81 @@
+#
+# Autogenerated by Thrift Compiler (0.7.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'debug_proto_test_types'
+
+module ServiceForExceptionWithAMap
+  class Client
+    include ::Thrift::Client
+
+    def methodThatThrowsAnException()
+      send_methodThatThrowsAnException()
+      recv_methodThatThrowsAnException()
+    end
+
+    def send_methodThatThrowsAnException()
+      send_message('methodThatThrowsAnException', MethodThatThrowsAnException_args)
+    end
+
+    def recv_methodThatThrowsAnException()
+      result = receive_message(MethodThatThrowsAnException_result)
+      raise result.xwamap unless result.xwamap.nil?
+      return
+    end
+
+  end
+
+  class Processor
+    include ::Thrift::Processor
+
+    def process_methodThatThrowsAnException(seqid, iprot, oprot)
+      args = read_args(iprot, MethodThatThrowsAnException_args)
+      result = MethodThatThrowsAnException_result.new()
+      begin
+        @handler.methodThatThrowsAnException()
+      rescue ExceptionWithAMap => xwamap
+        result.xwamap = xwamap
+      end
+      write_result(result, oprot, 'methodThatThrowsAnException', seqid)
+    end
+
+  end
+
+  # HELPER FUNCTIONS AND STRUCTURES
+
+  class MethodThatThrowsAnException_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class MethodThatThrowsAnException_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    XWAMAP = 1
+
+    FIELDS = {
+      XWAMAP => {:type => ::Thrift::Types::STRUCT, :name => 'xwamap', :class => ExceptionWithAMap}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+end
+

data/debug_proto_test/gen-rb/srv.rb

@@ -0,0 +1,330 @@
+#
+# Autogenerated by Thrift Compiler (0.7.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'debug_proto_test_types'
+
+module Srv
+  class Client
+    include ::Thrift::Client
+
+    def Janky(arg)
+      send_Janky(arg)
+      return recv_Janky()
+    end
+
+    def send_Janky(arg)
+      send_message('Janky', Janky_args, :arg => arg)
+    end
+
+    def recv_Janky()
+      result = receive_message(Janky_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'Janky failed: unknown result')
+    end
+
+    def voidMethod()
+      send_voidMethod()
+      recv_voidMethod()
+    end
+
+    def send_voidMethod()
+      send_message('voidMethod', VoidMethod_args)
+    end
+
+    def recv_voidMethod()
+      result = receive_message(VoidMethod_result)
+      return
+    end
+
+    def primitiveMethod()
+      send_primitiveMethod()
+      return recv_primitiveMethod()
+    end
+
+    def send_primitiveMethod()
+      send_message('primitiveMethod', PrimitiveMethod_args)
+    end
+
+    def recv_primitiveMethod()
+      result = receive_message(PrimitiveMethod_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'primitiveMethod failed: unknown result')
+    end
+
+    def structMethod()
+      send_structMethod()
+      return recv_structMethod()
+    end
+
+    def send_structMethod()
+      send_message('structMethod', StructMethod_args)
+    end
+
+    def recv_structMethod()
+      result = receive_message(StructMethod_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'structMethod failed: unknown result')
+    end
+
+    def methodWithDefaultArgs(something)
+      send_methodWithDefaultArgs(something)
+      recv_methodWithDefaultArgs()
+    end
+
+    def send_methodWithDefaultArgs(something)
+      send_message('methodWithDefaultArgs', MethodWithDefaultArgs_args, :something => something)
+    end
+
+    def recv_methodWithDefaultArgs()
+      result = receive_message(MethodWithDefaultArgs_result)
+      return
+    end
+
+    def onewayMethod()
+      send_onewayMethod()
+    end
+
+    def send_onewayMethod()
+      send_message('onewayMethod', OnewayMethod_args)
+    end
+  end
+
+  class Processor
+    include ::Thrift::Processor
+
+    def process_Janky(seqid, iprot, oprot)
+      args = read_args(iprot, Janky_args)
+      result = Janky_result.new()
+      result.success = @handler.Janky(args.arg)
+      write_result(result, oprot, 'Janky', seqid)
+    end
+
+    def process_voidMethod(seqid, iprot, oprot)
+      args = read_args(iprot, VoidMethod_args)
+      result = VoidMethod_result.new()
+      @handler.voidMethod()
+      write_result(result, oprot, 'voidMethod', seqid)
+    end
+
+    def process_primitiveMethod(seqid, iprot, oprot)
+      args = read_args(iprot, PrimitiveMethod_args)
+      result = PrimitiveMethod_result.new()
+      result.success = @handler.primitiveMethod()
+      write_result(result, oprot, 'primitiveMethod', seqid)
+    end
+
+    def process_structMethod(seqid, iprot, oprot)
+      args = read_args(iprot, StructMethod_args)
+      result = StructMethod_result.new()
+      result.success = @handler.structMethod()
+      write_result(result, oprot, 'structMethod', seqid)
+    end
+
+    def process_methodWithDefaultArgs(seqid, iprot, oprot)
+      args = read_args(iprot, MethodWithDefaultArgs_args)
+      result = MethodWithDefaultArgs_result.new()
+      @handler.methodWithDefaultArgs(args.something)
+      write_result(result, oprot, 'methodWithDefaultArgs', seqid)
+    end
+
+    def process_onewayMethod(seqid, iprot, oprot)
+      args = read_args(iprot, OnewayMethod_args)
+      @handler.onewayMethod()
+      return
+    end
+
+  end
+
+  # HELPER FUNCTIONS AND STRUCTURES
+
+  class Janky_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    ARG = 1
+
+    FIELDS = {
+      ARG => {:type => ::Thrift::Types::I32, :name => 'arg'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Janky_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class VoidMethod_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class VoidMethod_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class PrimitiveMethod_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class PrimitiveMethod_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class StructMethod_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class StructMethod_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => CompactProtoTestStruct}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class MethodWithDefaultArgs_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SOMETHING = 1
+
+    FIELDS = {
+      SOMETHING => {:type => ::Thrift::Types::I32, :name => 'something', :default => 2}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class MethodWithDefaultArgs_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class OnewayMethod_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class OnewayMethod_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+end
+

data/ext/binary_protocol_accelerated.c

@@ -34,6 +34,7 @@ static int VERSION_1;
 static int VERSION_MASK;
 static int TYPE_MASK;
 static int BAD_VERSION;
+static ID rbuf_ivar_id;
 
 static void write_byte_direct(VALUE trans, int8_t b) {
   WRITE(trans, (char*)&b, 1);
@@ -226,26 +227,36 @@ VALUE rb_thrift_binary_proto_read_i32(VALUE self);
 VALUE rb_thrift_binary_proto_read_i16(VALUE self);
 
 static char read_byte_direct(VALUE self) {
-  VALUE buf = READ(self, 1);
-  return RSTRING_PTR(buf)[0];
+  VALUE byte = rb_funcall(GET_TRANSPORT(self), read_byte_method_id, 0);
+  return (char)(FIX2INT(byte));
 }
 
 static int16_t read_i16_direct(VALUE self) {
-  VALUE buf = READ(self, 2);
-  return (int16_t)(((uint8_t)(RSTRING_PTR(buf)[1])) | ((uint16_t)((RSTRING_PTR(buf)[0]) << 8)));
+  VALUE rbuf = rb_ivar_get(self, rbuf_ivar_id);
+  rb_funcall(GET_TRANSPORT(self), read_into_buffer_method_id, 2, rbuf, INT2FIX(2));
+  return (int16_t)(((uint8_t)(RSTRING_PTR(rbuf)[1])) | ((uint16_t)((RSTRING_PTR(rbuf)[0]) << 8)));
 }
 
 static int32_t read_i32_direct(VALUE self) {
-  VALUE buf = READ(self, 4);
-  return ((uint8_t)(RSTRING_PTR(buf)[3])) | 
-    (((uint8_t)(RSTRING_PTR(buf)[2])) << 8) | 
-    (((uint8_t)(RSTRING_PTR(buf)[1])) << 16) | 
-    (((uint8_t)(RSTRING_PTR(buf)[0])) << 24);
+  VALUE rbuf = rb_ivar_get(self, rbuf_ivar_id);
+  rb_funcall(GET_TRANSPORT(self), read_into_buffer_method_id, 2, rbuf, INT2FIX(4));
+  return ((uint8_t)(RSTRING_PTR(rbuf)[3])) |
+    (((uint8_t)(RSTRING_PTR(rbuf)[2])) << 8) |
+    (((uint8_t)(RSTRING_PTR(rbuf)[1])) << 16) |
+    (((uint8_t)(RSTRING_PTR(rbuf)[0])) << 24);
 }
 
 static int64_t read_i64_direct(VALUE self) {
-  uint64_t hi = read_i32_direct(self);
-  uint32_t lo = read_i32_direct(self);
+  VALUE rbuf = rb_ivar_get(self, rbuf_ivar_id);
+  rb_funcall(GET_TRANSPORT(self), read_into_buffer_method_id, 2, rbuf, INT2FIX(8));
+  uint64_t hi = ((uint8_t)(RSTRING_PTR(rbuf)[3])) |
+    (((uint8_t)(RSTRING_PTR(rbuf)[2])) << 8) |
+    (((uint8_t)(RSTRING_PTR(rbuf)[1])) << 16) |
+    (((uint8_t)(RSTRING_PTR(rbuf)[0])) << 24);
+  uint32_t lo = ((uint8_t)(RSTRING_PTR(rbuf)[7])) |
+    (((uint8_t)(RSTRING_PTR(rbuf)[6])) << 8) |
+    (((uint8_t)(RSTRING_PTR(rbuf)[5])) << 16) |
+    (((uint8_t)(RSTRING_PTR(rbuf)[4])) << 24);
   return (hi << 32) | lo;
 }
 
@@ -425,4 +436,6 @@ 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);
+
+  rbuf_ivar_id = rb_intern("@rbuf");
 }

data/ext/compact_protocol.c

@@ -34,6 +34,7 @@ VALUE rb_thrift_compact_proto_native_qmark(VALUE self) {
 static ID last_field_id;
 static ID boolean_field_id;
 static ID bool_value_id;
+static ID rbuf_ivar_id;
 
 static int VERSION;
 static int VERSION_MASK;
@@ -354,8 +355,8 @@ static int8_t get_ttype(int8_t ctype) {
 }
 
 static char read_byte_direct(VALUE self) {
-  VALUE buf = READ(self, 1);
-  return RSTRING_PTR(buf)[0];
+  VALUE byte = rb_funcall(GET_TRANSPORT(self), read_byte_method_id, 0);
+  return (char)(FIX2INT(byte));
 }
 
 static int64_t zig_zag_to_ll(int64_t n) {
@@ -528,15 +529,16 @@ VALUE rb_thrift_compact_proto_read_double(VALUE self) {
     double f;
     int64_t l;
   } transfer;
-  VALUE bytes = READ(self, 8);
-  uint32_t lo = ((uint8_t)(RSTRING_PTR(bytes)[0]))
-    | (((uint8_t)(RSTRING_PTR(bytes)[1])) << 8)
-    | (((uint8_t)(RSTRING_PTR(bytes)[2])) << 16)
-    | (((uint8_t)(RSTRING_PTR(bytes)[3])) << 24);
-  uint64_t hi = (((uint8_t)(RSTRING_PTR(bytes)[4])))
-    | (((uint8_t)(RSTRING_PTR(bytes)[5])) << 8)
-    | (((uint8_t)(RSTRING_PTR(bytes)[6])) << 16)
-    | (((uint8_t)(RSTRING_PTR(bytes)[7])) << 24);
+  VALUE rbuf = rb_ivar_get(self, rbuf_ivar_id);
+  rb_funcall(GET_TRANSPORT(self), read_into_buffer_method_id, 2, rbuf, INT2FIX(8));
+  uint32_t lo = ((uint8_t)(RSTRING_PTR(rbuf)[0]))
+    | (((uint8_t)(RSTRING_PTR(rbuf)[1])) << 8)
+    | (((uint8_t)(RSTRING_PTR(rbuf)[2])) << 16)
+    | (((uint8_t)(RSTRING_PTR(rbuf)[3])) << 24);
+  uint64_t hi = (((uint8_t)(RSTRING_PTR(rbuf)[4])))
+    | (((uint8_t)(RSTRING_PTR(rbuf)[5])) << 8)
+    | (((uint8_t)(RSTRING_PTR(rbuf)[6])) << 16)
+    | (((uint8_t)(RSTRING_PTR(rbuf)[7])) << 24);
   transfer.l = (hi << 32) | lo;
 
   return rb_float_new(transfer.f);
@@ -559,6 +561,7 @@ static void Init_constants() {
   last_field_id = rb_intern("@last_field");
   boolean_field_id = rb_intern("@boolean_field");
   bool_value_id = rb_intern("@bool_value");
+  rbuf_ivar_id = rb_intern("@rbuf");
 }
 
 static void Init_rb_methods() {