cassandra-driver 2.0.1-java → 2.1.0-java

data/lib/cassandra/cluster/failed_connection.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/cluster/metadata.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/cluster/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.
@@ -21,9 +21,8 @@ module Cassandra
     # @private
     class Options
       attr_reader :credentials, :auth_provider, :compressor, :port,
-                  :connect_timeout, :ssl, :connections_per_local_node,
-                  :connections_per_remote_node, :heartbeat_interval,
-                  :idle_timeout, :schema_refresh_delay, :schema_refresh_timeout
+                  :connect_timeout, :ssl, :heartbeat_interval, :idle_timeout,
+                  :schema_refresh_delay, :schema_refresh_timeout
       attr_accessor :protocol_version
 
       def initialize(protocol_version, credentials, auth_provider, compressor, port, connect_timeout, ssl, connections_per_local_node, connections_per_remote_node, heartbeat_interval, idle_timeout, synchronize_schema, schema_refresh_delay, schema_refresh_timeout)
@@ -55,6 +54,18 @@ module Cassandra
       def create_authenticator(authentication_class)
         @auth_provider && @auth_provider.create_authenticator(authentication_class)
       end
+
+      # increased number of streams in native protocol v3 allow for one
+      # connections to be sufficient
+      def connections_per_local_node
+        (@protocol_version > 2) ? 1 : @connections_per_local_node
+      end
+
+      # increased number of streams in native protocol v3 allow for one
+      # connections to be sufficient
+      def connections_per_remote_node
+        (@protocol_version > 2) ? 1 : @connections_per_remote_node
+      end
     end
   end
 end

data/lib/cassandra/cluster/registry.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/cluster/schema.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,7 +51,7 @@ module Cassandra
         self
       end
 
-      def update_keyspaces(host, keyspaces, tables, columns)
+      def update_keyspaces(host, keyspaces, tables, columns, types)
         columns = columns.each_with_object(deephash { [] }) do |row, index|
           index[row['keyspace_name']] << row
         end
@@ -60,12 +60,16 @@ module Cassandra
           index[row['keyspace_name']] << row
         end
 
+        types = types.each_with_object(deephash { [] }) do |row, index|
+          index[row['keyspace_name']] << row
+        end
+
         current_keyspaces = ::Set.new
 
         keyspaces.each do |row|
           current_keyspaces << keyspace = row['keyspace_name']
 
-          update_keyspace(host, row, tables[keyspace], columns[keyspace])
+          update_keyspace(host, row, tables[keyspace], columns[keyspace], types[keyspace])
         end
 
         @keyspaces.each do |name, keyspace|
@@ -75,7 +79,7 @@ module Cassandra
         self
       end
 
-      def update_keyspace(host, keyspace, tables, columns)
+      def update_keyspace(host, keyspace, tables, columns, types)
         keyspace_name = keyspace['keyspace_name']
 
         columns = columns.each_with_object(deephash { ::Hash.new }) do |row, index|
@@ -87,8 +91,13 @@ module Cassandra
           index[name] = create_table(row, columns[name], host.release_version)
         end
 
+        types = types.each_with_object(Hash.new) do |row, index|
+          name = row['type_name']
+          index[name] = create_type(row, host.release_version)
+        end
+
         replication = Keyspace::Replication.new(keyspace['strategy_class'], ::JSON.load(keyspace['strategy_options']))
-        keyspace = Keyspace.new(keyspace_name, keyspace['durable_writes'], replication, tables)
+        keyspace = Keyspace.new(keyspace_name, keyspace['durable_writes'], replication, tables, types)
 
         return self if keyspace == @keyspaces[keyspace_name]
 
@@ -165,6 +174,43 @@ module Cassandra
         self
       end
 
+      def udpate_type(host, keyspace_name, type)
+        keyspace = @keyspaces[keyspace_name]
+
+        return self unless keyspace
+
+        type     = create_type(type, host.release_version)
+        keyspace = keyspace.update_type(type)
+
+        synchronize do
+          keyspaces = @keyspaces.dup
+          keyspaces[keyspace_name] = keyspace
+          @keyspaces = keyspaces
+        end
+
+        keyspace_changed(keyspace)
+
+        self
+      end
+
+      def delete_type(keyspace_name, type_name)
+        keyspace = @keyspaces[keyspace_name]
+
+        return self unless keyspace
+
+        keyspace = keyspace.delete_type(type_name)
+
+        synchronize do
+          keyspaces = @keyspaces.dup
+          keyspaces[keyspace_name] = keyspace
+          @keyspaces = keyspaces
+        end
+
+        keyspace_changed(keyspace)
+
+        self
+      end
+
       def has_keyspace?(name)
         @keyspaces.include?(name)
       end
