cassandra-driver 2.1.7-java → 3.0.0.beta.1-java

data/lib/cassandra/protocol/cql_byte_buffer.rb

@@ -178,6 +178,16 @@ module Cassandra
         map
       end
 
+      def read_bytes_map
+        map = {}
+        map_size = read_unsigned_short
+        map_size.times do
+          key = read_string
+          map[key] = read_bytes
+        end
+        map
+      end
+
       def read_string_multimap
         map = {}
         map_size = read_unsigned_short
@@ -188,6 +198,30 @@ module Cassandra
         map
       end
 
+      def read_smallint
+        n = read_short
+        return n if n <= 0x7fff
+        n - 0xffff - 1
+      rescue RangeError => e
+        raise Errors::DecodingError, "Not enough bytes available to decode a smallint: #{e.message}", e.backtrace
+      end
+
+      def read_tinyint
+        n = read_byte
+        return n if n <= 0x7f
+        n - 0xff - 1
+      rescue RangeError => e
+        raise Errors::DecodingError, "Not enough bytes available to decode a tinyint: #{e.message}", e.backtrace
+      end
+
+      def append_tinyint(n)
+        append([n].pack(Formats::CHAR_FORMAT))
+      end
+
+      def append_smallint(n)
+        append_short(n)
+      end
+
       def append_int(n)
         append([n].pack(Formats::INT_FORMAT))
       end
@@ -256,6 +290,15 @@ module Cassandra
         self
       end
 
+      def append_bytes_map(map)
+        append_short(map.size)
+        map.each do |key, value|
+          append_string(key)
+          append_bytes(value)
+        end
+        self
+      end
+
       def append_timestamp(timestamp)
         append_long(timestamp.tv_sec * 1000000 + timestamp.tv_usec)
       end

data/lib/cassandra/protocol/cql_protocol_handler.rb

@@ -49,7 +49,10 @@ module Cassandra
 
         @promises = Hash.new
 
-        if protocol_version > 2
+        if protocol_version > 3
+          @frame_encoder = V4::Encoder.new(@compressor, protocol_version)
+          @frame_decoder = V4::Decoder.new(self, @compressor)
+        elsif protocol_version > 2
           @frame_encoder = V3::Encoder.new(@compressor, protocol_version)
           @frame_decoder = V3::Decoder.new(self, @compressor)
         else

data/lib/cassandra/protocol/request.rb

@@ -33,6 +33,10 @@ module Cassandra
       def compressable?
         true
       end
+
+      def payload?
+        false
+      end
     end
   end
 end

data/lib/cassandra/protocol/requests/auth_response_request.rb

@@ -40,7 +40,11 @@ module Cassandra
       alias_method :==, :eql?
 
       def hash
-        @token.hash
+        @h ||= begin
+          h = 17
+          h = 31 * h + @token.hash
+          h
+        end
       end
     end
   end

data/lib/cassandra/protocol/requests/batch_request.rb

@@ -23,16 +23,21 @@ module Cassandra
       UNLOGGED_TYPE = 1
       COUNTER_TYPE = 2
 
-      attr_reader :type, :timestamp
+      attr_reader :type, :timestamp, :payload
       attr_accessor :consistency, :retries
 
-      def initialize(type, consistency, trace=false, serial_consistency = nil, timestamp = nil)
+      def initialize(type, consistency, trace=false, serial_consistency = nil, timestamp = nil, payload = nil)
         super(0x0D, trace)
         @type  = type
         @parts = []
         @consistency = consistency
         @serial_consistency = serial_consistency
         @timestamp = timestamp
+        @payload = payload
+      end
+
+      def payload?
+        !!@payload
       end
 
       def clear

data/lib/cassandra/protocol/requests/credentials_request.rb

@@ -40,7 +40,11 @@ module Cassandra
       alias_method :==, :eql?
 
       def hash
-        @h ||= @credentials.hash
+        @h ||= begin
+          h = 17
+          h = 31 * h + @credentials.hash
+          h
+        end
       end
     end
   end

data/lib/cassandra/protocol/requests/execute_request.rb

@@ -19,10 +19,10 @@
 module Cassandra
   module Protocol
     class ExecuteRequest < Request
-      attr_reader :metadata, :values, :request_metadata, :serial_consistency, :page_size, :paging_state, :timestamp
+      attr_reader :metadata, :values, :request_metadata, :serial_consistency, :page_size, :paging_state, :timestamp, :payload
       attr_accessor :consistency, :retries, :id
 
