cql-rb 1.1.3 → 1.2.0.pre0

data/spec/cql/protocol/responses/set_keyspace_result_response_spec.rb

@@ -0,0 +1,34 @@
+# encoding: ascii-8bit
+
+require 'spec_helper'
+
+
+module Cql
+  module Protocol
+    describe SetKeyspaceResultResponse do
+      describe '.decode!' do
+        let :response do
+          described_class.decode!(ByteBuffer.new("\x00\x06system"))
+        end
+
+        it 'decodes the keyspace' do
+          response.keyspace.should == 'system'
+        end
+      end
+
+      describe '#void?' do
+        it 'is not void' do
+          response = described_class.new('system', nil)
+          response.should_not be_void
+        end
+      end
+
+      describe '#to_s' do
+        it 'returns a string with the keyspace' do
+          response = described_class.new('system', nil)
+          response.to_s.should == 'RESULT SET_KEYSPACE "system"'
+        end
+      end
+    end
+  end
+end

data/spec/cql/protocol/responses/status_change_event_response_spec.rb

@@ -0,0 +1,35 @@
+# encoding: ascii-8bit
+
+require 'spec_helper'
+
+
+module Cql
+  module Protocol
+    describe StatusChangeEventResponse do
+      describe '.decode!' do
+        let :response do
+          described_class.decode!(ByteBuffer.new("\x00\x04DOWN\x04\x00\x00\x00\x00\x00\x00#R"))
+        end
+
+        it 'decodes the change' do
+          response.change.should == 'DOWN'
+        end
+
+        it 'decodes the address' do
+          response.address.should == IPAddr.new('0.0.0.0')
+        end
+
+        it 'decodes the port' do
+          response.port.should == 9042
+        end
+      end
+
+      describe '#to_s' do
+        it 'returns a string that includes the change, address and port' do
+          response = described_class.new('DOWN', IPAddr.new('0.0.0.0'), 9042)
+          response.to_s.should == 'EVENT STATUS_CHANGE DOWN 0.0.0.0:9042'
+        end
+      end
+    end
+  end
+end

data/spec/cql/protocol/responses/supported_response_spec.rb

@@ -0,0 +1,27 @@
+# encoding: ascii-8bit
+
+require 'spec_helper'
+
+
+module Cql
+  module Protocol
+    describe SupportedResponse do
+      describe '.decode!' do
+        let :response do
+          described_class.decode!(ByteBuffer.new("\x00\x02\x00\x0bCQL_VERSION\x00\x01\x00\x053.0.0\x00\x0bCOMPRESSION\x00\x00"))
+        end
+
+        it 'decodes the options' do
+          response.options.should == {'CQL_VERSION' => ['3.0.0'], 'COMPRESSION' => []}
+        end
+      end
+
+      describe '#to_s' do
+        it 'returns a string with the options' do
+          response = described_class.new('CQL_VERSION' => ['3.0.0'], 'COMPRESSION' => [])
+          response.to_s.should == 'SUPPORTED {"CQL_VERSION"=>["3.0.0"], "COMPRESSION"=>[]}'
+        end
+      end
+    end
+  end
+end

data/spec/cql/protocol/responses/topology_change_event_response_spec.rb

@@ -0,0 +1,35 @@
+# encoding: ascii-8bit
+
+require 'spec_helper'
+
+
+module Cql
+  module Protocol
+    describe TopologyChangeEventResponse do
+      describe '.decode!' do
+        let :response do
+          described_class.decode!(ByteBuffer.new("\x00\fREMOVED_NODE\x04\x00\x00\x00\x00\x00\x00#R"))
+        end
+
+        it 'decodes the change' do
+          response.change.should == 'REMOVED_NODE'
+        end
+
+        it 'decodes the address' do
+          response.address.should == IPAddr.new('0.0.0.0')
+        end
+
+        it 'decodes the port' do
+          response.port.should == 9042
+        end
+      end
+
+      describe '#to_s' do
+        it 'returns a string that includes the change, address and port' do
+          response = described_class.new('REMOVED_NODE', IPAddr.new('0.0.0.0'), 9042)
+          response.to_s.should == 'EVENT TOPOLOGY_CHANGE REMOVED_NODE 0.0.0.0:9042'
+        end
+      end
+    end
+  end
+end

data/spec/cql/protocol/responses/void_result_response_spec.rb

