cql-rb 1.0.0.pre6 → 1.0.0.pre7

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+module Cql
+  module Protocol
+    class VoidResultResponse < ResultResponse
+      def self.decode!(buffer)
+        new
+      end
+
+      def to_s
+        %(RESULT VOID)
+      end
+
+      def void?
+        true
+      end
+    end
+  end
+end

data/lib/cql/protocol/type_converter.rb

@@ -0,0 +1,165 @@
+# encoding: utf-8
+
+require 'ipaddr'
+require 'set'
+
+
+module Cql
+  module Protocol
+    class TypeConverter
+      include Decoding
+
+      def initialize
+        @conversions = conversions
+      end
+
+      def convert_type(buffer, type, size_bytes=4)
+        return nil if buffer.empty?
+        case type
+        when Array
+          return nil unless read_size(buffer, size_bytes)
+          case type.first
+          when :list
+            convert_list(buffer, @conversions[type[1]])
+          when :map
+            convert_map(buffer, @conversions[type[1]], @conversions[type[2]])
+          when :set
+            convert_set(buffer, @conversions[type[1]])
+          end
+        else
+          @conversions[type].call(buffer, size_bytes)
+        end
+      end
+
+      def conversions
+        {
+          :ascii => method(:convert_ascii),
+          :bigint => method(:convert_bigint),
+          :blob => method(:convert_blob),
+          :boolean => method(:convert_boolean),
+          :counter => method(:convert_bigint),
+          :decimal => method(:convert_decimal),
+          :double => method(:convert_double),
+          :float => method(:convert_float),
+          :int => method(:convert_int),
+          :timestamp => method(:convert_timestamp),
+          :varchar => method(:convert_varchar),
+          :text => method(:convert_varchar),
+          :varint => method(:convert_varint),
+          :timeuuid => method(:convert_uuid),
+          :uuid => method(:convert_uuid),
+          :inet => method(:convert_inet),
+        }
+      end
+
+      def convert_ascii(buffer, size_bytes)
+        bytes = size_bytes == 4 ? read_bytes!(buffer) : read_short_bytes!(buffer)
+        bytes ? bytes.force_encoding(::Encoding::ASCII) : nil
+      end
+
+      def convert_bigint(buffer, size_bytes)
+        return nil unless read_size(buffer, size_bytes)
+        read_long!(buffer)
+      end
+
+      def convert_blob(buffer, size_bytes)
+        bytes = size_bytes == 4 ? read_bytes!(buffer) : read_short_bytes!(buffer)
+        bytes ? bytes : nil
+      end
+
+      def convert_boolean(buffer, size_bytes)
+        return nil unless read_size(buffer, size_bytes)
+        buffer.read(1) == Constants::TRUE_BYTE
+      end
+
+      def convert_decimal(buffer, size_bytes)
+        size = read_size(buffer, size_bytes)
+        return nil unless size
+        read_decimal!(buffer, size)
+      end
+
+      def convert_double(buffer, size_bytes)
+        return nil unless read_size(buffer, size_bytes)
+        read_double!(buffer)
+      end
+
+      def convert_float(buffer, size_bytes)
+        return nil unless read_size(buffer, size_bytes)
+        read_float!(buffer)
+      end
+
+      def convert_int(buffer, size_bytes)
+        return nil unless read_size(buffer, size_bytes)
+        read_int!(buffer)
+      end
+
+      def convert_timestamp(buffer, size_bytes)
+        return nil unless read_size(buffer, size_bytes)
+        timestamp = read_long!(buffer)
+        Time.at(timestamp/1000.0)
+      end
+
+      def convert_varchar(buffer, size_bytes)
+        bytes = size_bytes == 4 ? read_bytes!(buffer) : read_short_bytes!(buffer)
+        bytes ? bytes.force_encoding(::Encoding::UTF_8) : nil
+      end
+
+      def convert_varint(buffer, size_bytes)
+        size = read_size(buffer, size_bytes)
+        return nil unless size
+        read_varint!(buffer, size)
+      end
+
+      def convert_uuid(buffer, size_bytes)
+        return nil unless read_size(buffer, size_bytes)
+        read_uuid!(buffer)
+      end
+
+      def convert_inet(buffer, size_bytes)
+        size = read_size(buffer, size_bytes)
+        return nil unless size
+        IPAddr.new_ntoh(buffer.read(size))
+      end
+
+      def convert_list(buffer, value_converter)
+        list = []
+        size = buffer.read_short
+        size.times do
+          list << value_converter.call(buffer, 2)
+        end
+        list
+      end
+
+      def convert_map(buffer, key_converter, value_converter)
+        map = {}
+        size = buffer.read_short
+        size.times do
+          key = key_converter.call(buffer, 2)
+          value = value_converter.call(buffer, 2)
+          map[key] = value
+        end
+        map
+      end
+
+      def convert_set(buffer, value_converter)
+        set = Set.new
+        size = buffer.read_short
+        size.times do
+          set << value_converter.call(buffer, 2)
+        end
+        set
+      end
+
+      def read_size(buffer, size_bytes)
+        if size_bytes == 2
+          size = buffer.read_short
+          return nil if size & 0x8000 == 0x8000
+        else
+          size = buffer.read_int
+          return nil if size & 0x80000000 == 0x80000000
+        end
+        size
+      end
+    end
+  end
+end

