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

data/lib/cassandra/protocol/cql_byte_buffer.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.
@@ -20,7 +20,7 @@ module Cassandra
   module Protocol
     class CqlByteBuffer < Ione::ByteBuffer
       def inspect
-        "#<#{self.class.name}:0x#{self.object_id.to_s(16)} #{to_str.inspect}>"
+        "#<#{self.class.name}:0x#{object_id.to_s(16)} #{to_str.inspect}>"
       end
 
       def read_unsigned_byte
@@ -28,22 +28,20 @@ module Cassandra
       rescue RangeError => e
         raise Errors::DecodingError, e.message, e.backtrace
       end
-      
-      def read_varint(len=bytesize, signed=true)
+
+      def read_varint(len = bytesize, signed = true)
         bytes = read(len)
         n = 0
         bytes.each_byte do |b|
           n = (n << 8) | b
         end
-        if signed && bytes.getbyte(0) & 0x80 == 0x80
-          n -= 2**(bytes.length * 8)
-        end
+        n -= 2**(bytes.length * 8) if signed && bytes.getbyte(0) & 0x80 == 0x80
         n
       rescue RangeError => e
         raise Errors::DecodingError, e.message, e.backtrace
       end
 
-      def read_decimal(len=bytesize)
+      def read_decimal(len = bytesize)
         size = read_signed_int
         number_string = read_varint(len - 4).to_s
         if number_string.length <= size
@@ -58,7 +56,8 @@ module Cassandra
         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]
+          fraction_string <<
+            number_string[number_string.length - size, number_string.length]
         end
         BigDecimal.new(fraction_string)
       rescue Errors::DecodingError => e
@@ -78,13 +77,15 @@ module Cassandra
       def read_double
         read(8).unpack(Formats::DOUBLE_FORMAT).first
       rescue RangeError => e
-        raise Errors::DecodingError, "Not enough bytes available to decode a double: #{e.message}", e.backtrace
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode a double: #{e.message}", e.backtrace
       end
 
       def read_float
         read(4).unpack(Formats::FLOAT_FORMAT).first
       rescue RangeError => e
-        raise Errors::DecodingError, "Not enough bytes available to decode a float: #{e.message}", e.backtrace
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode a float: #{e.message}", e.backtrace
       end
 
       def read_signed_int
@@ -92,13 +93,15 @@ module Cassandra
         return n if n <= 0x7fffffff
         n - 0xffffffff - 1
       rescue RangeError => e
-        raise Errors::DecodingError, "Not enough bytes available to decode an int: #{e.message}", e.backtrace
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode an int: #{e.message}", e.backtrace
       end
-      
+
       def read_unsigned_short
         read_short
       rescue RangeError => e
-        raise Errors::DecodingError, "Not enough bytes available to decode a short: #{e.message}", e.backtrace
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode a short: #{e.message}", e.backtrace
       end
 
       def read_string
@@ -107,7 +110,8 @@ module Cassandra
         string.force_encoding(::Encoding::UTF_8)
         string
       rescue RangeError => e
-        raise Errors::DecodingError, "Not enough bytes available to decode a string: #{e.message}", e.backtrace
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode a string: #{e.message}", e.backtrace
       end
 
       def read_long_string
@@ -116,13 +120,16 @@ module Cassandra
         string.force_encoding(::Encoding::UTF_8)
         string
       rescue RangeError => e
-        raise Errors::DecodingError, "Not enough bytes available to decode a long string: #{e.message}", e.backtrace
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode a long string: #{e.message}",
+              e.backtrace
       end
 
-      def read_uuid(impl=Uuid)
+      def read_uuid(impl = Uuid)
         impl.new(read_varint(16, false))
       rescue Errors::DecodingError => e
-        raise Errors::DecodingError, "Not enough bytes available to decode a UUID: #{e.message}", e.backtrace
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode a UUID: #{e.message}", e.backtrace
       end
 
       def read_string_list
@@ -135,21 +142,22 @@ module Cassandra
         return nil if size & 0x80000000 == 0x80000000
         read(size)
       rescue RangeError => e
