cassandra-driver 2.0.1 → 2.1.0

data/lib/cassandra/compression.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/compression/compressors/lz4.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/compression/compressors/snappy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/driver.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -91,7 +91,7 @@ module Cassandra
     end
 
     let(:port)                      { 9042 }
-    let(:protocol_version)          { 2 }
+    let(:protocol_version)          { 3 }
     let(:connect_timeout)           { 10 }
     let(:ssl)                       { false }
     let(:logger)                    { NullLogger.new  }

data/lib/cassandra/errors.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/execution/info.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/execution/options.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -76,12 +76,13 @@ module Cassandra
         unless paging_state.nil?
           paging_state = String(paging_state)
           Util.assert_not_empty(paging_state) { ":paging_state must not be empty" }
+          Util.assert(!page_size.nil?) { ":page_size is required when :paging_state is given" }
         end
 
         if arguments.nil?
           arguments = EMPTY_LIST
         else
-          Util.assert_instance_of(::Array, arguments) { ":arguments must be an Array, #{arguments.inspect} given" }
+          Util.assert_instance_of_one_of([::Array, ::Hash], arguments) { ":arguments must be an Array or a Hash, #{arguments.inspect} given" }
         end
 
         @consistency        = consistency

data/lib/cassandra/execution/trace.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/executors.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/future.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/host.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/keyspace.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,11 +51,12 @@ module Cassandra
     attr_reader :replication
 
     # @private
-    def initialize(name, durable_writes, replication, tables)
+    def initialize(name, durable_writes, replication, tables, types)
       @name           = name
       @durable_writes = durable_writes
       @replication    = replication
       @tables         = tables
+      @types          = types
     end
 
     # @return [Boolean] whether durables writes are enabled for this keyspace
@@ -91,6 +92,35 @@ module Cassandra
     end
     alias :tables :each_table
 
+    # @return [Boolean] whether this keyspace has a user-defined type with the
+    #   given name
+    # @param name [String] user-defined type name
+    def has_type?(name)
+      @types.has_key?(name)
+    end
+
+    # @return [Cassandra::Types::UserDefined, nil] a type or nil
+    # @param name [String] user-defined type name
+    def type(name)
+      @types[name]
+    end
+
+    # Yield or enumerate each user-defined type present in this keyspace
+    # @overload each_type
+    #   @yieldparam type [Cassandra::Types::UserDefined] current type
+    #   @return [Cassandra::Keyspace] self
+    # @overload each_type
+    #   @return [Array<Cassandra::Types::UserDefined>] a list of user-defined types
+    def each_type(&block)
+      if block_given?
+        @types.each_value(&block)
+        self
+      else
+        @types.values
+      end
+    end
+    alias :types :each_type
+
     # @return [String] a cql representation of this table
     def to_cql
       "CREATE KEYSPACE #{Util.escape_name(@name)} WITH REPLICATION = #{@replication.to_cql} AND DURABLE_WRITES = #{@durable_writes};"
@@ -102,7 +132,8 @@ module Cassandra
         @name == other.name &&
         @durable_writes == other.durable_writes &&
         @replication == other.replication &&
-        @tables == other.raw_tables
+        @tables == other.raw_tables &&
+        @types == other.raw_types
     end
     alias :== :eql?
 
@@ -115,14 +146,28 @@ module Cassandra
     def update_table(table)
       tables = @tables.dup
       tables[table.name] = table
-      Keyspace.new(@name, @durable_writes, @replication, tables)
+      Keyspace.new(@name, @durable_writes, @replication, tables, @types)
     end
 
     # @private
     def delete_table(table_name)
       tables = @tables.dup
       tables.delete(table_name)
-      Keyspace.new(@name, @durable_writes, @replication, tables)
+      Keyspace.new(@name, @durable_writes, @replication, tables, @types)
+    end
+
+    # @private
+    def update_type(type)
+      types = @types.dup
+      types[type.name] = type
+      Keyspace.new(@name, @durable_writes, @replication, @tables, types)
+    end
+
+    # @private
+    def delete_type(type_name)
+      types = @types.dup
+      types.delete(type_name)
+      Keyspace.new(@name, @durable_writes, @replication, @tables, types)
     end
 
     # @private