data/lib/cql/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cql
-  VERSION = '1.0.0.pre6'.freeze
+  VERSION = '1.0.0.pre7'.freeze
 end

data/spec/cql/protocol/response_frame_spec.rb

@@ -540,11 +540,42 @@ module Cql
             frame.body.rows.first['set_column'].should == Set.new(["\xab\x43\x21", "\xaf\xd8\x7e\xcd"].map { |s| s.force_encoding(::Encoding::BINARY) })
           end
 
+          it 'decodes nulls' do
+            frame = described_class.new(ByteBuffer.new("\x81\x00\x00\b\x00\x00\x01\xB6\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x13\x00\x12cql_rb_client_spec\x00\rlots_of_types\x00\x02id\x00\t\x00\fascii_column\x00\x01\x00\rbigint_column\x00\x02\x00\vblob_column\x00\x03\x00\x0Eboolean_column\x00\x04\x00\x0Edecimal_column\x00\x06\x00\rdouble_column\x00\a\x00\ffloat_column\x00\b\x00\vinet_column\x00\x10\x00\nint_column\x00\t\x00\vlist_column\x00 \x00\x01\x00\nmap_column\x00!\x00\r\x00\x04\x00\nset_column\x00\"\x00\x03\x00\vtext_column\x00\r\x00\x10timestamp_column\x00\v\x00\x0Ftimeuuid_column\x00\x0F\x00\vuuid_column\x00\f\x00\x0Evarchar_column\x00\r\x00\rvarint_column\x00\x0E\x00\x00\x00\x01\x00\x00\x00\x04\x00\x00\x00\x03\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"))
+            row = frame.body.rows.first
+            row.should eql(
+              'id' => 3,
+              'ascii_column' => nil,
+              'bigint_column' => nil,
+              'blob_column' => nil,
+              'boolean_column' => nil,
+              'decimal_column' => nil,
+              'double_column' => nil,
+              'float_column' => nil,
+              'int_column' => nil,
+              'text_column' => nil,
+              'timestamp_column' => nil,
+              'uuid_column' => nil,
+              'varchar_column' => nil,
+              'varint_column' => nil,
+              'timeuuid_column' => nil,
+              'inet_column' => nil,
+              'list_column' => nil,
+              'map_column' => nil,
+              'set_column' => nil,
+            )
+          end
+
           it 'decodes COUNTER as a number' do
             frame = described_class.new(ByteBuffer.new("\x81\x00\x00\b\x00\x00\x00N\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\x00\x04test\x00\x04cnts\x00\x02id\x00\r\x00\x02c1\x00\x05\x00\x02c2\x00\x05\x00\x00\x00\x01\x00\x00\x00\x04theo\x00\x00\x00\b\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\b\x00\x00\x00\x00\x00\x00\x00\x01"))
             frame.body.rows.first['c1'].should == 3
           end
 
