cassandra-driver 3.2.0-java → 3.2.5-java

data/lib/cassandra/keyspace.rb

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

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/load_balancing/policies.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/load_balancing/policies/dc_aware_round_robin.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/load_balancing/policies/round_robin.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/load_balancing/policies/token_aware.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/load_balancing/policies/white_list.rb

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

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

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

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

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -53,24 +53,30 @@ module Cassandra
       end
 
       def read_decimal(len = bytesize)
-        size = read_signed_int
+        scale = read_signed_int
         number_string = read_varint(len - 4).to_s
-        if number_string.length <= size
-          if number_string.start_with?(MINUS)
-            number_string = number_string[1, number_string.length - 1]
-            fraction_string = MINUS + ZERO << DECIMAL_POINT
+        if scale <= 0
+          # Special case where the actual scale is positive; scale in the protocol is actually negative of
+          # reality.
+          BigDecimal(number_string + '0' * -scale)
+        else
+          if number_string.length <= scale
+            if number_string.start_with?(MINUS)
+              number_string = number_string[1, number_string.length - 1]
+              fraction_string = MINUS + ZERO << DECIMAL_POINT
+            else
+              fraction_string = ZERO + DECIMAL_POINT
+            end
+            (scale - number_string.length).times { fraction_string << ZERO }
+            fraction_string << number_string
           else
-            fraction_string = ZERO + DECIMAL_POINT
+            fraction_string = number_string[0, number_string.length - scale]
+            fraction_string << DECIMAL_POINT
+            fraction_string <<
+              number_string[number_string.length - scale, number_string.length]
           end
-          (size - number_string.length).times { fraction_string << ZERO }
-          fraction_string << number_string
-        else
-          fraction_string = number_string[0, number_string.length - size]
-          fraction_string << DECIMAL_POINT
-          fraction_string <<
-            number_string[number_string.length - size, number_string.length]
+          BigDecimal(fraction_string)
         end
-        BigDecimal.new(fraction_string)
       rescue Errors::DecodingError => e
         raise Errors::DecodingError, e.message, e.backtrace
       end
@@ -281,6 +287,29 @@ module Cassandra
               "Not enough bytes available to decode a tinyint: #{e.message}", e.backtrace
       end
 
+      def read_vint
+        n = read_byte
+
+        # Bits are indexed in Integer in little-endian order
+        bytes_to_read = 7.downto(0).take_while {|i| n[i] == 1}.size
+        return n unless bytes_to_read > 0
+
+        rv = n & (0xff >> bytes_to_read)
+        1.upto(bytes_to_read) do |idx|
+          new_byte = read_byte
+          rv <<= 8
+          rv |= (new_byte & 0xff)
+        end
+
+        rv
+      rescue RangeError => e
+        raise Errors::DecodingError, e.message, e.backtrace
+      end
+
+      def read_signed_vint
+        Util.decode_zigzag(read_vint)
+      end
+
       def append_tinyint(n)
         append([n].pack(Formats::CHAR_FORMAT))
       end
@@ -403,6 +432,25 @@ module Cassandra
         append([n].pack(Formats::FLOAT_FORMAT))
       end
 
+      def append_vint(n)
+        send_bytes = Util.to_min_byte_array(n)
+        send_cnt = send_bytes.length
+
+        raise Errors::EncodingError, "Too many bytes (#{bytes_to_send.length}) to send!" if send_cnt > 8
+
+        send_cnt_byte = (0xff << (8 - send_cnt)) & 0xff
+        append([send_cnt_byte].pack(Formats::BYTES_FORMAT))
+        append(send_bytes.pack(Formats::BYTES_FORMAT))
+      end
+
+      def append_signed_vint32(n)
+        append_vint(Util.encode_zigzag32(n))
+      end
+
+      def append_signed_vint64(n)
+        append_vint(Util.encode_zigzag64(n))
+      end
+
       def eql?(other)
         other.eql?(to_str)
       end

data/lib/cassandra/protocol/cql_protocol_handler.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -170,7 +170,7 @@ module Cassandra
       def send_request(request, timeout = nil, with_heartbeat = true)
         return Ione::Future.failed(Errors::IOError.new('Connection closed')) if closed?
         schedule_heartbeat if with_heartbeat