@@ -0,0 +1,29 @@
+# encoding: ascii-8bit
+
+require 'spec_helper'
+
+
+module Cql
+  module Protocol
+    describe VoidResultResponse do
+      describe '.decode!' do
+        it 'returns a new instance' do
+          unused_byte_buffer = nil
+          described_class.decode!(unused_byte_buffer).should be_a(described_class)
+        end
+      end
+
+      describe '#void?' do
+        it 'is void' do
+          described_class.new(nil).should be_void
+        end
+      end
+
+      describe '#to_s' do
+        it 'returns a string' do
+          described_class.new(nil).to_s.should == 'RESULT VOID'
+        end
+      end
+    end
+  end
+end

data/spec/integration/client_spec.rb

@@ -142,6 +142,51 @@ describe 'A CQL client' do
     end
   end
 
+  context 'with tracing' do
+    before do
+      client.execute(%(DROP KEYSPACE cql_rb_client_spec)) rescue nil
+      client.execute(%(CREATE KEYSPACE cql_rb_client_spec WITH REPLICATION = {'class': 'SimpleStrategy', 'replication_factor': 1}))
+      client.use('cql_rb_client_spec')
+      client.execute(%(CREATE TABLE users (user_id VARCHAR PRIMARY KEY, first VARCHAR, last VARCHAR, age INT)))
+    end
+
+    it 'requests tracing and returns the trace ID, for row returning operations' do
+      result = client.execute(%(SELECT * FROM users), trace: true)
+      result.trace_id.should_not be_nil
+    end
+
+    it 'requests tracing and returns the trace ID, for void returning operations' do
+      result = client.execute(%(INSERT INTO users (user_id, first, last, age) VALUES ('1', 'Sue', 'Smith', 25)), trace: true)
+      result.trace_id.should_not be_nil
+    end
+  end
+
+  context 'with compression' do
+    begin
+      require 'cql/compression/snappy_compressor'
+
+      let :client do
+        Cql::Client.connect(connection_options.merge(compressor: compressor))
+      end
+
+      let :compressor do
+        Cql::Compression::SnappyCompressor.new(0)
+      end
+
+      it 'compresses requests and decompresses responses' do
+        compressor.stub(:compress).and_call_original
+        compressor.stub(:decompress).and_call_original
+        client.execute('SELECT * FROM system.schema_keyspaces')
+        compressor.should have_received(:compress).at_least(1).times
+        compressor.should have_received(:decompress).at_least(1).times
+      end
+    rescue LoadError
+      it 'compresses requests and decompresses responses' do
+        pending 'No compressor available for the current platform'
+      end
+    end
+  end
+
   context 'with error conditions' do
     it 'raises an error for CQL syntax errors' do
       expect { client.execute('BAD cql') }.to raise_error(Cql::CqlError)

data/spec/integration/protocol_spec.rb

@@ -345,6 +345,52 @@ describe 'Protocol parsing and communication' do
         end
       end
 
+      context 'with tracing' do
+        it 'sends a QUERY request with the tracing flag and receives a RESULT with a trace ID' do
+          in_keyspace_with_table do
+            response = execute_request(Cql::Protocol::QueryRequest.new('SELECT * FROM users', :quorum, true))
+            response.trace_id.should_not be_nil
+          end
+        end
+
+        it 'sends an PREPARE request with the tracing flag and receives a RESULT with a trace ID' do
+          in_keyspace_with_table do
+            response = execute_request(Cql::Protocol::PrepareRequest.new('SELECT * FROM users', true))
+            response.trace_id.should_not be_nil
+          end
+        end
+
+        it 'sends an EXECUTE request with the tracing flag and receives a RESULT with a trace ID' do
+          in_keyspace_with_table do
+            prepare_response = execute_request(Cql::Protocol::PrepareRequest.new('SELECT * FROM users'))
+            execute_response = execute_request(Cql::Protocol::ExecuteRequest.new(prepare_response.id, prepare_response.metadata, [], :one, true))
+            execute_response.trace_id.should_not be_nil
+          end
+        end
+      end
+
+      context 'with compression' do
+        let :compressor do
+          Cql::Compression::SnappyCompressor.new(0)
+        end
+
+        it 'sends a compressed request and receives a compressed response' do
+          compressor.stub(:compress).and_call_original
+          compressor.stub(:decompress).and_call_original
+          io_reactor = Cql::Io::IoReactor.new(lambda { |*args| Cql::Protocol::CqlProtocolHandler.new(*args, compressor) })
+          io_reactor.start.value
+          begin
+            connection = io_reactor.connect(ENV['CASSANDRA_HOST'], 9042, 0.1).value
+            connection.send_request(Cql::Protocol::StartupRequest.new(nil, 'snappy')).value
+            connection.send_request(Cql::Protocol::PrepareRequest.new('SELECT * FROM system.peers')).value
+            compressor.should have_received(:compress).at_least(1).times
+            compressor.should have_received(:decompress).at_least(1).times
+          ensure
+            io_reactor.stop.value
+          end
+        end
+      end
+
       context 'with pipelining' do
         let :connection do
           connections.first

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-ENV['CASSANDRA_HOST'] ||= '127.0.0.1'
+ENV['CASSANDRA_HOST'] ||= 'localhost'
 
 require 'bundler/setup'
 