@@ -185,6 +231,20 @@ module Cassandra
 
       private
 
+      def create_type(type, version)
+        keyspace        = type['keyspace_name']
+        name            = type['type_name']
+        fields          = ::Array.new
+
+        type['field_names'].zip(type['field_types']) do |(field_name, field_type)|
+          field_type = @type_parser.parse(field_type).results.first.first
+
+          fields << [field_name, field_type]
+        end
+
+        Types.udt(keyspace, name, fields)
+      end
+
       def create_table(table, columns, version)
         keyspace        = table['keyspace_name']
         name            = table['columnfamily_name']
@@ -210,7 +270,7 @@ module Cassandra
         options = Table::Options.new(table, compaction_strategy, compression_parameters, is_compact, version)
         columns = create_columns(key_validator, comparator, column_aliases, is_dense, clustering_size, table, columns, version, partition_key, clustering_columns, clustering_order)
 
-        Table.new(keyspace, name, partition_key, clustering_columns, columns, options, clustering_order)
+        Table.new(keyspace, name, partition_key, clustering_columns, columns, options, clustering_order, version)
       end
 
       def find_clustering_size(comparator, columns, aliases, cassandra_version)
@@ -247,33 +307,33 @@ module Cassandra
         if cassandra_version.start_with?('1')
           key_aliases = ::JSON.load(table['key_aliases'])
 
-          key_validator.results.each_with_index do |(type, order), i|
+          key_validator.results.each_with_index do |(type, order, is_frozen), i|
             key_alias = key_aliases.fetch(i) { i.zero? ? "key" : "key#{i + 1}" }
 
-            partition_key[i] = Column.new(key_alias, type, order)
+            partition_key[i] = Column.new(key_alias, type, order, nil, false, is_frozen)
           end
 
           if comparator.results.size > 1
             clustering_size.times do |i|
               column_alias = column_aliases.fetch(i) { "column#{i + 1}" }
-              type, order  = comparator.results.fetch(i)
+              type, order, is_frozen = comparator.results.fetch(i)
 
-              clustering_columns[i] = Column.new(column_alias, type, order)
+              clustering_columns[i] = Column.new(column_alias, type, order, nil, false, is_frozen)
               clustering_order[i]   = order
             end
           else
             column_alias = column_aliases.first || "column1"
-            type, order  = comparator.results.first
+            type, order, is_frozen = comparator.results.first
 
-            clustering_columns[0] = Column.new(column_alias, type, order)
+            clustering_columns[0] = Column.new(column_alias, type, order, nil, false, is_frozen)
             clustering_order[0]   = order
           end
 
           if is_dense
             value_alias = table['value_alias']
             value_alias = 'value' if value_alias.nil? || value_alias.empty?
-            type, order = @type_parser.parse(table['default_validator']).results.first
-            other_columns << Column.new(value_alias, type, order)
+            type, order, is_frozen = @type_parser.parse(table['default_validator']).results.first
+            other_columns << Column.new(value_alias, type, order, nil, false, is_frozen)
           end
 
           columns.each do |name, row|
@@ -316,7 +376,7 @@ module Cassandra
 
       def create_column(column)
         name        = column['column_name']
-        type, order = @type_parser.parse(column['validator']).results.first
+        type, order, is_frozen = @type_parser.parse(column['validator']).results.first
         is_static   = (column['type'] == 'STATIC')
 
         if column['index_type'].nil?
@@ -328,7 +388,7 @@ module Cassandra
           index   = Column::Index.new(column['index_name'], options['class_name'])
         end
 
-        Column.new(name, type, order, index, is_static)
+        Column.new(name, type, order, index, is_static, is_frozen)
       end
 
       def deephash

data/lib/cassandra/cluster/schema/partitioners.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/cluster/schema/partitioners/murmur3.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/cluster/schema/partitioners/ordered.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/cluster/schema/partitioners/random.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/cluster/schema/replication_strategies.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/cluster/schema/replication_strategies/network_topology.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/cluster/schema/replication_strategies/none.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/cluster/schema/replication_strategies/simple.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/cluster/schema/type_parser.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.
@@ -36,7 +36,7 @@ module Cassandra
           "org.apache.cassandra.db.marshal.FloatType"         => :float,
           "org.apache.cassandra.db.marshal.InetAddressType"   => :inet,
           "org.apache.cassandra.db.marshal.Int32Type"         => :int,