-      def initialize(id, metadata, values, request_metadata, consistency, serial_consistency=nil, page_size=nil, paging_state=nil, trace=false, timestamp = nil)
+      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)
@@ -37,6 +37,11 @@ module Cassandra
         @page_size = page_size
         @paging_state = paging_state
         @timestamp = timestamp
+        @payload = payload
+      end
+
+      def payload?
+        !!@payload
       end
 
       def write(buffer, protocol_version, encoder)
@@ -81,14 +86,15 @@ module Cassandra
 
       def hash
         @h ||= begin
-          h = 0
-          h = ((h & 33554431) * 31) ^ @id.hash
-          h = ((h & 33554431) * 31) ^ @metadata.hash
-          h = ((h & 33554431) * 31) ^ @values.hash
-          h = ((h & 33554431) * 31) ^ @consistency.hash
-          h = ((h & 33554431) * 31) ^ @serial_consistency.hash
-          h = ((h & 33554431) * 31) ^ @page_size.hash
-          h = ((h & 33554431) * 31) ^ @paging_state.hash
+          h = 17
+          h = 31 * h + @id.hash
+          h = 31 * h + @metadata.hash
+          h = 31 * h + @values.hash
+          h = 31 * h + @consistency.hash
+          h = 31 * h + @serial_consistency.hash
+          h = 31 * h + @page_size.hash
+          h = 31 * h + @paging_state.hash
+          h = 31 * h + @timestamp.hash
           h
         end
       end

data/lib/cassandra/protocol/requests/prepare_request.rb

@@ -19,14 +19,19 @@
 module Cassandra
   module Protocol
     class PrepareRequest < Request
-      attr_reader :cql
+      attr_reader :cql, :payload
       attr_accessor :consistency, :retries
 
-      def initialize(cql, trace=false)
+      def initialize(cql, trace=false, payload = nil)
         raise ArgumentError, 'No CQL given!' unless cql
         super(9, trace)
         @cql = cql
         @consistency = :one
+        @payload = payload
+      end
+
+      def payload?
+        !!@payload
       end
 
       def write(buffer, protocol_version, encoder)
@@ -43,7 +48,11 @@ module Cassandra
       alias_method :==, :eql?
 
       def hash
-        @h ||= @cql.hash
+        @h ||= begin
+          h = 17
+          h = 31 * h + @cql.hash
+          h
+        end
       end
     end
   end

data/lib/cassandra/protocol/requests/query_request.rb

@@ -19,10 +19,10 @@
 module Cassandra
   module Protocol
     class QueryRequest < Request
-      attr_reader :cql, :values, :type_hints, :serial_consistency, :page_size, :paging_state, :timestamp
+      attr_reader :cql, :values, :type_hints, :serial_consistency, :page_size, :paging_state, :timestamp, :payload
       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)
+      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
@@ -33,6 +33,11 @@ module Cassandra
         @paging_state = paging_state
         @names = names
         @timestamp = timestamp
+        @payload = payload
+      end
+
+      def payload?
+        !!@payload
       end
 
       def write(buffer, protocol_version, encoder)
@@ -83,15 +88,19 @@ module Cassandra
       alias_method :==, :eql?
 
       def hash
-        h = 0xcbf29ce484222325
-        h = 0xffffffffffffffff & (0x100000001b3 * (h ^ @cql.hash))
-        h = 0xffffffffffffffff & (0x100000001b3 * (h ^ @values.hash))
-        h = 0xffffffffffffffff & (0x100000001b3 * (h ^ @type_hints.hash))
-        h = 0xffffffffffffffff & (0x100000001b3 * (h ^ @consistency.hash))
-        h = 0xffffffffffffffff & (0x100000001b3 * (h ^ @serial_consistency.hash))
-        h = 0xffffffffffffffff & (0x100000001b3 * (h ^ @page_size.hash))
-        h = 0xffffffffffffffff & (0x100000001b3 * (h ^ @paging_state.hash))
-        h
+        @h ||= begin
+          h = 17
+          h = 31 * h + @cql.hash
+          h = 31 * h + @values.hash
+          h = 31 * h + @type_hints.hash
+          h = 31 * h + @consistency.hash
+          h = 31 * h + @serial_consistency.hash
+          h = 31 * h + @page_size.hash
+          h = 31 * h + @paging_state.hash
+          h = 31 * h + @names.hash
+          h = 31 * h + @timestamp.hash
+          h
+        end
       end
     end
   end

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

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

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

