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

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.
@@ -55,41 +55,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 +123,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 +168,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 +180,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 +276,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 +289,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 +305,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 +320,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 +349,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 +375,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 +396,7 @@ module Cassandra
       @signal.get(timeout)
     end
 
-    alias :join :get
+    alias join get
   end
 
   # @private
@@ -493,9 +517,7 @@ module Cassandra
       end
 
       def failure(error)
-        unless error.is_a?(::Exception)
-          raise ::ArgumentError, "error must be an exception, #{error.inspect} given"
-        end
+        raise ::ArgumentError, "error must be an exception, #{error.inspect} given" unless error.is_a?(::Exception)
 
         return unless @state == :pending
 
@@ -507,12 +529,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 +561,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,7 +593,7 @@ 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
@@ -590,18 +622,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 +646,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 +670,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 +689,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 +708,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.
@@ -18,7 +18,7 @@
 
 module Cassandra
   class Host
-    # @return [IPAddr] host ip
+    # @return [IPAddr] host ip that clients use to connect to this host.
     attr_reader :ip
     # @note Host id can be `nil` before cluster has connected.
     # @return [Cassandra::Uuid, nil] host id.
@@ -37,9 +37,25 @@ module Cassandra
     attr_reader :tokens
     # @return [Symbol] host status. Must be `:up` or `:down`
     attr_reader :status
+    # @note This is the public IP address of the host if the cluster is deployed across multiple Amazon EC2 regions
+    #   (or equivalently multiple networks). Cassandra nodes in other EC2 regions use this address to connect to this
+    #   host.
+    # @return [IPAddr, String] broadcast address, if available.
+    attr_reader :broadcast_address
+    # @note This is the address that other Cassandra nodes use to connect to this host.
+    # @return [IPAddr, String] listen address, if available.
+    attr_reader :listen_address
 
     # @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,
+                   broadcast_address = nil,
+                   listen_address = nil)
       @ip              = ip
       @id              = id
       @rack            = rack
@@ -47,6 +63,10 @@ module Cassandra
       @release_version = release_version
       @tokens          = tokens
       @status          = status
+      @broadcast_address = broadcast_address.is_a?(String) ?
+          ::IPAddr.new(broadcast_address) : broadcast_address
+      @listen_address = listen_address.is_a?(String) ?
+          ::IPAddr.new(listen_address) : listen_address
     end
 
     # @return [Boolean] whether this host's status is `:up`
@@ -72,11 +92,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/index.rb

@@ -0,0 +1,118 @@
+# encoding: utf-8
+
+#--
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+
+module Cassandra
+  # Represents an index on a cassandra table
+  class Index
+    # @return [Cassandra::Table] table that the index applies to.
+    attr_reader :table
+    # @return [String] name of the index.
+    attr_reader :name
+    # @return [Symbol] kind of index: `:keys`, `:composites`, or `:custom`.
+    attr_reader :kind
+    # @return [String] name of column that the index applies to.
+    attr_reader :target
+    # @return [Hash] options of the index.
+    attr_reader :options
+
+    # @private
+    def initialize(table,
+                   name,
+                   kind,
+                   target,
+                   options)
+      @table = table
+      @name = name.freeze
+      @kind = kind
+      @options = options.freeze
+
+      # Target is a bit tricky; it may be an escaped name or not
+      # depending on C* version. Unify to be unescaped since a user
+      # who wants to know the target would want the bare column name.
+
+      @target = if target[0] == '"'
+                  target[1..-2]
+                else
+                  target
+                end.freeze
+    end
+
+    # @return [Boolean] whether or not this index uses a custom class.
+    def custom_index?
+      !@options['class_name'].nil?
+    end
+
+    # @return [String] name of the index class if this is a custom index; nil otherwise.
+    def custom_class_name
+      @options['class_name']
+    end
+
+    # @return [String] a cql representation of this table
+    def to_cql
+      keyspace_name = Util.escape_name(@table.keyspace.name)
+      table_name = Util.escape_name(@table.name)
+      index_name = Util.escape_name(@name)
+
+      # Target is interesting in that it's not necessarily a column name,
+      # so we can't simply escape it. If it contains a paren, we take it as is,
+      # otherwise assume it's a column name and escape accordingly.
+      escaped_target = @target.include?('(') ? @target : Util.escape_name(@target)
+
+      if custom_index?
+        "CREATE CUSTOM INDEX #{index_name} ON #{keyspace_name}.#{table_name} (#{escaped_target}) " \
+        "USING '#{@options['class_name']}'#{options_cql};"
+      else
+        "CREATE INDEX #{index_name} ON #{keyspace_name}.#{table_name} (#{escaped_target});"
+      end
+    end
+
+    # @private
+    def eql?(other)
+      other.is_a?(Index) &&
+        @table == other.table &&
+        @name == other.name &&
+        @kind == other.kind &&
+        @target == other.target &&
+        @options == other.options
+    end
+    alias == eql?
+
+    # @private
+    def inspect
+      "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+          "@name=#{@name.inspect} @table=#{@table.inspect} @kind=#{@kind.inspect} @target=#{@target.inspect}>"
+    end
+
+    private
+
+    def options_cql
+      # exclude 'class_name', 'target' keys
+      filtered_options = @options.reject do |key, _|
+        key == 'class_name' || key == 'target'
+      end
+      return '' if filtered_options.empty?
+
+      result = ' WITH OPTIONS = {'
+      result << filtered_options.map do |key, value|
+        "'#{key}': '#{value}'"
+      end.join(', ')
+      result << '}'
+      result
+    end
+  end
+end