cassandra-driver 3.0.0.beta.1 → 3.0.0.rc.1

data/lib/cassandra/retry.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,10 +23,10 @@ module Cassandra
     #   its methods. This class exists for documentation purposes only.
     module Policy
       # Decides wether to retry a read and at what consistency level.
-      # 
+      #
       # @note this method may be called even if required_responses >= received
       #   responses if data_present is false.
-      # 
+      #
       # @param statement [Cassandra::Statement] the original statement that timed out
       # @param consistency [Symbol] the original consistency level for the
       #   request, one of {Cassandra::CONSISTENCIES}
@@ -37,7 +37,7 @@ module Cassandra
       # @param retrieved [Boolean] whether actual data (as opposed to data
       #   checksum) was present in the received responses.
       # @param retries [Integer] the number of retries already performed
-      # 
+      #
       # @return [Cassandra::Policies::Retry::Decision] a retry decision
       #
       # @see Cassandra::Retry::Policy#try_again
@@ -47,7 +47,7 @@ module Cassandra
       end
 
       # Decides wether to retry a write and at what consistency level.
-      # 
+      #
       # @param statement [Cassandra::Statement] the original statement that timed out
       # @param consistency [Symbol] the original consistency level for the
       #   request, one of {Cassandra::CONSISTENCIES}
@@ -57,7 +57,7 @@ module Cassandra
       # @param received [Integer] the number of acks received by the time the
       #   query timed out
       # @param retries [Integer] the number of retries already performed
-      # 
+      #
       # @return [Cassandra::Policies::Retry::Decision] a retry decision
       #
       # @see Cassandra::Retry::Policy#try_again
@@ -68,7 +68,7 @@ module Cassandra
 
       # Decides wether to retry and at what consistency level on an Unavailable
       # exception.
-      # 
+      #
       # @param statement [Cassandra::Statement] the original Statement that timed out
       # @param consistency [Symbol] the original consistency level for the
       #   request, one of {Cassandra::CONSISTENCIES}
@@ -76,7 +76,7 @@ module Cassandra
       #   requested consistency level
       # @param alive [Integer] the number of replicas available for the request
       # @param retries [Integer] the number of retries already performed
-      # 
+      #
       # @return [Cassandra::Policies::Retry::Decision] a retry decision
       #
       # @see Cassandra::Retry::Policy#try_again

data/lib/cassandra/retry/policies.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/retry/policies/default.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/retry/policies/downgrading_consistency.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,9 @@ module Cassandra
 
         def read_timeout(statement, consistency, required, received, retrieved, retries)
           return reraise if retries > 0 || SERIAL_CONSISTENCIES.include?(consistency)
-          return max_likely_to_work(consistency, required, received) if received < required
+          if received < required
+            return max_likely_to_work(consistency, required, received)
+          end
 
           retrieved ? reraise : try_again(consistency)
         end
@@ -53,7 +55,9 @@ module Cassandra
         private
 
         def max_likely_to_work(consistency, required, received)
-          if consistency == :all && required > 1 && received >= (required.to_f / 2).floor + 1
+          if consistency == :all &&
+             required > 1 &&
+             received >= (required.to_f / 2).floor + 1
             try_again(:quorum)
           elsif received >= 3
             try_again(:three)

data/lib/cassandra/retry/policies/fallthrough.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/session.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,9 @@
 #++
 
 module Cassandra
-  # Sessions are used for query execution. Each session tracks its current keyspace. A session should be reused as much as possible, however it is ok to create several independent session for interacting with different keyspaces in the same application.
+  # Sessions are used for query execution. Each session tracks its current keyspace.
+  # A session should be reused as much as possible, however it is ok to create several
+  # independent session for interacting with different keyspaces in the same application.
   class Session
     extend Forwardable
 
@@ -79,15 +81,19 @@ module Cassandra
     # @see Cassandra::Session#execute A list of errors this future can be
     #   resolved with
     def execute_async(statement, options = nil)
-      if options
-        options = @options.override(options)
-      else
-        options = @options
-      end
+      options = if options
+                  @options.override(options)
+                else
+                  @options
+                end
 
       case statement
       when ::String
-        @client.query(Statements::Simple.new(statement, options.arguments, options.type_hints, options.idempotent?), options)
+        @client.query(Statements::Simple.new(statement,
+                                             options.arguments,
+                                             options.type_hints,
+                                             options.idempotent?),
+                      options)
       when Statements::Simple
         @client.query(statement, options)
       when Statements::Prepared
@@ -95,7 +101,7 @@ module Cassandra
       when Statements::Bound
         @client.execute(statement, options)
       when Statements::Batch
