cassandra-driver 2.1.7 → 3.0.0.beta.1

data/lib/cassandra/protocol/responses/read_failure_error_response.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+#--
+# Copyright 2013-2015 DataStax, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+
+module Cassandra
+  module Protocol
+    class ReadFailureErrorResponse < ErrorResponse
+      attr_reader :consistency, :received, :blockfor, :numfailures, :data_present
+
+      def initialize(custom_payload, warnings, code, message, consistency, received, blockfor, numfailures, data_present)
+        super(custom_payload, warnings, code, message)
+
+        @consistency  = consistency
+        @received     = received
+        @blockfor     = blockfor
+        @numfailures  = numfailures
+        @data_present = data_present
+      end
+
+      def to_error(keyspace, statement, options, hosts, consistency, retries)
+        Errors::ReadError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @data_present, @consistency, @blockfor, @numfailures, @received)
+      end
+
+      def to_s
+        "#{super} #{@consistency} #{@received} #{@blockfor} #{@numfailures} #{@data_present}"
+      end
+    end
+  end
+end

data/lib/cassandra/protocol/responses/read_timeout_error_response.rb

@@ -21,8 +21,8 @@ module Cassandra
     class ReadTimeoutErrorResponse < ErrorResponse
       attr_reader :consistency, :received, :blockfor, :data_present
 
-      def initialize(code, message, consistency, received, blockfor, data_present)
-        super(code, message)
+      def initialize(custom_payload, warnings, code, message, consistency, received, blockfor, data_present)
+        super(custom_payload, warnings, code, message)
 
         @consistency  = consistency
         @received     = received
@@ -30,8 +30,8 @@ module Cassandra
         @data_present = data_present
       end
 
-      def to_error(statement = nil)
-        Errors::ReadTimeoutError.new(@message, statement, @data_present, @consistency, @blockfor, @received)
+      def to_error(keyspace, statement, options, hosts, consistency, retries)
+        Errors::ReadTimeoutError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @data_present, @consistency, @blockfor, @received)
       end
 
       def to_s

data/lib/cassandra/protocol/responses/ready_response.rb

@@ -25,7 +25,11 @@ module Cassandra
       alias_method :==, :eql?
 
       def hash
-        @h ||= to_s.hash ^ 0xbadc0de
+        @h ||= begin
+          h = 17
+          h = 31 * h + 'READY'.hash
+          h
+        end
       end
 
       def to_s

data/lib/cassandra/protocol/responses/result_response.rb

@@ -19,10 +19,10 @@
 module Cassandra
   module Protocol
     class ResultResponse < Response
-      attr_reader :trace_id
+      attr_reader :custom_payload, :warnings, :trace_id
 
-      def initialize(trace_id)
-        @trace_id = trace_id
+      def initialize(custom_payload, warnings, trace_id)
+        @custom_payload, @warnings, @trace_id = custom_payload, warnings, trace_id
       end
 
       def void?

data/lib/cassandra/protocol/responses/rows_result_response.rb

@@ -21,8 +21,8 @@ module Cassandra
     class RowsResultResponse < ResultResponse
       attr_reader :rows, :metadata, :paging_state
 
-      def initialize(rows, metadata, paging_state, trace_id)
-        super(trace_id)
+      def initialize(custom_payload, warnings, rows, metadata, paging_state, trace_id)
+        super(custom_payload, warnings, trace_id)
         @rows, @metadata, @paging_state = rows, metadata, paging_state
       end
 

data/lib/cassandra/protocol/responses/schema_change_event_response.rb

@@ -21,47 +21,48 @@ module Cassandra
     class SchemaChangeEventResponse < EventResponse
       TYPE = 'SCHEMA_CHANGE'.freeze
 
-      attr_reader :change, :keyspace, :table, :type, :target
+      attr_reader :change, :keyspace, :name, :target, :arguments
 
-      def initialize(change, keyspace, name, target = nil)
-        @change   = change
-        @keyspace = keyspace
-
-        if target
-          @target = target
-          @table = @type = name
-        else
-          if name.empty?
-            @target = Constants::SCHEMA_CHANGE_TARGET_KEYSPACE
-          else
-            @target = Constants::SCHEMA_CHANGE_TARGET_TABLE
-            @table  = name
-          end
-        end
+      def initialize(change, keyspace, name, target, arguments)
+        @change    = change
+        @keyspace  = keyspace
+        @name      = name
+        @target    = target
+        @arguments = arguments
       end
 
       def type
         TYPE
       end
 
