thrift 0.2.0 → 0.2.0.2

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.2.0.2 Remove -Werror from compile.
 
 v0.2.0. Update version to Thrift release 0.2.0. No actual code changes.
 

data/Manifest

@@ -6,14 +6,15 @@ Rakefile
 benchmark/Benchmark.thrift
 benchmark/benchmark.rb
 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
 ext/binary_protocol_accelerated.h
 ext/compact_protocol.c
 ext/compact_protocol.h
-ext/conftest.dSYM/Contents/Info.plist
-ext/conftest.dSYM/Contents/Resources/DWARF/conftest
 ext/constants.h
 ext/extconf.rb
 ext/macros.h
@@ -33,15 +34,23 @@ lib/thrift/processor.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
@@ -69,6 +78,9 @@ 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

data/benchmark/gen-rb/BenchmarkService.rb

@@ -0,0 +1,81 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'thrift/protocol'
+require File.dirname(__FILE__) + '/Benchmark_types'
+
+    module ThriftBenchmark
+      module BenchmarkService
+        class Client
+          include ::Thrift::Client
+
+          def fibonacci(n)
+            send_fibonacci(n)
+            return recv_fibonacci()
+          end
+
+          def send_fibonacci(n)
+            send_message('fibonacci', Fibonacci_args, :n => n)
+          end
+
+          def recv_fibonacci()
+            result = receive_message(Fibonacci_result)
+            return result.success unless result.success.nil?
+            raise Thrift::ApplicationException.new(Thrift::ApplicationException::MISSING_RESULT, 'fibonacci failed: unknown result')
+          end
+
+        end
+
+        class Processor
+          include ::Thrift::Processor
+
+          def process_fibonacci(seqid, iprot, oprot)
+            args = read_args(iprot, Fibonacci_args)
+            result = Fibonacci_result.new()
+            result.success = @handler.fibonacci(args.n)
+            write_result(result, oprot, 'fibonacci', seqid)
+          end
+
+        end
+
+        # HELPER FUNCTIONS AND STRUCTURES
+
+        class Fibonacci_args
+          include ::Thrift::Struct
+          N = 1
+
+          Thrift::Struct.field_accessor self, :n
+          FIELDS = {
+            N => {:type => Thrift::Types::BYTE, :name => 'n'}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
+        class Fibonacci_result
+          include ::Thrift::Struct
+          SUCCESS = 0
+
+          Thrift::Struct.field_accessor self, :success
+          FIELDS = {
+            SUCCESS => {:type => Thrift::Types::I32, :name => 'success'}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+        end
+
+      end
+
+    end

data/benchmark/gen-rb/Benchmark_constants.rb

@@ -0,0 +1,11 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift/protocol'
+require File.dirname(__FILE__) + '/Benchmark_types'
+
+  module ThriftBenchmark
+end

data/benchmark/gen-rb/Benchmark_types.rb

@@ -0,0 +1,10 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift/protocol'
+
+module ThriftBenchmark
+  end

data/ext/extconf.rb

@@ -19,7 +19,7 @@
 
 require 'mkmf'
 
-$CFLAGS = "-g -O2 -Wall -Werror"
+$CFLAGS = "-g -O2 -Wall"
 
 have_func("strlcpy", "string.h")
 

data/lib/thrift/protocol/binaryprotocol.rb

@@ -0,0 +1,213 @@
+#
+# Copyright (c) 2006- Facebook
+# Distributed under the Apache Software License
+#
+# See accompanying file LICENSE or visit the Thrift site at:
+# http://developers.facebook.com/thrift/
+#
+# Author: Mark Slee <mcslee@facebook.com>
+#
+require 'thrift/protocol'
+
+module Thrift
+  class BinaryProtocol < Protocol
+    VERSION_MASK = 0xffff0000
+    VERSION_1 = 0x80010000
+    TYPE_MASK = 0x000000ff
+    
+    attr_reader :strict_read, :strict_write
+
+    def initialize(trans, strict_read=true, strict_write=true)
+      super(trans)
+      @strict_read = strict_read
+      @strict_write = strict_write
+    end
+
+    def write_message_begin(name, type, seqid)
+      # this is necessary because we added (needed) bounds checking to 
+      # write_i32, and 0x80010000 is too big for that.
+      if strict_write
+        write_i16(VERSION_1 >> 16)
+        write_i16(type)
+        write_string(name)
+        write_i32(seqid)
+      else
+        write_string(name)
+        write_byte(type)
+        write_i32(seqid)
+      end
+    end
+
+    def write_field_begin(name, type, id)
+      write_byte(type)
+      write_i16(id)
+    end
+
+    def write_field_stop
+      write_byte(Thrift::Types::STOP)
+    end
+
+    def write_map_begin(ktype, vtype, size)
+      write_byte(ktype)
+      write_byte(vtype)
+      write_i32(size)
+    end
+
+    def write_list_begin(etype, size)
+      write_byte(etype)
+      write_i32(size)
+    end
+
+    def write_set_begin(etype, size)
+      write_byte(etype)
+      write_i32(size)
+    end
+
+    def write_bool(bool)
+      write_byte(bool ? 1 : 0)
+    end
+
+    def write_byte(byte)
+      trans.write([byte].pack('c'))
+    end
+
+    def write_i16(i16)
+      trans.write([i16].pack('n'))
+    end
+
+    def write_i32(i32)
+      raise RangeError if i32 < -2**31 || i32 >= 2**31
+      trans.write([i32].pack('N'))
+    end
+
+    def write_i64(i64)
+      hi = i64 >> 32
+      lo = i64 & 0xffffffff
+      trans.write([hi, lo].pack('N2'))
+    end
+
+    def write_double(dub)
+      trans.write([dub].pack('G'))
+    end
+
+    def write_string(str)
+      write_i32(str.length)
+      trans.write(str)
+    end
+
+    def read_message_begin
+      version = read_i32
+      if version < 0
+        if (version & VERSION_MASK != VERSION_1)
+          raise ProtocolException.new(ProtocolException::BAD_VERSION, 'Missing version identifier')
+        end
+        type = version & TYPE_MASK
+        name = read_string
+        seqid = read_i32
+        [name, type, seqid]
+      else
+        if strict_read
+          raise ProtocolException.new(ProtocolException::BAD_VERSION, 'No version identifier, old protocol client?')
+        end
+        name = trans.read_all(version)
+        type = read_byte
+        seqid = read_i32
+        [name, type, seqid]
+      end
+    end
+
+    def read_field_begin
+      type = read_byte
+      if (type == Types::STOP)
+        [nil, type, 0]
+      else
+        id = read_i16
+        [nil, type, id]
+      end
+    end
+
+    def read_map_begin
+      ktype = read_byte
+      vtype = read_byte
+      size = read_i32
+      [ktype, vtype, size]
+    end
+
+    def read_list_begin
+      etype = read_byte
+      size = read_i32
+      [etype, size]
+    end
+
+    def read_set_begin
+      etype = read_byte
+      size = read_i32
+      [etype, size]
+    end
+
+    def read_bool
+      byte = read_byte
+      byte != 0
+    end
+
+    def read_byte
+      dat = trans.read_all(1)
+      val = dat[0]
+      if (val > 0x7f)
+        val = 0 - ((val - 1) ^ 0xff)
+      end
+      val
+    end
+
+    def read_i16
+      dat = trans.read_all(2)
+      val, = dat.unpack('n')
+      if (val > 0x7fff)
+        val = 0 - ((val - 1) ^ 0xffff)
+      end
+      val
+    end
+
+    def read_i32
+      dat = trans.read_all(4)
+      val, = dat.unpack('N')
+      if (val > 0x7fffffff)
+        val = 0 - ((val - 1) ^ 0xffffffff)
+      end
+      val
+    end
+
+    def read_i64
+      dat = trans.read_all(8)
+      hi, lo = dat.unpack('N2')
+      if (hi > 0x7fffffff)
+        hi ^= 0xffffffff
+        lo ^= 0xffffffff
+        0 - (hi << 32) - lo - 1
+      else
+        (hi << 32) + lo
+      end
+    end
+
+    def read_double
+      dat = trans.read_all(8)
+      val = dat.unpack('G').first
+      val
+    end
+
+    def read_string
+      sz = read_i32
+      dat = trans.read_all(sz)
+      dat
+    end
+
+  end
+  deprecate_class! :TBinaryProtocol => BinaryProtocol
+
+  class BinaryProtocolFactory < ProtocolFactory
+    def get_protocol(trans)
+      return Thrift::BinaryProtocol.new(trans)
+    end
+  end
+  deprecate_class! :TBinaryProtocolFactory => BinaryProtocolFactory
+end

data/lib/thrift/protocol/binaryprotocolaccelerated.rb

@@ -0,0 +1,19 @@
+require 'thrift/protocol/binaryprotocol'
+require 'thrift_native'
+
+=begin
+The only change required for a transport to support TBinaryProtocolAccelerated is to implement 2 methods:
+  * borrow(size), which takes an optional argument and returns atleast _size_ bytes from the transport, 
+                  or the default buffer size if no argument is given
+  * consume!(size), which removes size bytes from the front of the buffer
+
+See TMemoryBuffer and TBufferedTransport for examples.
+=end
+
+module Thrift
+  class BinaryProtocolAcceleratedFactory < ProtocolFactory
+    def get_protocol(trans)
+      BinaryProtocolAccelerated.new(trans)
+    end
+  end
+end

data/lib/thrift/protocol/tbinaryprotocol.rb

@@ -0,0 +1,2 @@
+require 'thrift/deprecation'
+require 'thrift/protocol/binaryprotocol'

data/lib/thrift/protocol/tprotocol.rb

@@ -0,0 +1,2 @@
+require 'thrift/deprecation'
+require 'thrift/protocol'

data/lib/thrift/server/httpserver.rb

@@ -0,0 +1,44 @@
+require 'thrift/protocol'
+require 'thrift/protocol/binaryprotocol'
+require 'thrift/transport'
+
+require 'mongrel'
+
+## Sticks a service on a URL, using mongrel to do the HTTP work
+module Thrift
+  class SimpleMongrelHTTPServer
+    class Handler < Mongrel::HttpHandler
+      def initialize(processor, protocol_factory)
+        @processor = processor
+        @protocol_factory = protocol_factory
+      end
+
+      def process(request, response)
+        if request.params["REQUEST_METHOD"] == "POST"
+          response.start(200) do |head, out|
+            head["Content-Type"] = "application/x-thrift"
+            transport = IOStreamTransport.new request.body, out
+            protocol = @protocol_factory.get_protocol transport
+            @processor.process protocol, protocol
+          end
+        else
+          response.start(404) { }
+        end
+      end
+    end
+
+    def initialize(processor, opts={})
+      port = opts[:port] || 80
+      ip = opts[:ip] || "0.0.0.0"
+      path = opts[:path] || ""
+      protocol_factory = opts[:protocol_factory] || BinaryProtocolFactory.new
+      @server = Mongrel::HttpServer.new ip, port
+      @server.register "/#{path}", Handler.new(processor, protocol_factory)
+    end
+
+    def serve
+      @server.run.join
+    end
+  end
+  deprecate_class! :TSimpleMongrelHTTPServer => SimpleMongrelHTTPServer
+end