Merge pull request #207 from datastax/RUBY-266

RUBY-266 - expose execution profiles through cluster object

Author: stamhankar999

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cassandra-driver (3.0.4.rc.1)
+    cassandra-driver (3.1.0.rc.1)
       ione (~> 1.2)
 
 GEM

lib/cassandra/cluster.rb

@@ -161,9 +161,16 @@ def protocol_version
       @connection_options.protocol_version
     end
 
+    # @param name [String] Name of profile to retrieve
+    # @return [Cassandra::Execution::Profile] execution profile of the given name
+    def execution_profile(name)
+      @profile_manager.profiles[name]
+    end
+
     # @return [Hash<String, Cassandra::Execution::Profile>] the collection of execution profiles
     def execution_profiles
-      @profile_manager.profiles
+      # Return a dup of the hash to prevent the user from adding/removing profiles from the profile-manager.
+      @profile_manager.profiles.dup
     end
 
     # @!method refresh_schema_async

lib/cassandra/execution/profile_manager.rb

@@ -33,13 +33,11 @@ def initialize(default_profile, profiles)
 
         @load_balancing_policies = Set.new
         @load_balancing_policies << default_profile.load_balancing_policy if default_profile.load_balancing_policy
+        @profiles = {DEFAULT_EXECUTION_PROFILE => default_profile}
 
-        profiles.each_value do |profile|
-          @load_balancing_policies << profile.load_balancing_policy if profile.load_balancing_policy
-          profile.merge_from(default_profile)
+        profiles.each do |name, profile|
+          add_profile(name, profile)
         end
-
-        @profiles = profiles.merge({DEFAULT_EXECUTION_PROFILE => default_profile})
       end
 
       def default_profile
@@ -59,6 +57,14 @@ def distance(host)
         return :ignore
       end
 
+      # NOTE: It's only safe to call add_profile when setting up the cluster object. In particular,
+      # this is only ok before calling Driver#connect.
+      def add_profile(name, profile)
+        @profiles[name] = profile
+        @load_balancing_policies << profile.load_balancing_policy if profile.load_balancing_policy
+        profile.merge_from(default_profile)
+      end
+
       # @private
       def inspect
         "#<#{self.class.name}:0x#{object_id.to_s(16)} " \

lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '3.0.4.rc.1'.freeze
+  VERSION = '3.1.0.rc.1'.freeze
 end

spec/support/stub_io_reactor.rb

@@ -17,6 +17,8 @@
 #++
 
 class StubIoReactor
+  include MonitorMixin
+
   class NullObject
     def method_missing(method, *args, &block)
       self
@@ -385,6 +387,8 @@ def initialize
     @connections   = ::Array.new
     @timers        = ::Array.new
     @max_conns     = ::Hash.new
+
+    mon_initialize
   end
 
   def enable_nodes(ips)
@@ -465,21 +469,26 @@ def connect(host, port, options)
   end
 
   def schedule_timer(seconds)
-    promise = Ione::Promise.new
-    @timers << Timer.new(promise, Time.now + seconds)
-    promise.future
+    synchronize do
+      promise = Ione::Promise.new
+      @timers << Timer.new(promise, Time.now + seconds)
+      promise.future
+    end
   end
 
   def advance_time(seconds)
-    @timers.dup.each {|timer| timer.advance(seconds)}
-    @timers.reject! {|timer| timer.expired?}
-
+    synchronize do
+      @timers.dup.each { |timer| timer.advance(seconds) }
+      @timers.reject! { |timer| timer.expired? }
+    end
     self
   end
 
   def cancel_timer(timer_future)
-    @timers.reject! do |timer|
-      timer.resolves?(timer_future)
+    synchronize do
+      @timers.reject! do |timer|
+        timer.resolves?(timer_future)
+      end
     end
   end
 end