-          "org.apache.cassandra.db.marshal.UTF8Type"          => :text,
+          "org.apache.cassandra.db.marshal.UTF8Type"          => :varchar,
           "org.apache.cassandra.db.marshal.TimestampType"     => :timestamp,
           "org.apache.cassandra.db.marshal.DateType"          => :timestamp,
           "org.apache.cassandra.db.marshal.UUIDType"          => :uuid,
@@ -44,7 +44,9 @@ module Cassandra
           "org.apache.cassandra.db.marshal.TimeUUIDType"      => :timeuuid,
           "org.apache.cassandra.db.marshal.MapType"           => :map,
           "org.apache.cassandra.db.marshal.SetType"           => :set,
-          "org.apache.cassandra.db.marshal.ListType"          => :list
+          "org.apache.cassandra.db.marshal.ListType"          => :list,
+          "org.apache.cassandra.db.marshal.UserType"          => :udt,
+          "org.apache.cassandra.db.marshal.TupleType"         => :tuple
         }.freeze
 
         def parse(string)
@@ -85,26 +87,51 @@ module Cassandra
         end
 
         def create_type(node)
-          order = :asc
+          order  = :asc
+          frozen = false
 
           if node.name == "org.apache.cassandra.db.marshal.ReversedType"
             order = :desc
             node  = node.children.first
           end
 
-          [lookup_type(node), order]
+          if node.name == "org.apache.cassandra.db.marshal.FrozenType"
+            frozen = true
+            node   = node.children.first
+          end
+
+          [lookup_type(node), order, frozen]
         end
 
         def lookup_type(node)
+          if node.name == "org.apache.cassandra.db.marshal.FrozenType"
+            return lookup_type(node.children.first)
+          end
+
           type = @@types[node.name]
 
           case type
           when :set, :list
-            [type, lookup_type(node.children.first)]
+            Cassandra::Types.send(type, lookup_type(node.children.first))
           when :map
-            [type, *node.children.map {|child| lookup_type(child)}]
+            Cassandra::Types.map(*node.children.map(&method(:lookup_type)))
+          when :udt
+            keyspace = node.children.shift.name
+            name     = [node.children.shift.name].pack('H*')
+            fields   = node.children.map do |child|
+              field_name, child_name = child.name.split(":")
+
+              child.name = child_name
+              field_name = [field_name].pack('H*').force_encoding(::Encoding::UTF_8)
+
+              [field_name, lookup_type(child)]
+            end
+
+            Cassandra::Types.udt(keyspace, name, fields)
+          when :tuple
+            Cassandra::Types.tuple(*node.children.map(&method(:lookup_type)))
           else
-            type
+            Cassandra::Types.send(type)
           end
         end
 

data/lib/cassandra/column.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.
@@ -37,25 +37,22 @@ module Cassandra
 
     # @return [String] column name
     attr_reader :name
-    # @private
-    # @return [Symbol, Array(Symbol, Symbol)] column type
+    # @return [Cassandra::Type] column type
     attr_reader :type
     # @return [Symbol] column order (`:asc` or `:desc`)
     attr_reader :order
     # @private
     # @return [Cassandra::Column::Index, nil] column index
     attr_reader :index
-    # @private
-    # @return [Boolean] whether the column is static
-    attr_reader :static
 
     # @private
-    def initialize(name, type, order, index = nil, is_static = false)
+    def initialize(name, type, order, index = nil, is_static = false, is_frozen = false)
       @name     = name
       @type     = type
       @order    = order
       @index    = index
       @static   = is_static
+      @frozen   = is_frozen
     end
 
     # @return [Boolean] whether the column is static
@@ -63,16 +60,14 @@ module Cassandra
       @static
     end
 
-    # @return [String] a cql representation of this column
-    def to_cql
-      cql = "#{@name} #{Util.type_to_cql(@type)}"
-      cql << ' static' if @static
-      cql
+    # @return [Boolean] whether the column is frozen
+    def frozen?
+      @frozen
     end
 
     # @return [String] a CLI-friendly column representation
     def inspect
-      "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @name=#{@name}>"
+      "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @name=#{@name} @type=#{@type}>"
     end
 
     # @return [Boolean] whether this column is equal to the other
@@ -82,7 +77,8 @@ module Cassandra
         @type == other.type &&
         @order == other.order &&
         @index == other.index &&
-        @static == other.static?
+        @static == other.static? &&
+        @frozen == other.frozen?
     end
     alias :== :eql?
   end