thrift 0.22.0 → 0.23.0

data/lib/thrift/transport/socket.rb

@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
-# 
+#
 # 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
@@ -7,22 +7,22 @@
 # 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.
-# 
+#
 
 require 'socket'
 
 module Thrift
   class Socket < BaseTransport
-    def initialize(host='localhost', port=9090, timeout=nil)
+    def initialize(host = 'localhost', port = 9090, timeout = nil)
       @host = host
       @port = port
       @timeout = timeout
@@ -62,26 +62,26 @@ module Thrift
     end
 
     def write(str)
-      raise IOError, "closed stream" unless open?
+      raise TransportException.new(TransportException::NOT_OPEN, "closed stream") unless open?
       str = Bytes.force_binary_encoding(str)
       begin
         if @timeout.nil? or @timeout == 0
           @handle.write(str)
         else
+          deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
           len = 0
-          start = Time.now
-          while Time.now - start < @timeout
-            rd, wr, = IO.select(nil, [@handle], nil, @timeout)
-            if wr and not wr.empty?
+
+          while len < str.length
+            begin
               len += @handle.write_nonblock(str[len..-1])
-              break if len >= str.length
+            rescue IO::WaitWritable
+              wait_for(:write, deadline, str.length)
+            rescue IO::WaitReadable
+              wait_for(:read, deadline, str.length)
             end
           end
-          if len < str.length
-            raise TransportException.new(TransportException::TIMED_OUT, "Socket: Timed out writing #{str.length} bytes to #{@desc}")
-          else
-            len
-          end
+
+          len
         end
       rescue TransportException => e
         # pass this on
@@ -94,25 +94,22 @@ module Thrift
     end
 
     def read(sz)
-      raise IOError, "closed stream" unless open?
+      raise TransportException.new(TransportException::NOT_OPEN, "closed stream") unless open?
 
       begin
         if @timeout.nil? or @timeout == 0
           data = @handle.readpartial(sz)
         else
-          # it's possible to interrupt select for something other than the timeout
-          # so we need to ensure we've waited long enough, but not too long
-          start = Time.now
-          timespent = 0
-          rd = loop do
-            rd, = IO.select([@handle], nil, nil, @timeout - timespent)
-            timespent = Time.now - start
-            break rd if (rd and not rd.empty?) or timespent >= @timeout
-          end
-          if rd.nil? or rd.empty?
-            raise TransportException.new(TransportException::TIMED_OUT, "Socket: Timed out reading #{sz} bytes from #{@desc}")
-          else
-            data = @handle.readpartial(sz)
+          deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
+
+          data = loop do
+            begin
+              break @handle.read_nonblock(sz)
+            rescue IO::WaitReadable
+              wait_for(:read, deadline, sz)
+            rescue IO::WaitWritable
+              wait_for(:write, deadline, sz)
+            end
           end
         end
       rescue TransportException => e
@@ -134,10 +131,40 @@ module Thrift
       @handle = nil
     end
 
-    alias to_io handle
+    def to_io
+      @handle&.to_io || raise(IOError, 'closed stream')
+    end
 
     def to_s
       "socket(#{@host}:#{@port})"
     end
+
+    private
+
+    def wait_for(operation, deadline, sz)
+      rd_ary, wr_ary = case operation
+      when :read
+        [[@handle], nil]
+      when :write
+        [nil, [@handle]]
+      else
+        raise ArgumentError, "Unknown IO wait operation: #{operation.inspect}"
+      end
+
+      loop do
+        remaining = deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        if remaining <= 0
+          case operation
+          when :read
+            raise TransportException.new(TransportException::TIMED_OUT, "Socket: Timed out reading #{sz} bytes from #{@desc}")
+          when :write
+            raise TransportException.new(TransportException::TIMED_OUT, "Socket: Timed out writing #{sz} bytes to #{@desc}")
+          end
+        end
+
+        rd, wr, = IO.select(rd_ary, wr_ary, nil, remaining)
+        return if (rd && !rd.empty?) || (wr && !wr.empty?)
+      end
+    end
   end
 end