-        raise Errors::DecodingError, "Not enough bytes available to decode a bytes: #{e.message}", e.backtrace
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode a bytes: #{e.message}", e.backtrace
       end
 
       def read_short_bytes
         read(read_unsigned_short)
       rescue RangeError => e
-        raise Errors::DecodingError, "Not enough bytes available to decode a short bytes: #{e.message}", e.backtrace
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode a short bytes: #{e.message}",
+              e.backtrace
       end
 
       def read_option
         id = read_unsigned_short
         value = nil
-        if block_given?
-          value = yield id, self
-        end
+        value = yield id, self if block_given?
         [id, value]
       end
 
@@ -159,12 +167,16 @@ module Cassandra
         port = read_int
         [ip_addr, port]
       rescue RangeError => e
-        raise Errors::DecodingError, "Not enough bytes available to decode an INET: #{e.message}", e.backtrace
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode an INET: #{e.message}",
+              e.backtrace
       end
 
       def read_consistency
         index = read_unsigned_short
-        raise Errors::DecodingError, "Unknown consistency index #{index}" if index >= CONSISTENCIES.size || CONSISTENCIES[index].nil?
+        if index >= CONSISTENCIES.size || CONSISTENCIES[index].nil?
+          raise Errors::DecodingError, "Unknown consistency index #{index}"
+        end
         CONSISTENCIES[index]
       end
 
@@ -203,7 +215,8 @@ module Cassandra
         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
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode a smallint: #{e.message}", e.backtrace
       end
 
       def read_tinyint
@@ -211,7 +224,8 @@ module Cassandra
         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
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode a tinyint: #{e.message}", e.backtrace
       end
 
       def append_tinyint(n)
@@ -246,7 +260,7 @@ module Cassandra
         append_int((v >> 96) & 0xffffffff)
         append_int((v >> 64) & 0xffffffff)
         append_int((v >> 32) & 0xffffffff)
-        append_int((v >>  0) & 0xffffffff)
+        append_int((v >> 0) & 0xffffffff)
       end
 
       def append_string_list(strs)
@@ -277,7 +291,9 @@ module Cassandra
 
       def append_consistency(consistency)
         index = CONSISTENCIES.index(consistency)
-        raise Errors::EncodingError, %(Unknown consistency "#{consistency}") if index.nil? || CONSISTENCIES[index].nil?
+        if index.nil? || CONSISTENCIES[index].nil?
+          raise Errors::EncodingError, %(Unknown consistency "#{consistency}")
+        end
         append_short(index)
       end
 
@@ -313,10 +329,11 @@ module Cassandra
       def append_varint(n)
         num = n
         bytes = []
-        begin
+        loop do
           bytes << (num & 0xff)
           num >>= 8
-        end until (num == 0 || num == -1) && (bytes.last[7] == num[7])
+          break if (num == 0 || num == -1) && (bytes.last[7] == num[7])
+        end
         append(bytes.reverse.pack(Formats::BYTES_FORMAT))
       end
 
@@ -342,7 +359,7 @@ module Cassandra
       def eql?(other)
         other.eql?(to_str)
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       private
 
@@ -353,4 +370,4 @@ module Cassandra
       NO_CHAR = ''.freeze
     end
   end
-end
+end

data/lib/cassandra/protocol/cql_protocol_handler.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.
@@ -34,20 +34,22 @@ module Cassandra
       # @return [String] the current keyspace for the underlying connection
       attr_reader :keyspace, :error
 
-      def initialize(connection, scheduler, protocol_version, compressor=nil, heartbeat_interval = 30, idle_timeout = 60)
+      def initialize(connection,
+                     scheduler,
+                     protocol_version,
+                     compressor = nil,
+                     heartbeat_interval = 30,
+                     idle_timeout = 60,
+                     requests_per_connection = 128)
         @connection = connection
         @scheduler = scheduler
         @compressor = compressor
         @connection.on_data(&method(:receive_data))
         @connection.on_closed(&method(:socket_closed))
 
-        if protocol_version > 2
-          @streams = Array.new(1024) {|i| i}
-        else
-          @streams = Array.new(128) {|i| i}
-        end
+        @streams = Array.new(requests_per_connection) {|i| i}
 
