cassandra-driver 3.0.3-java → 3.1.0-java

data/lib/cassandra/execution/profile_manager.rb

@@ -0,0 +1,71 @@
+# 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
+  module Execution
+    # @private
+    class ProfileManager
+      attr_reader :profiles
+      attr_reader :load_balancing_policies
+
+      def initialize(default_profile, profiles)
+        # default_profile is the default profile that we constructed internally. However, the user can override it
+        # with their own :default profile. If that happens, ignore the internally generated default profile.
+
+        profiles[:default] = default_profile unless profiles.key?(:default)
+
+        # Save off all of the load-balancing policies for easy access.
+        @load_balancing_policies = Set.new
+        profiles.each do |name, profile|
+          @load_balancing_policies << profile.load_balancing_policy
+        end
+        @profiles = profiles
+      end
+
+      def default_profile
+        @profiles[:default]
+      end
+
+      def distance(host)
+        # Return the min distance to the host, as per each lbp.
+        distances = Set.new
+        @load_balancing_policies.each do |lbp|
+          distances.add(lbp.distance(host))
+        end
+        return :local if distances.include?(:local)
+        return :remote if distances.include?(:remote)
+
+        # Fall back to ignore the host.
+        :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
+      end
+
+      # @private
+      def inspect
+        "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+          "profiles=#{@profiles.inspect}>"
+      end
+    end
+  end
+end

data/lib/cassandra/execution/trace.rb

@@ -53,7 +53,7 @@ module Cassandra
       attr_reader :id
 
       # @private
-      def initialize(id, client)
+      def initialize(id, client, load_balancing_policy)
         @id            = id
         @client        = client
         @coordinator   = nil
@@ -65,6 +65,7 @@ module Cassandra
         @client_ip     = nil
         @loaded        = false
         @loaded_events = false
+        @load_balancing_policy = load_balancing_policy
 
         mon_initialize
       end
@@ -141,12 +142,12 @@ module Cassandra
 
           attempt = 1
           data    = @client.query(Statements::Simple.new(SELECT_SESSION % @id),
-                                  VOID_OPTIONS).get.first
+                                  VOID_OPTIONS.override(load_balancing_policy: @load_balancing_policy)).get.first
 
           while data.nil? && attempt <= 5
             sleep(attempt * 0.4)
             data = @client.query(Statements::Simple.new(SELECT_SESSION % @id),
-                                 VOID_OPTIONS).get.first
+                                 VOID_OPTIONS.override(load_balancing_policy: @load_balancing_policy)).get.first
             break if data
             attempt += 1
           end