-        Util.assert_not_empty(statement.statements) { "batch cannot be empty" }
+        Util.assert_not_empty(statement.statements) { 'batch cannot be empty' }
         @client.batch(statement, options)
       else
         @futures.error(::ArgumentError.new("unsupported statement #{statement.inspect}"))
@@ -143,11 +149,11 @@ module Cassandra
     # @return [Cassandra::Future<Cassandra::Statements::Prepared>] future
     #   prepared statement
     def prepare_async(statement, options = nil)
-      if options.is_a?(::Hash)
-        options = @options.override(options)
-      else
-        options = @options
-      end
+      options = if options.is_a?(::Hash)
+                  @options.override(options)
+                else
+                  @options
+                end
 
       case statement
       when ::String
@@ -181,7 +187,7 @@ module Cassandra
       yield(statement) if block_given?
       statement
     end
-    alias :batch :logged_batch
+    alias batch logged_batch
 
     # Returns a unlogged {Statements::Batch} instance and optionally yields it
     # to a given block
@@ -232,7 +238,7 @@ module Cassandra
 
     # @private
     def inspect
-      "#<#{self.class.name}:0x#{self.object_id.to_s(16)}>"
+      "#<#{self.class.name}:0x#{object_id.to_s(16)}>"
     end
   end
 end

data/lib/cassandra/statement.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/statements.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/statements/batch.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -88,21 +88,26 @@ module Cassandra
       #
       # @return [self]
       def add(statement, options = nil)
-        if options.is_a?(::Hash)
-          options = @options.override(options)
-        else
-          options = @options
-        end
+        options = if options.is_a?(::Hash)
+                    @options.override(options)
+                  else
+                    @options
+                  end
 
         case statement
         when String
-          @statements << Simple.new(statement, options.arguments, options.type_hints, options.idempotent?)
+          @statements << Simple.new(statement,
+                                    options.arguments,
+                                    options.type_hints,
+                                    options.idempotent?)
         when Prepared
           @statements << statement.bind(options.arguments)
         when Bound, Simple
           @statements << statement
         else
-          raise ::ArgumentError, "a batch can only consist of simple or prepared statements, #{statement.inspect} given"
+          raise ::ArgumentError,
+                'a batch can only consist of simple or prepared statements, ' \
+                    "#{statement.inspect} given"
         end
 
         self
@@ -115,7 +120,8 @@ module Cassandra
         @statements.all?(&:idempotent?)
       end
 
-      # A batch statement doesn't really have any cql of its own as it is composed of multiple different statements
+      # A batch statement doesn't really have any cql of its own as it is composed of
+      # multiple different statements
       # @return [nil] nothing
       def cql
         nil
@@ -127,7 +133,7 @@ module Cassandra
 
       # @return [String] a CLI-friendly batch statement representation
       def inspect
-        "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @type=#{type.inspect}>"
+        "#<#{self.class.name}:0x#{object_id.to_s(16)} @type=#{type.inspect}>"
       end
     end
   end

data/lib/cassandra/statements/bound.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,7 +30,13 @@ module Cassandra
       attr_reader :params_types, :result_metadata, :keyspace, :partition_key
 
       # @private
-      def initialize(cql, params_types, result_metadata, params, keyspace = nil, partition_key = nil, idempotent = false)
+      def initialize(cql,
+                     params_types,
+                     result_metadata,
+                     params,
+                     keyspace = nil,
+                     partition_key = nil,
+                     idempotent = false)
         @cql             = cql
         @params_types    = params_types
         @result_metadata = result_metadata
@@ -42,7 +48,8 @@ module Cassandra
 
       # @return [String] a CLI-friendly bound statement representation
       def inspect
-        "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @cql=#{@cql.inspect} @params=#{@params}>"
+        "#<#{self.class.name}:0x#{object_id.to_s(16)} @cql=#{@cql.inspect} " \
+            "@params=#{@params}>"
       end
     end
   end

data/lib/cassandra/statements/prepared.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,21 @@ module Cassandra
       attr_reader :result_metadata
 
       # @private
-      def initialize(payload, warnings, cql, params_metadata, result_metadata, partition_key, trace_id, keyspace, statement, options, hosts, consistency, retries, client, connection_options)
+      def initialize(payload,
+                     warnings,
+                     cql,
+                     params_metadata,
+                     result_metadata,
+                     partition_key,
+                     trace_id,
+                     keyspace,
+                     statement,
+                     options,
+                     hosts,
+                     consistency,
+                     retries,
+                     client,
+                     connection_options)
         @payload            = payload
         @warnings           = warnings
         @cql                = cql
