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

data/lib/cassandra/future.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.
@@ -46,7 +46,9 @@ module Cassandra
     # @private
     class Error < Future
       def initialize(error)
-        raise ::ArgumentError, "error must be an exception, #{error.inspect} given" unless error.is_a?(::Exception)
+        unless error.is_a?(::Exception)
+          raise ::ArgumentError, "error must be an exception, #{error.inspect} given"
+        end
 
         @error = error
       end
@@ -55,41 +57,53 @@ module Cassandra
         raise(@error, @error.message, @error.backtrace)
       end
 
-      alias :join :get
+      alias join get
 
       def on_success
-        raise ::ArgumentError, "no block given" unless block_given?
+        raise ::ArgumentError, 'no block given' unless block_given?
         self
       end
 
       def on_failure
-        raise ::ArgumentError, "no block given" unless block_given?
-        yield(@error) rescue nil
+        raise ::ArgumentError, 'no block given' unless block_given?
+        begin
+          yield(@error)
+        rescue
+          nil
+        end
         self
       end
 
       def on_complete
-        raise ::ArgumentError, "no block given" unless block_given?
-        yield(nil, @error) rescue nil
+        raise ::ArgumentError, 'no block given' unless block_given?
+        begin
+          yield(nil, @error)
+        rescue
+          nil
+        end
         self
       end
 
       def add_listener(listener)
-        unless (listener.respond_to?(:success) && listener.respond_to?(:failure))
-          raise ::ArgumentError, "listener must respond to both #success and #failure"
+        unless listener.respond_to?(:success) && listener.respond_to?(:failure)
+          raise ::ArgumentError, 'listener must respond to both #success and #failure'
         end
 
-        listener.failure(@error) rescue nil
+        begin
+          listener.failure(@error)
+        rescue
+          nil
+        end
         self
       end
 
       def then
-        raise ::ArgumentError, "no block given" unless block_given?
+        raise ::ArgumentError, 'no block given' unless block_given?
         self
       end
 
       def fallback
-        raise ::ArgumentError, "no block given" unless block_given?
+        raise ::ArgumentError, 'no block given' unless block_given?
 
         begin
           result = yield(@error)
@@ -111,31 +125,43 @@ module Cassandra
         @value
       end
 
-      alias :join :get
+      alias join get
 
       def on_success
-        raise ::ArgumentError, "no block given" unless block_given?
-        yield(@value) rescue nil
+        raise ::ArgumentError, 'no block given' unless block_given?
+        begin
+          yield(@value)
+        rescue
+          nil
+        end
         self
       end
 
       def on_failure
-        raise ::ArgumentError, "no block given" unless block_given?
+        raise ::ArgumentError, 'no block given' unless block_given?
         self
       end
 
       def on_complete
-        raise ::ArgumentError, "no block given" unless block_given?
-        yield(@value, nil) rescue nil
+        raise ::ArgumentError, 'no block given' unless block_given?
+        begin
+          yield(@value, nil)
+        rescue
+          nil
+        end
         self
       end
 
       def add_listener(listener)
-        unless (listener.respond_to?(:success) && listener.respond_to?(:failure))
-          raise ::ArgumentError, "listener must respond to both #success and #failure"
+        unless listener.respond_to?(:success) && listener.respond_to?(:failure)
+          raise ::ArgumentError, 'listener must respond to both #success and #failure'
         end
 
-        listener.success(@value) rescue nil
+        begin
+          listener.success(@value)
+        rescue
+          nil
+        end
         self
       end
 
@@ -144,7 +170,7 @@ module Cassandra
       end
 
       def then
-        raise ::ArgumentError, "no block given" unless block_given?
+        raise ::ArgumentError, 'no block given' unless block_given?
 
         begin
           result = yield(@value)
@@ -156,7 +182,7 @@ module Cassandra
       end
 
       def fallback
-        raise ::ArgumentError, "no block given" unless block_given?
+        raise ::ArgumentError, 'no block given' unless block_given?
         self
       end
     end
@@ -252,7 +278,7 @@ module Cassandra
     # @raise [ArgumentError] if no block given
     # @return [self]
     def on_success(&block)
-      raise ::ArgumentError, "no block given" unless block_given?
+      raise ::ArgumentError, 'no block given' unless block_given?
       @signal.on_success(&block)
       self
     end
@@ -265,7 +291,7 @@ module Cassandra
     # @raise [ArgumentError] if no block given
     # @return [self]
     def on_failure(&block)
-      raise ::ArgumentError, "no block given" unless block_given?
+      raise ::ArgumentError, 'no block given' unless block_given?
       @signal.on_failure(&block)
       self
     end