@@ -173,7 +174,7 @@ module Cassandra
           @events = []
 
           @client.query(Statements::Simple.new(SELECT_EVENTS % @id),
-                        VOID_OPTIONS).get.each do |row|
+                        VOID_OPTIONS.override(load_balancing_policy: @load_balancing_policy)).get.each do |row|
             @events << Event.new(row['event_id'],
                                  row['activity'],
                                  row['source'],

data/lib/cassandra/executors.rb

@@ -43,8 +43,8 @@ module Cassandra
         @cond    = new_cond
         @tasks   = ::Array.new
         @waiting = 0
-        @pool    = ::Array.new(size, &method(:spawn_thread))
         @term    = false
+        @pool    = ::Array.new(size, &method(:spawn_thread))
       end
 
       def execute(*args, &block)

data/lib/cassandra/index.rb

@@ -62,7 +62,7 @@ module Cassandra
       @options['class_name']
     end
 
-    # @return [String] a cql representation of this table
+    # @return [String] a cql representation of this index
     def to_cql
       keyspace_name = Util.escape_name(@table.keyspace.name)
       table_name = Util.escape_name(@table.name)

data/lib/cassandra/keyspace.rb

@@ -69,11 +69,18 @@ module Cassandra
       @views          = views
 
       # Set the keyspace attribute on the tables and views.
+      # Also set up the index collection on the keyspace and the view-collection on each table.
+      @indexes_hash = {}
       @tables.each_value do |t|
         t.set_keyspace(self)
+        t.each_index do |index|
+          @indexes_hash[index.name] = index
+        end
       end
       @views.each_value do |v|
         v.set_keyspace(self)
+        table = v.base_table
+        table.add_view(v) if table
       end
     end
 
@@ -110,6 +117,34 @@ module Cassandra
     end
     alias tables each_table
 
+    # @return [Boolean] whether this keyspace has an index with the given name
+    # @param name [String] index name
+    def has_index?(name)
+      @indexes_hash.key?(name)
+    end
+
+    # @return [Cassandra::Index, nil] an index or nil
+    # @param name [String] index name
+    def index(name)
+      @indexes_hash[name]
+    end
+
+    # Yield or enumerate each index defined in this keyspace
+    # @overload each_index
+    #   @yieldparam index [Cassandra::Index] current index
+    #   @return [Cassandra::Keyspace] self
+    # @overload each_index
+    #   @return [Array<Cassandra::Index>] a list of indexes
+    def each_index(&block)
+      if block_given?
+        @indexes_hash.each_value(&block)
+        self
+      else
+        @indexes_hash.values
+      end
+    end
+    alias indexes each_index
+
     # @return [Boolean] whether this keyspace has a materialized view with the given name
     # @param name [String] materialized view name
     def has_materialized_view?(name)
@@ -133,7 +168,7 @@ module Cassandra
     def each_materialized_view(&block)
       if block_given?
         @views.each_value do |v|
-          block.call(v) if v.base_table
+          yield(v) if v.base_table
         end
         self
       else

data/lib/cassandra/protocol.rb

@@ -49,6 +49,11 @@ module Cassandra
       SCHEMA_CHANGE_TARGET_FUNCTION  = 'FUNCTION'.freeze
       SCHEMA_CHANGE_TARGET_AGGREGATE = 'AGGREGATE'.freeze
     end
+
+    module Versions
+      BETA_VERSION = 5
+      MAX_SUPPORTED_VERSION = 4
+    end
   end
 end
 

data/lib/cassandra/protocol/coder.rb

@@ -268,7 +268,8 @@ module Cassandra
           value      = ::Hash.new
 
           buffer.read_signed_int.times do
-            value[read_value_v4(buffer, key_type, custom_type_handlers)] = read_value_v4(buffer, value_type, custom_type_handlers)
+            value[read_value_v4(buffer, key_type, custom_type_handlers)] =
+              read_value_v4(buffer, value_type, custom_type_handlers)
           end
 
           value

data/lib/cassandra/protocol/cql_byte_buffer.rb

@@ -204,6 +204,15 @@ module Cassandra
               e.backtrace
       end
 
+      def read_inet_addr
+        size = read_byte
+        IPAddr.new_ntoh(read(size))
+      rescue RangeError => e
+        raise Errors::DecodingError,
+              "Not enough bytes available to decode an INET addr: #{e.message}",
+              e.backtrace
+      end
+
       def read_consistency
         index = read_unsigned_short
         if index >= CONSISTENCIES.size || CONSISTENCIES[index].nil?
@@ -232,6 +241,18 @@ module Cassandra
         map
       end
 
+      def read_reason_map
+        # reason_map is new in v5. Starts with an int indicating the number of key-value pairs, followed by
+        # the key-value pairs. Keys are inet's, values are short int's.
+        map = {}
+        map_size = read_int
+        map_size.times do
+          key = read_inet_addr
+          map[key] = read_short
+        end
+        map
+      end
+
       def read_string_multimap
         map = {}
         map_size = read_unsigned_short

data/lib/cassandra/protocol/responses/read_failure_error_response.rb

@@ -19,7 +19,7 @@
 module Cassandra
   module Protocol
     class ReadFailureErrorResponse < ErrorResponse
-      attr_reader :consistency, :received, :blockfor, :numfailures, :data_present
+      attr_reader :consistency, :received, :blockfor, :numfailures, :data_present, :failures_by_node
 
       def initialize(custom_payload,
                      warnings,
@@ -29,14 +29,19 @@ module Cassandra
                      received,
                      blockfor,
                      numfailures,
-                     data_present)
+                     data_present,
+                     failures_by_node)
         super(custom_payload, warnings, code, message)
 
         @consistency  = consistency
         @received     = received
         @blockfor     = blockfor
-        @numfailures  = numfailures
         @data_present = data_present
+        @failures_by_node = failures_by_node
+
+        # If failures_by_node is set, numfailures isn't, and v.v. Set @numfailures to the size of the failure-map
+        # if numfailures is nil.
+        @numfailures = numfailures || @failures_by_node.size
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
@@ -53,7 +58,8 @@ module Cassandra
                               @consistency,
                               @blockfor,
                               @numfailures,
-                              @received)
+                              @received,
+                              @failures_by_node)
       end
 
       def to_s

data/lib/cassandra/protocol/responses/write_failure_error_response.rb

@@ -19,7 +19,7 @@
 module Cassandra
   module Protocol
     class WriteFailureErrorResponse < ErrorResponse
-      attr_reader :consistency, :received, :blockfor, :numfailures, :write_type
+      attr_reader :consistency, :received, :blockfor, :numfailures, :write_type, :failures_by_node
 
       def initialize(custom_payload,
                      warnings,
@@ -29,16 +29,21 @@ module Cassandra
                      received,
                      blockfor,
                      numfailures,
-                     write_type)
+                     write_type,
+                     failures_by_node)
         super(custom_payload, warnings, code, message)
 
         write_type.downcase!
 
