cassandra-driver 3.0.0.beta.1-java → 3.0.0-java

data/lib/cassandra/cluster/failed_connection.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 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-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,7 +24,11 @@ module Cassandra
 
       attr_reader :name
 
-      def initialize(cluster_registry, cluster_schema, schema_partitioners, replication_strategies, default_replication_strategy)
+      def initialize(cluster_registry,
+                     cluster_schema,
+                     schema_partitioners,
+                     replication_strategies,
+                     default_replication_strategy)
         @registry         = cluster_registry
         @schema           = cluster_schema
         @partitioners     = schema_partitioners
@@ -35,9 +39,7 @@ module Cassandra
       end
 
       def find_replicas(keyspace, statement)
-        unless statement.respond_to?(:partition_key) && statement.respond_to?(:keyspace)
-          return EMPTY_LIST
-        end
+        return EMPTY_LIST unless statement.respond_to?(:partition_key) && statement.respond_to?(:keyspace)
 
         keyspace      = String(statement.keyspace || keyspace)
         partition_key = statement.partition_key
@@ -59,7 +61,7 @@ module Cassandra
       end
 
       def update(data)
-        @name        = data['name']
+        @name        = data['cluster_name']
         @partitioner = @partitioners[data['partitioner']]
 
         self
@@ -74,7 +76,11 @@ module Cassandra
 
         @registry.each_host do |host|
           host.tokens.each do |token|
-            token = partitioner.parse_token(token) rescue next
+            token = begin
+                      partitioner.parse_token(token)
+                    rescue
+                      next
+                    end
             tokens.add(token)
             token_to_host[token] = host
           end
@@ -116,7 +122,7 @@ module Cassandra
         min = 0
         max = list.size - 1
 
-        while min <= max do
+        while min <= max
           idx = (min + max) / 2
           val = list[idx]
 

data/lib/cassandra/cluster/options.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,12 +20,33 @@ module Cassandra
   class Cluster
     # @private
     class Options
-      attr_reader :credentials, :auth_provider, :compressor, :port,
-                  :connect_timeout, :ssl, :heartbeat_interval, :idle_timeout,
-                  :schema_refresh_delay, :schema_refresh_timeout
+      extend AttrBoolean
+
+      attr_reader :auth_provider, :compressor, :connect_timeout, :credentials,
+                  :heartbeat_interval, :idle_timeout, :port, :schema_refresh_delay,
+                  :schema_refresh_timeout, :ssl
+      attr_boolean :protocol_negotiable, :synchronize_schema, :nodelay
+
       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, client_timestamps, nodelay)
+      def initialize(logger,
+                     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,
+                     nodelay,
+                     requests_per_connection)
+        @logger                 = logger
         @protocol_version       = protocol_version
         @credentials            = credentials
         @auth_provider          = auth_provider
@@ -38,23 +59,19 @@ module Cassandra
         @synchronize_schema     = synchronize_schema
         @schema_refresh_delay   = schema_refresh_delay
         @schema_refresh_timeout = schema_refresh_timeout
-        @client_timestamps      = client_timestamps
         @nodelay                = nodelay
 
         @connections_per_local_node  = connections_per_local_node
         @connections_per_remote_node = connections_per_remote_node
-      end
+        @requests_per_connection = requests_per_connection
 
-      def synchronize_schema?
-        @synchronize_schema
-      end
-
-      def client_timestamps?
-        @client_timestamps
-      end
+        # If @protocol_version is nil, it means we want the driver to negotiate the
+        # protocol starting with our known max (4). If @protocol_version is not nil,
+        # it means the user wants us to use a particular version, so we should not
+        # support negotiation.
 
-      def nodelay?
-        @nodelay
+        @protocol_negotiable = @protocol_version.nil?
+        @protocol_version ||= 4
       end
 
       def compression
@@ -65,16 +82,45 @@ module Cassandra
         @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
+        # Return the option if set.
+        return @connections_per_local_node if @connections_per_local_node
+
+        # For v3 and later, default is 1 local connection.
+        # For v2 and earlier, default is 2 local connections.
+        # Return the default
+        (@protocol_version > 2) ? 1 : 2
       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
