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

data/lib/cassandra/protocol/requests/batch_request.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.
@@ -26,7 +26,12 @@ module Cassandra
       attr_reader :type, :timestamp, :payload
       attr_accessor :consistency, :retries
 
-      def initialize(type, consistency, trace=false, serial_consistency = nil, timestamp = nil, payload = nil)
+      def initialize(type,
+                     consistency,
+                     trace = false,
+                     serial_consistency = nil,
+                     timestamp = nil,
+                     payload = nil)
         super(0x0D, trace)
         @type  = type
         @parts = []
@@ -60,7 +65,11 @@ module Cassandra
         buffer.append_short(@parts.size)
 
         @parts.each do |(statement_kind, *arguments)|
-          __send__(:"write_#{statement_kind}", buffer, protocol_version, encoder, *arguments)
+          __send__(:"write_#{statement_kind}",
+                   buffer,
+                   protocol_version,
+                   encoder,
+                   *arguments)
         end
 
         buffer.append_consistency(@consistency)
@@ -80,10 +89,10 @@ module Cassandra
 
       def to_s
         type_str = case @type
-          when LOGGED_TYPE then 'LOGGED'
-          when UNLOGGED_TYPE then 'UNLOGGED'
-          when COUNTER_TYPE then 'COUNTER'
-        end
+                   when LOGGED_TYPE then 'LOGGED'
+                   when UNLOGGED_TYPE then 'UNLOGGED'
+                   when COUNTER_TYPE then 'COUNTER'
+                   end
         %(BATCH #{type_str} #{@parts.size} #{@consistency.to_s.upcase})
       end
 

data/lib/cassandra/protocol/requests/credentials_request.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.
@@ -35,9 +35,9 @@ module Cassandra
       end
 
       def eql?(rq)
-        self.class === rq && rq.credentials.eql?(@credentials)
+        rq.is_a?(self.class) && rq.credentials.eql?(@credentials)
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin

data/lib/cassandra/protocol/requests/execute_request.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.
@@ -19,14 +19,34 @@
 module Cassandra
   module Protocol
     class ExecuteRequest < Request
-      attr_reader :metadata, :values, :request_metadata, :serial_consistency, :page_size, :paging_state, :timestamp, :payload
-      attr_accessor :consistency, :retries, :id
+      attr_reader :metadata, :request_metadata, :page_size, :paging_state, :payload,
+                  :serial_consistency, :timestamp, :values
+      attr_accessor :consistency, :id, :retries
 
-      def initialize(id, metadata, values, request_metadata, consistency, serial_consistency=nil, page_size=nil, paging_state=nil, trace=false, timestamp = nil, payload = nil)
-        raise ArgumentError, "Metadata for #{metadata.size} columns, but #{values.size} values given" if metadata.size != values.size
-        raise ArgumentError, %(No such consistency: #{consistency.inspect}) if consistency.nil? || !CONSISTENCIES.include?(consistency)
-        raise ArgumentError, %(No such consistency: #{serial_consistency.inspect}) unless serial_consistency.nil? || CONSISTENCIES.include?(serial_consistency)
-        raise ArgumentError, %(Paging state given but no page size) if paging_state && !page_size
+      def initialize(id,
+                     metadata,
+                     values,
+                     request_metadata,
+                     consistency,
+                     serial_consistency = nil,
+                     page_size = nil,
+                     paging_state = nil,
+                     trace = false,
+                     timestamp = nil,
+                     payload = nil)
+        if metadata.size != values.size
+          raise ArgumentError, "Metadata for #{metadata.size} columns, but " \
+              "#{values.size} values given"
+        end
+        if consistency.nil? || !CONSISTENCIES.include?(consistency)
+          raise ArgumentError, %(No such consistency: #{consistency.inspect})
+        end
+        unless serial_consistency.nil? || CONSISTENCIES.include?(serial_consistency)
+          raise ArgumentError, %(No such consistency: #{serial_consistency.inspect})
+        end
+        if paging_state && !page_size
+          raise ArgumentError, %(Paging state given but no page size)
+        end
         super(10, trace)
         @id = id
         @metadata = metadata
@@ -54,19 +74,13 @@ module Cassandra
           flags |= 0x04 if @page_size
           flags |= 0x08 if @paging_state
           flags |= 0x10 if @serial_consistency
-          if protocol_version > 2
-            flags |= 0x20 if @timestamp
-          end
+          flags |= 0x20 if protocol_version > 2 && @timestamp
           buffer.append(flags.chr)
-          if @values.size > 0
-            encoder.write_parameters(buffer, @values, @metadata)
-          end
+          encoder.write_parameters(buffer, @values, @metadata) if @values.size > 0
           buffer.append_int(@page_size) if @page_size
           buffer.append_bytes(@paging_state) if @paging_state
           buffer.append_consistency(@serial_consistency) if @serial_consistency
-          if protocol_version > 2
-            buffer.append_timestamp(@timestamp) if @timestamp
-          end
+          buffer.append_timestamp(@timestamp) if protocol_version > 2 && @timestamp
         else
           encoder.write_parameters(buffer, @values, @metadata)
           buffer.append_consistency(@consistency)
@@ -76,13 +90,20 @@ module Cassandra
 
       def to_s
         id = @id.each_byte.map { |x| x.to_s(16) }.join('')
-        %(EXECUTE #{id} #@values #{@consistency.to_s.upcase})
+        %(EXECUTE #{id} #{@values} #{@consistency.to_s.upcase})
       end
 
       def eql?(rq)
-        self.class === rq && rq.id == self.id && rq.metadata == self.metadata && rq.values == self.values && rq.consistency == self.consistency && rq.serial_consistency == self.serial_consistency && rq.page_size == self.page_size && rq.paging_state == self.paging_state
+        rq.is_a?(self.class) &&
+          rq.id == id &&
+          rq.metadata == metadata &&
+          rq.values == values &&
+          rq.consistency == consistency &&
+          rq.serial_consistency == serial_consistency &&
+          rq.page_size == page_size &&
+          rq.paging_state == paging_state
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin

data/lib/cassandra/protocol/requests/options_request.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/protocol/requests/prepare_request.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.
@@ -22,7 +22,7 @@ module Cassandra
       attr_reader :cql, :payload
       attr_accessor :consistency, :retries
 
-      def initialize(cql, trace=false, payload = nil)
+      def initialize(cql, trace = false, payload = nil)
         raise ArgumentError, 'No CQL given!' unless cql
         super(9, trace)
         @cql = cql
@@ -39,13 +39,13 @@ module Cassandra
       end
 
       def to_s
-        %(PREPARE "#@cql")
+        %(PREPARE "#{@cql}")
       end
 
       def eql?(rq)
-        self.class === rq && rq.cql == self.cql
+        rq.is_a?(self.class) && rq.cql == cql
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin

data/lib/cassandra/protocol/requests/query_request.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.
@@ -19,10 +19,21 @@
 module Cassandra
   module Protocol
     class QueryRequest < Request
-      attr_reader :cql, :values, :type_hints, :serial_consistency, :page_size, :paging_state, :timestamp, :payload
+      attr_reader :cql, :page_size, :paging_state, :payload, :serial_consistency,
+                  :timestamp, :type_hints, :values
       attr_accessor :consistency, :retries
 
-      def initialize(cql, values, type_hints, consistency, serial_consistency = nil, page_size = nil, paging_state = nil, trace = false, names = EMPTY_LIST, timestamp = nil, payload = nil)
+      def initialize(cql,
+                     values,
+                     type_hints,
+                     consistency,
+                     serial_consistency = nil,
+                     page_size = nil,
+                     paging_state = nil,
+                     trace = false,
+                     names = EMPTY_LIST,
+                     timestamp = nil,
+                     payload = nil)
         super(7, trace)
         @cql = cql
         @values = values
@@ -48,14 +59,10 @@ module Cassandra
           flags |= 0x04 if @page_size
           flags |= 0x08 if @paging_state
           flags |= 0x10 if @serial_consistency
-          if protocol_version > 2
-            flags |= 0x20 if @timestamp
-          end
+          flags |= 0x20 if protocol_version > 2 && @timestamp
           if @values && @values.size > 0
             flags |= 0x01
-            if protocol_version > 2
-              flags |= 0x40 unless @names.empty?
-            end
+            flags |= 0x40 if protocol_version > 2 && !@names.empty?
             buffer.append(flags.chr)
             encoder.write_parameters(buffer, @values, @type_hints, @names)
           else
@@ -64,28 +71,26 @@ module Cassandra
           buffer.append_int(@page_size) if @page_size
           buffer.append_bytes(@paging_state) if @paging_state
           buffer.append_consistency(@serial_consistency) if @serial_consistency
-          if protocol_version > 2
-            buffer.append_timestamp(@timestamp) if @timestamp
-          end
+          buffer.append_timestamp(@timestamp) if protocol_version > 2 && @timestamp
         end
         buffer
       end
 
       def to_s
-        %(QUERY "#@cql" #{@consistency.to_s.upcase})
+        %(QUERY "#{@cql}" #{@consistency.to_s.upcase})
       end
 
       def eql?(rq)
-        self.class === rq &&
-          rq.cql == self.cql &&
-          rq.values == self.values &&
-          rq.type_hints == self.type_hints &&
-          rq.consistency == self.consistency &&
-          rq.serial_consistency == self.serial_consistency &&
-          rq.page_size == self.page_size &&
-          rq.paging_state == self.paging_state
+        rq.is_a?(self.class) &&
+          rq.cql == cql &&
+          rq.values == values &&
+          rq.type_hints == type_hints &&
+          rq.consistency == consistency &&
+          rq.serial_consistency == serial_consistency &&
+          rq.page_size == page_size &&
+          rq.paging_state == paging_state
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin

data/lib/cassandra/protocol/requests/register_request.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.
@@ -31,7 +31,7 @@ module Cassandra
       end
 
       def to_s
-        %(REGISTER #@events)
+        %(REGISTER #{@events})
       end
     end
   end

data/lib/cassandra/protocol/requests/startup_request.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.
@@ -21,9 +21,11 @@ module Cassandra
     class StartupRequest < Request
       attr_reader :options
 
-      def initialize(cql_version, compression=nil)
+      def initialize(cql_version, compression = nil)
         super(1)
-        raise ArgumentError, "Invalid CQL version: #{cql_version.inspect}" unless cql_version
+        unless cql_version
+          raise ArgumentError, "Invalid CQL version: #{cql_version.inspect}"
+        end
         @options = {CQL_VERSION => cql_version}
         @options[COMPRESSION] = compression if compression
       end
@@ -37,7 +39,7 @@ module Cassandra
       end
 
       def to_s
-        %(STARTUP #@options)
+        %(STARTUP #{@options})
       end
 
       private

data/lib/cassandra/protocol/requests/void_query_request.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/protocol/response.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.
@@ -26,4 +26,4 @@ module Cassandra
       ]
     end
   end
-end
+end

data/lib/cassandra/protocol/responses/already_exists_error_response.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,17 @@ module Cassandra
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
-        Errors::AlreadyExistsError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @keyspace, @table)
+        Errors::AlreadyExistsError.new(@message,
+                                       @custom_payload,
+                                       @warnings,
+                                       keyspace,
+                                       statement,
+                                       options,
+                                       hosts,
+                                       consistency,
+                                       retries,
+                                       @keyspace,
+                                       @table)
       end
 
       def to_s

data/lib/cassandra/protocol/responses/auth_challenge_response.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/protocol/responses/auth_success_response.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/protocol/responses/authenticate_response.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/protocol/responses/error_response.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.
@@ -27,23 +27,111 @@ module Cassandra
 
       def to_s
         hex_code = @code.to_s(16).rjust(4, '0').upcase
-        %(ERROR 0x#{hex_code} "#@message")
+        %(ERROR 0x#{hex_code} "#{@message}")
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
         case @code
-        when 0x0000 then Errors::ServerError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x000A then Errors::ProtocolError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x0100 then Errors::AuthenticationError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x1001 then Errors::OverloadedError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x1002 then Errors::IsBootstrappingError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x1003 then Errors::TruncateError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x2000 then Errors::SyntaxError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x2100 then Errors::UnauthorizedError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x2200 then Errors::InvalidError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x2300 then Errors::ConfigurationError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
+        when 0x0000 then Errors::ServerError.new(@message,
+                                                 @custom_payload,
+                                                 @warnings,
+                                                 keyspace,
+                                                 statement,
+                                                 options,
+                                                 hosts,
+                                                 consistency,
+                                                 retries)
+        when 0x000A then Errors::ProtocolError.new(@message,
+                                                   @custom_payload,
+                                                   @warnings,
+                                                   keyspace,
+                                                   statement,
+                                                   options,
+                                                   hosts,
+                                                   consistency,
+                                                   retries)
+        when 0x0100 then Errors::AuthenticationError.new(@message,
+                                                         @custom_payload,
+                                                         @warnings,
+                                                         keyspace,
+                                                         statement,
+                                                         options,
+                                                         hosts,
+                                                         consistency,
+                                                         retries)
+        when 0x1001 then Errors::OverloadedError.new(@message,
+                                                     @custom_payload,
+                                                     @warnings,
+                                                     keyspace,
+                                                     statement,
+                                                     options,
+                                                     hosts,
+                                                     consistency,
+                                                     retries)
+        when 0x1002 then Errors::IsBootstrappingError.new(@message,
+                                                          @custom_payload,
+                                                          @warnings,
+                                                          keyspace,
+                                                          statement,
+                                                          options,
+                                                          hosts,
+                                                          consistency,
+                                                          retries)
+        when 0x1003 then Errors::TruncateError.new(@message,
+                                                   @custom_payload,
+                                                   @warnings,
+                                                   keyspace,
+                                                   statement,
+                                                   options,
+                                                   hosts,
+                                                   consistency,
+                                                   retries)
+        when 0x2000 then Errors::SyntaxError.new(@message,
+                                                 @custom_payload,
+                                                 @warnings,
+                                                 keyspace,
+                                                 statement,
+                                                 options,
+                                                 hosts,
+                                                 consistency,
+                                                 retries)
+        when 0x2100 then Errors::UnauthorizedError.new(@message,
+                                                       @custom_payload,
+                                                       @warnings,
+                                                       keyspace,
+                                                       statement,
+                                                       options,
+                                                       hosts,
+                                                       consistency,
+                                                       retries)
+        when 0x2200 then Errors::InvalidError.new(@message,
+                                                  @custom_payload,
+                                                  @warnings,
+                                                  keyspace,
+                                                  statement,
+                                                  options,
+                                                  hosts,
+                                                  consistency,
+                                                  retries)
+        when 0x2300 then Errors::ConfigurationError.new(@message,
+                                                        @custom_payload,
+                                                        @warnings,
+                                                        keyspace,
+                                                        statement,
+                                                        options,
+                                                        hosts,
+                                                        consistency,
+                                                        retries)
         else
-          Errors::ServerError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
+          Errors::ServerError.new(@message,
+                                  @custom_payload,
+                                  @warnings,
+                                  keyspace,
+                                  statement,
+                                  options,
+                                  hosts,
+                                  consistency,
+                                  retries)
         end
       end