data/lib/thrift/transport/ssl_server_socket.rb

@@ -33,7 +33,7 @@ module Thrift
       socket = TCPServer.new(@host, @port)
       @handle = OpenSSL::SSL::SSLServer.new(socket, @ssl_context)
     end
-    
+
     def to_s
       "ssl(#{super.to_s})"
     end

data/lib/thrift/transport/ssl_socket.rb

@@ -19,7 +19,7 @@
 
 module Thrift
   class SSLSocket < Socket
-    def initialize(host='localhost', port=9090, timeout=nil, ssl_context=nil)
+    def initialize(host = 'localhost', port = 9090, timeout = nil, ssl_context = nil)
       super(host, port, timeout)
       @ssl_context = ssl_context
     end
@@ -43,7 +43,7 @@ module Thrift
         raise TransportException.new(TransportException::NOT_OPEN, "Could not connect to #{@desc}: #{e}")
       end
     end
-    
+
     def to_s
       "ssl(#{super.to_s})"
     end

data/lib/thrift/transport/unix_server_socket.rb

@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
-# 
+#
 # 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
@@ -7,16 +7,16 @@
 # 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.
-# 
+#
 
 require 'socket'
 

data/lib/thrift/transport/unix_socket.rb

@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
-# 
+#
 # 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
@@ -7,22 +7,22 @@
 # 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.
-# 
+#
 
 require 'socket'
 
 module Thrift
   class UNIXSocket < Socket
-    def initialize(path, timeout=nil)
+    def initialize(path, timeout = nil)
       @path = path
       @timeout = timeout
       @desc = @path # for read()'s error
@@ -36,7 +36,7 @@ module Thrift
         raise TransportException.new(TransportException::NOT_OPEN, "Could not open UNIX socket at #{@path}")
       end
     end
-    
+
     def to_s
       "domain(#{@path})"
     end

data/lib/thrift/types.rb

@@ -1,4 +1,4 @@
-# 
+#
 # 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
@@ -6,16 +6,16 @@
 # 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.
-# 
+#
 
 require 'set'
 
@@ -34,6 +34,7 @@ module Thrift
     MAP = 13
     SET = 14
     LIST = 15
+    UUID = 16
   end
 
   class << self
@@ -43,7 +44,7 @@ module Thrift
   class TypeError < Exception
   end
 
-  def self.check_type(value, field, name, skip_nil=true)
+  def self.check_type(value, field, name, skip_nil = true)
     return if value.nil? and skip_nil
     klasses = case field[:type]
               when Types::VOID
@@ -56,6 +57,8 @@ module Thrift
                 Float
               when Types::STRING
                 String
+              when Types::UUID
+                String
               when Types::STRUCT
                 [Struct, Union]
               when Types::MAP
@@ -70,7 +73,7 @@ module Thrift
     # check elements now
     case field[:type]
     when Types::MAP
-      value.each_pair do |k,v|
+      value.each_pair do |k, v|
         check_type(k, field[:key], "#{name}.key", false)
         check_type(v, field[:value], "#{name}.value", false)
       end

data/lib/thrift/union.rb

@@ -1,4 +1,4 @@
-# 
+#
 # 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
@@ -6,20 +6,20 @@
 # 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.
-# 
+#
 
 module Thrift
   class Union
-    def initialize(name=nil, value=nil)
+    def initialize(name = nil, value = nil)
       if name
         if name.is_a? Hash
           if name.size > 1
@@ -60,7 +60,9 @@ module Thrift
       iprot.read_field_end
 
       fname, ftype, fid = iprot.read_field_begin
-      raise "Too many fields for union" unless (ftype == Types::STOP) 
+      unless (ftype == Types::STOP)
+        raise ProtocolException.new(ProtocolException::INVALID_DATA, "Too many fields for union")
+      end
 
       iprot.read_struct_end
       validate
@@ -73,6 +75,10 @@ module Thrift
       fid = self.name_to_id(@setfield.to_s)
 
       field_info = struct_fields[fid]