-      def eql?(rs)
-        rs.type == self.type && rs.change == self.change && rs.keyspace == self.keyspace && rs.table == self.table
+      def eql?(other)
+        other.is_a?(SchemaChangeEventResponse) && other.type == TYPE &&
+          @change == other.change &&
+          @keyspace == other.keyspace &&
+          @name == other.name &&
+          @target == other.target &&
+          @arguments == other.arguments
       end
       alias_method :==, :eql?
 
       def hash
         @h ||= begin
-          h = 0
-          h = ((h & 33554431) * 31) ^ @type.hash
-          h = ((h & 33554431) * 31) ^ @change.hash
-          h = ((h & 33554431) * 31) ^ @keyspace.hash
-          h = ((h & 33554431) * 31) ^ @table.hash
+          h = 17
+          h = 31 * h + @change.hash
+          h = 31 * h + @keyspace.hash
+          h = 31 * h + @name.hash
+          h = 31 * h + @target.hash
+          h = 31 * h + @arguments.hash
           h
         end
       end
 
       def to_s
-        %(EVENT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@table")
+        if @arguments
+          %(EVENT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@name" #@arguments)
+        else
+          %(EVENT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@name")
+        end
       end
 
       private

data/lib/cassandra/protocol/responses/schema_change_result_response.rb

@@ -19,44 +19,41 @@
 module Cassandra
   module Protocol
     class SchemaChangeResultResponse < ResultResponse
-      attr_reader :change, :keyspace, :table, :type, :target
+      attr_reader :change, :keyspace, :name, :type, :target, :arguments
 
-      def initialize(change, keyspace, name, trace_id, target = nil)
-        super(trace_id)
+      def initialize(custom_payload, warnings, change, keyspace, name, target, arguments, trace_id)
+        super(custom_payload, warnings, trace_id)
 
-        @change   = change
-        @keyspace = keyspace
-
-        if target
-          @target = target
-          @table = @type = name
-        else
-          if name.empty?
-            @target = Constants::SCHEMA_CHANGE_TARGET_KEYSPACE
-          else
-            @target = Constants::SCHEMA_CHANGE_TARGET_TABLE
-            @table  = name
-          end
-        end
+        @change    = change
+        @keyspace  = keyspace
+        @name      = name
+        @target    = target
+        @arguments = arguments
       end
 
       def eql?(other)
-        self.change == other.change && self.keyspace == other.keyspace && self.table == other.table
+        @change == other.change &&
+        @keyspace == other.keyspace &&
+        @name == other.name &&
+        @target == other.target &&
+        @arguments == other.arguments
       end
       alias_method :==, :eql?
 
       def hash
         @h ||= begin
-          h = 0
-          h = ((h & 0xffffffff) * 31) ^ @change.hash
-          h = ((h & 0xffffffff) * 31) ^ @keyspace.hash
-          h = ((h & 0xffffffff) * 31) ^ @table.hash
+          h = 17
+          h = 31 * h + @change.hash
+          h = 31 * h + @keyspace.hash
+          h = 31 * h + @name.hash
+          h = 31 * h + @target.hash
+          h = 31 * h + @arguments.hash
           h
         end
       end
 
       def to_s
-        %(RESULT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@table")
+        %(RESULT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@name")
       end
 
       private

data/lib/cassandra/protocol/responses/set_keyspace_result_response.rb

@@ -21,8 +21,8 @@ module Cassandra
     class SetKeyspaceResultResponse < ResultResponse
       attr_reader :keyspace
 
-      def initialize(keyspace, trace_id)
-        super(trace_id)
+      def initialize(custom_payload, warnings, keyspace, trace_id)
+        super(custom_payload, warnings, trace_id)
         @keyspace = keyspace
       end
 

data/lib/cassandra/protocol/responses/unavailable_error_response.rb

@@ -21,16 +21,16 @@ module Cassandra
     class UnavailableErrorResponse < ErrorResponse
       attr_reader :consistency, :required, :alive
 
-      def initialize(code, message, consistency, required, alive)
-        super(code, message)
+      def initialize(custom_payload, warnings, code, message, consistency, required, alive)
+        super(custom_payload, warnings, code, message)
 
         @consistency = consistency
         @required    = required
         @alive       = alive
       end
 
-      def to_error(statement = nil)
-        Errors::UnavailableError.new(@message, statement, @consistency, @required, @alive)
+      def to_error(keyspace, statement, options, hosts, r_consistency, retries)
+        Errors::UnavailableError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, r_consistency, retries, @consistency, @required, @alive)
       end
 
       def to_s

data/lib/cassandra/protocol/responses/unprepared_error_response.rb

@@ -21,14 +21,14 @@ module Cassandra
     class UnpreparedErrorResponse < ErrorResponse
       attr_reader :id
 
-      def initialize(code, message, id)
-        super(code, message)
+      def initialize(custom_payload, warnings, code, message, id)
+        super(custom_payload, warnings, code, message)
 
         @id = id
       end
 
-      def to_error(statement = nil)
-        Errors::UnpreparedError.new(@message, statement, @id)
+      def to_error(keyspace, statement, options, hosts, consistency, retries)
+        Errors::UnpreparedError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @id)
       end
 
       def to_s

data/lib/cassandra/protocol/responses/write_failure_error_response.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+#--
+# Copyright 2013-2015 DataStax, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+
+module Cassandra
+  module Protocol
+    class WriteFailureErrorResponse < ErrorResponse
+      attr_reader :consistency, :received, :blockfor, :numfailures, :write_type
+
+      def initialize(custom_payload, warnings, code, message, consistency, received, blockfor, numfailures, write_type)
+        super(custom_payload, warnings, code, message)
+
+        write_type.downcase!
+
+        @consistency = consistency
+        @received    = received
+        @blockfor    = blockfor
+        @numfailures = numfailures
+        @write_type  = write_type.to_sym
+      end
+
+      def to_error(keyspace, statement, options, hosts, consistency, retries)
+        Errors::WriteError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @write_type, @consistency, @blockfor, @numfailures, @received)
+      end
+
+      def to_s
+        "#{super} #{@write_type} #{@consistency} #{@blockfor} #{@numfailures} #{@received}"
+      end
+    end
+  end
+end

data/lib/cassandra/protocol/responses/write_timeout_error_response.rb

@@ -21,8 +21,8 @@ module Cassandra
     class WriteTimeoutErrorResponse < ErrorResponse
       attr_reader :consistency, :received, :blockfor, :write_type
 
-      def initialize(code, message, consistency, received, blockfor, write_type)
-        super(code, message)
+      def initialize(custom_payload, warnings, code, message, consistency, received, blockfor, write_type)
+        super(custom_payload, warnings, code, message)
 
         write_type.downcase!
 
@@ -32,8 +32,8 @@ module Cassandra
         @write_type  = write_type.to_sym
       end
 
-      def to_error(statement = nil)
-        Errors::WriteTimeoutError.new(@message, statement, @write_type, @consistency, @blockfor, @received)
+      def to_error(keyspace, statement, options, hosts, consistency, retries)
+        Errors::WriteTimeoutError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @write_type, @consistency, @blockfor, @received)
       end
 
       def to_s

data/lib/cassandra/protocol/v1.rb

@@ -179,19 +179,19 @@ module Cassandra
             message = buffer.read_string
 
             case code
-            when 0x1000 then UnavailableErrorResponse.new(code, message, buffer.read_consistency, buffer.read_int, buffer.read_int)
-            when 0x1100 then WriteTimeoutErrorResponse.new(code, message, buffer.read_consistency, buffer.read_int, buffer.read_int, buffer.read_string)
-            when 0x1200 then ReadTimeoutErrorResponse.new(code, message, buffer.read_consistency, buffer.read_int, buffer.read_int, (buffer.read_byte != 0))
-            when 0x2400 then AlreadyExistsErrorResponse.new(code, message, buffer.read_string, buffer.read_string)
-            when 0x2500 then UnpreparedErrorResponse.new(code, message, buffer.read_short_bytes)
+            when 0x1000 then UnavailableErrorResponse.new(nil, nil, code, message, buffer.read_consistency, buffer.read_int, buffer.read_int)
+            when 0x1100 then WriteTimeoutErrorResponse.new(nil, nil, code, message, buffer.read_consistency, buffer.read_int, buffer.read_int, buffer.read_string)
+            when 0x1200 then ReadTimeoutErrorResponse.new(nil, nil, code, message, buffer.read_consistency, buffer.read_int, buffer.read_int, (buffer.read_byte != 0))
+            when 0x2400 then AlreadyExistsErrorResponse.new(nil, nil, code, message, buffer.read_string, buffer.read_string)
+            when 0x2500 then UnpreparedErrorResponse.new(nil, nil, code, message, buffer.read_short_bytes)
             else
-              ErrorResponse.new(code, message)
+              ErrorResponse.new(nil, nil, code, message)
             end
           when CODE_RESULT
             result_type = buffer.read_int
             case result_type
             when 0x0001 # Void
-              VoidResultResponse.new(trace_id)
+              VoidResultResponse.new(nil, nil, trace_id)
             when 0x0002 # Rows
               original_buffer_length = buffer.length
               column_specs, paging_state = Coder.read_metadata_v1(buffer)
@@ -199,21 +199,34 @@ module Cassandra
               if column_specs.nil?
                 consumed_bytes  = original_buffer_length - buffer.length
                 remaining_bytes = CqlByteBuffer.new(buffer.read(size - consumed_bytes - 4))
-                RawRowsResultResponse.new(protocol_version, remaining_bytes, paging_state, trace_id)
+                RawRowsResultResponse.new(nil, nil, protocol_version, remaining_bytes, paging_state, trace_id)
               else
-                RowsResultResponse.new(Coder.read_values_v1(buffer, column_specs), column_specs, paging_state, trace_id)
+                RowsResultResponse.new(nil, nil, Coder.read_values_v1(buffer, column_specs), column_specs, paging_state, trace_id)
               end
             when 0x0003 # SetKeyspace
-              SetKeyspaceResultResponse.new(buffer.read_string, trace_id)
+              SetKeyspaceResultResponse.new(nil, nil, buffer.read_string, trace_id)
             when 0x0004 # Prepared
               id              = buffer.read_short_bytes
               params_metadata = Coder.read_metadata_v1(buffer).first
               result_metadata = nil
               result_metadata = Coder.read_metadata_v1(buffer).first if protocol_version > 1
 
-              PreparedResultResponse.new(id, params_metadata, result_metadata, trace_id)
+              PreparedResultResponse.new(nil, nil, id, params_metadata, result_metadata, nil, trace_id)
             when 0x0005 # SchemaChange
-              SchemaChangeResultResponse.new(buffer.read_string, buffer.read_string, buffer.read_string, trace_id)
+              change    = buffer.read_string
+              keyspace  = buffer.read_string
+              name      = buffer.read_string
+              arguments = EMPTY_LIST
+              target    = nil
+
+              if name.empty?
+                name   = nil
+                target = Constants::SCHEMA_CHANGE_TARGET_KEYSPACE
+              else
+                target = Constants::SCHEMA_CHANGE_TARGET_TABLE
+              end
+
+              SchemaChangeResultResponse.new(nil, nil, change, keyspace, name, target, arguments, nil)
             else
               raise Errors::DecodingError, "Unsupported result type: #{result_type.inspect}"
             end
@@ -221,7 +234,19 @@ module Cassandra
             event_type = buffer.read_string
             case event_type
             when 'SCHEMA_CHANGE'
-              SchemaChangeEventResponse.new(buffer.read_string, buffer.read_string, buffer.read_string)
+              change    = buffer.read_string
+              keyspace  = buffer.read_string
+              name      = buffer.read_string
+              arguments = EMPTY_LIST
+
+              if name.empty?
+                name   = nil
+                target = Constants::SCHEMA_CHANGE_TARGET_KEYSPACE
+              else
+                target = Constants::SCHEMA_CHANGE_TARGET_TABLE
+              end
+
+              SchemaChangeEventResponse.new(change, keyspace, name, target, arguments)
             when 'STATUS_CHANGE'
               StatusChangeEventResponse.new(buffer.read_string, *buffer.read_inet)
             when 'TOPOLOGY_CHANGE'