@@ -281,7 +307,7 @@ module Cassandra
     # @raise [ArgumentError] if no block given
     # @return [self]
     def on_complete(&block)
-      raise ::ArgumentError, "no block given" unless block_given?
+      raise ::ArgumentError, 'no block given' unless block_given?
       @signal.on_complete(&block)
       self
     end
@@ -296,8 +322,8 @@ module Cassandra
     #   `#success` and `#failure`
     # @return [self]
     def add_listener(listener)
-      unless (listener.respond_to?(:success) && listener.respond_to?(:failure))
-        raise ::ArgumentError, "listener must respond to both #success and #failure"
+      unless listener.respond_to?(:success) && listener.respond_to?(:failure)
+        raise ::ArgumentError, 'listener must respond to both #success and #failure'
       end
 
       @signal.add_listener(listener)
@@ -325,7 +351,7 @@ module Cassandra
     # @raise [ArgumentError] if no block given
     # @return [Cassandra::Future] a new future
     def then(&block)
-      raise ::ArgumentError, "no block given" unless block_given?
+      raise ::ArgumentError, 'no block given' unless block_given?
       @signal.then(&block)
     end
 
@@ -351,7 +377,7 @@ module Cassandra
     # @raise [ArgumentError] if no block given
     # @return [Cassandra::Future] a new future
     def fallback(&block)
-      raise ::ArgumentError, "no block given" unless block_given?
+      raise ::ArgumentError, 'no block given' unless block_given?
       @signal.fallback(&block)
     end
 
@@ -372,7 +398,7 @@ module Cassandra
       @signal.get(timeout)
     end
 
-    alias :join :get
+    alias join get
   end
 
   # @private
@@ -507,12 +533,17 @@ module Cassandra
           @error = error
           @state = :broken
 
-          listeners, @listeners = @listeners, nil
+          listeners = @listeners
+          @listeners = nil
         end
 
         @executor.execute do
           listeners.each do |listener|
-            listener.failure(error) rescue nil
+            begin
+              listener.failure(error)
+            rescue
+              nil
+            end
           end
 
           synchronize do
@@ -534,12 +565,17 @@ module Cassandra
           @value = value
           @state = :fulfilled
 
-          listeners, @listeners = @listeners, nil
+          listeners = @listeners
+          @listeners = nil
         end
 
         @executor.execute do
           listeners.each do |listener|
-            listener.success(value) rescue nil
+            begin
+              listener.success(value)
+            rescue
+              nil
+            end
           end
 
           synchronize do
@@ -561,10 +597,12 @@ module Cassandra
       #
       # @return [Object] the value that the future has been resolved with
       def get(timeout = nil)
-        timeout = timeout && Float(timeout)
+        timeout &&= Float(timeout)
 
         if timeout
-          raise ::ArgumentError, "timeout cannot be negative, #{timeout.inspect} given" if timeout < 0
+          if timeout < 0
+            raise ::ArgumentError, "timeout cannot be negative, #{timeout.inspect} given"
+          end
 
           start    = ::Time.now
           now      = start
@@ -590,18 +628,18 @@ module Cassandra
 
           if @state == :pending
             total_wait = deadline - start
-            raise Errors::TimeoutError, "Future did not complete within #{timeout.inspect} seconds. Wait time: #{total_wait.inspect}"
+            raise Errors::TimeoutError,
+                  "Future did not complete within #{timeout.inspect} seconds. " \
+                      "Wait time: #{total_wait.inspect}"
           end
         end
 
-        if @state == :broken
-          raise(@error, @error.message, @error.backtrace)
-        end
+        raise(@error, @error.message, @error.backtrace) if @state == :broken
 
         @value
       end
 
-      alias :join :get
+      alias join get
 
       def add_listener(listener)
         if @state == :pending
@@ -614,8 +652,16 @@ module Cassandra
           end
         end
 
-        listener.success(@value) rescue nil if @state == :fulfilled
-        listener.failure(@error) rescue nil if @state == :broken
+        begin
+          listener.success(@value)
+        rescue
+          nil
+        end if @state == :fulfilled
+        begin
+          listener.failure(@error)
+        rescue
+          nil
+        end if @state == :broken
 
         self
       end
@@ -630,7 +676,11 @@ module Cassandra
           end
         end
 
-        yield(@value) rescue nil if @state == :fulfilled
+        begin
+          yield(@value)
+        rescue
+          nil
+        end if @state == :fulfilled
 
         self
       end
@@ -645,7 +695,11 @@ module Cassandra
           end
         end
 