+        # Return the option if set; otherwise return the default (1).
+        @connections_per_remote_node || 1
+      end
+
+      def requests_per_connection
+        # There are a few possibilities here based on @requests_per_connection:
+        # nil: default to 1024 for protocol 3 and later, 128 for < 3.
+        # we're in v2 and value too high: return 128. We don't worry
+        #   about this case for v3+ because option validation in
+        #   Cassandra::cluster_async takes care of that.
+        # good value: return it.
+        #
+        # NOTE: We can't compute and cache the result because protocol_version
+        # can change over time in theory (if all nodes are upgraded to a new
+        # version of Cassandra)
+
+        # Return the default if option wasn't specified.
+        default_requests_per_connection = @protocol_version > 2 ? 1024 : 128
+        return default_requests_per_connection unless @requests_per_connection
+
+        if @requests_per_connection > 128 && @protocol_version < 3
+          @logger.warn(
+            ":requests_per_connection setting of #{@requests_per_connection} is more " \
+                'than the max of 128 for protocol v2. Falling back to 128.'
+          )
+          return 128
+        end
+        @requests_per_connection
       end
     end
   end

data/lib/cassandra/cluster/registry.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -58,14 +58,14 @@ module Cassandra
           @hosts.values
         end
       end
-      alias :hosts :each_host
+      alias hosts each_host
 
       def host(address)
         @hosts[address.to_s]
       end
 
       def has_host?(address)
-        @hosts.has_key?(address.to_s)
+        @hosts.key?(address.to_s)
       end
 
       def host_found(address, data = {})
@@ -76,13 +76,16 @@ module Cassandra
           if host.id              == data['host_id']         &&
              host.release_version == data['release_version'] &&
              host.rack            == data['rack']            &&
-             host.datacenter      == data['data_center']
+             host.datacenter      == data['data_center']     &&
+             host.broadcast_address == data['broadcast_address'] &&
+             host.listen_address == data['listen_address']
 
             return self if host.up?
 
             host = toggle_up(host)
           else
-            @logger.debug("Host #{host.ip} metadata has been updated, it will be considered lost and found")
+            @logger.debug("Host #{host.ip} metadata has been updated, it will be " \
+                'considered lost and found')
 
             notify_lost(host)
 
@@ -143,7 +146,7 @@ module Cassandra
         ip   = address.to_s
         host = nil
 
-        return self unless @hosts.has_key?(ip)
+        return self unless @hosts.key?(ip)
 
         synchronize do
           hosts  = @hosts.dup
@@ -159,23 +162,56 @@ module Cassandra
       private
 
       def create_host(ip, data)
-        Host.new(ip, data['host_id'], data['rack'], data['data_center'], data['release_version'], Array(data['tokens']).freeze, :up)
+        Host.new(ip,
+                 data['host_id'],
+                 data['rack'],
+                 data['data_center'],
+                 data['release_version'],
+                 Array(data['tokens']).freeze,
+                 :up,
+                 data['broadcast_address'],
+                 data['listen_address']
+                )
       end
 
       def toggle_up(host)
-        host = Host.new(host.ip, host.id, host.rack, host.datacenter, host.release_version, host.tokens, :up)
+        host = Host.new(host.ip,
+                        host.id,
+                        host.rack,
+                        host.datacenter,
+                        host.release_version,
+                        host.tokens,
+                        :up,
+                        host.broadcast_address,
+                        host.listen_address)
         @logger.debug("Host #{host.ip} is up")
         @listeners.each do |listener|
-          listener.host_up(host) rescue nil
+          begin
+            listener.host_up(host)
+          rescue
+            nil
+          end
         end
         host
       end
 
       def toggle_down(host)
-        host = Host.new(host.ip, host.id, host.rack, host.datacenter, host.release_version, host.tokens, :down)
+        host = Host.new(host.ip,
+                        host.id,
+                        host.rack,
+                        host.datacenter,
+                        host.release_version,
+                        host.tokens,
+                        :down,
+                        host.broadcast_address,
+                        host.listen_address)
         @logger.debug("Host #{host.ip} is down")
         @listeners.reverse_each do |listener|
-          listener.host_down(host) rescue nil
+          begin
+            listener.host_down(host)
+          rescue
+            nil
+          end
         end
         host
       end
@@ -183,15 +219,35 @@ module Cassandra
       def notify_lost(host)
         if host.up?
           @logger.debug("Host #{host.ip} is down and lost")
-          host = Host.new(host.ip, host.id, host.rack, host.datacenter, host.release_version, host.tokens, :down)
+          host = Host.new(host.ip,
+                          host.id,
+                          host.rack,
+                          host.datacenter,
+                          host.release_version,
+                          host.tokens,
+                          :down,
+                          host.broadcast_address,
+                          host.listen_address)
           @listeners.reverse_each do |listener|
