cassandra-driver 2.0.0-java → 2.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac564e933a3a1b1d04c14f96afa1ac994b458791
-  data.tar.gz: 3b1dcfad7d8ef21c9aa36636315a7cb04c881c6b
+  metadata.gz: e7d782a7b9279adb3048c9016528c985711a1ff8
+  data.tar.gz: 7d34349798d149e436b0b15cd091cb5f843b100a
 SHA512:
-  metadata.gz: e74e1b2f03f7b3c5d144018e5d50c290894369c01ee9d57afc072d1a75aed0a248bc931b56c941263ec754fb00e82c9d5ae024908ab00209b06eff30149d8a57
-  data.tar.gz: 09f253218bf4355dba7c321565124800cdef73b3c764aa84d51f09b21f270c9cbe971c9b7e668e4871ca1390ad6f8acd0a573c50d827665e3d6a020397a4fd4b
+  metadata.gz: afe2e6d1a624d68f2e5b6912a23376b604f7535cd983693cfa58529e195cff5e19f7688557231855597ccc8c83a9614a67c7465dc51cf9bf0cf1d880c9d67a33
+  data.tar.gz: 2ac2b96751e6af10fc3f0377d8bcf3d5a0bc8c4a17a0b57bdcee3e2e2f4942259337433978d8281ca7b359f9665eb9df2a5e6242a62ba728336a77e3dfc90bf8

data/README.md

@@ -93,7 +93,7 @@ __Note__: if you want to use compression you should also install [snappy](http:/
 
 Some of the new features added to the driver have unfortunately led to changes in the original cql-rb API. In the examples directory, you can find [an example of how to wrap the ruby driver to achieve almost complete interface parity with cql-rb](https://github.com/datastax/ruby-driver/blob/master/examples/cql-rb-wrapper.rb) to assist you with gradual upgrade.
 
-## What's new in v2.0.0
+## What's new in v2.0.1
 
 Current release lays groundwork for the upcoming support of native protocol v3 and Apache Cassandra 2.1. This release introduces the following major public API changes:
 

data/lib/cassandra/auth/providers.rb

@@ -1,3 +1,4 @@
+#--
 # Copyright 2013-2014 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/cassandra/load_balancing/policies.rb

@@ -1,3 +1,4 @@
+#--
 # Copyright 2013-2014 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/cassandra/protocol/coder.rb

@@ -187,7 +187,9 @@ module Cassandra
       end
 
       def read_type_v1(buffer)
-        case buffer.read_unsigned_short
+        kind = buffer.read_unsigned_short
+
+        case kind
         when 0x0000 then [:custom, buffer.read_string]
         when 0x0001 then :ascii
         when 0x0002 then :bigint
@@ -209,7 +211,7 @@ module Cassandra
         when 0x0021 then [:map, read_type_v1(buffer), read_type_v1(buffer)]
         when 0x0022 then [:set, read_type_v1(buffer)]
         else 
-          raise Errors::DecodingError, %(Unsupported column type: #{id})
+          raise Errors::DecodingError, %(Unsupported column type: #{kind})
         end
       end
 

data/lib/cassandra/protocol/v1.rb

@@ -18,6 +18,7 @@
 
 module Cassandra
   module Protocol
+    # @private
     module V1
       class Encoder
         HEADER_FORMAT = 'c4N'.freeze
@@ -68,11 +69,9 @@ module Cassandra
         READY = ReadyResponse.new
 
         def decode_header(buffer)
-          loop do
-            buffer_length = buffer.length
-
-            return if buffer_length < 8
+          buffer_length = buffer.length
 
+          while buffer_length >= 8
             frame_header = buffer.read_int
             frame_length = buffer.read_int
 
@@ -85,23 +84,22 @@ module Cassandra
             end
 
             actual_decode(buffer, frame_header, frame_length)
+            buffer_length = buffer.length
           end
 
           nil
         end
 
         def decode_body(buffer)
-          frame_header = @header
-          frame_length = @length
-
-          loop do
-            buffer_length = buffer.length
-
-            return if buffer_length < frame_length
+          frame_header  = @header
+          frame_length  = @length
+          buffer_length = buffer.length
 
+          until buffer_length < frame_length
             actual_decode(buffer, frame_header, frame_length)
+            buffer_length = buffer.length
 
-            if (buffer_length - frame_length) < 8
+            if buffer_length < 8
               @header = nil
               @length = nil
               @state  = :header
@@ -109,8 +107,9 @@ module Cassandra
               return
             end
 
-            frame_header = buffer.read_int
-            frame_length = buffer.read_int
+            frame_header   = buffer.read_int
+            frame_length   = buffer.read_int
+            buffer_length -= 8
           end
 
           @header = frame_header

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione