cql-rb 1.1.3 → 1.2.0.pre0

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

@@ -5,9 +5,9 @@ module Cql
     class ExecuteRequest < Request
       attr_reader :id, :metadata, :values, :consistency
 
-      def initialize(id, metadata, values, consistency)
+      def initialize(id, metadata, values, consistency, trace=false)
         raise ArgumentError, "Metadata for #{metadata.size} columns, but #{values.size} values given" if metadata.size != values.size
-        super(10)
+        super(10, trace)
         @id = id
         @metadata = metadata
         @values = values

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

@@ -7,6 +7,10 @@ module Cql
         super(5)
       end
 
+      def compressable?
+        false
+      end
+
       def write(io)
         io
       end

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

@@ -5,9 +5,9 @@ module Cql
     class PrepareRequest < Request
       attr_reader :cql
 
-      def initialize(cql)
+      def initialize(cql, trace=false)
         raise ArgumentError, 'No CQL given!' unless cql
-        super(9)
+        super(9, trace)
         @cql = cql
       end
 

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

@@ -5,10 +5,10 @@ module Cql
     class QueryRequest < Request
       attr_reader :cql, :consistency
 
-      def initialize(cql, consistency)
+      def initialize(cql, consistency, trace=false)
         raise ArgumentError, %(No CQL given!) unless cql
         raise ArgumentError, %(No such consistency: #{consistency.inspect}) if consistency.nil? || !CONSISTENCIES.include?(consistency)
-        super(7)
+        super(7, trace)
         @cql = cql
         @consistency = consistency
       end

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

@@ -3,22 +3,29 @@
 module Cql
   module Protocol
     class StartupRequest < Request
-      def initialize(cql_version='3.0.0', compression=nil)
+      attr_reader :options
+
+      def initialize(cql_version=nil, compression=nil)
         super(1)
-        @arguments = {CQL_VERSION => cql_version}
-        @arguments[COMPRESSION] = compression if compression
+        @options = {CQL_VERSION => cql_version || DEFAULT_CQL_VERSION}
+        @options[COMPRESSION] = compression if compression
+      end
+
+      def compressable?
+        false
       end
 
       def write(io)
-        write_string_map(io, @arguments)
+        write_string_map(io, @options)
       end
 
       def to_s
-        %(STARTUP #@arguments)
+        %(STARTUP #@options)
       end
 
       private
 
+      DEFAULT_CQL_VERSION = '3.0.0'.freeze
       CQL_VERSION = 'CQL_VERSION'.freeze
       COMPRESSION = 'COMPRESSION'.freeze
     end

data/lib/cql/protocol/response.rb

@@ -1,13 +1,24 @@
 # encoding: utf-8
 
-
 module Cql
   module Protocol
     class Response
       extend Decoding
 
-      def self.decode!(buffer)
+      def self.decode!(opcode, buffer, trace_id)
+        response_class = RESPONSE_TYPES[opcode]
+        if response_class
+          response_class.decode!(buffer, trace_id)
+        else
+          raise UnsupportedOperationError, "The operation #{opcode} is not supported"
+        end
       end
+
+      private
+
+      RESPONSE_TYPES = [
+        # populated by subclasses
+      ]
     end
   end
 end

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

@@ -5,7 +5,7 @@ module Cql
     class AuthenticateResponse < Response
       attr_reader :authentication_class
 
-      def self.decode!(buffer)
+      def self.decode!(buffer, trace_id=nil)
         new(read_string!(buffer))
       end
 
@@ -16,6 +16,10 @@ module Cql
       def to_s
         %(AUTHENTICATE #{authentication_class})
       end
+
+      private
+
+      RESPONSE_TYPES[0x03] = self
     end
   end
 end

data/lib/cql/protocol/responses/detailed_error_response.rb

@@ -10,7 +10,7 @@ module Cql
         @details = details
       end
 
-      def self.decode!(code, message, buffer)
+      def self.decode!(code, message, buffer, trace_id=nil)
         details = {}
         case code
         when 0x1000 # unavailable
@@ -37,7 +37,7 @@ module Cql
       end
 
       def to_s
-        %(ERROR #@code "#@message" #@details)
+        "#{super} #{@details}"
       end
     end
   end

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

@@ -9,7 +9,7 @@ module Cql
         @code, @message = args
       end
 
-      def self.decode!(buffer)
+      def self.decode!(buffer, trace_id=nil)
         code = read_int!(buffer)
         message = read_string!(buffer)
         case code
@@ -21,8 +21,13 @@ module Cql
       end
 
       def to_s
-        %(ERROR #@code "#@message")
+        hex_code = @code.to_s(16).rjust(4, '0').upcase
+        %(ERROR 0x#{hex_code} "#@message")
       end
+
+      private
+
+      RESPONSE_TYPES[0x00] = self
     end
   end
 end

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

@@ -3,15 +3,17 @@
 module Cql
   module Protocol
     class EventResponse < ResultResponse
-      def self.decode!(buffer)
+      def self.decode!(buffer, trace_id=nil)
         type = read_string!(buffer)
         impl = EVENT_TYPES[type]
         raise UnsupportedEventTypeError, %(Unsupported event type: "#{type}") unless impl
-        impl.decode!(buffer)
+        impl.decode!(buffer, trace_id)
       end
 
       private
 
+      RESPONSE_TYPES[0x0c] = self
+
       EVENT_TYPES = {
         # populated by subclasses
       }

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

@@ -5,14 +5,30 @@ module Cql
     class PreparedResultResponse < ResultResponse
       attr_reader :id, :metadata
 
-      def initialize(*args)
-        @id, @metadata = args
+      def initialize(id, metadata, trace_id)
+        super(trace_id)
+        @id, @metadata = id, metadata
       end
 
-      def self.decode!(buffer)
+      def self.decode!(buffer, trace_id=nil)
         id = read_short_bytes!(buffer)
         metadata = RowsResultResponse.read_metadata!(buffer)
-        new(id, metadata)
+        new(id, metadata, trace_id)
+      end
+
+      def eql?(other)
+        self.id == other.id && self.metadata == other.metadata && self.trace_id == other.trace_id
+      end
+      alias_method :==, :eql?
+
+      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
+        end
       end
 
       def to_s

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

@@ -3,7 +3,7 @@
 module Cql
   module Protocol
     class ReadyResponse < Response
-      def self.decode!(buffer)
+      def self.decode!(buffer, trace_id=nil)
         new
       end
 
@@ -19,6 +19,10 @@ module Cql
       def to_s
         'READY'
       end
+
+      private
+
+      RESPONSE_TYPES[0x02] = self
     end
   end
 end

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

@@ -3,11 +3,17 @@
 module Cql
   module Protocol
     class ResultResponse < Response
-      def self.decode!(buffer)
+      attr_reader :trace_id
+
+      def initialize(trace_id)
+        @trace_id = trace_id
+      end
+
+      def self.decode!(buffer, trace_id=nil)
         kind = read_int!(buffer)
         impl = RESULT_TYPES[kind]
         raise UnsupportedResultKindError, %(Unsupported result kind: #{kind}) unless impl
-        impl.decode!(buffer)
+        impl.decode!(buffer, trace_id)
       end
 
       def void?
@@ -16,6 +22,8 @@ module Cql
 
       private
 
+      RESPONSE_TYPES[0x08] = self
+
       RESULT_TYPES = [
         # populated by subclasses
       ]

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

@@ -5,13 +5,14 @@ module Cql
     class RowsResultResponse < ResultResponse
       attr_reader :rows, :metadata
 
-      def initialize(*args)
-        @rows, @metadata = args
+      def initialize(rows, metadata, trace_id)
+        super(trace_id)
+        @rows, @metadata = rows, metadata
       end
 
-      def self.decode!(buffer)
+      def self.decode!(buffer, trace_id=nil)
         column_specs = read_metadata!(buffer)
-        new(read_rows!(buffer, column_specs), column_specs)
+        new(read_rows!(buffer, column_specs), column_specs, trace_id)
       end
 
       def to_s

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

@@ -12,7 +12,7 @@ module Cql
         @type = TYPE
       end
 
-      def self.decode!(buffer)
+      def self.decode!(buffer, trace_id=nil)
         new(read_string!(buffer), read_string!(buffer), read_string!(buffer))
       end
 

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

@@ -5,12 +5,13 @@ module Cql
     class SchemaChangeResultResponse < ResultResponse
       attr_reader :change, :keyspace, :table
 
-      def initialize(*args)
-        @change, @keyspace, @table = args
+      def initialize(change, keyspace, table, trace_id)
+        super(trace_id)
+        @change, @keyspace, @table = change, keyspace, table
       end
 
-      def self.decode!(buffer)
-        new(read_string!(buffer), read_string!(buffer), read_string!(buffer))
+      def self.decode!(buffer, trace_id=nil)
+        new(read_string!(buffer), read_string!(buffer), read_string!(buffer), trace_id)
       end
 
       def eql?(other)

data/lib/cql/protocol/responses/set_keyspace_result_response.rb

@@ -5,12 +5,13 @@ module Cql
     class SetKeyspaceResultResponse < ResultResponse
       attr_reader :keyspace
 
-      def initialize(keyspace)
+      def initialize(keyspace, trace_id)
+        super(trace_id)
         @keyspace = keyspace
       end
 
-      def self.decode!(buffer)
-        new(read_string!(buffer))
+      def self.decode!(buffer, trace_id=nil)
+        new(read_string!(buffer), trace_id)
       end
 
       def to_s

data/lib/cql/protocol/responses/{status_change_event_result_response.rb → status_change_event_response.rb}

@@ -12,7 +12,7 @@ module Cql
         @type = TYPE
       end
 
-      def self.decode!(buffer)
+      def self.decode!(buffer, trace_id=nil)
         new(read_string!(buffer), *read_inet!(buffer))
       end
 

data/lib/cql/protocol/responses/supported_response.rb

@@ -9,13 +9,17 @@ module Cql
         @options = options
       end
 
-      def self.decode!(buffer)
+      def self.decode!(buffer, trace_id=nil)
         new(read_string_multimap!(buffer))
       end
 
       def to_s
         %(SUPPORTED #{options})
       end
+
+      private
+
+      RESPONSE_TYPES[0x06] = self
     end
   end
 end

data/lib/cql/protocol/responses/void_result_response.rb

@@ -3,8 +3,8 @@
 module Cql
   module Protocol
     class VoidResultResponse < ResultResponse
-      def self.decode!(buffer)
-        new
+      def self.decode!(buffer, trace_id=nil)
+        new(trace_id)
       end
 
       def to_s

data/lib/cql/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cql
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.2.0.pre0'.freeze
 end

data/spec/cql/client/asynchronous_client_spec.rb

@@ -111,7 +111,7 @@ module Cql
                 case request.cql
                 when /FROM system\.local/
                   row = {'host_id' => connection[:spec_host_id], 'data_center' => connection[:spec_data_center]}
-                  Protocol::RowsResultResponse.new([row], local_metadata)
+                  Protocol::RowsResultResponse.new([row], local_metadata, nil)
                 when /FROM system\.peers/
                   other_host_ids = connections.reject { |c| c[:spec_host_id] == connection[:spec_host_id] }.map { |c| c[:spec_host_id] }
                   until other_host_ids.size >= min_peers[0]
@@ -126,7 +126,7 @@ module Cql
                       'rpc_address' => bind_all_rpc_addresses ? IPAddr.new('0.0.0.0') : ip
                     }
                   end
-                  Protocol::RowsResultResponse.new(rows, peer_metadata)
+                  Protocol::RowsResultResponse.new(rows, peer_metadata, nil)
                 end
               end
             end
@@ -208,26 +208,23 @@ module Cql
           last_connection.timeout.should == 10
         end
 
-        it 'sends a startup request' do
+        it 'is not in a keyspace' do
           client.connect.value
-          requests.first.should be_a(Protocol::StartupRequest)
+          client.keyspace.should be_nil
         end
 
-        it 'sends a startup request to each connection' do
-          client.close.value
-          io_reactor.stop.value
-          io_reactor.start.value
-
-          c = described_class.new(connection_options.merge(hosts: %w[h1.example.com h2.example.com h3.example.com]))
-          c.connect.value
-          connections.each do |cc|
-            cc.requests.first.should be_a(Protocol::StartupRequest)
+        it 'enables compression when a compressor is specified' do
+          handle_request do |request|
+            case request
+            when Protocol::OptionsRequest
+              Protocol::SupportedResponse.new('CQL_VERSION' => %w[3.0.0], 'COMPRESSION' => %w[lz4 snappy])
+            end
           end
-        end
-
-        it 'is not in a keyspace' do
-          client.connect.value
-          client.keyspace.should be_nil
+          compressor = double(:compressor, algorithm: 'lz4')
+          c = described_class.new(connection_options.merge(compressor: compressor))
+          c.connect.value
+          request = requests.find { |rq| rq.is_a?(Protocol::StartupRequest) }
+          request.options.should include('COMPRESSION' => 'lz4')
         end
 
         it 'changes to the keyspace given as an option' do
@@ -412,7 +409,7 @@ module Cql
         it 'executes a USE query' do
           handle_request do |request|
             if request.is_a?(Protocol::QueryRequest) && request.cql == 'USE system'
-              Protocol::SetKeyspaceResultResponse.new('system')
+              Protocol::SetKeyspaceResultResponse.new('system', nil)
             end
           end
           client.connect.value
@@ -440,7 +437,7 @@ module Cql
         it 'knows which keyspace it changed to' do
           handle_request do |request|
             if request.is_a?(Protocol::QueryRequest) && request.cql == 'USE system'
-              Protocol::SetKeyspaceResultResponse.new('system')
+              Protocol::SetKeyspaceResultResponse.new('system', nil)
             end
           end
           client.connect.value
@@ -456,7 +453,7 @@ module Cql
         it 'allows the keyspace name to be quoted' do
           handle_request do |request|
             if request.is_a?(Protocol::QueryRequest) && request.cql == 'USE "system"'
-              Protocol::SetKeyspaceResultResponse.new('system')
+              Protocol::SetKeyspaceResultResponse.new('system', nil)
             end
           end
           client.connect.value
@@ -497,14 +494,14 @@ module Cql
         end
 
         context 'with a void CQL query' do
-          it 'returns nil' do
+          it 'returns a VoidResult' do
             handle_request do |request|
               if request.is_a?(Protocol::QueryRequest) && request.cql =~ /UPDATE/
-                Protocol::VoidResultResponse.new
+                Protocol::VoidResultResponse.new(nil)
               end
             end
             result = client.execute('UPDATE stuff SET thing = 1 WHERE id = 3').value
-            result.should be_nil
+            result.should be_a(VoidResult)
           end
         end
 
@@ -512,7 +509,7 @@ module Cql
           it 'returns nil' do
             handle_request do |request|
               if request.is_a?(Protocol::QueryRequest) && request.cql == 'USE system'
-                Protocol::SetKeyspaceResultResponse.new('system')
+                Protocol::SetKeyspaceResultResponse.new('system', nil)
               end
             end
             result = client.execute('USE system').value
@@ -522,7 +519,7 @@ module Cql
           it 'knows which keyspace it changed to' do
             handle_request do |request|
               if request.is_a?(Protocol::QueryRequest) && request.cql == 'USE system'
-                Protocol::SetKeyspaceResultResponse.new('system')
+                Protocol::SetKeyspaceResultResponse.new('system', nil)
               end
             end
             client.execute('USE system').value
@@ -536,7 +533,7 @@ module Cql
 
             handle_request do |request, connection|
               if request.is_a?(Protocol::QueryRequest) && request.cql == 'USE system'
-                Protocol::SetKeyspaceResultResponse.new('system')
+                Protocol::SetKeyspaceResultResponse.new('system', nil)
               end
             end
 
@@ -571,7 +568,7 @@ module Cql
           before do
             handle_request do |request|
               if request.is_a?(Protocol::QueryRequest) && request.cql =~ /FROM things/
-                Protocol::RowsResultResponse.new(rows, metadata)
+                Protocol::RowsResultResponse.new(rows, metadata, nil)
               end
             end
           end
@@ -648,6 +645,30 @@ module Cql
             sent_timeout.should == 3
           end
         end
+
+        context 'with tracing' do
+          it 'sets the trace flag' do
+            tracing = false
+            handle_request do |request|
+              if request.is_a?(Protocol::QueryRequest)
+                tracing = request.trace
+              end
+            end
+            client.execute(cql, trace: true).value
+            tracing.should be_true
+          end
+
+          it 'returns the trace ID with the result' do
+            trace_id = Uuid.new('a1028490-3f05-11e3-9531-fb72eff05fbb')
+            handle_request do |request|
+              if request.is_a?(Protocol::QueryRequest) && request.cql == cql
+                Protocol::RowsResultResponse.new([], [], trace_id)
+              end
+            end
+            result = client.execute(cql, trace: true).value
+            result.trace_id.should == trace_id
+          end
+        end
       end
 
       describe '#prepare' do
@@ -666,7 +687,7 @@ module Cql
         before do
           handle_request do |request|
             if request.is_a?(Protocol::PrepareRequest)
-              Protocol::PreparedResultResponse.new(id, metadata)
+              Protocol::PreparedResultResponse.new(id, metadata, nil)
             end
           end
         end
@@ -721,7 +742,7 @@ module Cql
           it 'returns a failed future' do
             handle_request do |request|
               if request.is_a?(Protocol::PrepareRequest)
-                Protocol::PreparedResultResponse.new(id, metadata)
+                Protocol::PreparedResultResponse.new(id, metadata, nil)
               end
             end
             statement = client.prepare(cql).value
@@ -794,7 +815,7 @@ module Cql
         it 'complains when #execute of a prepared statement is called after #close' do
           handle_request do |request|
             if request.is_a?(Protocol::PrepareRequest)
-              Protocol::PreparedResultResponse.new('A' * 32, [])
+              Protocol::PreparedResultResponse.new('A' * 32, [], nil)
             end
           end
           client.connect.value