@@ -141,5 +186,10 @@ module Cassandra
     def raw_tables
       @tables
     end
+
+    # @private
+    def raw_types
+      @types
+    end
   end
 end

data/lib/cassandra/listener.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/load_balancing.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/load_balancing/policies.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/load_balancing/policies/dc_aware_round_robin.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/load_balancing/policies/round_robin.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/load_balancing/policies/token_aware.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/load_balancing/policies/white_list.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/null_logger.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/protocol.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 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,6 +35,10 @@ module Cassandra
       FALSE_BYTE = "\x00".freeze
       PROTOCOL_VERSION = "\x01".freeze
       COMPRESSION_OFF = "\x00".freeze
+
+      SCHEMA_CHANGE_TARGET_KEYSPACE = 'KEYSPACE'.freeze
+      SCHEMA_CHANGE_TARGET_TABLE    = 'TABLE'.freeze
+      SCHEMA_CHANGE_TARGET_UDT      = 'TYPE'.freeze
     end
   end
 end
@@ -76,4 +80,5 @@ require 'cassandra/protocol/requests/prepare_request'
 require 'cassandra/protocol/requests/execute_request'
 require 'cassandra/protocol/cql_protocol_handler'
 require 'cassandra/protocol/v1'
+require 'cassandra/protocol/v3'
 require 'cassandra/protocol/coder'

data/lib/cassandra/protocol/coder.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2014 DataStax, Inc.
+# Copyright 2013-2015 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,6 +23,241 @@ module Cassandra
       HAS_MORE_PAGES_FLAG     = 0x02
       NO_METADATA_FLAG        = 0x04
 