-        @consistency = consistency
-        @received    = received
-        @blockfor    = blockfor
-        @numfailures = numfailures
-        @write_type  = write_type.to_sym
+        @consistency      = consistency
+        @received         = received
+        @blockfor         = blockfor
+        @write_type       = write_type.to_sym
+        @failures_by_node = failures_by_node
+
+        # If failures_by_node is set, numfailures isn't, and v.v. Set @numfailures to the size of the failure-map
+        # if numfailures is nil.
+        @numfailures = numfailures || @failures_by_node.size
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
@@ -55,7 +60,8 @@ module Cassandra
                                @consistency,
                                @blockfor,
                                @numfailures,
-                               @received)
+                               @received,
+                               @failures_by_node)
       end
 
       def to_s

data/lib/cassandra/protocol/v3.rb

@@ -166,7 +166,8 @@ module Cassandra
           if compression == 1
             if @compressor
               buffer = CqlByteBuffer.new(
-                @compressor.decompress(buffer.read(frame_length)))
+                @compressor.decompress(buffer.read(frame_length))
+              )
               frame_length = buffer.size
             else
               raise Errors::DecodingError,

data/lib/cassandra/protocol/v4.rb

@@ -23,7 +23,7 @@ module Cassandra
       class Encoder
         HEADER_FORMAT = 'c2ncN'.freeze
 
-        def initialize(compressor = nil, protocol_version = 4)
+        def initialize(compressor, protocol_version)
           @compressor       = compressor
           @protocol_version = protocol_version
         end
@@ -31,6 +31,7 @@ module Cassandra
         def encode(buffer, request, stream_id)
           flags  = 0
           flags |= 0x02 if request.trace?
+          flags |= 0x10 if @protocol_version == Cassandra::Protocol::Versions::BETA_VERSION
 
           body = CqlByteBuffer.new
 
@@ -178,7 +179,8 @@ module Cassandra
           if compression
             if @compressor
               buffer = CqlByteBuffer.new(
-                @compressor.decompress(buffer.read(frame_length)))
+                @compressor.decompress(buffer.read(frame_length))
+              )
               frame_length = buffer.size
             else
               raise Errors::DecodingError,
@@ -259,15 +261,33 @@ module Cassandra
                                            buffer.read_int,
                                            (buffer.read_byte != 0))
             when 0x1300
-              ReadFailureErrorResponse.new(custom_payload,
-                                           warnings,
-                                           code,
-                                           message,
-                                           buffer.read_consistency,
-                                           buffer.read_int,
-                                           buffer.read_int,
-                                           buffer.read_int,
-                                           (buffer.read_byte != 0))
+              cl = buffer.read_consistency
+              received = buffer.read_int
+              block_for = buffer.read_int
+              if protocol_version < 5
+                ReadFailureErrorResponse.new(custom_payload,
+                                             warnings,
+                                             code,
+                                             message,
+                                             cl,
+                                             received,
+                                             block_for,
+                                             buffer.read_int,
+                                             (buffer.read_byte != 0),
+                                             nil)
+              else
+                failures_by_node = buffer.read_reason_map
+                ReadFailureErrorResponse.new(custom_payload,
+                                             warnings,
+                                             code,
+                                             message,
+                                             cl,
+                                             received,
+                                             block_for,
+                                             nil,
+                                             (buffer.read_byte != 0),
+                                             failures_by_node)
+              end
             when 0x1400
               FunctionFailureErrorResponse.new(custom_payload,
                                                warnings,
@@ -277,15 +297,33 @@ module Cassandra
                                                buffer.read_string,
                                                buffer.read_string_list)
             when 0x1500
-              WriteFailureErrorResponse.new(custom_payload,
-                                            warnings,
-                                            code,
-                                            message,
-                                            buffer.read_consistency,
-                                            buffer.read_int,
-                                            buffer.read_int,
-                                            buffer.read_int,
-                                            buffer.read_string)
+              cl = buffer.read_consistency
+              received = buffer.read_int
+              block_for = buffer.read_int
+              if protocol_version < 5
+                WriteFailureErrorResponse.new(custom_payload,
+                                              warnings,
+                                              code,
+                                              message,
+                                              cl,
+                                              received,
+                                              block_for,
+                                              buffer.read_int,
+                                              buffer.read_string,
+                                              nil)
+              else
+                failures_by_node = buffer.read_reason_map
+                WriteFailureErrorResponse.new(custom_payload,
+                                              warnings,
+                                              code,
+                                              message,
+                                              cl,
+                                              received,
+                                              block_for,
+                                              nil,
+                                              buffer.read_string,
+                                              failures_by_node)
+              end
             when 0x2400
               AlreadyExistsErrorResponse.new(custom_payload,
                                              warnings,