cassandra-driver 3.2.1 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c8e0d7864e62d15fe4b121fa231a7aacf0e5b9ac
-  data.tar.gz: d764b23105540c02c13ba4c6178e9b670b643df9
+SHA256:
+  metadata.gz: e8c5a43dbb0d9f94193939527fc90de1e0f0d52c3860626c6344f22a5f42dd70
+  data.tar.gz: 1de98d478a133db7eb1c21812562c9397a882483db11f2da5b976e9cbf0b2b8e
 SHA512:
-  metadata.gz: ff7569c2777c2181b05f3dad7fbd77d1c10bd118f34992f8a8987085338e3f9d95725548365d9e3f1545c7a58a6dacfd2a9ef9dcf5328f00341d78e3cc8fa2f2
-  data.tar.gz: 560dc83528a665916db34e8299b902348da48d3ff14d931703357dc261b941afdc3139e3d0588434ef92860ef172392b9101735f84a17f1fab5f3202cf483c93
+  metadata.gz: 638e6bbee952fd60df5aead9e71072b64ffa0d4c93ed8b85abc57fd40733c12972be228af587adbb8a86fa798d776329b82c492e02d95bf069323c821b9685c8
+  data.tar.gz: a6f0e1760b0cefacecae677961c4a8bcefd40d2a71df85e1ac1dd086a4b12214859aba362c36cd8b6b4de749079f49415de0224d196f95369d4a31164401fae6

data/README.md

@@ -1,3 +1,5 @@
+:warning: **The Ruby driver is in maintenance mode. We are still accepting pull-requests and we will occasionally release critical bug fixes, but no ongoing active development is being done currently.**
+
 # Datastax Ruby Driver for Apache Cassandra
 
 *If you're reading this on GitHub, please note that this is the readme for the development version and that some
