cassandra-driver 2.1.4-java → 2.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32c86970c749f6a1afe3c4af85e2d16eb62c11f9
-  data.tar.gz: 97c1cacbbffa03e9d1162dce3bbf0a1929b02af2
+  metadata.gz: b54cece0a4702c4e54ce84d876a1efc6dc2b913b
+  data.tar.gz: 045113e69793b513866c82251ee22ad1e47cfdd9
 SHA512:
-  metadata.gz: 52a010f2c3254b953ff1d9af072ecba957def21236fafa3467029ef1fa4a50428c8179a5ee9cc5b9a421082347ad45da07966512bc8cf012fa687578eabcada9
-  data.tar.gz: 85094e7b051ae8c91c1b6caf8669383e4671ccb18095f6265c6aff8270f47fe0debde9465042e2bb1ec8070f29e8fd66d5bd6f6d6dd132ea5d54a1e99e5cf121
+  metadata.gz: 4406fd2b63d3468dab784cdce99d5cef2cf71e7dd5600fc8728137621d61d6dc8faefcf6d6f402f6214598ea3259e544cf6f05ec2486f7ffff58b5a3df0b2492
+  data.tar.gz: 8787bb59dad47ffcdc85f4c8022e128c60fd301f9a52967a285359c0a90a62a0e68206d5913719eb318409cb970f7666ee7ff0245974bee35993ae3eb111aa36

data/.yardopts

@@ -1,4 +1,13 @@
 --no-private
 --markup markdown
+--type-tag expected_errors:"Expected Errors"
+--tag jira_ticket:"JIRA Ticket"
+--type-tag expected_result:"Expected Result"
+--tag test_assumptions:"Test Assumptions"
+--tag test_category:"Test Category"
+
 lib/**/*.rb
--- README
+integration/**/*.rb
+-- README
+
+load_plugins: true

data/lib/cassandra.rb

@@ -47,7 +47,7 @@ module Cassandra
   # A list of all possible write types that a
   # {Cassandra::Errors::WriteTimeoutError} can have.
   #
-  # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L591-L603 Description of possible types of writes in Apache Cassandra native protocol spec v1
+  # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v2.spec#L872-L887 Description of possible types of writes in Apache Cassandra native protocol spec v1
   WRITE_TYPES = [:simple, :batch, :unlogged_batch, :counter, :batch_log].freeze
 
   # Creates a {Cassandra::Cluster Cluster instance}.
@@ -176,9 +176,9 @@ module Cassandra
   # @option options [Integer] :page_size (10000) default page size for all
   #   select queries. Set this value to `nil` to disable paging.
   #
-  # @option options [Hash{String => String}] :credentials (none) a hash of credentials - to be used with [credentials authentication in cassandra 1.2](https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L238-L250). Note that if you specified `:username` and `:password` options, those credentials are configured automatically.
+  # @option options [Hash{String => String}] :credentials (none) a hash of credentials - to be used with [credentials authentication in cassandra 1.2](https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L238-L250). Note that if you specified `:username` and `:password` options, those credentials are configured automatically.
   #
-  # @option options [Cassandra::Auth::Provider] :auth_provider (none) a custom auth provider to be used with [SASL authentication in cassandra 2.0](https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v2.spec#L257-L273). Note that if you have specified `:username` and `:password`, then a {Cassandra::Auth::Providers::Password Password Provider} will be used automatically.
+  # @option options [Cassandra::Auth::Provider] :auth_provider (none) a custom auth provider to be used with [SASL authentication in cassandra 2.0](https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v2.spec#L257-L273). Note that if you have specified `:username` and `:password`, then a {Cassandra::Auth::Providers::Password Password Provider} will be used automatically.
   #
   # @option options [Cassandra::Compression::Compressor] :compressor (none) a
   #   custom compressor. Note that if you have specified `:compression`, an

data/lib/cassandra/auth.rb