+      unless field_info
+        raise ProtocolException.new(ProtocolException::INVALID_DATA, "set_field is not valid for this union!")
+      end
+
       type = field_info[:type]
       if is_container? type
         oprot.write_field_begin(@setfield, type, fid)
@@ -99,7 +105,7 @@ module Thrift
       klass.send :define_method, field_info[:name] do
         if field_info[:name].to_sym == @setfield
           @value
-        else 
+        else
           raise RuntimeError, "#{field_info[:name]} is not union's set field."
         end
       end
@@ -124,7 +130,7 @@ module Thrift
       end
     end
 
-    # get the symbol that indicates what the currently set field type is. 
+    # get the symbol that indicates what the currently set field type is.
     def get_set_field
       @setfield
     end

data/lib/thrift/uuid.rb

@@ -0,0 +1,49 @@
+#
+# 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.
+#
+
+require 'thrift/protocol/base_protocol'
+
+module Thrift
+  module UUID
+    UUID_REGEX = /\A[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\z/.freeze
+
+    def self.validate_uuid!(uuid)
+      unless uuid.is_a?(String)
+        raise ProtocolException.new(ProtocolException::INVALID_DATA, 'UUID must be a string')
+      end
+
+      unless uuid =~ UUID_REGEX
+        raise ProtocolException.new(ProtocolException::INVALID_DATA, 'Invalid UUID format')
+      end
+    end
+
+    def self.uuid_bytes(uuid)
+      [uuid.delete('-')].pack('H*')
+    end
+
+    def self.uuid_from_bytes(bytes)
+      unless bytes.bytesize == 16
+        raise ProtocolException.new(ProtocolException::INVALID_DATA, 'Invalid UUID data length')
+      end
+
+      hex = bytes.unpack('H*').first
+      "#{hex[0, 8]}-#{hex[8, 4]}-#{hex[12, 4]}-#{hex[16, 4]}-#{hex[20, 12]}"
+    end
+  end
+end

data/lib/thrift.rb

@@ -23,7 +23,6 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'thrift/bytes'
-require 'thrift/core_ext'
 require 'thrift/exceptions'
 require 'thrift/types'
 require 'thrift/processor'
@@ -32,6 +31,7 @@ require 'thrift/client'
 require 'thrift/struct'
 require 'thrift/union'
 require 'thrift/struct_union'
+require 'thrift/uuid'
 
 # serializer
 require 'thrift/serializer/serializer'
@@ -44,6 +44,7 @@ require 'thrift/protocol/binary_protocol_accelerated'
 require 'thrift/protocol/compact_protocol'
 require 'thrift/protocol/json_protocol'
 require 'thrift/protocol/multiplexed_protocol'
+require 'thrift/protocol/header_protocol'
 
 # transport
 require 'thrift/transport/base_transport'
@@ -56,6 +57,7 @@ require 'thrift/transport/unix_socket'
 require 'thrift/transport/unix_server_socket'
 require 'thrift/transport/buffered_transport'
 require 'thrift/transport/framed_transport'
+require 'thrift/transport/header_transport'
 require 'thrift/transport/http_client_transport'
 require 'thrift/transport/io_stream_transport'
 require 'thrift/transport/memory_buffer_transport'

data/spec/ThriftSpec.thrift

@@ -60,6 +60,7 @@ union TestUnion {
   3: i32 other_i32_field;
   4: SomeEnum enum_field;
   5: binary binary_field;
+  6: uuid uuid_field;
 }
 
 struct Foo {
@@ -71,6 +72,7 @@ struct Foo {
   6: set<i16> shorts = [5, 17, 239],
   7: optional string opt_string
   8: bool my_bool
+  9: optional uuid opt_uuid
 }
 
 struct Foo2 {
@@ -92,7 +94,8 @@ struct SimpleList {
   8: list<map<i16, i16>> maps,
   9: list<list<i16>> lists,
   10: list<set<i16>> sets,
-  11: list<Hello> hellos
+  11: list<Hello> hellos,
+  12: list<uuid> uuids
 }
 
 exception Xception {
@@ -119,6 +122,7 @@ union My_union {
   8: i32 other_i32
   9: SomeEnum some_enum;
   10: map<SomeEnum, list<SomeEnum>> my_map;
+  11: uuid unique_id;
 }
 
 struct Struct_with_union {

data/spec/base_protocol_spec.rb

@@ -20,7 +20,6 @@
 require 'spec_helper'
 
 describe 'BaseProtocol' do
-
   before(:each) do
     @trans = double("MockTransport")
     @prot = Thrift::BaseProtocol.new(@trans)
@@ -215,7 +214,7 @@ describe 'BaseProtocol' do
   describe Thrift::BaseProtocolFactory do
     it "should raise NotImplementedError" do
       # returning nil since Protocol is just an abstract class
-      expect {Thrift::BaseProtocolFactory.new.get_protocol(double("MockTransport"))}.to raise_error(NotImplementedError)
+      expect { Thrift::BaseProtocolFactory.new.get_protocol(double("MockTransport")) }.to raise_error(NotImplementedError)
     end
 
     it "should provide a reasonable to_s" do

data/spec/base_transport_spec.rb

@@ -20,7 +20,6 @@
 require 'spec_helper'
 
 describe 'BaseTransport' do
-
   describe Thrift::TransportException do
     it "should make type accessible" do
       exc = Thrift::TransportException.new(Thrift::TransportException::ALREADY_OPEN, "msg")
@@ -48,7 +47,7 @@ describe 'BaseTransport' do
     it "should alias << to write" do
       expect(Thrift::BaseTransport.instance_method(:<<)).to eq(Thrift::BaseTransport.instance_method(:write))
     end
-    
+
     it "should provide a reasonable to_s" do
       expect(Thrift::BaseTransport.new.to_s).to eq("base")
     end
@@ -67,7 +66,7 @@ describe 'BaseTransport' do
       transport = double("Transport")
       expect(Thrift::BaseTransportFactory.new.get_transport(transport)).to eql(transport)
     end
-    
+
     it "should provide a reasonable to_s" do
       expect(Thrift::BaseTransportFactory.new.to_s).to eq("base")
     end
@@ -149,7 +148,7 @@ describe 'BaseTransport' do
       expect(Thrift::BufferedTransport).to receive(:new).with(trans).and_return(btrans)
       expect(Thrift::BufferedTransportFactory.new.get_transport(trans)).to eq(btrans)
     end
-    
+
     it "should provide a reasonable to_s" do
       expect(Thrift::BufferedTransportFactory.new.to_s).to eq("buffered")
     end
@@ -271,7 +270,7 @@ describe 'BaseTransport' do
       expect(Thrift::FramedTransport).to receive(:new).with(trans)
       Thrift::FramedTransportFactory.new.get_transport(trans)
     end
-    
+
     it "should provide a reasonable to_s" do
       expect(Thrift::FramedTransportFactory.new.to_s).to eq("framed")
     end
@@ -341,10 +340,10 @@ describe 'BaseTransport' do
 
     it "should throw an EOFError when there isn't enough data in the buffer" do
       @buffer.reset_buffer("")
-      expect{@buffer.read(1)}.to raise_error(EOFError)
+      expect{ @buffer.read(1) }.to raise_error(EOFError)
 
       @buffer.reset_buffer("1234")
-      expect{@buffer.read(5)}.to raise_error(EOFError)
+      expect{ @buffer.read(5) }.to raise_error(EOFError)
     end
   end
 

data/spec/binary_protocol_spec.rb

@@ -21,7 +21,6 @@ require 'spec_helper'
 require File.expand_path("#{File.dirname(__FILE__)}/binary_protocol_spec_shared")
 
 describe 'BinaryProtocol' do
-
   it_should_behave_like 'a binary protocol'
 
   def protocol_class
@@ -29,7 +28,6 @@ describe 'BinaryProtocol' do
   end
 
   describe Thrift::BinaryProtocol do
-
     before(:each) do
       @trans = Thrift::MemoryBufferTransport.new
       @prot = protocol_class.new(@trans)