avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmhod...@apache.org
Subject svn commit: r951301 - in /avro/branches/branch-1.3: ./ CHANGES.txt lang/ruby/lib/avro/ipc.rb
Date Fri, 04 Jun 2010 06:57:02 GMT
Author: jmhodges
Date: Fri Jun  4 06:57:01 2010
New Revision: 951301

URL: http://svn.apache.org/viewvc?rev=951301&view=rev
Log:
AVRO-562 ruby side had busted client handshaking. merge from trunk

Modified:
    avro/branches/branch-1.3/   (props changed)
    avro/branches/branch-1.3/CHANGES.txt
    avro/branches/branch-1.3/lang/ruby/lib/avro/ipc.rb

Propchange: avro/branches/branch-1.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  4 06:57:01 2010
@@ -1,2 +1,2 @@
-/avro/trunk:944035,944049,946466,949477
+/avro/trunk:944035,944049,946466,949477,951298
 /hadoop/avro/trunk:930458-930459,930461-930462,930599,931026-931027,931437,933158,933180-933181,933184,935526,938347,938577,941168

Modified: avro/branches/branch-1.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.3/CHANGES.txt?rev=951301&r1=951300&r2=951301&view=diff
==============================================================================
--- avro/branches/branch-1.3/CHANGES.txt (original)
+++ avro/branches/branch-1.3/CHANGES.txt Fri Jun  4 06:57:01 2010
@@ -39,6 +39,14 @@ Avro 1.3.3 (Unreleased)
     AVRO-548. Python client should handle CLIENT handshake match status
     correctly. (hammer)
 
+    AVR0-555 Missing license headers in some ruby source
+    files. (jmhodges)
+
+    AVRO-554 Fixing syncing in ruby data file writing. (Grant Rodgers
+    via jmhodges)
+
+    AVRO-562 ruby side had busted client handshaking. (jmhodges)
+
     AVRO-517. Resolving Decoder fails in some cases. (thiru) 
 
     AVRO-524. DataFileWriter.appendTo leads to intermittent IOException during write() (thiru)
@@ -52,8 +60,6 @@ Avro 1.3.3 (Unreleased)
     AVR0-555 Missing license headers in some ruby source
     files. (jmhodges)
  
-Avro 1.3.3 (Unreleased)
-
 Avro 1.3.2 (31 March 2010)
 
   IMPROVEMENTS

Modified: avro/branches/branch-1.3/lang/ruby/lib/avro/ipc.rb
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.3/lang/ruby/lib/avro/ipc.rb?rev=951301&r1=951300&r2=951301&view=diff
==============================================================================
--- avro/branches/branch-1.3/lang/ruby/lib/avro/ipc.rb (original)
+++ avro/branches/branch-1.3/lang/ruby/lib/avro/ipc.rb Fri Jun  4 06:57:01 2010
@@ -161,25 +161,28 @@ module Avro::IPC
 
     def read_handshake_response(decoder)
       handshake_response = HANDSHAKE_REQUESTOR_READER.read(decoder)
-      case match = handshake_response['match']
+      we_have_matching_schema = false
+
+      case handshake_response['match']
       when 'BOTH'
         self.send_protocol = false
-        true
+        we_have_matching_schema = true
       when 'CLIENT'
         raise AvroError.new('Handshake failure. match == CLIENT') if send_protocol
         self.remote_protocol = Avro::Protocol.parse(handshake_response['serverProtocol'])
         self.remote_hash = handshake_response['serverHash']
         self.send_protocol = false
-        false
+        we_have_matching_schema = true
       when 'NONE'
         raise AvroError.new('Handshake failure. match == NONE') if send_protocol
         self.remote_protocol = Avro::Protocol.parse(handshake_response['serverProtocol'])
         self.remote_hash = handshake_response['serverHash']
         self.send_protocol = true
-        false
       else
         raise AvroError.new("Unexpected match: #{match}")
       end
+
+      return we_have_matching_schema
     end
 
     def read_call_response(message_name, decoder)



Mime
View raw message