@@ -59,7 +59,7 @@ module Cassandra
     #   subclasses of this class, but need to implement the same methods. This
     #   class exists only for documentation purposes.
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v2.spec#L257-L273 Cassandra native protocol v2 SASL authentication
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v2.spec#L257-L273 Cassandra native protocol v2 SASL authentication
     # @see Cassandra::Auth::Provider#create_authenticator
     class Authenticator
       # @!method initial_response

data/lib/cassandra/cluster/client.rb

@@ -97,7 +97,7 @@ module Cassandra
 
             if failed_connections.size == connections.size
               errors = {}
-              connections.each {|c| errors[c.host] = c.error}
+              connections.each {|c| errors[c.host] = c.error unless c.error.nil?}
               raise Errors::NoHostsAvailable.new(errors)
             else
               failed_connections.each do |f|

data/lib/cassandra/cluster/control_connection.rb

@@ -60,9 +60,6 @@ module Cassandra
           plan = @load_balancing_policy.plan(nil, VOID_STATEMENT, VOID_OPTIONS)
           connect_to_first_available(plan)
         end
-        f.on_failure do |e|
-          close_async
-        end
         f
       end
 
@@ -394,7 +391,7 @@ module Cassandra
           if tables.empty?
             @schema.delete_table(keyspace, table)
           else
-            @schema.udpate_table(host, keyspace, tables.first, columns)
+            @schema.update_table(host, keyspace, tables.first, columns)
           end
         end
       end
@@ -447,7 +444,7 @@ module Cassandra
           if types.empty?
             @schema.delete_type(keyspace, type)
           else
-            @schema.udpate_type(host, keyspace, types.first)
+            @schema.update_type(host, keyspace, types.first)
           end
         end
       end

data/lib/cassandra/cluster/schema.rb

@@ -134,7 +134,7 @@ module Cassandra
         self
       end
 
-      def udpate_table(host, keyspace_name, table, columns)
+      def update_table(host, keyspace_name, table, columns)
         keyspace = @keyspaces[keyspace_name]
 
         return self unless keyspace
@@ -174,7 +174,7 @@ module Cassandra
         self
       end
 
-      def udpate_type(host, keyspace_name, type)
+      def update_type(host, keyspace_name, type)
         keyspace = @keyspaces[keyspace_name]
 
         return self unless keyspace

data/lib/cassandra/driver.rb

@@ -148,9 +148,8 @@ module Cassandra
           promise.fulfill(cluster)
         else
           f.on_failure do |e|
-            cluster.close_async.on_complete do |_, _|
-              promise.break(e)
-            end
+            cluster.close_async
+            promise.break(e)
           end
         end
       end

data/lib/cassandra/errors.rb

@@ -43,7 +43,7 @@ module Cassandra
     # Raised when something unexpected happened. This indicates a server-side
     # bug.
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L554-L555 Description of Server Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L654-L655 Description of Server Error in Apache Cassandra native protocol spec v1
     class ServerError < ::StandardError
       include Error, HostError
     end
@@ -95,7 +95,7 @@ module Cassandra
     # @note This error can be handled by a {Cassandra::Retry::Policy} to
     #   determine the desired outcome.
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L562-L572 Description of Unavailable Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L662-L672 Description of Unavailable Error in Apache Cassandra native protocol spec v1
     class UnavailableError < ::StandardError
       include ExecutionError
       # Consistency level that triggered the error.
@@ -124,7 +124,7 @@ module Cassandra
     # Raised when the request cannot be processed because the coordinator node
     # is overloaded
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L573-L574 Description of Overloaded Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L673-L674 Description of Overloaded Error in Apache Cassandra native protocol spec v1
     class OverloadedError < ::StandardError
       include ExecutionError, HostError
     end
