cassandra-driver 3.2.0 → 3.2.5.rc.1

data/lib/cassandra/cluster/schema/fetchers.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -293,7 +293,7 @@ module Cassandra
 
       # @private
       module Fetchers
-        # rubocop:disable Style/ClassAndModuleCamelCase
+        # rubocop:disable Naming/ClassAndModuleCamelCase
         class V1_2_x
           SELECT_KEYSPACES        = 'SELECT * FROM system.schema_keyspaces'.freeze
           SELECT_TABLES           = 'SELECT * FROM system.schema_columnfamilies'.freeze

data/lib/cassandra/cluster/schema/fqcn_type_parser.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -50,7 +50,8 @@ module Cassandra
           'org.apache.cassandra.db.marshal.ShortType'         => :smallint,
           'org.apache.cassandra.db.marshal.ByteType'          => :tinyint,
           'org.apache.cassandra.db.marshal.TimeType'          => :time,
-          'org.apache.cassandra.db.marshal.SimpleDateType'    => :date
+          'org.apache.cassandra.db.marshal.SimpleDateType'    => :date,
+          'org.apache.cassandra.db.marshal.FrozenType'        => :frozen
         }.freeze
 
         def parse(string)
@@ -109,14 +110,12 @@ module Cassandra
         end
 
         def lookup_type(node)
-          return lookup_type(node.children.first) if node.name == 'org.apache.cassandra.db.marshal.FrozenType'
-
           type = @@types.fetch(node.name) do
             return Cassandra::Types.custom(dump_node(node))
           end
 
           case type
-          when :set, :list
+          when :set, :list, :frozen
             Cassandra::Types.send(type, lookup_type(node.children.first))
           when :map
             Cassandra::Types.map(*node.children.map(&method(:lookup_type)))

data/lib/cassandra/cluster/schema/partitioners.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/schema/partitioners/murmur3.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/schema/partitioners/ordered.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/schema/partitioners/random.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/schema/replication_strategies.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/schema/replication_strategies/network_topology.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/schema/replication_strategies/none.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/schema/replication_strategies/simple.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/column.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/column_container.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -294,7 +294,7 @@ module Cassandra
     # its keyspace constructed yet. So allow updating @keyspace, thus
     # allowing fetchers to create keyspace, table/view, and hook them together without
     # worrying about chickens and eggs.
-    # rubocop:disable Style/AccessorMethodName
+    # rubocop:disable Naming/AccessorMethodName
     def set_keyspace(keyspace)
       @keyspace = keyspace
     end

data/lib/cassandra/compression.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/compression/compressors/lz4.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/compression/compressors/snappy.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/custom_data.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/driver.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/duration.rb

@@ -0,0 +1,100 @@
+# encoding: utf-8
+
+#--
+# Copyright 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 Types
+
+    class Duration < Type
+      include CustomData
+
+      @@four_byte_max = 2 ** 32
+      @@eight_byte_max = 2 ** 64
+
+      # @private
+      attr_reader :months, :days, :nanos
+
+      # @private
+      def initialize(months, days, nanos)
+        super(:duration)
+        @months = months
+        @days = days
+        @nanos = nanos
+      end
+
+      def new(*values)
+        Util.assert_size(3, values, "Duration type expects three values, #{values.size} were provided")
+        values.each { |v| Util.assert_type(Int, v) }
+        Util.assert (Util.encode_zigzag32(values[0]) < @@four_byte_max), "Months value must be a valid 32-bit integer"
+        Util.assert (Util.encode_zigzag32(values[1]) < @@four_byte_max), "Days value must be a valid 32-bit integer"
+        Util.assert (Util.encode_zigzag64(values[2]) < @@eight_byte_max), "Nanos value must be a valid 64-bit integer"
+        all_positive = values.all? {|i| i >= 0 }
+        all_negative = values.all? {|i| i <= 0 }
+        Util.assert (all_positive or all_negative), "Values in a duration must be uniformly positive or negative"
+        Duration.new *values
+      end
+
+      def assert(value, message = nil, &block)
+        Util.assert_instance_of(Duration, value, message, &block)
+      end
+
+      def to_s
+        "Duration: months => #{@months}, days => #{@days}, nanos => #{@nanos}"
+      end
+
+      def hash
+        @hash ||= begin
+          h = 17
+          h = 31 * h + @months.hash
+          h = 31 * h + @days.hash
+          h = 31 * h + @nanos.hash
+          h
+        end
+      end
+
+      def eql?(other)
+        other.is_a?(Duration) &&
+          @months == other.months &&
+          @days == other.days &&
+          @nanos == other.nanos
+      end
+
+      alias == eql?
+
+      def self.cql_type
+        Type.new(@kind)
+      end
+
+      # Requirements for CustomData module
+      def self.deserialize(bytestr)
+        buffer = Cassandra::Protocol::CqlByteBuffer.new.append(bytestr)
+        Cassandra::Types::Duration.new(buffer.read_signed_vint,buffer.read_signed_vint,buffer.read_signed_vint)
+      end
+
+      def self.type
+        Cassandra::Types::Custom.new('org.apache.cassandra.db.marshal.DurationType')
+      end
+
+      def serialize
+        rv = Cassandra::Protocol::CqlByteBuffer.new
+        rv.append_signed_vint32(@months)
+        rv.append_signed_vint32(@days)
+        rv.append_signed_vint64(@nanos)
+        rv
+      end
+    end
+  end
+end

data/lib/cassandra/errors.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/execution/info.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/execution/options.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/execution/profile.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,10 @@ module Cassandra
           timeout = options[:timeout]
 
           unless timeout.nil?
-            Util.assert_instance_of(::Numeric, timeout, ":timeout must be a number of seconds, #{timeout.inspect} given")
+            Util.assert_instance_of(::Numeric,
+                                    timeout,
+                                    ":timeout must be a number of seconds,
+                                    #{timeout.inspect} given")
             Util.assert(timeout > 0, ":timeout must be greater than 0, #{timeout} given")
           end
         end

data/lib/cassandra/execution/profile_manager.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/execution/trace.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/executors.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/function.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/function_collection.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright 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/future.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -204,7 +204,13 @@ module Cassandra
       end
 
       def all(*futures)
-        futures   = Array(futures.first) if futures.one?
+        # May get called with varargs or an array of futures. In the latter case,
+        # the first element in futures is the array of futures. Promote it.
+        futures = Array(futures.first) if futures.one?
+
+        # Special case where there are no futures to aggregate.
+        return Value.new([]) if futures.empty?
+
         monitor   = Monitor.new
         promise   = Promise.new(@executor)
         remaining = futures.length
@@ -609,9 +615,9 @@ module Cassandra
               @waiting += 1
               while @state == :pending
                 if deadline
+                  break if now >= deadline
                   @cond.wait(deadline - now)
                   now = ::Time.now
-                  break if now >= deadline
                 else
                   @cond.wait
                 end

data/lib/cassandra/host.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2017 DataStax, Inc.
+# Copyright DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.