cassandra-driver 3.2.4-java → 3.2.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f94a1acff5571ded31dff334da12c9c79b32f36c
-  data.tar.gz: 8292e18ef0dd3b87fb59a8784c25f15cff14e92d
+  metadata.gz: adcc351cebf1729957fd2025e3dda1cf7fc321ab
+  data.tar.gz: d42716e5990eca3d78e8bcafb0dd81d822e3682d
 SHA512:
-  metadata.gz: c7caf623323bcfb40c0856fc990924247008d5c5c049083897302babb0f283f719aec7bb54542d100ec46f77779578a8b5a4ea3a632355f9a3e2e00ed561bfcd
-  data.tar.gz: ea30bba937d845b537848b366bedd8879b2e389024d4720aceb7b0cc2413543497d8d363c8378a71034ef8ebcbebcb3c05875bc0a4e71fa8d3b27b3a2071a7ae
+  metadata.gz: 3e7aac57c3abc6ac87a67e786185166e0415bfee8904f1ff225df934a0566b0f1906092a12c85f938f612e47802979ac02f3f3d527eb95ad60358197c5a35ef6
+  data.tar.gz: 7939cfefe9c669fecc346b1e7b8cbb4eb55d68be75a57927682f1c0fe522740658c2d775dbaebc700dc218fe8d789dd75ceb4b8bdecc87030eeebc5551b166aa

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
@@ -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
@@ -101,18 +99,17 @@ __Note__: if you want to use compression you should also install [snappy](http:/
 
 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.4/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.4/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.4/.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.4/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

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

@@ -60,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

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

@@ -287,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
@@ -409,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/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/types.rb

@@ -1700,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.4'.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.4
+  version: 3.2.5
 platform: java
 authors:
 - Theo Hultberg
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +106,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