-        yield(@error) rescue nil if @state == :broken
+        begin
+          yield(@error)
+        rescue
+          nil
+        end if @state == :broken
 
         self
       end
@@ -660,7 +714,11 @@ module Cassandra
           end
         end
 
-        yield(@value, @error) rescue nil
+        begin
+          yield(@value, @error)
+        rescue
+          nil
+        end
 
         self
       end

data/lib/cassandra/host.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.
@@ -39,7 +39,13 @@ module Cassandra
     attr_reader :status
 
     # @private
-    def initialize(ip, id = nil, rack = nil, datacenter = nil, release_version = nil, tokens = EMPTY_LIST, status = :up)
+    def initialize(ip,
+                   id = nil,
+                   rack = nil,
+                   datacenter = nil,
+                   release_version = nil,
+                   tokens = EMPTY_LIST,
+                   status = :up)
       @ip              = ip
       @id              = id
       @rack            = rack
@@ -72,11 +78,11 @@ module Cassandra
     def eql?(other)
       other.eql?(@ip)
     end
-    alias :== :eql?
+    alias == eql?
 
     # @private
     def inspect
-      "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @ip=#{@ip}>"
+      "#<#{self.class.name}:0x#{object_id.to_s(16)} @ip=#{@ip}>"
     end
   end
 end

data/lib/cassandra/keyspace.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.
@@ -42,7 +42,7 @@ module Cassandra
           @klass == other.klass &&
           @options == other.options
       end
-      alias :== :eql?
+      alias == eql?
     end
 
     # @return [String] this keyspace name
@@ -51,7 +51,13 @@ module Cassandra
     attr_reader :replication
 
     # @private
-    def initialize(name, durable_writes, replication, tables, types, functions, aggregates)
+    def initialize(name,
+                   durable_writes,
+                   replication,
+                   tables,
+                   types,
+                   functions,
+                   aggregates)
       @name           = name
       @durable_writes = durable_writes
       @replication    = replication
@@ -69,7 +75,7 @@ module Cassandra
     # @return [Boolean] whether this keyspace has a table with the given name
     # @param name [String] table name
     def has_table?(name)
-      @tables.has_key?(name)
+      @tables.key?(name)
     end
 
     # @return [Cassandra::Table, nil] a table or nil
@@ -92,13 +98,13 @@ module Cassandra
         @tables.values
       end
     end
-    alias :tables :each_table
+    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)
+      @types.key?(name)
     end
 
     # @return [Cassandra::Types::UserDefined, nil] a type or nil
@@ -121,13 +127,14 @@ module Cassandra
         @types.values
       end
     end
-    alias :types :each_type
+    alias types each_type
 
-    # @return [Boolean] whether this keyspace has a function with the given name and arguments
+    # @return [Boolean] whether this keyspace has a function with the given name and
+    #   arguments
     # @param name [String] function name
     # @param args [Array<String>] (var-args style) function argument types
     def has_function?(name, *args)
-      @functions.has_key?([name.downcase, args])
+      !@functions.get(name.downcase, args).nil?
     end
 
     # @return [Cassandra::Function, nil] a function or nil
@@ -136,7 +143,7 @@ module Cassandra
     def function(name, *args)
       # The functions_hash datastructure is a hash <[func-name, args], Function>.
       # So construct the array-key we're looking for.
-      @functions[[name.downcase, args]]
+      @functions.get(name.downcase, args)
     end
 
     # Yield or enumerate each function defined in this keyspace
@@ -147,27 +154,27 @@ module Cassandra
     #   @return [Array<Cassandra::Function>] a list of functions
     def each_function(&block)
       if block_given?
-        @functions.each_value(&block)
+        @functions.each_function(&block)
         self
       else
-        @functions.values
+        @functions.functions
       end
     end
-    alias :functions :each_function
+    alias functions each_function
 
     # @return [Boolean] whether this keyspace has an aggregate with the given
     #                   name and arguments
     # @param name [String] aggregate name
     # @param args [Array<String>] (var-args style) aggregate function argument types
     def has_aggregate?(name, *args)
-      @aggregates.has_key?([name.downcase, args])
+      !@aggregates.get(name.downcase, args).nil?
     end
 
     # @return [Cassandra::Aggregate, nil] an aggregate or nil
     # @param name [String] aggregate name
     # @param args [Array<String>] (var-args style) aggregate function argument types
     def aggregate(name, *args)
-      @aggregates[[name.downcase, args]]
+      @aggregates.get(name.downcase, args)
     end
 
     # Yield or enumerate each aggregate defined in this keyspace