@@ -59,7 +73,9 @@ module Cassandra
       # @return [Cassandra::Statements::Bound] bound statement
       def bind(args = nil)
         if args
-          Util.assert_instance_of_one_of([::Array, ::Hash], args) { "args must be an Array or a Hash, #{args.inspect} given" }
+          Util.assert_instance_of_one_of([::Array, ::Hash], args) do
+            "args must be an Array or a Hash, #{args.inspect} given"
+          end
         else
           args = EMPTY_LIST
         end
@@ -69,29 +85,38 @@ module Cassandra
 
         if args.is_a?(::Hash)
           @params_metadata.each do |(_, _, name, type)|
-            name = name.to_sym unless args.has_key?(name)
+            name = name.to_sym unless args.key?(name)
             value = args.fetch(name, NOT_SET)
 
             if NOT_SET.eql?(value)
               if @connection_options.protocol_version < 4
-                raise ::ArgumentError, "argument #{name.inspect} it not present in #{args.inspect}"
+                raise ::ArgumentError,
+                      "argument #{name.inspect} it not present in #{args.inspect}"
               end
             else
-              Util.assert_type(type, value) { "argument for #{name.inspect} must be #{type}, #{value} given" }
+              Util.assert_type(type, value) do
+                "argument for #{name.inspect} must be #{type}, #{value} given"
+              end
             end
 
             params << value
             param_types << type
           end
         else
-          Util.assert_equal(@params_metadata.size, args.size) { "expecting exactly #{@params_metadata.size} bind parameters, #{args.size} given" }
+          Util.assert_equal(@params_metadata.size, args.size) do
+            "expecting exactly #{@params_metadata.size} bind parameters, " \
+                "#{args.size} given"
+          end
           @params_metadata.zip(args) do |(_, _, name, type), value|
             if NOT_SET.eql?(value)
               if @connection_options.protocol_version < 4
-                raise ::ArgumentError, "argument #{name.inspect} it not present in #{args.inspect}"
+                raise ::ArgumentError,
+                      "argument #{name.inspect} it not present in #{args.inspect}"
               end
             else
-              Util.assert_type(type, value) { "argument for #{name.inspect} must be #{type}, #{value} given" }
+              Util.assert_type(type, value) do
+                "argument for #{name.inspect} must be #{type}, #{value} given"
+              end
             end
 
             params << value
@@ -99,21 +124,40 @@ module Cassandra
           end
         end
 
-        keyspace_name, _ = @params_metadata.first
+        # params_metadata is an array of column-specs; each column-spec is an array
+        # of keyspace, tablename, other stuff. We only care about the keyspace name.
+        # See read_prepared_metadata_v4 in coder.rb for more details.
+        keyspace_name = @params_metadata.first.first unless @params_metadata.empty?
 
         partition_key = create_partition_key(params)
 
-        Bound.new(@cql, param_types, @result_metadata, params, keyspace_name, partition_key, @idempotent)
+        Bound.new(@cql,
+                  param_types,
+                  @result_metadata,
+                  params,
+                  keyspace_name,
+                  partition_key,
+                  @idempotent)
       end
 
       # @return [Cassandra::Execution::Info] execution info for PREPARE request
       def execution_info
-        @info ||= Execution::Info.new(@payload, @warnings, @keyspace, @statement, @options, @hosts, @consistency, @retries, @trace_id ? Execution::Trace.new(@trace_id, @client) : nil)
+        @info ||= Execution::Info.new(@payload,
+                                      @warnings,
+                                      @keyspace,
+                                      @statement,
+                                      @options,
+                                      @hosts,
+                                      @consistency,
+                                      @retries,
+                                      @trace_id ?
+                                          Execution::Trace.new(@trace_id, @client) :
+                                          nil)
       end
 
       # @return [String] a CLI-friendly prepared statement representation
       def inspect
-        "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @cql=#{@cql.inspect}>"
+        "#<#{self.class.name}:0x#{object_id.to_s(16)} @cql=#{@cql.inspect}>"
       end
 
       private
@@ -133,7 +177,7 @@ module Cassandra
 
           if NOT_SET.eql?(value)
             raise ::ArgumentError, "argument #{name.inspect} is a part of " \
-                                   "the partition key and must be present."
+                                   'the partition key and must be present.'
           end
 
           if @connection_options.protocol_version >= 3
@@ -153,7 +197,7 @@ module Cassandra
 
             if NOT_SET.eql?(value)
               raise ::ArgumentError, "argument #{name.inspect} is a part of " \
-                                     "the partition key and must be present."
+                                     'the partition key and must be present.'
             end
 
             if @connection_options.protocol_version >= 3