-        promise = RequestPromise.new(request, timeout)
+        promise = RequestPromise.new(request, timeout, @scheduler)
         id = nil
         @lock.lock
         begin
@@ -256,22 +256,74 @@ module Cassandra
 
         attr_reader :request, :timeout
         attr_boolean :timed_out
+        attr_accessor :timer
 
-        def initialize(request, timeout)
+        def initialize(request, timeout, scheduler)
           @request = request
           @timeout = timeout
           @timed_out = false
+          @scheduler = scheduler
+          @lock = Mutex.new
+          @timer = nil
           super()
         end
 
         def time_out!
           unless future.completed?
             @timed_out = true
-            # rubocop:disable Style/SignalException
             fail(Errors::TimeoutError.new('Timed out'))
-            # rubocop:enable Style/SignalException
           end
         end
+
+        def maybe_start_timer
+          # This is more complicated than one would expect. First, we want to start a timer
+          # if a timeout is set. But there is a race condition where send_request creates
+          # a fresh promise and adds it to @promises, but another thread handles a socket
+          # closure event and fails all known promises. When a promise fails, we want to cancel
+          # the timer, if set. So, we synchronize access to @timer to be sure we don't set up
+          # and cancel the timer at the same time. However, if promise.fail runs first, there
+          # will be no timer to cancel, and then when maybe_start_timer gets called in the other
+          # thread, it'll create a timer on a promise that no one is going to action on going forward.
+          # So, that leads to leaking the timer until it times out. To avoid this, we want to
+          # check that the future of the promise isn't completed before starting the timer.
+
+          return if @timeout.nil?
+          return if @future.completed?
+
+          if @timer.nil?
+            @lock.synchronize do
+              if @timer.nil?
+                return if @future.completed?
+                @timer = @scheduler.schedule_timer(@timeout)
+                @timer.on_value { time_out! }
+              end
+            end
+          end
+        end
+
+        def fulfill(response)
+          super
+          maybe_cancel_timer
+        end
+
+        def fail(cause)
+          super
+          maybe_cancel_timer
+        end
+
+        def maybe_cancel_timer
+          return if @timeout.nil?
+          timer = nil
+          if @timer
+            @lock.synchronize do
+              if @timer
+                timer = @timer
+                @timer = nil
+              end
+            end
+          end
+          @scheduler.cancel_timer(timer) if timer
+        end
       end
 
       def receive_data(data)
@@ -312,11 +364,7 @@ module Cassandra
         @connection.write do |buffer|
           @frame_encoder.encode(buffer, request_promise.request, id)
         end
-        if request_promise.timeout
-          @scheduler.schedule_timer(request_promise.timeout).on_value do
-            request_promise.time_out!
-          end
-        end
+        request_promise.maybe_start_timer
       end
 
       def socket_closed(cause)

data/lib/cassandra/protocol/request.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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-2017 DataStax, Inc.
+# Copyright 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-2017 DataStax, Inc.
+# Copyright 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-2017 DataStax, Inc.
+# Copyright 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-2017 DataStax, Inc.
+# Copyright 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-2017 DataStax, Inc.
+# Copyright 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-2017 DataStax, Inc.
+# Copyright 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-2017 DataStax, Inc.
+# Copyright DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,6 +51,14 @@ module Cassandra
         !!@payload
       end
 
+      def append_flags(buffer,flags,protocol_version)
+        if protocol_version < 5
+          buffer.append(flags.chr)
+        else
+          buffer.append_int(flags)
+        end
+      end
+
       def write(buffer, protocol_version, encoder)
         buffer.append_long_string(@cql)
         buffer.append_consistency(@consistency)
@@ -63,10 +71,10 @@ module Cassandra
           if @values && !@values.empty?
             flags |= 0x01
             flags |= 0x40 if protocol_version > 2 && !@names.empty?
-            buffer.append(flags.chr)
+            append_flags(buffer, flags, protocol_version)
             encoder.write_parameters(buffer, @values, @type_hints, @names)
           else
-            buffer.append(flags.chr)
+            append_flags(buffer, flags, protocol_version)
           end
           buffer.append_int(@page_size) if @page_size
           buffer.append_bytes(@paging_state) if @paging_state

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

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