-            listener.host_down(host) rescue nil
-            listener.host_lost(host) rescue nil
+            begin
+              listener.host_down(host)
+            rescue
+              nil
+            end
+            begin
+              listener.host_lost(host)
+            rescue
+              nil
+            end
           end
         else
           @logger.debug("Host #{host.ip} is lost")
           @listeners.reverse_each do |listener|
-            listener.host_lost(host) rescue nil
+            begin
+              listener.host_lost(host)
+            rescue
+              nil
+            end
           end
         end
       end
@@ -199,8 +255,16 @@ module Cassandra
       def notify_found(host)
         @logger.debug("Host #{host.ip} is found and up")
         @listeners.each do |listener|
-          listener.host_found(host) rescue nil
-          listener.host_up(host) rescue nil
+          begin
+            listener.host_found(host)
+          rescue
+            nil
+          end
+          begin
+            listener.host_up(host)
+          rescue
+            nil
+          end
         end
       end
     end

data/lib/cassandra/cluster/schema.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,7 +32,13 @@ module Cassandra
       def get_pk_idx(metadata)
         return EMPTY_LIST unless metadata
 
-        keyspace_name, table_name, _ = metadata.first
+        # metadata is an array of column-specs; each column-spec is an array
+        # of keyspace_name, tablename, other stuff. We only care about the first two.
+        # See read_prepared_metadata_v4 in coder.rb for more details.
+        # NB: sandman: I think all of the column specs have the same keyspace and
+        # table name in this context, so we can safely grab the first.
+
+        keyspace_name, table_name = metadata.first
         return EMPTY_LIST unless keyspace_name && table_name
 
         keyspace = @keyspaces[keyspace_name]
@@ -76,7 +82,7 @@ module Cassandra
           replace_keyspace(keyspace)
         end
 
-        @keyspaces.each do |name, keyspace|
+        @keyspaces.each do |name, _keyspace|
           delete_keyspace(name) unless current_keyspaces.include?(name)
         end
 
@@ -120,7 +126,7 @@ module Cassandra
       end
 
       def replace_table(table)
-        keyspace = @keyspaces[table.keyspace]
+        keyspace = table.keyspace
 
         return self unless keyspace
 
@@ -163,6 +169,50 @@ module Cassandra
         self
       end
 
+      def replace_materialized_view(view)
+        keyspace = view.keyspace
+
+        return self unless keyspace
+
+        old_view = keyspace.materialized_view(view.name)
+
+        return self if old_view == view
+
+        keyspace = keyspace.update_materialized_view(view)
+
+        synchronize do
+          keyspaces = @keyspaces.dup
+          keyspaces[keyspace.name] = keyspace
+          @keyspaces = keyspaces
+        end
+
+        keyspace_changed(keyspace)
+
+        self
+      end
+
+      def delete_materialized_view(keyspace_name, view_name)
+        keyspace = @keyspaces[keyspace_name]
+
+        return self unless keyspace
+
+        view = keyspace.materialized_view(view_name)
+
+        return self unless view
+
+        keyspace = keyspace.delete_materialized_view(view_name)
+
+        synchronize do
+          keyspaces = @keyspaces.dup
+          keyspaces[keyspace_name] = keyspace
+          @keyspaces = keyspaces
+        end
+
+        keyspace_changed(keyspace)
+
+        self
+      end
+
       def replace_type(type)
         keyspace = @keyspaces[type.keyspace]
 
@@ -311,25 +361,37 @@ module Cassandra
           @keyspaces.values
         end
       end
-      alias :keyspaces :each_keyspace
+      alias keyspaces each_keyspace
 
       private
 
       def keyspace_created(keyspace)
         @listeners.each do |listener|
-          listener.keyspace_created(keyspace) rescue nil
+          begin
+            listener.keyspace_created(keyspace)
+          rescue
+            nil
+          end
         end
       end
 
       def keyspace_changed(keyspace)
         @listeners.each do |listener|
-          listener.keyspace_changed(keyspace) rescue nil
+          begin
+            listener.keyspace_changed(keyspace)
+          rescue
+            nil
+          end
         end
       end
 
       def keyspace_dropped(keyspace)
         @listeners.each do |listener|
-          listener.keyspace_dropped(keyspace) rescue nil
+          begin
+            listener.keyspace_dropped(keyspace)
+          rescue
+            nil
+          end
         end
       end
     end