cassandra-driver 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950f81b3248939bd7178b7e6c05144ed7da77cb6
-  data.tar.gz: efc50ee4050ea234d8e63e509d4f298ca671a876
+  metadata.gz: c5546b5f0956cd7d4d1c769c455e78e48ac5961a
+  data.tar.gz: 7c24862b085ac804ff8c8dd338a2dd7826a93caa
 SHA512:
-  metadata.gz: d85304895d5b91d7774c08a146889c07919fccd8c0841cf7596a53f499a70cd8bae02781e03ccbf7f3592fe3eb4d19fbaaef98f88f8143f7636566071812dcba
-  data.tar.gz: 9bd76f5c388c000c572a85905febeedc6c37e67a60441842c25970ce9df54a91dbd66d2de858b7db245d05402c00488d7422a35cddaa11ed77394faaba08b42d
+  metadata.gz: 5164d4dd457d57592cbdc0e523c471bbeba2f7afeebb89811d103267795ee3ce335a617b82291dd4b5fd96971f960740c65da80d3346d7250234cf61f8bd80e4
+  data.tar.gz: 99ee34fe7142a194b3a9c78c9493f7d82a31081dba46efa396f96cfecd411e77be523414a823f68e2967fa38496aa116697348f50789861f6f91a805077739dd

data/README.md

@@ -101,7 +101,7 @@ __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.2/examples/cql-rb-wrapper.rb)
+interface parity with cql-rb](https://github.com/datastax/ruby-driver/blob/v3.2.3/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) 
@@ -112,7 +112,7 @@ This minor release adds support for MRI 2.4.x and also contains a few miscellane
 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.2/CHANGELOG.md) for more information on all
+See the [changelog](https://github.com/datastax/ruby-driver/blob/v3.2.3/CHANGELOG.md) for more information on all
 changes in this version and past versions.
 
 ## What's new in v3.1
@@ -180,7 +180,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.2/.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.3/.travis.yml).
 
 * Check out the driver codebase and install test dependencies:
 
@@ -204,7 +204,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.2/CHANGELOG.md). Version
+[changelog](https://github.com/datastax/ruby-driver/blob/v3.2.3/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/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
@@ -70,6 +68,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/protocol/cql_byte_buffer.rb

@@ -55,7 +55,7 @@ module Cassandra
       def read_decimal(len = bytesize)
         scale = read_signed_int
         number_string = read_varint(len - 4).to_s
-        if scale < 0
+        if scale <= 0
           # Special case where the actual scale is positive; scale in the protocol is actually negative of
           # reality.
           BigDecimal.new(number_string + '0' * -scale)

data/lib/cassandra/protocol/cql_protocol_handler.rb

@@ -264,6 +264,7 @@ module Cassandra
           @timed_out = false
           @scheduler = scheduler
           @lock = Mutex.new
+          @timer = nil
           super()
         end
 

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

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

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '3.2.2'.freeze
+  VERSION = '3.2.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Theo Hultberg
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione