cassandra-driver 3.0.0.rc.1-java → 3.0.0.rc.2-java

data/lib/cassandra/protocol/coder.rb

@@ -26,7 +26,7 @@ module Cassandra
       NO_METADATA_FLAG        = 0x04
 
       def write_values_v4(buffer, values, types, names = EMPTY_LIST)
-        if values && values.size > 0
+        if values && !values.empty?
           buffer.append_short(values.size)
           values.zip(types, names) do |(value, type, name)|
             buffer.append_string(name) if name
@@ -320,7 +320,7 @@ module Cassandra
       end
 
       def write_values_v3(buffer, values, types, names = EMPTY_LIST)
-        if values && values.size > 0
+        if values && !values.empty?
           buffer.append_short(values.size)
           values.zip(types, names) do |(value, type, name)|
             buffer.append_string(name) if name
@@ -571,7 +571,7 @@ module Cassandra
       end
 
       def write_values_v1(buffer, values, types)
-        if values && values.size > 0
+        if values && !values.empty?
           buffer.append_short(values.size)
           values.each_with_index do |value, index|
             write_value_v1(buffer, value, types[index])

data/lib/cassandra/protocol/cql_byte_buffer.rb

@@ -19,6 +19,17 @@
 module Cassandra
   module Protocol
     class CqlByteBuffer < Ione::ByteBuffer
+      # @private
+      MINUS = '-'.freeze
+      # @private
+      ZERO = '0'.freeze
+      # @private
+      DECIMAL_POINT = '.'.freeze
+      # @private
+      FLOAT_STRING_FORMAT = 'F'.freeze
+      # @private
+      NO_CHAR = ''.freeze
+
       def inspect
         "#<#{self.class.name}:0x#{object_id.to_s(16)} #{to_str.inspect}>"
       end
@@ -291,9 +302,7 @@ module Cassandra
 
       def append_consistency(consistency)
         index = CONSISTENCIES.index(consistency)
-        if index.nil? || CONSISTENCIES[index].nil?
-          raise Errors::EncodingError, %(Unknown consistency "#{consistency}")
-        end
+        raise Errors::EncodingError, %(Unknown consistency "#{consistency}") if index.nil? || CONSISTENCIES[index].nil?
         append_short(index)
       end
 
@@ -360,14 +369,6 @@ module Cassandra
         other.eql?(to_str)
       end
       alias == eql?
-
-      private
-
-      MINUS = '-'.freeze
-      ZERO = '0'.freeze
-      DECIMAL_POINT = '.'.freeze
-      FLOAT_STRING_FORMAT = 'F'.freeze
-      NO_CHAR = ''.freeze
     end
   end
 end

data/lib/cassandra/protocol/cql_protocol_handler.rb

@@ -32,7 +32,13 @@ module Cassandra
     #   puts "These options are supported: #{response.options}"
     class CqlProtocolHandler
       # @return [String] the current keyspace for the underlying connection
-      attr_reader :keyspace, :error
+      attr_reader :keyspace
+
+      # @return [Exception] outstanding error, from a failed connection.
+      attr_reader :error
+
+      # @return [Integer] the version of the protocol to use in communicating with C*.
+      attr_reader :protocol_version
 
       def initialize(connection,
                      scheduler,
@@ -41,6 +47,7 @@ module Cassandra
                      heartbeat_interval = 30,
                      idle_timeout = 60,
                      requests_per_connection = 128)
+        @protocol_version = protocol_version
         @connection = connection
         @scheduler = scheduler
         @compressor = compressor
@@ -229,9 +236,7 @@ module Cassandra
         ensure
           @lock.unlock
         end
-        if response.is_a?(Protocol::SetKeyspaceResultResponse)
-          @keyspace = response.keyspace
-        end
+        @keyspace = response.keyspace if response.is_a?(Protocol::SetKeyspaceResultResponse)
         if response.is_a?(Protocol::SchemaChangeResultResponse) &&
            response.change == 'DROPPED' &&
            response.keyspace == @keyspace &&
@@ -246,7 +251,10 @@ module Cassandra
 
       # @private
       class RequestPromise < Ione::Promise
+        extend AttrBoolean
+
         attr_reader :request, :timeout
+        attr_boolean :timed_out
 
         def initialize(request, timeout)
           @request = request
@@ -255,10 +263,6 @@ module Cassandra
           super()
         end
 
-        def timed_out?
-          @timed_out
-        end
-
         def time_out!
           unless future.completed?
             @timed_out = true

data/lib/cassandra/protocol/request.rb

@@ -19,17 +19,16 @@
 module Cassandra
   module Protocol
     class Request
-      attr_reader :opcode, :trace
+      extend AttrBoolean
+
+      attr_reader :opcode
+      attr_boolean :trace
 
       def initialize(opcode, trace = false)
         @opcode = opcode
         @trace = trace
       end
 
-      def trace?
-        @trace
-      end
-
       def compressable?
         true
       end

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

@@ -44,9 +44,7 @@ module Cassandra
         unless serial_consistency.nil? || CONSISTENCIES.include?(serial_consistency)
           raise ArgumentError, %(No such consistency: #{serial_consistency.inspect})
         end
-        if paging_state && !page_size
-          raise ArgumentError, %(Paging state given but no page size)
-        end
+        raise ArgumentError, %(Paging state given but no page size) if paging_state && !page_size
         super(10, trace)
         @id = id
         @metadata = metadata
@@ -69,14 +67,14 @@ module Cassandra
         if protocol_version > 1
           buffer.append_consistency(@consistency)
           flags  = 0
-          flags |= 0x01 if @values.size > 0
+          flags |= 0x01 unless @values.empty?
           flags |= 0x02 unless @request_metadata
           flags |= 0x04 if @page_size
           flags |= 0x08 if @paging_state
           flags |= 0x10 if @serial_consistency
           flags |= 0x20 if protocol_version > 2 && @timestamp
           buffer.append(flags.chr)
-          encoder.write_parameters(buffer, @values, @metadata) if @values.size > 0
+          encoder.write_parameters(buffer, @values, @metadata) unless @values.empty?
           buffer.append_int(@page_size) if @page_size
           buffer.append_bytes(@paging_state) if @paging_state
           buffer.append_consistency(@serial_consistency) if @serial_consistency

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

@@ -60,7 +60,7 @@ module Cassandra
           flags |= 0x08 if @paging_state
           flags |= 0x10 if @serial_consistency
           flags |= 0x20 if protocol_version > 2 && @timestamp
-          if @values && @values.size > 0
+          if @values && !@values.empty?
             flags |= 0x01
             flags |= 0x40 if protocol_version > 2 && !@names.empty?
             buffer.append(flags.chr)

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

@@ -19,13 +19,16 @@
 module Cassandra
   module Protocol
     class StartupRequest < Request
+      # @private
+      CQL_VERSION = 'CQL_VERSION'.freeze
+      # @private
+      COMPRESSION = 'COMPRESSION'.freeze
+
       attr_reader :options
 
       def initialize(cql_version, compression = nil)
         super(1)
-        unless cql_version
-          raise ArgumentError, "Invalid CQL version: #{cql_version.inspect}"
-        end
+        raise ArgumentError, "Invalid CQL version: #{cql_version.inspect}" unless cql_version
         @options = {CQL_VERSION => cql_version}
         @options[COMPRESSION] = compression if compression
       end
@@ -41,11 +44,6 @@ module Cassandra
       def to_s
         %(STARTUP #{@options})
       end
-
-      private
-
-      CQL_VERSION = 'CQL_VERSION'.freeze
-      COMPRESSION = 'COMPRESSION'.freeze
     end
   end
 end

data/lib/cassandra/protocol/response.rb

@@ -19,8 +19,7 @@
 module Cassandra
   module Protocol
     class Response
-      private
-
+      # @private
       RESPONSE_TYPES = [
         # populated by subclasses
       ]

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

@@ -19,6 +19,9 @@
 module Cassandra
   module Protocol
     class AuthChallengeResponse < Response
+      # @private
+      RESPONSE_TYPES[0x0e] = self
+
       attr_reader :token
 
       def initialize(token)
@@ -28,10 +31,6 @@ module Cassandra
       def to_s
         %(AUTH_CHALLENGE #{@token.bytesize})
       end
-
-      private
-
-      RESPONSE_TYPES[0x0e] = self
     end
   end
 end

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

@@ -19,6 +19,9 @@
 module Cassandra
   module Protocol
     class AuthSuccessResponse < Response
+      # @private
+      RESPONSE_TYPES[0x10] = self
+
       attr_reader :token
 
       def initialize(token)
@@ -28,10 +31,6 @@ module Cassandra
       def to_s
         %(AUTH_SUCCESS #{@token && @token.bytesize})
       end
-
-      private
-
-      RESPONSE_TYPES[0x10] = self
     end
   end
 end

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

@@ -19,6 +19,9 @@
 module Cassandra
   module Protocol
     class AuthenticateResponse < Response
+      # @private
+      RESPONSE_TYPES[0x03] = self
+
       attr_reader :authentication_class
 
       def initialize(authentication_class)
@@ -28,10 +31,6 @@ module Cassandra
       def to_s
         %(AUTHENTICATE #{authentication_class})
       end
-
-      private
-
-      RESPONSE_TYPES[0x03] = self
     end
   end
 end

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

@@ -19,6 +19,9 @@
 module Cassandra
   module Protocol
     class ErrorResponse < Response
+      # @private
+      RESPONSE_TYPES[0x00] = self
+
       attr_reader :code, :message, :custom_payload, :warnings
 
       def initialize(*args)
@@ -134,10 +137,6 @@ module Cassandra
                                   retries)
         end
       end
-
-      private
-
-      RESPONSE_TYPES[0x00] = self
     end
   end
 end

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

@@ -19,10 +19,9 @@
 module Cassandra
   module Protocol
     class EventResponse < ResultResponse
-      private
-
+      # @private
       RESPONSE_TYPES[0x0c] = self
-
+      # @private
       EVENT_TYPES = {
         # populated by subclasses
       }

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

@@ -19,6 +19,9 @@
 module Cassandra
   module Protocol
     class PreparedResultResponse < ResultResponse
+      # @private
+      RESULT_TYPES[0x04] = self
+
       attr_reader :id, :metadata, :result_metadata, :pk_idx
 
       def initialize(custom_payload,
@@ -54,10 +57,6 @@ module Cassandra
         hex_id = @id.each_byte.map { |x| x.to_s(16).rjust(2, '0') }.join('')
         %(RESULT PREPARED #{hex_id} #{@metadata})
       end
-
-      private
-
-      RESULT_TYPES[0x04] = self
     end
   end
 end

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

@@ -19,6 +19,9 @@
 module Cassandra
   module Protocol
     class ReadyResponse < Response
+      # @private
+      RESPONSE_TYPES[0x02] = self
+
       def eql?(rs)
         rs.is_a?(self.class)
       end
@@ -35,10 +38,6 @@ module Cassandra
       def to_s
         'READY'
       end
-
-      private
-
-      RESPONSE_TYPES[0x02] = self
     end
   end
 end

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

@@ -19,6 +19,13 @@
 module Cassandra
   module Protocol
     class ResultResponse < Response
+      # @private
+      RESPONSE_TYPES[0x08] = self
+      # @private
+      RESULT_TYPES = [
+        # populated by subclasses
+      ]
+
       attr_reader :custom_payload, :warnings, :trace_id
 
       def initialize(custom_payload, warnings, trace_id)
@@ -30,14 +37,6 @@ module Cassandra
       def void?
         false
       end
-
-      private
-
-      RESPONSE_TYPES[0x08] = self
-
-      RESULT_TYPES = [
-        # populated by subclasses
-      ]
     end
   end
 end

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

@@ -19,6 +19,9 @@
 module Cassandra
   module Protocol
     class RowsResultResponse < ResultResponse
+      # @private
+      RESULT_TYPES[0x02] = self
+
       attr_reader :rows, :metadata, :paging_state
 
       def initialize(custom_payload, warnings, rows, metadata, paging_state, trace_id)
@@ -31,10 +34,6 @@ module Cassandra
       def to_s
         %(RESULT ROWS #{@metadata} #{@rows})
       end
-
-      private
-
-      RESULT_TYPES[0x02] = self
     end
   end
 end

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

@@ -21,6 +21,9 @@ module Cassandra
     class SchemaChangeEventResponse < EventResponse
       TYPE = 'SCHEMA_CHANGE'.freeze
 
+      # @private
+      EVENT_TYPES[TYPE] = self
+
       attr_reader :change, :keyspace, :name, :target, :arguments
 
       def initialize(change, keyspace, name, target, arguments)
@@ -65,10 +68,6 @@ module Cassandra
           %(EVENT SCHEMA_CHANGE #{@change} #{@target} "#{@keyspace}" "#{@name}")
         end
       end
-
-      private
-
-      EVENT_TYPES[TYPE] = self
     end
   end
 end

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

@@ -19,6 +19,9 @@
 module Cassandra
   module Protocol
     class SchemaChangeResultResponse < ResultResponse
+      # @private
+      RESULT_TYPES[0x05] = self
+
       attr_reader :arguments, :change, :keyspace, :name, :target, :type
 
       def initialize(custom_payload,
@@ -62,10 +65,6 @@ module Cassandra
       def to_s
         %(RESULT SCHEMA_CHANGE #{@change} #{@target} "#{@keyspace}" "#{@name}")
       end
-
-      private
-
-      RESULT_TYPES[0x05] = self
     end
   end
 end