@@ -26,3 +26,4 @@ unless ENV['COVERAGE'] == 'no' || RUBY_ENGINE == 'rbx'
 end
 
 require 'cql'
+require 'cql/compression/snappy_compressor'

data/spec/support/fake_io_reactor.rb

@@ -151,7 +151,7 @@ class FakeConnection
       when Cql::Protocol::StartupRequest
         Cql::Protocol::ReadyResponse.new
       when Cql::Protocol::QueryRequest
-        Cql::Protocol::RowsResultResponse.new([], [])
+        Cql::Protocol::RowsResultResponse.new([], [], nil)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0.pre0
 platform: ruby
 authors:
 - Theo Hultberg
@@ -27,11 +27,15 @@ files:
 - lib/cql/client/keyspace_changer.rb
 - lib/cql/client/null_logger.rb
 - lib/cql/client/query_result.rb
+- lib/cql/client/query_trace.rb
 - lib/cql/client/request_runner.rb
 - lib/cql/client/result_metadata.rb
 - lib/cql/client/synchronous_client.rb
 - lib/cql/client/synchronous_prepared_statement.rb
+- lib/cql/client/void_result.rb
 - lib/cql/client.rb
+- lib/cql/compression/snappy_compressor.rb
+- lib/cql/compression.rb
 - lib/cql/future.rb
 - lib/cql/io/connection.rb
 - lib/cql/io/io_reactor.rb
@@ -39,6 +43,8 @@ files:
 - lib/cql/protocol/cql_protocol_handler.rb
 - lib/cql/protocol/decoding.rb
 - lib/cql/protocol/encoding.rb
+- lib/cql/protocol/frame_decoder.rb
+- lib/cql/protocol/frame_encoder.rb
 - lib/cql/protocol/request.rb
 - lib/cql/protocol/requests/credentials_request.rb
 - lib/cql/protocol/requests/execute_request.rb
@@ -48,7 +54,6 @@ files:
 - lib/cql/protocol/requests/register_request.rb
 - lib/cql/protocol/requests/startup_request.rb
 - lib/cql/protocol/response.rb
-- lib/cql/protocol/response_frame.rb
 - lib/cql/protocol/responses/authenticate_response.rb
 - lib/cql/protocol/responses/detailed_error_response.rb
 - lib/cql/protocol/responses/error_response.rb
@@ -60,9 +65,9 @@ files:
 - lib/cql/protocol/responses/schema_change_event_response.rb
 - lib/cql/protocol/responses/schema_change_result_response.rb
 - lib/cql/protocol/responses/set_keyspace_result_response.rb
-- lib/cql/protocol/responses/status_change_event_result_response.rb
+- lib/cql/protocol/responses/status_change_event_response.rb
 - lib/cql/protocol/responses/supported_response.rb
-- lib/cql/protocol/responses/topology_change_event_result_response.rb
+- lib/cql/protocol/responses/topology_change_event_response.rb
 - lib/cql/protocol/responses/void_result_response.rb
 - lib/cql/protocol/type_converter.rb
 - lib/cql/protocol.rb
@@ -78,16 +83,21 @@ files:
 - spec/cql/client/connection_helper_spec.rb
 - spec/cql/client/connection_manager_spec.rb
 - spec/cql/client/keyspace_changer_spec.rb
+- spec/cql/client/query_trace_spec.rb
 - spec/cql/client/request_runner_spec.rb
 - spec/cql/client/synchronous_client_spec.rb
 - spec/cql/client/synchronous_prepared_statement_spec.rb
+- spec/cql/client/void_result_spec.rb
+- spec/cql/compression/compression_common.rb
+- spec/cql/compression/snappy_compressor_spec.rb
 - spec/cql/future_spec.rb
 - spec/cql/io/connection_spec.rb
 - spec/cql/io/io_reactor_spec.rb
 - spec/cql/protocol/cql_protocol_handler_spec.rb
 - spec/cql/protocol/decoding_spec.rb
 - spec/cql/protocol/encoding_spec.rb