+          it 'decodes a null COUNTER as nil' do
+            frame = described_class.new(ByteBuffer.new("\x81\x00\x00\b\x00\x00\x00V\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\x00\x12cql_rb_client_spec\x00\bcounters\x00\bcounter1\x00\x05\x00\bcounter2\x00\x05\x00\x00\x00\x01\x00\x00\x00\b\x00\x00\x00\x00\x00\x00\x00\x01\xFF\xFF\xFF\xFF"))
+            frame.body.rows.first['counter2'].should be_nil
+          end
+
           it 'raises an error when encountering an unknown column type' do
             frame = described_class.new
             frame << "\x81\x00\x00\b\x00\x00\x00E"

data/spec/integration/regression_spec.rb

@@ -20,7 +20,7 @@ describe 'Regressions' do
   end
 
   after do
-    client.execute('DROP KEYSPACE cql_rb_client_spec')
+    client.execute('DROP KEYSPACE cql_rb_client_spec') rescue nil
     client.close
   end
 
@@ -63,18 +63,65 @@ describe 'Regressions' do
     end
   end
 
-  context 'wat' do
-    it 'finds all things' do
-      client.execute('CREATE TABLE t_b (a BIGINT, b BOOLEAN, c SET<BIGINT>, PRIMARY KEY (a, b))')
-      client.execute('INSERT INTO t_b (a, b, c) VALUES (271, false, {429512359, 22140083129, 154124373, 7133790052, 3263802876, 7306375341, 1086106894, 18819871958, 2754233688, 11353254728, 9045041985, 17997058330, 12443485304, 8549364896, 731630293, 21159857519, 1111535777, 3180792037, 9563930655, 7144898604, 12770338502, 22740775138, 18618244615, 22214143018, 6934152431, 18762976055, 17285647286, 20125813811, 9133629150, 15424700007, 118980476, 14741258930, 18779991792, 8324600546, 11637140295, 9991399356, 19199483004, 21445636099, 16558957905, 15918629196, 18233976642, 11046492659, 6935319727, 10159850783, 4663807554, 7355805674, 7635043414, 21675092442, 13600103335, 22306919328, 9217523096, 12529064948, 8776455938, 2245602097, 15670128881, 18058001691, 21092222111, 17277710588, 14115070523, 9070732951, 2812255943, 9349962400, 3159466851, 16008470639, 19953811077, 21577742012, 22095236133, 14644601174, 8617764033, 16140330747, 6430474270, 8193684764, 18867977174, 19652105799, 17553107189, 18499057047, 15047410679, 14622689532, 116299629, 7516765793, 8115675759, 16051975041, 16430971219, 10443592529, 7029456978, 4636255483, 10311426631, 18607907259, 13049692716, 20594963153, 11747270720, 8552608868, 13807260864, 18374272405, 19847587719, 12573496801, 2860931462, 16578852692, 22804253685, 2720329280})')
-      result = client.execute('SELECT * FROM t_b')
-      raise unless result.first['c'] == Set.new([429512359, 22140083129, 154124373, 7133790052, 3263802876, 7306375341, 1086106894, 18819871958, 2754233688, 11353254728, 9045041985, 17997058330, 12443485304, 8549364896, 731630293, 21159857519, 1111535777, 3180792037, 9563930655, 7144898604, 12770338502, 22740775138, 18618244615, 22214143018, 6934152431, 18762976055, 17285647286, 20125813811, 9133629150, 15424700007, 118980476, 14741258930, 18779991792, 8324600546, 11637140295, 9991399356, 19199483004, 21445636099, 16558957905, 15918629196, 18233976642, 11046492659, 6935319727, 10159850783, 4663807554, 7355805674, 7635043414, 21675092442, 13600103335, 22306919328, 9217523096, 12529064948, 8776455938, 2245602097, 15670128881, 18058001691, 21092222111, 17277710588, 14115070523, 9070732951, 2812255943, 9349962400, 3159466851, 16008470639, 19953811077, 21577742012, 22095236133, 14644601174, 8617764033, 16140330747, 6430474270, 8193684764, 18867977174, 19652105799, 17553107189, 18499057047, 15047410679, 14622689532, 116299629, 7516765793, 8115675759, 16051975041, 16430971219, 10443592529, 7029456978, 4636255483, 10311426631, 18607907259, 13049692716, 20594963153, 11747270720, 8552608868, 13807260864, 18374272405, 19847587719, 12573496801, 2860931462, 16578852692, 22804253685, 2720329280])
+  context 'frame decoding' do
+    it 'decodes null counters' do
+      client.execute(%<CREATE TABLE counters (id ASCII, counter1 COUNTER, counter2 COUNTER, PRIMARY KEY (id))>)
+      client.execute(%<UPDATE counters SET counter1 = counter1 + 1 WHERE id = 'foo'>)
+      result = client.execute(%<SELECT counter1, counter2 FROM counters WHERE id = 'foo'>)
+      result.first['counter1'].should == 1
+      result.first['counter2'].should be_nil
     end
 
