cassandra-driver 2.0.1-java → 2.1.0-java

data/lib/cassandra/protocol/cql_byte_buffer.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

data/lib/cassandra/protocol/cql_protocol_handler.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.
@@ -40,9 +40,23 @@ module Cassandra
         @compressor = compressor
         @connection.on_data(&method(:receive_data))
         @connection.on_closed(&method(:socket_closed))
-        @promises = Array.new(128) { nil }
-        @frame_encoder = V1::Encoder.new(@compressor, protocol_version)
-        @frame_decoder = V1::Decoder.new(self, @compressor)
+
+        if protocol_version > 2
+          @streams = Array.new(1024) {|i| i}
+        else
+          @streams = Array.new(128) {|i| i}
+        end
+
+        @promises = Hash.new
+
+        if protocol_version > 2
+          @frame_encoder = V3::Encoder.new(@compressor, protocol_version)
+          @frame_decoder = V3::Decoder.new(self, @compressor)
+        else
+          @frame_encoder = V1::Encoder.new(@compressor, protocol_version)
+          @frame_decoder = V1::Decoder.new(self, @compressor)
+        end
+
         @request_queue_in = []
         @request_queue_out = []
         @event_listeners = []
@@ -211,15 +225,15 @@ module Cassandra
         promise = nil
         @lock.lock
         begin
-          promise = @promises[id]
-          @promises[id] = nil
+          promise = @promises.delete(id)
+          @streams.unshift(id)
         ensure
           @lock.unlock
         end
         if response.is_a?(Protocol::SetKeyspaceResultResponse)
           @keyspace = response.keyspace
         end
-        if response.is_a?(Protocol::SchemaChangeResultResponse) && response.change == 'DROPPED' && response.keyspace == @keyspace && response.table.empty?
+        if response.is_a?(Protocol::SchemaChangeResultResponse) && response.change == 'DROPPED' && response.keyspace == @keyspace && response.target == Protocol::Constants::SCHEMA_CHANGE_TARGET_KEYSPACE
           @keyspace = nil
         end
         flush_request_queue
@@ -310,10 +324,10 @@ module Cassandra
           @heartbeat = nil
           @terminate = nil
 
-          promises_to_fail = @promises.compact
+          promises_to_fail = @promises.values
           promises_to_fail.concat(@request_queue_in)
           promises_to_fail.concat(@request_queue_out)
-          @promises.fill(nil)
+          @promises.clear
           @request_queue_in.clear
           @request_queue_out.clear
         end
@@ -363,7 +377,7 @@ module Cassandra
       end
 
       def next_stream_id
-        if (stream_id = @promises.index(nil))
+        if (stream_id = @streams.shift)
           stream_id
         else
           nil

data/lib/cassandra/protocol/request.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.
@@ -22,7 +22,7 @@ module Cassandra
       attr_reader :cql, :values, :type_hints, :serial_consistency, :page_size, :paging_state
       attr_accessor :consistency, :retries
 
-      def initialize(cql, values, type_hints, consistency, serial_consistency = nil, page_size = nil, paging_state = nil, trace = false)
+      def initialize(cql, values, type_hints, consistency, serial_consistency = nil, page_size = nil, paging_state = nil, trace = false, names = EMPTY_LIST)
         super(7, trace)
         @cql = cql
         @values = values
@@ -31,6 +31,7 @@ module Cassandra
         @serial_consistency = serial_consistency
         @page_size = page_size
         @paging_state = paging_state
+        @names = names
       end
 
       def write(buffer, protocol_version, encoder)
@@ -43,8 +44,9 @@ module Cassandra
           flags |= 0x10 if @serial_consistency
           if @values && @values.size > 0
             flags |= 0x01
+            flags |= 0x40 unless @names.empty?
             buffer.append(flags.chr)
-            encoder.write_parameters(buffer, @values, @type_hints)
+            encoder.write_parameters(buffer, @values, @type_hints, @names)
           else
             buffer.append(flags.chr)
           end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

data/lib/cassandra/protocol/response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.
@@ -27,7 +27,14 @@ module Cassandra
 
       def materialize(metadata)
         @metadata = metadata
-        @rows = Coder.read_values_v1(@raw_rows, @metadata)
+
+        if @protocol_version == 3
+          @rows = Coder.read_values_v3(@raw_rows, @metadata)
+        else
+          @rows = Coder.read_values_v1(@raw_rows, @metadata)
+        end
+
+        @rows
       end
 
       def rows

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.
@@ -21,13 +21,28 @@ module Cassandra
     class SchemaChangeEventResponse < EventResponse
       TYPE = 'SCHEMA_CHANGE'.freeze
 
-      attr_reader :type, :change, :keyspace, :table
+      attr_reader :change, :keyspace, :table, :type, :target
 
-      def initialize(*args)
-        @change, @keyspace, @table = args
-        @type = TYPE
+      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
       end
 
+      def type
+        TYPE
+      end
 
       def eql?(rs)
         rs.type == self.type && rs.change == self.change && rs.keyspace == self.keyspace && rs.table == self.table
@@ -46,7 +61,7 @@ module Cassandra
       end
 
       def to_s
-        %(EVENT #@type #@change "#@keyspace" "#@table")
+        %(EVENT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@table")
       end
 
       private

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# 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.
@@ -19,15 +19,25 @@
 module Cassandra
   module Protocol
     class SchemaChangeResultResponse < ResultResponse
-      attr_reader :change, :keyspace, :table
+      attr_reader :change, :keyspace, :table, :type, :target
 
-      def initialize(change, keyspace, table, trace_id)
+      def initialize(change, keyspace, name, trace_id, target = nil)
         super(trace_id)
-        @change, @keyspace, @table = change, keyspace, table
-      end
 
-      def self.decode(protocol_version, buffer, length, trace_id=nil)
-        new(buffer.read_string, buffer.read_string, buffer.read_string, 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
       end
 
       def eql?(other)
@@ -46,7 +56,7 @@ module Cassandra
       end
 
       def to_s
-        %(RESULT SCHEMA_CHANGE #@change "#@keyspace" "#@table")
+        %(RESULT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@table")
       end
 
       private