-- spec/cql/protocol/request_spec.rb
+- spec/cql/protocol/frame_decoder_spec.rb
+- spec/cql/protocol/frame_encoder_spec.rb
 - spec/cql/protocol/requests/credentials_request_spec.rb
 - spec/cql/protocol/requests/execute_request_spec.rb
 - spec/cql/protocol/requests/options_request_spec.rb
@@ -95,8 +105,21 @@ files:
 - spec/cql/protocol/requests/query_request_spec.rb
 - spec/cql/protocol/requests/register_request_spec.rb
 - spec/cql/protocol/requests/startup_request_spec.rb
-- spec/cql/protocol/response_frame_spec.rb
+- spec/cql/protocol/responses/authenticate_response_spec.rb
+- spec/cql/protocol/responses/detailed_error_response_spec.rb
+- spec/cql/protocol/responses/error_response_spec.rb
+- spec/cql/protocol/responses/event_response_spec.rb
+- spec/cql/protocol/responses/prepared_result_response_spec.rb
+- spec/cql/protocol/responses/ready_response_spec.rb
+- spec/cql/protocol/responses/result_response_spec.rb
+- spec/cql/protocol/responses/rows_result_response_spec.rb
+- spec/cql/protocol/responses/schema_change_event_response_spec.rb
 - spec/cql/protocol/responses/schema_change_result_response_spec.rb
+- spec/cql/protocol/responses/set_keyspace_result_response_spec.rb
+- spec/cql/protocol/responses/status_change_event_response_spec.rb
+- spec/cql/protocol/responses/supported_response_spec.rb
+- spec/cql/protocol/responses/topology_change_event_response_spec.rb
+- spec/cql/protocol/responses/void_result_response_spec.rb
 - spec/cql/protocol/type_converter_spec.rb
 - spec/cql/time_uuid_spec.rb
 - spec/cql/uuid_spec.rb
@@ -125,9 +148,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11
@@ -142,16 +165,21 @@ test_files:
 - spec/cql/client/connection_helper_spec.rb
 - spec/cql/client/connection_manager_spec.rb
 - spec/cql/client/keyspace_changer_spec.rb
+- spec/cql/client/query_trace_spec.rb
 - spec/cql/client/request_runner_spec.rb
 - spec/cql/client/synchronous_client_spec.rb
 - spec/cql/client/synchronous_prepared_statement_spec.rb
+- spec/cql/client/void_result_spec.rb
+- spec/cql/compression/compression_common.rb
+- spec/cql/compression/snappy_compressor_spec.rb
 - spec/cql/future_spec.rb
 - spec/cql/io/connection_spec.rb
 - spec/cql/io/io_reactor_spec.rb
 - spec/cql/protocol/cql_protocol_handler_spec.rb
 - spec/cql/protocol/decoding_spec.rb
 - spec/cql/protocol/encoding_spec.rb
-- spec/cql/protocol/request_spec.rb
+- spec/cql/protocol/frame_decoder_spec.rb
+- spec/cql/protocol/frame_encoder_spec.rb
 - spec/cql/protocol/requests/credentials_request_spec.rb
 - spec/cql/protocol/requests/execute_request_spec.rb
 - spec/cql/protocol/requests/options_request_spec.rb
@@ -159,8 +187,21 @@ test_files:
 - spec/cql/protocol/requests/query_request_spec.rb
 - spec/cql/protocol/requests/register_request_spec.rb
 - spec/cql/protocol/requests/startup_request_spec.rb
-- spec/cql/protocol/response_frame_spec.rb
+- spec/cql/protocol/responses/authenticate_response_spec.rb
+- spec/cql/protocol/responses/detailed_error_response_spec.rb
+- spec/cql/protocol/responses/error_response_spec.rb
+- spec/cql/protocol/responses/event_response_spec.rb
+- spec/cql/protocol/responses/prepared_result_response_spec.rb
+- spec/cql/protocol/responses/ready_response_spec.rb
+- spec/cql/protocol/responses/result_response_spec.rb
+- spec/cql/protocol/responses/rows_result_response_spec.rb
+- spec/cql/protocol/responses/schema_change_event_response_spec.rb
 - spec/cql/protocol/responses/schema_change_result_response_spec.rb
+- spec/cql/protocol/responses/set_keyspace_result_response_spec.rb
+- spec/cql/protocol/responses/status_change_event_response_spec.rb
+- spec/cql/protocol/responses/supported_response_spec.rb
+- spec/cql/protocol/responses/topology_change_event_response_spec.rb
+- spec/cql/protocol/responses/void_result_response_spec.rb
 - spec/cql/protocol/type_converter_spec.rb
 - spec/cql/time_uuid_spec.rb
 - spec/cql/uuid_spec.rb