-        @promises = Hash.new
+        @promises = {}
 
         if protocol_version > 3
           @frame_encoder = V4::Encoder.new(@compressor, protocol_version)
@@ -147,20 +149,20 @@ module Cassandra
       # closes the futures of all active requests will be failed with the error
       # that caused the connection to close, or nil.
       #
-      # When `timeout` is specified the future will fail with {Cassandra::Errors::TimeoutError}
-      # after that many seconds have passed. If a response arrives after that
-      # time it will be lost. If a response never arrives for the request the
-      # channel occupied by the request will _not_ be reused.
+      # When `timeout` is specified the future will fail with
+      # {Cassandra::Errors::TimeoutError} after that many seconds have passed. If a
+      # response arrives after that time it will be lost. If a response never arrives
+      # for the request the channel occupied by the request will _not_ be reused.
       #
       # @param [Cassandra::Protocol::Request] request
       # @param [Float] timeout an optional number of seconds to wait until
       #   failing the request
       # @return [Ione::Future<Cassandra::Protocol::Response>] a future that resolves to
       #   the response
-      def send_request(request, timeout=nil, with_heartbeat = true)
+      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)
+        promise = RequestPromise.new(request, timeout)
         id = nil
         @lock.lock
         begin
@@ -171,9 +173,7 @@ module Cassandra
           @lock.unlock
         end
         if id
-          @connection.write do |buffer|
-            @frame_encoder.encode(buffer, request, id)
-          end
+          write_request(id, promise)
         else
           @lock.lock
           begin
@@ -182,11 +182,6 @@ module Cassandra
             @lock.unlock
           end
         end
-        if timeout
-          @scheduler.schedule_timer(timeout).on_value do
-            promise.time_out!
-          end
-        end
         promise.future
       end
 
@@ -237,23 +232,25 @@ module Cassandra
         if response.is_a?(Protocol::SetKeyspaceResultResponse)
           @keyspace = response.keyspace
         end
-        if response.is_a?(Protocol::SchemaChangeResultResponse) && response.change == 'DROPPED' && response.keyspace == @keyspace && response.target == Protocol::Constants::SCHEMA_CHANGE_TARGET_KEYSPACE
+        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
-        unless promise.timed_out?
-          promise.fulfill(response)
-        end
+        promise.fulfill(response) unless promise.timed_out?
       end
 
       private
 
       # @private
       class RequestPromise < Ione::Promise
-        attr_reader :request
+        attr_reader :request, :timeout
 
-        def initialize(request)
+        def initialize(request, timeout)
           @request = request
+          @timeout = timeout
           @timed_out = false
           super()
         end
@@ -265,7 +262,9 @@ module Cassandra
         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
       end
@@ -285,28 +284,32 @@ module Cassandra
         ensure
           @lock.unlock
         end
-        while true
+        loop do
           id = nil
           promise = nil
           @lock.lock
           begin
             if @request_queue_out.any? && (id = next_stream_id)
               promise = @request_queue_out.shift
-              if promise.timed_out?
-                next
-              else
-                @promises[id] = promise
-              end
+              next if promise.timed_out?
+              @promises[id] = promise
             end
           ensure
             @lock.unlock
           end
-          if id
-            @connection.write do |buffer|
-              @frame_encoder.encode(buffer, promise.request, id)
-            end
-          else
-            break
+
+          break unless id
+          write_request(id, promise)
+        end
+      end
+
+      def write_request(id, request_promise)
+        @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
       end
@@ -382,11 +385,7 @@ module Cassandra
       end
 
       def next_stream_id
-        if (stream_id = @streams.shift)
-          stream_id
-        else
-          nil
-        end
+        @streams.shift
       end
 
       HEARTBEAT  = OptionsRequest.new

data/lib/cassandra/protocol/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,7 +21,7 @@ module Cassandra
     class Request
       attr_reader :opcode, :trace
 
-      def initialize(opcode, trace=false)
+      def initialize(opcode, trace = false)
         @opcode = opcode
         @trace = trace
       end

data/lib/cassandra/protocol/requests/auth_response_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?(other)
-        self.token == other.token
+        token == other.token
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin