riakpb 0.1.5 → 0.1.6

data/Rakefile

@@ -6,7 +6,7 @@ require './lib/riak'
 gemspec = Gem::Specification.new do |gem|
   gem.name = "riakpb"
   gem.summary = %Q{riakpb is a protocol buffer client for Riak--the distributed database by Basho.}
-  gem.description = %Q{riakpb is a protocol buffer client for Riak--the distributed database by Basho.  Connects via Protocol Buffers instead of REST.}
+  gem.description = %Q{riakpb is a protocol buffer client for Riak--the distributed database by Basho.}
   gem.version = Riak::VERSION
   gem.email = "me@inherentlylame.com"
   gem.homepage = "http://github.com/aitrus/riak-pbclient"

data/lib/riak/client/rpc.rb

@@ -14,7 +14,7 @@ module Riak
       include Riak::Util::Encode
       include Riak::Util::Decode
 
-      RECV_LIMIT=1638400
+      RECV_LIMIT=1073741824
 
       attr_reader :req_message, :response, :resp_message_codes, :resp_message, :status
 
@@ -30,7 +30,7 @@ module Riak
 
         # Request / Response Data
         @resp_message_codes = -1
-        @resp_message       = ''
+        @resp_message       = []
         @req_message_code   = -1
         @req_message        = ''
         @response           = ''
@@ -39,11 +39,12 @@ module Riak
       # Clears the request / response data, in preparation for a new request
       def clear
         @resp_message_codes = -1
-        @resp_message       = ''
+        @resp_message       = []
         @req_message_code   = -1
         @req_message        = ''
         @response           = ''
         @status             = false
+        @buffer             = ''
       end
 
       # Opens a TCPSocket connection with the riak host/node
@@ -93,9 +94,9 @@ module Riak
             end
 
             socket.send(@req_message, 0)
-            self.response = socket.recv(@limit)
+            self.parse_response socket.recv(@limit)
 
-          end while(false == (@response.done rescue true))
+          end while(false == (@response[:done] rescue true))
         end # with_socket
 
         return(@response)
@@ -104,10 +105,14 @@ module Riak
       # Handles the response from the Riak node
       # @param [String] value The message returned from the Riak node over the TCP Socket
       # @return [Protobuf::Message] @response the processed response (if any) from the Riak node
-      def response=(value)
-        @resp_message = value
+      def parse_response(value)
+        @resp_message << value
 
-        response_chunk, @resp_message_codes = decode_message(value)
+        value = @buffer + value
+
+#        return {:done => false} if message_remaining?(@resp_message)
+
+        response_chunk, @resp_message_codes, @buffer = decode_message(value)
 
         @resp_message_codes.each do |resp_mc|
           if resp_mc.equal?(ERROR_RESPONSE)

data/lib/riak/util/decode.rb

@@ -9,9 +9,11 @@ module Riak
       POFF  = (PBMC+1)
 
       def decode_message(message)
+        
         pb_len  = 0
         pb_mc   = ''
         pb_msg  = ''
+        remain  = ''
 
         until message.empty?
           pb_len  = message[PLEN].unpack('N')[0]    # message[0..3]unpack('N')[0]
@@ -20,17 +22,28 @@ module Riak
           prange  = POFF..(pb_len+3)                # range for the start->finish of the pb message
           mrange  = (pb_len+4)..(message.size-1)    # range for any remaining portions of message
 
-          if(prange.count != message[prange].size)
-            raise FailedExchange.new(prange.count, message[prange].size, message[prange], "decode_error")
-          end
+          break if(prange.count > message[prange].size)
 
           pb_msg  = pb_msg + message[prange]
           message = message[mrange]      # message[(5+pb_len)..(message.size)]
         end
 
-        [pb_msg, pb_mc.unpack("c" * pb_mc.size)]
+        [pb_msg, pb_mc.unpack("c" * pb_mc.size), message]
       end
 
+      def message_remaining?(message)
+        pb_len  = message[PLEN].unpack('N')[0]
+        msg_len = message.size - PBMC
+
+        puts "pb_len:#{pb_len}"
+        puts "msg_len:#{msg_len}"
+        puts "message:#{message.inspect}"
+
+        return false  if pb_len  == msg_len
+        return true   if pb_len   > msg_len
+
+        return message_remaining?(message[(pb_len+4)..(msg_len-1)])
+      end
     end # module Decode
   end
 end

data/lib/riak.rb

@@ -9,7 +9,7 @@ require 'base64'
 require 'riak/client_pb'
 
 module Riak
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 
   # Domain objects
   autoload :I18n,             'riak/i18n'

data/riakpb.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riakpb}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Gonyea"]
-  s.date = %q{2010-06-16}
-  s.description = %q{riakpb is a protocol buffer client for Riak--the distributed database by Basho.  Connects via Protocol Buffers instead of REST.}
+  s.date = %q{2010-07-08}
+  s.description = %q{riakpb is a protocol buffer client for Riak--the distributed database by Basho.}
   s.email = %q{me@inherentlylame.com}
   s.files = ["goog.csv", "History.txt", "lib/riak/bucket.rb", "lib/riak/client/rpc.rb", "lib/riak/client.rb", "lib/riak/client_pb.rb", "lib/riak/failed_exchange.rb", "lib/riak/failed_request.rb", "lib/riak/i18n.rb", "lib/riak/key.rb", "lib/riak/locale/en.yml", "lib/riak/map_reduce.rb", "lib/riak/riak_content.rb", "lib/riak/sibling_error.rb", "lib/riak/util/decode.rb", "lib/riak/util/encode.rb", "lib/riak/util/message_code.rb", "lib/riak/util/translation.rb", "lib/riak.rb", "load_stocks.rb", "Manifest.txt", "Rakefile", "README.rdoc", "riakpb.gemspec", "script/console", "script/destroy", "script/generate", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/key_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/riak_content_spec.rb", "spec/riak/rpc_spec.rb", "spec/spec_helper.rb"]
   s.homepage = %q{http://github.com/aitrus/riak-pbclient}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Scott Gonyea
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 -07:00
+date: 2010-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,7 @@ dependencies:
         version: 0.4.4
   type: :runtime
   version_requirements: *id003
-description: riakpb is a protocol buffer client for Riak--the distributed database by Basho.  Connects via Protocol Buffers instead of REST.
+description: riakpb is a protocol buffer client for Riak--the distributed database by Basho.
 email: me@inherentlylame.com
 executables: []