@@ -19,10 +19,10 @@
 module Cassandra
   module Protocol
     class ErrorResponse < Response
-      attr_reader :code, :message
+      attr_reader :code, :message, :custom_payload, :warnings
 
       def initialize(*args)
-        @code, @message = args
+        @custom_payload, @warnings, @code, @message = args
       end
 
       def to_s
@@ -30,20 +30,20 @@ module Cassandra
         %(ERROR 0x#{hex_code} "#@message")
       end
 
-      def to_error(statement = nil)
+      def to_error(keyspace, statement, options, hosts, consistency, retries)
         case @code
-        when 0x0000 then Errors::ServerError.new(@message)
-        when 0x000A then Errors::ProtocolError.new(@message)
-        when 0x0100 then Errors::AuthenticationError.new(@message)
-        when 0x1001 then Errors::OverloadedError.new(@message, statement)
-        when 0x1002 then Errors::IsBootstrappingError.new(@message, statement)
-        when 0x1003 then Errors::TruncateError.new(@message, statement)
-        when 0x2000 then Errors::SyntaxError.new(@message, statement)
-        when 0x2100 then Errors::UnauthorizedError.new(@message, statement)
-        when 0x2200 then Errors::InvalidError.new(@message, statement)
-        when 0x2300 then Errors::ConfigurationError.new(@message, statement)
+        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)
+          Errors::ServerError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
         end
       end
 

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

@@ -0,0 +1,41 @@
+# 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 FunctionFailureErrorResponse < ErrorResponse
+      attr_reader :keyspace, :name, :signature
+
+      def initialize(custom_payload, warnings, code, message, keyspace, name, signature)
+        super(custom_payload, warnings, code, message)
+
+        @keyspace  = keyspace
+        @name      = name
+        @signature = signature
+      end
+
+      def to_error(keyspace, statement, options, hosts, consistency, retries)
+        Errors::FunctionCallError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @keyspace, @name, @signature)
+      end
+
+      def to_s
+        "#{super} #{@keyspace} #{@name} #{@signature}"
+      end
+    end
+  end
+end

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

@@ -19,11 +19,14 @@
 module Cassandra
   module Protocol
     class PreparedResultResponse < ResultResponse
-      attr_reader :id, :metadata, :result_metadata
-
-      def initialize(id, metadata, result_metadata, trace_id)
-        super(trace_id)
-        @id, @metadata, @result_metadata = id, metadata, result_metadata
+      attr_reader :id, :metadata, :result_metadata, :pk_idx
+
+      def initialize(custom_payload, warnings, id, metadata, result_metadata, pk_idx, trace_id)
+        super(custom_payload, warnings, trace_id)
+        @id              = id
+        @metadata        = metadata
+        @result_metadata = result_metadata
+        @pk_idx          = pk_idx
       end
 
       def eql?(other)
@@ -33,10 +36,10 @@ module Cassandra
 
       def hash
         @h ||= begin
-          h = 0
-          h = ((h & 0x01ffffff) * 31) ^ @id.hash
-          h = ((h & 0x01ffffff) * 31) ^ @metadata.hash
-          h = ((h & 0x01ffffff) * 31) ^ @trace_id.hash
+          h = 17
+          h = 31 * h + @id.hash
+          h = 31 * h + @metadata.hash
+          h = 31 * h + @trace_id.hash
           h
         end
       end

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

@@ -19,8 +19,8 @@
 module Cassandra
   module Protocol
     class RawRowsResultResponse < RowsResultResponse
-      def initialize(protocol_version, raw_rows, paging_state, trace_id)
-        super(nil, nil, paging_state, trace_id)
+      def initialize(custom_payload, warnings, protocol_version, raw_rows, paging_state, trace_id)
+        super(custom_payload, warnings, nil, nil, paging_state, trace_id)
         @protocol_version = protocol_version
         @raw_rows = raw_rows
       end
@@ -28,7 +28,9 @@ module Cassandra
       def materialize(metadata)
         @metadata = metadata
 
-        if @protocol_version == 3
+        if @protocol_version == 4
+          @rows = Coder.read_values_v4(@raw_rows, @metadata)
+        elsif @protocol_version == 3
           @rows = Coder.read_values_v3(@raw_rows, @metadata)
         else
           @rows = Coder.read_values_v1(@raw_rows, @metadata)