@@ -132,21 +132,21 @@ module Cassandra
     # Raise when the request was a read request but the coordinator node is
     # bootstrapping
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L575-L576 Description of Is Bootstrapping Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L675-L676 Description of Is Bootstrapping Error in Apache Cassandra native protocol spec v1
     class IsBootstrappingError < ::StandardError
       include ExecutionError, HostError
     end
 
     # Raised when truncation failed.
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L577 Description of Truncate Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L677 Description of Truncate Error in Apache Cassandra native protocol spec v1
     class TruncateError < ::StandardError
       include ExecutionError
     end
 
     # Raised when a write request timed out.
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L578-L603 Description of Write Timeout Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L678-L703 Description of Write Timeout Error in Apache Cassandra native protocol spec v1
     class WriteTimeoutError < ::StandardError
       include ExecutionError
 
@@ -176,7 +176,7 @@ module Cassandra
 
     # Raised when a read request timed out.
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L604-L622 Description of Read Timeout Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L704-L721 Description of Read Timeout Error in Apache Cassandra native protocol spec v1
     class ReadTimeoutError < ::StandardError
       include ExecutionError
 
@@ -216,13 +216,13 @@ module Cassandra
     # Raised when some client message triggered a protocol violation (for
     # instance a QUERY message is sent before a STARTUP one has been sent)
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L556-L558 Description of Protocol Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L656-L658 Description of Protocol Error in Apache Cassandra native protocol spec v1
     class ProtocolError < ClientError
     end
 
     # Raised when cannot authenticate to Cassandra
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L559-L561 Description of Bad Credentials Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L659-L660 Description of Bad Credentials Error in Apache Cassandra native protocol spec v1
     class AuthenticationError < ClientError
     end
 
@@ -247,7 +247,7 @@ module Cassandra
     # @note Seeing this error can be considered a Ruby Driver bug as it should
     #   handle automatic re-preparing internally.
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L638-L641 Description of Unprepared Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L738-L741 Description of Unprepared Error in Apache Cassandra native protocol spec v1
     class UnpreparedError < ::StandardError
       include ValidationError
       # @return [String] prepared statement id that triggered the error
@@ -263,14 +263,14 @@ module Cassandra
 
     # Raised when the submitted query has a syntax error.
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L623 Description of Syntax Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L723 Description of Syntax Error in Apache Cassandra native protocol spec v1
     class SyntaxError < ::StandardError
       include ValidationError
     end
 
     # Raised when the logged user doesn't have the right to perform the query.
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L624-L625 Description of Unauthorized Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L724-L725 Description of Unauthorized Error in Apache Cassandra native protocol spec v1
     class UnauthorizedError < ::StandardError
       include ValidationError
     end
@@ -283,7 +283,7 @@ module Cassandra
     #   rescue Cassandra::Errors::InvalidError
     #   end
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L626 Description of Invalid Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L726 Description of Invalid Error in Apache Cassandra native protocol spec v1
     class InvalidError < ::StandardError
       include ValidationError
     end
@@ -296,7 +296,7 @@ module Cassandra
     #   rescue Cassandra::Errors::ConfigurationError
     #   end
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L627 Description of Config Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L727 Description of Config Error in Apache Cassandra native protocol spec v1
     class ConfigurationError < ::StandardError
       include ValidationError
     end
@@ -313,7 +313,7 @@ module Cassandra
     #     p ['already exists', e.keyspace, e.table]
     #   end
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v1.spec#L628-L637 Description of Already Exists Error in Apache Cassandra native protocol spec v1
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v1.spec#L728-L737 Description of Already Exists Error in Apache Cassandra native protocol spec v1
     class AlreadyExistsError < ConfigurationError
       # @return [String] keyspace
       attr_reader :keyspace

data/lib/cassandra/execution/options.rb

@@ -32,6 +32,8 @@ module Cassandra
       attr_reader :timeout
       # @return [Array] positional arguments for the statement
       attr_reader :arguments
+      # @return [Array] type hints for positional arguments for the statement
+      attr_reader :type_hints
 
       # @return [String] paging state
       #
@@ -56,6 +58,7 @@ module Cassandra
         serial_consistency = options[:serial_consistency]
         paging_state       = options[:paging_state]
         arguments          = options[:arguments]
+        type_hints         = options[:type_hints]
 
         Util.assert_one_of(CONSISTENCIES, consistency) { ":consistency must be one of #{CONSISTENCIES.inspect}, #{consistency.inspect} given" }
 