@@ -9,7 +11,7 @@ version [here](http://docs.datastax.com/en/developer/ruby-driver/latest).*
 A Ruby client driver for Apache Cassandra. This driver works exclusively with
 the Cassandra Query Language version 3 (CQL3) and Cassandra's native protocol.
 
-Use the [Ruby DSE driver](https://github.com/datastax/ruby-dse-driver.git) for
+Use the [Ruby DSE driver](https://docs.datastax.com/en/developer/ruby-driver-dse/2.1/) for
 better compatibility and support for DataStax Enterprise.
 
 - Code: https://github.com/datastax/ruby-driver
@@ -21,14 +23,14 @@ better compatibility and support for DataStax Enterprise.
 
 This driver is based on [the cql-rb gem](https://github.com/iconara/cql-rb) by [Theo Hultberg](https://github.com/iconara) and we added support for:
 
-* [Asynchronous execution](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/asynchronous_io/)
-* One-off, [prepared](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/basics/prepared_statements/) and [batch statements](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/basics/batch_statements/)
-* Automatic peer discovery and cluster metadata with [support for change notifications](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/state_listeners/)
-* Various [load-balancing](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/load_balancing/), [retry](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/retry_policies/) and [reconnection](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/reconnection/) policies with [ability to write your own](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/load_balancing/implementing_a_policy/)
-* [SSL encryption](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/security/ssl_encryption/)
-* [Flexible and robust error handling](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/error_handling/)
-* [Per-request execution information and tracing](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/debugging/)
-* [Configurable address resolution](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/address_resolution/)
+* [Asynchronous execution](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/asynchronous_io/)
+* One-off, [prepared](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/basics/prepared_statements/) and [batch statements](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/basics/batch_statements/)
+* Automatic peer discovery and cluster metadata with [support for change notifications](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/state_listeners/)
+* Various [load-balancing](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/load_balancing/), [retry](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/retry_policies/) and [reconnection](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/reconnection/) policies with [ability to write your own](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/load_balancing/implementing_a_policy/)
+* [SSL encryption](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/security/ssl_encryption/)
+* [Flexible and robust error handling](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/error_handling/)
+* [Per-request execution information and tracing](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/debugging/)
+* [Configurable address resolution](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/address_resolution/)
 
 [Check out the slides from Ruby Driver Explained](https://speakerdeck.com/avalanche123/ruby-driver-explained) for a detailed overview of the Ruby Driver architecture.
 
@@ -37,7 +39,7 @@ This driver is based on [the cql-rb gem](https://github.com/iconara/cql-rb) by [
 This driver works exclusively with the Cassandra Query Language v3 (CQL3) and Cassandra's native protocol. The current version works with:
 
 * Apache Cassandra versions 2.1, 2.2, and 3.x
-* DataStax Enterprise 4.8 and above. However, the [Ruby DSE driver](https://github.com/datastax/ruby-dse-driver.git) provides more features and is recommended for use with DataStax Enterprise.
+* DataStax Enterprise 4.8 and above. However, the [Ruby DSE driver](https://docs.datastax.com/en/developer/ruby-driver-dse/2.1/) provides more features and is recommended for use with DataStax Enterprise.
 * Ruby (MRI) 2.2, 2.3, 2.4
 * JRuby 9k
 
@@ -45,10 +47,6 @@ __Note__: Rubinius is not supported.
 
 __Note__: Big-endian systems are not supported.
 
-## Feedback Requested
-
-*Help us focus our efforts!* [Provide your input](http://goo.gl/forms/pCs8PTpHLf) on the Ruby Driver Platform and Runtime Survey (we kept it short).
-
 ## Quick start
 
 ```ruby
@@ -76,9 +74,9 @@ __Note__: The host you specify is just a seed node, the driver will automaticall
 
 Read more:
 
-* [`Cassandra.cluster` options](http://docs.datastax.com/en/developer/ruby-driver/3.0/api/cassandra/#cluster-class_method)
-* [`Session#execute_async` options](http://docs.datastax.com/en/developer/ruby-driver/3.0/api/cassandra/session/#execute_async-instance_method)
-* [Usage documentation](http://docs.datastax.com/en/developer/ruby-driver/3.0/features)
+* [`Cassandra.cluster` options](http://docs.datastax.com/en/developer/ruby-driver/3.2/api/cassandra/#cluster-class_method)
+* [`Session#execute_async` options](http://docs.datastax.com/en/developer/ruby-driver/3.2/api/cassandra/session/#execute_async-instance_method)
+* [Usage documentation](http://docs.datastax.com/en/developer/ruby-driver/3.2/features)
 
 ## Installation
 
@@ -94,25 +92,24 @@ Install via Gemfile
 gem 'cassandra-driver'
 ```
 
-__Note__: if you want to use compression you should also install [snappy](http://rubygems.org/gems/snappy) or [lz4-ruby](http://rubygems.org/gems/lz4-ruby). [Read more about compression.](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/#compression)
+__Note__: if you want to use compression you should also install [snappy](http://rubygems.org/gems/snappy) or [lz4-ruby](http://rubygems.org/gems/lz4-ruby). [Read more about compression.](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/#compression)
 
 
 ## Upgrading from cql-rb
 
 Some of the new features added to the driver have unfortunately led to changes in the original cql-rb API.
 In the examples directory, you can find [an example of how to wrap the ruby driver to achieve almost complete
-interface parity with cql-rb](https://github.com/datastax/ruby-driver/blob/v3.2.1/examples/cql-rb-wrapper.rb)
+interface parity with cql-rb](https://github.com/datastax/ruby-driver/blob/v3.2.5/examples/cql-rb-wrapper.rb)
 to assist you with gradual upgrade.
 
-If you are upgrading to DataStax Enterprise, use the [Ruby DSE driver](https://github.com/datastax/ruby-dse-driver.git) 
-for more features and better compatibility.
+If you are upgrading to DataStax Enterprise, use the [Ruby DSE driver](https://docs.datastax.com/en/developer/ruby-driver-dse/2.1/) for more features and better compatibility.
 
 ## What's new in v3.2
 This minor release adds support for MRI 2.4.x and also contains a few miscellaneous defect fixes. It also removes
 support for Ruby versions prior to 2.2. This was already officially the case, but the minimum version limit is
 now enforced.
 
-See the [changelog](https://github.com/datastax/ruby-driver/blob/v3.2.1/CHANGELOG.md) for more information on all
+See the [changelog](https://github.com/datastax/ruby-driver/blob/v3.2.5/CHANGELOG.md) for more information on all
 changes in this version and past versions.
 
 ## What's new in v3.1
@@ -180,7 +177,7 @@ examples in the `features/` directory.
 ## Running tests
 
 If you don't feel like reading through the following instructions on how to run
-ruby-driver tests, feel free to [check out .travis.yml for the entire build code](https://github.com/datastax/ruby-driver/blob/v3.2.1/.travis.yml).
+ruby-driver tests, feel free to [check out .travis.yml for the entire build code](https://github.com/datastax/ruby-driver/blob/v3.2.5/.travis.yml).
 
 * Check out the driver codebase and install test dependencies:
 
@@ -204,7 +201,7 @@ CASSANDRA_VERSION=2.1.12 bundle exec rake test # run both as well as integration
 ## Changelog & versioning
 
 Check out the [releases on GitHub](https://github.com/datastax/ruby-driver/releases) and
-[changelog](https://github.com/datastax/ruby-driver/blob/v3.2.1/CHANGELOG.md). Version
+[changelog](https://github.com/datastax/ruby-driver/blob/v3.2.5/CHANGELOG.md). Version
 numbering follows the [semantic versioning](http://semver.org/) scheme.
 
 Private and experimental APIs, defined as whatever is not in the
@@ -227,7 +224,7 @@ the release.
 * Because the driver reactor is using `IO.select`, the maximum number of tcp connections allowed is 1024.
 * Because the driver uses `IO#write_nonblock`, Windows is not supported.
 
-Please [refer to the usage documentation for more information on common pitfalls](http://docs.datastax.com/en/developer/ruby-driver/3.0/features/)
+Please [refer to the usage documentation for more information on common pitfalls](http://docs.datastax.com/en/developer/ruby-driver/3.2/features/)
 
 ## Contributing
 
@@ -245,7 +242,7 @@ Driver for Apache Cassandra will continue on this project, while
 
 ## Copyright
 
-Copyright DataStax, Inc.
+© 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
@@ -257,4 +254,4 @@ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 either express or implied. See the License for the specific language governing permissions
 and limitations under the License.
 
-  [1]: http://docs.datastax.com/en/developer/ruby-driver/3.0/api
+  [1]: http://docs.datastax.com/en/developer/ruby-driver/3.2/api

data/lib/cassandra.rb

@@ -777,6 +777,8 @@ require 'cassandra/udt'
 require 'cassandra/time'
 
 require 'cassandra/types'
+require 'cassandra/custom_data'
+require 'cassandra/duration'
 
 require 'cassandra/errors'
 require 'cassandra/compression'
@@ -788,7 +790,6 @@ require 'cassandra/null_logger'
 require 'cassandra/executors'
 require 'cassandra/future'
 require 'cassandra/cluster'
-require 'cassandra/custom_data'
 require 'cassandra/driver'
 require 'cassandra/host'
 require 'cassandra/session'

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

@@ -40,8 +40,6 @@ module Cassandra
         private
 
         def lookup_type(node, types)
-          return lookup_type(node.children.first, types) if node.name == 'frozen'
-
           case node.name
           when 'text'              then Cassandra::Types.text
           when 'blob'              then Cassandra::Types.blob
@@ -62,6 +60,7 @@ module Cassandra
           when 'smallint'          then Cassandra::Types.smallint
           when 'time'              then Cassandra::Types.time
           when 'tinyint'           then Cassandra::Types.tinyint
+          when 'duration'          then Cassandra::Types.duration
           when 'map'               then
             Cassandra::Types.map(*node.children.map { |t| lookup_type(t, types)})
           when 'set'               then
@@ -70,6 +69,8 @@ module Cassandra
             Cassandra::Types.list(lookup_type(node.children.first, types))
           when 'tuple'             then
             Cassandra::Types.tuple(*node.children.map { |t| lookup_type(t, types)})
+          when 'frozen'            then
+            Cassandra::Types.frozen(lookup_type(node.children.first, types))
           when 'empty'             then
             Cassandra::Types.custom('org.apache.cassandra.db.marshal.EmptyType')
           when /\A'/ then

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

@@ -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/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/future.rb

@@ -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/protocol/cql_byte_buffer.rb

@@ -53,24 +53,30 @@ module Cassandra
       end
 
       def read_decimal(len = bytesize)
-        size = read_signed_int
+        scale = read_signed_int
         number_string = read_varint(len - 4).to_s
-        if number_string.length <= size
-          if number_string.start_with?(MINUS)
-            number_string = number_string[1, number_string.length - 1]
-            fraction_string = MINUS + ZERO << DECIMAL_POINT
+        if scale <= 0
+          # Special case where the actual scale is positive; scale in the protocol is actually negative of
+          # reality.
+          BigDecimal(number_string + '0' * -scale)
+        else
+          if number_string.length <= scale
+            if number_string.start_with?(MINUS)
+              number_string = number_string[1, number_string.length - 1]
+              fraction_string = MINUS + ZERO << DECIMAL_POINT
+            else
+              fraction_string = ZERO + DECIMAL_POINT
+            end
+            (scale - number_string.length).times { fraction_string << ZERO }
+            fraction_string << number_string
           else
-            fraction_string = ZERO + DECIMAL_POINT
+            fraction_string = number_string[0, number_string.length - scale]
+            fraction_string << DECIMAL_POINT
+            fraction_string <<
+              number_string[number_string.length - scale, number_string.length]
           end
-          (size - number_string.length).times { fraction_string << ZERO }
-          fraction_string << number_string
-        else
-          fraction_string = number_string[0, number_string.length - size]
-          fraction_string << DECIMAL_POINT
-          fraction_string <<
-            number_string[number_string.length - size, number_string.length]
+          BigDecimal(fraction_string)
         end
-        BigDecimal.new(fraction_string)
       rescue Errors::DecodingError => e
         raise Errors::DecodingError, e.message, e.backtrace
       end
@@ -281,6 +287,29 @@ module Cassandra
               "Not enough bytes available to decode a tinyint: #{e.message}", e.backtrace
       end
 
+      def read_vint
+        n = read_byte
+
+        # Bits are indexed in Integer in little-endian order
+        bytes_to_read = 7.downto(0).take_while {|i| n[i] == 1}.size
+        return n unless bytes_to_read > 0
+
+        rv = n & (0xff >> bytes_to_read)
+        1.upto(bytes_to_read) do |idx|
+          new_byte = read_byte
+          rv <<= 8
+          rv |= (new_byte & 0xff)
+        end
+
+        rv
+      rescue RangeError => e
+        raise Errors::DecodingError, e.message, e.backtrace
+      end
+
+      def read_signed_vint
+        Util.decode_zigzag(read_vint)
+      end
+
       def append_tinyint(n)
         append([n].pack(Formats::CHAR_FORMAT))
       end
@@ -403,6 +432,25 @@ module Cassandra
         append([n].pack(Formats::FLOAT_FORMAT))
       end
 
+      def append_vint(n)
+        send_bytes = Util.to_min_byte_array(n)
+        send_cnt = send_bytes.length
+
+        raise Errors::EncodingError, "Too many bytes (#{bytes_to_send.length}) to send!" if send_cnt > 8
+
+        send_cnt_byte = (0xff << (8 - send_cnt)) & 0xff
+        append([send_cnt_byte].pack(Formats::BYTES_FORMAT))
+        append(send_bytes.pack(Formats::BYTES_FORMAT))
+      end
+
+      def append_signed_vint32(n)
+        append_vint(Util.encode_zigzag32(n))
+      end
+
+      def append_signed_vint64(n)
+        append_vint(Util.encode_zigzag64(n))
+      end
+
       def eql?(other)
         other.eql?(to_str)
       end

data/lib/cassandra/protocol/cql_protocol_handler.rb

@@ -264,15 +264,14 @@ module Cassandra
           @timed_out = false
           @scheduler = scheduler
           @lock = Mutex.new
+          @timer = nil
           super()
         end
 
         def time_out!
           unless future.completed?
             @timed_out = true
-            # rubocop:disable Style/SignalException
             fail(Errors::TimeoutError.new('Timed out'))
-            # rubocop:enable Style/SignalException
           end
         end
 

data/lib/cassandra/protocol/requests/query_request.rb

@@ -51,6 +51,14 @@ module Cassandra
         !!@payload
       end
 
+      def append_flags(buffer,flags,protocol_version)
+        if protocol_version < 5
+          buffer.append(flags.chr)
+        else
+          buffer.append_int(flags)
+        end
+      end
+
       def write(buffer, protocol_version, encoder)
         buffer.append_long_string(@cql)
         buffer.append_consistency(@consistency)
@@ -63,10 +71,10 @@ module Cassandra
           if @values && !@values.empty?
             flags |= 0x01
             flags |= 0x40 if protocol_version > 2 && !@names.empty?
-            buffer.append(flags.chr)
+            append_flags(buffer, flags, protocol_version)
             encoder.write_parameters(buffer, @values, @type_hints, @names)
           else
-            buffer.append(flags.chr)
+            append_flags(buffer, flags, protocol_version)
           end
           buffer.append_int(@page_size) if @page_size
           buffer.append_bytes(@paging_state) if @paging_state

data/lib/cassandra/protocol/v4.rb

@@ -61,6 +61,9 @@ module Cassandra
 
       class Decoder
         def initialize(handler, compressor = nil, custom_type_handlers = {})
+          # In v4 the duration type is represented as a custom type so we always want to have
+          # a handler included here.  This handler can be overridden via the connection options.
+          custom_type_handlers[Cassandra::Types::Duration.type] ||= Cassandra::Types::Duration
           @handler    = handler
           @compressor = compressor
           @state      = :initial

data/lib/cassandra/table.rb

@@ -169,7 +169,7 @@ module Cassandra
 
       cql << "\n)\nWITH "
 
-      if @clustering_order.any? {|o| o != :asc}
+      if !@clustering_order.empty? && !@clustering_columns.empty?
         cql << 'CLUSTERING ORDER BY ('
         first = true
         @clustering_columns.zip(@clustering_order) do |column, order|

data/lib/cassandra/types.rb

@@ -158,7 +158,7 @@ module Cassandra
       end
 
       def new_decimal(value)
-        ::BigDecimal.new(value)
+        BigDecimal(value)
       end
 
       def assert_decimal(value, message, &block)
@@ -1414,6 +1414,73 @@ module Cassandra
       alias == eql?
     end
 
+    class Frozen < Type
+      # @private
+      attr_reader :value_type
+
+      # @private
+      def initialize(value_type)
+        super(:frozen)
+        @value_type = value_type
+      end
+
+      # Coerces the value to Array
+      # @param value [Object] original value
+      # @return [Array] value
+      # @see Cassandra::Type#new
+      def new(*value)
+        value = Array(value.first) if value.one?
+
+        value.each do |v|
+          Util.assert_type(@value_type, v)
+        end
+        value
+      end
+
+      # Asserts that a given value is an Array
+      # @param value [Object] value to be validated
+      # @param message [String] error message to use when assertion fails
+      # @yieldreturn [String] error message to use when assertion fails
+      # @raise [ArgumentError] if the value is not an Array
+      # @return [void]
+      # @see Cassandra::Type#assert
+      def assert(value, message = nil, &block)
+        Util.assert_instance_of(::Array, value, message, &block)
+        value.each do |v|
+          Util.assert_type(@value_type, v, message, &block)
+        end
+        nil
+      end
+
+      # @return [String] `"list<type>"`
+      # @see Cassandra::Type#to_s
+      def to_s
+        "frozen<#{@value_type}>"
+      end
+
+      def hash
+        @hash ||= begin
+          h = 17
+          h = 31 * h + @kind.hash
+          h = 31 * h + @value_type.hash
+          h
+        end
+      end
+
+      def eql?(other)
+        other.is_a?(List) && @value_type == other.value_type
+      end
+
+      alias == eql?
+    end
+
+    def frozen(value_type)
+      Util.assert_instance_of(Cassandra::Type, value_type,
+                              "frozen type must be a Cassandra::Type, #{value_type.inspect} given")
+
+      Frozen.new(value_type)
+    end
+
     # @return [Cassandra::Types::Text] text type since varchar is an alias for text
     def varchar
       Text
@@ -1633,5 +1700,9 @@ module Cassandra
     def custom(name)
       Custom.new(name)
     end
+
+    def duration
+      Duration.new 0,0,0
+    end
   end
 end

data/lib/cassandra/util.rb

@@ -302,6 +302,26 @@ module Cassandra
       end
     end
 
+    def to_byte_array(n)
+      [n].pack("Q>").unpack("C*")
+    end
+
+    def to_min_byte_array(n)
+      to_byte_array(n).drop_while {|i| i == 0}
+    end
+
+    def decode_zigzag(n)
+      (n >> 1) ^ -(n & 1)
+    end
+
+    def encode_zigzag32(n)
+      (n >> 31) ^ (n << 1)
+    end
+
+    def encode_zigzag64(n)
+      (n >> 63) ^ (n << 1)
+    end
+
     # @private
     LOWERCASE_REGEXP = /[[:lower:]\_]*/
     # @private

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '3.2.1'.freeze
+  VERSION = '3.2.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.5
 platform: ruby
 authors:
 - Theo Hultberg
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 description: A pure Ruby driver for Apache Cassandra
 email:
 - theo@iconara.net
@@ -109,6 +109,7 @@ files:
 - lib/cassandra/compression/compressors/snappy.rb
 - lib/cassandra/custom_data.rb
 - lib/cassandra/driver.rb
+- lib/cassandra/duration.rb
 - lib/cassandra/errors.rb
 - lib/cassandra/execution/info.rb
 - lib/cassandra/execution/options.rb
@@ -232,8 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Datastax Ruby Driver for Apache Cassandra