+      def write_values_v3(buffer, values, types, names = EMPTY_LIST)
+        if values && values.size > 0
+          buffer.append_short(values.size)
+          values.zip(types, names) do |(value, type, name)|
+            buffer.append_string(name) if name
+            write_value_v3(buffer, value, type)
+          end
+          buffer
+        else
+          buffer.append_short(0)
+        end
+      end
+
+      def write_value_v3(buffer, value, type)
+        case type.kind
+        when :ascii            then write_ascii(buffer, value)
+        when :bigint, :counter then write_bigint(buffer, value)
+        when :blob             then write_blob(buffer, value)
+        when :boolean          then write_boolean(buffer, value)
+        when :decimal          then write_decimal(buffer, value)
+        when :double           then write_double(buffer, value)
+        when :float            then write_float(buffer, value)
+        when :int              then write_int(buffer, value)
+        when :inet             then write_inet(buffer, value)
+        when :timestamp        then write_timestamp(buffer, value)
+        when :uuid, :timeuuid  then write_uuid(buffer, value)
+        when :varchar          then write_varchar(buffer, value)
+        when :varint           then write_varint(buffer, value)
+        when :list, :set
+          if value
+            raw        = CqlByteBuffer.new
+            value_type = type.value_type
+
+            raw.append_int(value.size)
+            value.each do |element|
+              write_value_v3(raw, element, value_type)
+            end
+
+            buffer.append_bytes(raw)
+          else
+            buffer.append_int(-1)
+          end
+        when :map
+          if value
+            raw        = CqlByteBuffer.new
+            key_type   = type.key_type
+            value_type = type.value_type
+
+            raw.append_int(value.size)
+            value.each do |key, value|
+              write_value_v3(raw, key, key_type)
+              write_value_v3(raw, value, value_type)
+            end
+
+            buffer.append_bytes(raw)
+          else
+            buffer.append_int(-1)
+          end
+        when :udt
+          if value
+            raw    = CqlByteBuffer.new
+            fields = type.fields
+
+            fields.each do |field|
+              write_value_v3(raw, value[field.name], field.type)
+            end
+
+            buffer.append_bytes(raw)
+          else
+            buffer.append_int(-1)
+          end
+        when :tuple
+          if value
+            raw     = CqlByteBuffer.new
+            members = type.members
+
+            members.each_with_index do |member_type, i|
+              write_value_v3(raw, value[i], member_type)
+            end
+
+            buffer.append_bytes(raw)
+          else
+            buffer.append_int(-1)
+          end
+        else
+          raise Errors::EncodingError, %(Unsupported value type: #{type})
+        end
+      end
+
+      def read_values_v3(buffer, column_metadata)
+        ::Array.new(buffer.read_int) do |i|
+          row = ::Hash.new
+
+          column_metadata.each do |(_, _, column, type)|
+            row[column] = read_value_v3(buffer, type)
+          end
+
+          row
+        end
+      end
+
+      def read_value_v3(buffer, type)
+        case type.kind
+        when :ascii            then read_ascii(buffer)
+        when :bigint, :counter then read_bigint(buffer)
+        when :blob             then buffer.read_bytes
+        when :boolean          then read_boolean(buffer)
+        when :decimal          then read_decimal(buffer)
+        when :double           then read_double(buffer)
+        when :float            then read_float(buffer)
+        when :int              then read_int(buffer)
+        when :timestamp        then read_timestamp(buffer)
+        when :uuid             then read_uuid(buffer)
+        when :timeuuid         then read_uuid(buffer, TimeUuid)
+        when :varchar          then read_varchar(buffer)
+        when :varint           then read_varint(buffer)
+        when :inet             then read_inet(buffer)
+        when :list
+          return nil unless read_size(buffer)
+
+          value_type = type.value_type
+          ::Array.new(buffer.read_signed_int) { read_value_v3(buffer, value_type) }
+        when :map
+          return nil unless read_size(buffer)
+
+          key_type   = type.key_type
+          value_type = type.value_type
+          value      = ::Hash.new
+
+          buffer.read_signed_int.times do
+            value[read_value_v3(buffer, key_type)] = read_value_v3(buffer, value_type)
+          end
+
+          value
+        when :set
+          return nil unless read_size(buffer)
+
+          value_type = type.value_type
+          value      = ::Set.new
+
+          buffer.read_signed_int.times do
+            value << read_value_v3(buffer, value_type)
+          end
+
+          value
+        when :udt
+          return nil unless read_size(buffer)
+
+          keyspace = type.keyspace
+          name     = type.name
+          fields   = type.fields
+          values   = ::Hash.new
+
+          fields.each do |field|
+            if buffer.empty?
+              values[field.name] = nil
+            else
+              values[field.name] = read_value_v3(buffer, field.type)
+            end
+          end
+
+          Cassandra::UDT::Strict.new(keyspace, name, fields, values)
+        when :tuple
+          return nil unless read_size(buffer)
+
+          members = type.members
+          values  = ::Array.new
+
+          members.each do |member_type|
+            break if buffer.empty?
+            values << read_value_v3(buffer, member_type)
+          end
+
+          values.fill(nil, values.length, (members.length - values.length))
+
+          Cassandra::Tuple::Strict.new(members, values)
+        else
+          raise Errors::DecodingError, %(Unsupported value type: #{type})
+        end
+      end
+
+      def read_metadata_v3(buffer)
+        flags = buffer.read_int
+        count = buffer.read_int
+
+        paging_state = nil
+        paging_state = buffer.read_bytes if flags & HAS_MORE_PAGES_FLAG != 0
+        column_specs = nil
+
+        if flags & NO_METADATA_FLAG == 0
+          if flags & GLOBAL_TABLES_SPEC_FLAG != 0
+            keyspace_name = buffer.read_string
+            table_name    = buffer.read_string
+
+            column_specs = ::Array.new(count) do |i|
+              [keyspace_name, table_name, buffer.read_string, read_type_v3(buffer)]
+            end
+          else
+            column_specs = ::Array.new(count) do |i|
+              [buffer.read_string, buffer.read_string, buffer.read_string, read_type_v3(buffer)]
+            end
+          end
+        end
+
+        [column_specs, paging_state]
+      end
+
+      def read_type_v3(buffer)
+        case buffer.read_unsigned_short
+        when 0x0000 then Types.custom(buffer.read_string)
+        when 0x0001 then Types.ascii
+        when 0x0002 then Types.bigint
+        when 0x0003 then Types.blob
+        when 0x0004 then Types.boolean
+        when 0x0005 then Types.counter
+        when 0x0006 then Types.decimal
+        when 0x0007 then Types.double
+        when 0x0008 then Types.float
+        when 0x0009 then Types.int
+        when 0x000B then Types.timestamp
+        when 0x000C then Types.uuid
+        when 0x000D then Types.varchar
+        when 0x000E then Types.varint
+        when 0x000F then Types.timeuuid
+        when 0x0010 then Types.inet
+        when 0x0020 then Types.list(read_type_v3(buffer))
+        when 0x0021 then Types.map(read_type_v3(buffer), read_type_v3(buffer))
+        when 0x0022 then Types.set(read_type_v3(buffer))
+        when 0x0030 then Types.udt(*read_user_defined_type(buffer))
+        when 0x0031 then Types.tuple(*read_tuple(buffer))
+        else
+          raise Errors::DecodingError, %(Unsupported column type: #{id})
+        end
+      end
+
       def write_values_v1(buffer, values, types)
         if values && values.size > 0
           buffer.append_short(values.size)
@@ -36,7 +271,7 @@ module Cassandra
       end
 
       def write_value_v1(buffer, value, type)
-        case type
+        case type.kind
         when :ascii            then write_ascii(buffer, value)
         when :bigint, :counter then write_bigint(buffer, value)
         when :blob             then write_blob(buffer, value)
@@ -50,40 +285,35 @@ module Cassandra
         when :timestamp        then write_timestamp(buffer, value)
         when :timeuuid, :uuid  then write_uuid(buffer, value)
         when :varint           then write_varint(buffer, value)
-        when ::Array
-          case type.first
-          when :list, :set
-            if value
-              raw        = CqlByteBuffer.new
-              value_type = type[1]
-
-              raw.append_short(value.size)
-              value.each do |element|
-                write_short_value(raw, element, value_type)
-              end
-
-              buffer.append_bytes(raw)
-            else
-              buffer.append_int(-1)
+        when :list, :set
+          if value
+            raw        = CqlByteBuffer.new
+            value_type = type.value_type
+
+            raw.append_short(value.size)
+            value.each do |element|
+              write_short_value(raw, element, value_type)
             end
-          when :map
-            if value
-              raw        = CqlByteBuffer.new
-              key_type   = type[1]
-              value_type = type[2]
-
-              raw.append_short(value.size)
-              value.each do |key, value|
-                write_short_value(raw, key, key_type)
-                write_short_value(raw, value, value_type)
-              end
-
-              buffer.append_bytes(raw)
-            else
-              buffer.append_int(-1)
+
+            buffer.append_bytes(raw)
+          else
+            buffer.append_int(-1)
+          end
+        when :map
+          if value
+            raw        = CqlByteBuffer.new
+            key_type   = type.key_type
+            value_type = type.value_type
+
+            raw.append_short(value.size)
+            value.each do |key, value|
+              write_short_value(raw, key, key_type)
+              write_short_value(raw, value, value_type)
             end
+
+            buffer.append_bytes(raw)
           else
-            raise Errors::EncodingError, %(Unsupported value type: #{type})
+            buffer.append_int(-1)
           end
         else
           raise Errors::EncodingError, %(Unsupported value type: #{type})
@@ -103,7 +333,7 @@ module Cassandra
       end
 
       def read_value_v1(buffer, type)
-        case type
+        case type.kind
         when :ascii            then read_ascii(buffer)
         when :bigint, :counter then read_bigint(buffer)
         when :blob             then buffer.read_bytes
@@ -118,43 +348,36 @@ module Cassandra
         when :uuid             then read_uuid(buffer)
         when :timeuuid         then read_uuid(buffer, TimeUuid)
         when :inet             then read_inet(buffer)
-        when ::Array
-          case type.first
-          when :list
-            return nil unless read_size(buffer)
+        when :list
+          return nil unless read_size(buffer)
 
-            value_type = type[1]
-            ::Array.new(buffer.read_short) { read_short_value(buffer, value_type) }
-          when :map
-            return nil unless read_size(buffer)
+          value_type = type.value_type
+          ::Array.new(buffer.read_short) { read_short_value(buffer, value_type) }
+        when :map
+          return nil unless read_size(buffer)
 
-            key_type   = type[1]
-            value_type = type[2]
+          key_type   = type.key_type
+          value_type = type.value_type
 
-            value = ::Hash.new
+          value = ::Hash.new
 
-            buffer.read_short.times do
-              value[read_short_value(buffer, key_type)] = read_short_value(buffer, value_type)
-            end
+          buffer.read_short.times do
+            value[read_short_value(buffer, key_type)] = read_short_value(buffer, value_type)
+          end
 
-            value
-          when :set
-            return nil unless read_size(buffer)
+          value
+        when :set
+          return nil unless read_size(buffer)
 
-            value_type = type[1]
+          value_type = type.value_type
 
-            value = ::Set.new
+          value = ::Set.new
 
-            buffer.read_short.times do
-              value << read_short_value(buffer, value_type)
-            end
-
-            value
-          when :custom
-            buffer.read_bytes
-          else
-            raise Errors::DecodingError, %(Unsupported complex value type: #{type})
+          buffer.read_short.times do
+            value << read_short_value(buffer, value_type)
           end
+
+          value
         else
           raise Errors::DecodingError, %(Unsupported value type: #{type})
         end
@@ -190,26 +413,26 @@ module Cassandra
         kind = buffer.read_unsigned_short
 
         case kind
-        when 0x0000 then [:custom, buffer.read_string]
-        when 0x0001 then :ascii
-        when 0x0002 then :bigint
-        when 0x0003 then :blob
-        when 0x0004 then :boolean
-        when 0x0005 then :counter
-        when 0x0006 then :decimal
-        when 0x0007 then :double
-        when 0x0008 then :float
-        when 0x0009 then :int
-        when 0x000A then :text
-        when 0x000B then :timestamp
-        when 0x000C then :uuid
-        when 0x000D then :varchar
-        when 0x000E then :varint
-        when 0x000F then :timeuuid
-        when 0x0010 then :inet
-        when 0x0020 then [:list, read_type_v1(buffer)]
-        when 0x0021 then [:map, read_type_v1(buffer), read_type_v1(buffer)]
-        when 0x0022 then [:set, read_type_v1(buffer)]
+        when 0x0000 then Types.custom(buffer.read_string)
+        when 0x0001 then Types.ascii
+        when 0x0002 then Types.bigint
+        when 0x0003 then Types.blob
+        when 0x0004 then Types.boolean
+        when 0x0005 then Types.counter
+        when 0x0006 then Types.decimal
+        when 0x0007 then Types.double
+        when 0x0008 then Types.float
+        when 0x0009 then Types.int
+        when 0x000A then Types.text
+        when 0x000B then Types.timestamp
+        when 0x000C then Types.uuid
+        when 0x000D then Types.varchar
+        when 0x000E then Types.varint
+        when 0x000F then Types.timeuuid
+        when 0x0010 then Types.inet
+        when 0x0020 then Types.list(read_type_v1(buffer))
+        when 0x0021 then Types.map(read_type_v1(buffer), read_type_v1(buffer))
+        when 0x0022 then Types.set(read_type_v1(buffer))
         else 
           raise Errors::DecodingError, %(Unsupported column type: #{kind})
         end
@@ -380,7 +603,7 @@ module Cassandra
       end
 
       def read_short_value(buffer, type)
-        case type
+        case type.kind
         when :ascii
           value = buffer.read_short_bytes
           value && value.force_encoding(::Encoding::ASCII)
@@ -427,7 +650,7 @@ module Cassandra
       end
 
       def write_short_value(buffer, value, type)
-        case type
+        case type.kind
         when :ascii
           buffer.append_short_bytes(value && value.encode(::Encoding::ASCII))
         when :bigint, :counter
@@ -506,6 +729,18 @@ module Cassandra
 
         size
       end
+
+      def read_tuple(buffer)
+        ::Array.new(buffer.read_short) { read_type_v3(buffer) }
+      end
+
+      def read_user_defined_type(buffer)
+        keyspace = buffer.read_string
+        name     = buffer.read_string
+        fields   = ::Array.new(buffer.read_short) { [buffer.read_string, read_type_v3(buffer)] }
+
+        [keyspace, name, fields]
+      end
     end
   end
 end