@@ -178,17 +185,19 @@ module Cassandra
     #   @return [Array<Cassandra::Aggregate>] a list of aggregates
     def each_aggregate(&block)
       if block_given?
-        @aggregates.each_value(&block)
+        @aggregates.each_function(&block)
         self
       else
-        @aggregates.values
+        @aggregates.functions
       end
     end
-    alias :aggregates :each_aggregate
+    alias aggregates each_aggregate
 
     # @return [String] a cql representation of this keyspace
     def to_cql
-      "CREATE KEYSPACE #{Util.escape_name(@name)} WITH replication = #{@replication.to_cql} AND durable_writes = #{@durable_writes};"
+      "CREATE KEYSPACE #{Util.escape_name(@name)} " \
+          "WITH replication = #{@replication.to_cql} AND " \
+          "durable_writes = #{@durable_writes};"
     end
 
     # @private
@@ -202,67 +211,115 @@ module Cassandra
         @functions == other.raw_functions &&
         @aggregates == other.raw_aggregates
     end
-    alias :== :eql?
+    alias == eql?
 
     # @private
     def inspect
-      "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @name=#{@name}>"
+      "#<#{self.class.name}:0x#{object_id.to_s(16)} @name=#{@name}>"
     end
 
     # @private
     def update_table(table)
       tables = @tables.dup
       tables[table.name] = table
-      Keyspace.new(@name, @durable_writes, @replication, tables, @types, @functions, @aggregates)
+      Keyspace.new(@name,
+                   @durable_writes,
+                   @replication,
+                   tables,
+                   @types,
+                   @functions,
+                   @aggregates)
     end
 
     # @private
     def delete_table(table_name)
       tables = @tables.dup
       tables.delete(table_name)
-      Keyspace.new(@name, @durable_writes, @replication, tables, @types, @functions, @aggregates)
+      Keyspace.new(@name,
+                   @durable_writes,
+                   @replication,
+                   tables,
+                   @types,
+                   @functions,
+                   @aggregates)
     end
 
     # @private
     def update_type(type)
       types = @types.dup
       types[type.name] = type
-      Keyspace.new(@name, @durable_writes, @replication, @tables, types, @functions, @aggregates)
+      Keyspace.new(@name,
+                   @durable_writes,
+                   @replication,
+                   @tables,
+                   types,
+                   @functions,
+                   @aggregates)
     end
 
     # @private
     def delete_type(type_name)
       types = @types.dup
       types.delete(type_name)
-      Keyspace.new(@name, @durable_writes, @replication, @tables, types, @functions, @aggregates)
+      Keyspace.new(@name,
+                   @durable_writes,
+                   @replication,
+                   @tables,
+                   types,
+                   @functions,
+                   @aggregates)
     end
 
     # @private
     def update_function(function)
       functions = @functions.dup
-      functions[[function.name, function.argument_types]] = function
-      Keyspace.new(@name, @durable_writes, @replication, @tables, @types, functions, @aggregates)
+      functions.add_or_update(function)
+      Keyspace.new(@name,
+                   @durable_writes,
+                   @replication,
+                   @tables,
+                   @types,
+                   functions,
+                   @aggregates)
     end
 
     # @private
     def delete_function(function_name, function_args)
       functions = @functions.dup
-      functions.delete([function_name, function_args])
-      Keyspace.new(@name, @durable_writes, @replication, @tables, @types, functions, @aggregates)
+      functions.delete(function_name, function_args)
+      Keyspace.new(@name,
+                   @durable_writes,
+                   @replication,
+                   @tables,
+                   @types,
+                   functions,
+                   @aggregates)
     end
 
     # @private
     def update_aggregate(aggregate)
       aggregates = @aggregates.dup
-      aggregates[[aggregate.name, aggregate.argument_types]] = aggregate
-      Keyspace.new(@name, @durable_writes, @replication, @tables, @types, @functions, aggregates)
+      aggregates.add_or_update(aggregate)
+      Keyspace.new(@name,
+                   @durable_writes,
+                   @replication,
+                   @tables,
+                   @types,
+                   @functions,
+                   aggregates)
     end
 
     # @private
     def delete_aggregate(aggregate_name, aggregate_args)
       aggregates = @aggregates.dup
-      aggregates.delete([aggregate_name, aggregate_args])
-      Keyspace.new(@name, @durable_writes, @replication, @tables, @types, @functions, aggregates)
+      aggregates.delete(aggregate_name, aggregate_args)
+      Keyspace.new(@name,
+                   @durable_writes,
+                   @replication,
+                   @tables,
+                   @types,
+                   @functions,
+                   aggregates)
     end
 
     # @private