@@ -85,6 +88,12 @@ module Cassandra
           Util.assert_instance_of_one_of([::Array, ::Hash], arguments) { ":arguments must be an Array or a Hash, #{arguments.inspect} given" }
         end
 
+        if type_hints.nil?
+          type_hints = EMPTY_LIST
+        else
+          Util.assert_instance_of_one_of([::Array, ::Hash], type_hints) { ":type_hints must be an Array or a Hash, #{type_hints.inspect} given" }
+        end
+
         @consistency        = consistency
         @page_size          = page_size
         @trace              = !!trace
@@ -92,6 +101,7 @@ module Cassandra
         @serial_consistency = serial_consistency
         @paging_state       = paging_state
         @arguments          = arguments
+        @type_hints         = type_hints
       end
 
       # @return [Boolean] whether request tracing was enabled
@@ -107,7 +117,8 @@ module Cassandra
           other.timeout == @timeout &&
           other.serial_consistency == @serial_consistency &&
           other.paging_state == @paging_state &&
-          other.arguments == @arguments
+          other.arguments == @arguments &&
+          other.type_hints == @type_hints
       end
       alias :== :eql?
 
@@ -130,7 +141,8 @@ module Cassandra
           :trace              => @trace,
           :timeout            => @timeout,
           :serial_consistency => @serial_consistency,
-          :arguments          => @arguments || EMPTY_LIST
+          :arguments          => @arguments || EMPTY_LIST,
+          :type_hints         => @type_hints || EMPTY_LIST
         }
       end
     end

data/lib/cassandra/protocol/coder.rb

@@ -433,7 +433,7 @@ module Cassandra
         when 0x0020 then Types.list(read_type_v1(buffer))
         when 0x0021 then Types.map(read_type_v1(buffer), read_type_v1(buffer))
         when 0x0022 then Types.set(read_type_v1(buffer))