-    it 'inet' do
-      client.execute('select inet_column from test_types.lots_of_types')
+    it 'decodes null values' do
+      client.execute(<<-CQL)
+        CREATE TABLE lots_of_types (
+          id               INT,
+          ascii_column     ASCII,
+          bigint_column    BIGINT,
+          blob_column      BLOB,
+          boolean_column   BOOLEAN,
+          decimal_column   DECIMAL,
+          double_column    DOUBLE,
+          float_column     FLOAT,
+          int_column       INT,
+          text_column      TEXT,
+          timestamp_column TIMESTAMP,
+          uuid_column      UUID,
+          varchar_column   VARCHAR,
+          varint_column    VARINT,
+          timeuuid_column  TIMEUUID,
+          inet_column      INET,
+          list_column      LIST<ASCII>,
+          map_column       MAP<TEXT, BOOLEAN>,
+          set_column       SET<BLOB>,
+          PRIMARY KEY (id)
+        )
+      CQL
+      client.execute(%<INSERT INTO lots_of_types (id) VALUES (3)>)
+      result = client.execute(%<SELECT * FROM lots_of_types WHERE id = 3>)
+      row = result.first
+      row['ascii_column'].should be_nil
+      row['bigint_column'].should be_nil
+      row['blob_column'].should be_nil
+      row['boolean_column'].should be_nil
+      row['decimal_column'].should be_nil
+      row['double_column'].should be_nil
+      row['float_column'].should be_nil
+      row['int_column'].should be_nil
+      row['text_column'].should be_nil
+      row['timestamp_column'].should be_nil
+      row['uuid_column'].should be_nil
+      row['varchar_column'].should be_nil
+      row['varint_column'].should be_nil
+      row['timeuuid_column'].should be_nil
+      row['inet_column'].should be_nil
+      row['list_column'].should be_nil
+      row['map_column'].should be_nil
+      row['set_column'].should be_nil
     end
+  end
 
+  context 'wat' do
     it 'null values' do
       client.execute('CREATE TABLE null_value (a BIGINT, b BOOLEAN, c INT, PRIMARY KEY ((a, b), c))')
       client.execute('INSERT INTO null_value (a, b, c) VALUES (123123123123, true, 3234)')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre6
+  version: 1.0.0.pre7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies: []
 description: A pure Ruby CQL3 driver for Cassandra
 email:
@@ -26,8 +26,33 @@ files:
 - lib/cql/io.rb
 - lib/cql/protocol/decoding.rb
 - lib/cql/protocol/encoding.rb
+- lib/cql/protocol/request_body.rb
 - lib/cql/protocol/request_frame.rb
+- lib/cql/protocol/requests/credentials_request.rb
+- lib/cql/protocol/requests/execute_request.rb
+- lib/cql/protocol/requests/options_request.rb
+- lib/cql/protocol/requests/prepare_request.rb
+- lib/cql/protocol/requests/query_request.rb
+- lib/cql/protocol/requests/register_request.rb
+- lib/cql/protocol/requests/startup_request.rb
+- lib/cql/protocol/response_body.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
+- lib/cql/protocol/responses/event_response.rb
+- lib/cql/protocol/responses/prepared_result_response.rb
+- lib/cql/protocol/responses/ready_response.rb
+- lib/cql/protocol/responses/result_response.rb
+- lib/cql/protocol/responses/rows_result_response.rb
+- lib/cql/protocol/responses/schema_change_event_result_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/supported_response.rb
+- lib/cql/protocol/responses/topology_change_event_result_response.rb
+- lib/cql/protocol/responses/void_result_response.rb
+- lib/cql/protocol/type_converter.rb
 - lib/cql/protocol.rb
 - lib/cql/uuid.rb
 - lib/cql/version.rb