-        else 
+        else
           raise Errors::DecodingError, %(Unsupported column type: #{kind})
         end
       end

data/lib/cassandra/protocol/cql_byte_buffer.rb

@@ -139,9 +139,7 @@ module Cassandra
       end
 
       def read_short_bytes
-        size = read_unsigned_short
-        return nil if size & 0x8000 == 0x8000
-        read(size)
+        read(read_unsigned_short)
       rescue RangeError => e
         raise Errors::DecodingError, "Not enough bytes available to decode a short bytes: #{e.message}", e.backtrace
       end

data/lib/cassandra/protocol/cql_protocol_handler.rb

@@ -32,7 +32,7 @@ module Cassandra
     #   puts "These options are supported: #{response.options}"
     class CqlProtocolHandler
       # @return [String] the current keyspace for the underlying connection
-      attr_reader :keyspace
+      attr_reader :keyspace, :error
 
       def initialize(connection, scheduler, protocol_version, compressor=nil, heartbeat_interval = 30, idle_timeout = 60)
         @connection = connection
@@ -68,6 +68,7 @@ module Cassandra
         @terminate = nil
         @heartbeat_interval = heartbeat_interval
         @idle_timeout = idle_timeout
+        @error = nil
       end
 
       # Returns the hostname of the underlying connection
@@ -314,6 +315,7 @@ module Cassandra
 
           cause = e
         end
+        @error = cause
 
         request_failure_cause = cause || Errors::IOError.new('Connection closed')
         promises_to_fail = nil

data/lib/cassandra/result.rb

@@ -86,7 +86,7 @@ module Cassandra
     #   undefined and will likely cause a server process of the coordinator of
     #   such request to abort.
     #
-    # @see https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v2.spec#L482-L487 Paging State description in Cassandra Native Protocol v2 specification
+    # @see https://github.com/apache/cassandra/blob/cassandra-2.0.16/doc/native_protocol_v2.spec#L482-L487 Paging State description in Cassandra Native Protocol v2 specification
     def paging_state
     end
   end

data/lib/cassandra/session.rb

@@ -57,6 +57,9 @@ module Cassandra
     #   initial request.
     # @option options [Array, Hash] :arguments (nil) positional or named
     #   arguments for the statement.
+    # @option options [Array, Hash] :type_hints (nil) override Util.guess_type to
+    #   determine the CQL type for an argument; nil elements will fall-back
+    #   to Util.guess_type.
     #
     # @see Cassandra.cluster Options that can be specified on the cluster-level
     #   and their default values.
@@ -80,7 +83,7 @@ module Cassandra
 
       case statement
       when ::String
-        @client.query(Statements::Simple.new(statement, options.arguments), options)
+        @client.query(Statements::Simple.new(statement, options.arguments, options.type_hints), options)
       when Statements::Simple
         @client.query(statement, options)
       when Statements::Prepared

data/lib/cassandra/statements/batch.rb

@@ -63,6 +63,8 @@ module Cassandra
       # @param args [Array, Hash] (nil) positional or named arguments to bind,
       #   must contain the same number of parameters as the number of positional
       #   (`?`) or named (`:name`) markers in the CQL passed.
+      # @param type_hints [Array, Hash] (nil) specified CQL types for positional
+      #   or named arguments to override type guessing.
       #
       # @note Positional arguments for simple statements are only supported
       #   starting with Apache Cassandra 2.0 and above.
@@ -71,12 +73,13 @@ module Cassandra
       #   starting with Apache Cassandra 2.1 and above.
       #
       # @return [self]
-      def add(statement, args = nil)
+      def add(statement, args = nil, type_hints = nil)
         args ||= EMPTY_LIST
+        type_hints ||= EMPTY_LIST
 
         case statement
         when String
-          @statements << Simple.new(statement, args)
+          @statements << Simple.new(statement, args, type_hints)
         when Prepared
           @statements << statement.bind(args)
         when Bound, Simple

data/lib/cassandra/statements/simple.rb

@@ -33,7 +33,10 @@ module Cassandra
       attr_reader :params_names
 
       # @param cql [String] a cql statement
-      # @param params [Array] (nil) positional arguments for the query
+      # @param params [Array, Hash] (nil) positional or named arguments
+      #   for the query
+      # @param type_hints [Array, Hash] (nil) positional or named types
+      #   to override type guessing for the query
       #
       # @note Positional arguments for simple statements are only supported
       #   starting with Apache Cassandra 2.0 and above.
@@ -42,25 +45,37 @@ module Cassandra
       #   starting with Apache Cassandra 2.1 and above.
       #
       # @raise [ArgumentError] if cql statement given is not a String
-      def initialize(cql, params = nil)
+      def initialize(cql, params = nil, type_hints = nil)
         Util.assert_instance_of(::String, cql) { "cql must be a string, #{cql.inspect} given" }
 
         params ||= EMPTY_LIST
 
+
         if params.is_a?(::Hash)
           params_names = []
           params = params.each_with_object([]) do |(name, value), params|
             params_names << name
             params       << value
           end
+          if type_hints && !type_hints.empty?
+            Util.assert_instance_of(::Hash, type_hints) { "type_hints must be a Hash when using named params" }
+          end
         else
           Util.assert_instance_of(::Array, params) { "params must be an Array or a Hash, #{params.inspect} given" }
           params_names = EMPTY_LIST
         end
 
+        type_hints ||= EMPTY_LIST
+
+        if type_hints.is_a?(::Hash)
+          type_hints = params_names.map {|name| type_hints[name] }
+        else
+          Util.assert_instance_of(::Array, type_hints) { "type_hints must be an Array or a Hash, #{type_hints.inspect} given" }
+        end
+
         @cql          = cql
         @params       = params
-        @params_types = params.map {|value| Util.guess_type(value)}
+        @params_types = params.each_with_index.map {|value, index| (!type_hints.empty? && type_hints[index] && type_hints[index].is_a?(Type)) ? type_hints[index] : Util.guess_type(value)}
         @params_names = params_names
       end
 

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '2.1.4'.freeze
+  VERSION = '2.1.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione