cassandra-driver 2.1.7 → 3.0.0.beta.1

data/lib/cassandra/udt.rb

@@ -408,13 +408,23 @@ module Cassandra
       '{ ' + @values.map {|(n, v)| "#{n}: #{v.inspect}"}.join(', ') + ' }'
     end
 
+    # @private
     def inspect
       "#<Cassandra::UDT:0x#{self.object_id.to_s(16)} #{to_s}>"
     end
 
+    # @private
     def eql?(other)
       other.is_a?(UDT) && @values.all? {|(n, v)| v == other[n]}
     end
     alias :== :eql?
+
+    # @private
+    def hash
+      @values.inject(17) do |h, (n, v)|
+        h = 31 * h + n.hash
+        h = 31 * h + v.hash
+      end
+    end
   end
 end

data/lib/cassandra/util.rb

@@ -99,6 +99,9 @@ module Cassandra
       when ::Numeric then encode_number(object, io)
       when ::IPAddr  then encode_inet(object, io)
       when Uuid      then encode_uuid(object, io)
+      when Tuple     then encode_tuple(object, io)
+      when Time      then encode_time(object, io)
+      when UDT       then encode_udt(object, io)
       when nil       then io.print(NULL_STR)
       when false     then io.print(FALSE_STR)
       when true      then io.print(TRUE_STR)
@@ -110,6 +113,14 @@ module Cassandra
     end
     alias :encode :encode_object
 
+    def encode_time(time, io = StringIO.new)
+      encode_string(time.to_s, io)
+    end
+
+    def encode_udt(udt, io = StringIO.new)
+      encode_hash(udt.to_h, io)
+    end
+
     def encode_timestamp(time, io = StringIO.new)
       io.print(time.to_i)
       io.string
@@ -132,6 +143,22 @@ module Cassandra
       io.string
     end
 
+    def encode_tuple(tuple, io = StringIO.new)
+      first = true
+
+      io.putc(PRN_OPN)
+      tuple.each do |object|
+        if first
+          first = false
+        else
+          io.print(COMMA)
+        end
+
+        encode_object(object, io)
+      end
+      io.putc(PRN_CLS)
+    end
+
     def escape_name(name)
       return name if name[LOWERCASE_REGEXP] == name
       DBL_QUOT + name + DBL_QUOT
@@ -282,12 +309,16 @@ module Cassandra
     # @private
     COMMA = ', '.freeze
     # @private
-    COLON = ' : '.freeze
+    COLON = ': '.freeze
     # @private
     QUOT = ?'.freeze
     # @private
     ESC_QUOT = "''".freeze
     # @private
     DBL_QUOT = ?".freeze
+    # @private
+    PRN_OPN = '('.freeze
+    # @private
+    PRN_CLS = ')'.freeze
   end
 end

data/lib/cassandra/uuid.rb

@@ -53,8 +53,13 @@ module Cassandra
       end
     end
 
+    # @private
     def hash
-      @n.hash
+      @h ||= begin
+        h = 17
+        h = 31 * h + @n.hash
+        h
+      end
     end
 
     # Returns the numerical representation of this UUID

data/lib/cassandra/uuid/generator.rb

@@ -44,7 +44,7 @@ module Cassandra
       # @param [Object<#now>] clock used to generate timeuuid from current time
       #
       # @raise [ArgumentError] if clock doesn't respond to `now`
-      def initialize(node_id = (SecureRandom.random_number(2**47) | 0x010000000000), clock_id = SecureRandom.random_number(65536), clock = Time)
+      def initialize(node_id = (::SecureRandom.random_number(2**47) | 0x010000000000), clock_id = ::SecureRandom.random_number(65536), clock = ::Time)
         raise ::ArgumentError, "invalid clock" unless clock.respond_to?(:now)
 
         @node_id  = Integer(node_id)
@@ -84,7 +84,7 @@ module Cassandra
           @sequence += 1
         elsif @last_usecs && @last_usecs > usecs
           @sequence = 0
-          @clock_id = SecureRandom.random_number(65536)
+          @clock_id = ::SecureRandom.random_number(65536)
         else
           @sequence = 0
         end
@@ -153,12 +153,12 @@ module Cassandra
         raise ::ArgumentError, "not enough arguments" if args.empty?
         raise ::ArgumentError, "too many arguments"   if args.size > 3
 
-        if args.first.is_a?(Time)
+        if args.first.is_a?(::Time)
           time   = args.shift
-          jitter = args.empty? ? SecureRandom.random_number(65536) : Integer(args.shift)
+          jitter = args.empty? ? ::SecureRandom.random_number(65536) : Integer(args.shift)
         else
-          jitter = args.size > 2 ? Integer(args.pop) : SecureRandom.random_number(65536)
-          time   = Time.at(*args)
+          jitter = args.size > 2 ? Integer(args.pop) : ::SecureRandom.random_number(65536)
+          time   = ::Time.at(*args)
         end
 
         from_usecs(time.to_i * 1_000_000 + time.usec + jitter)
@@ -179,7 +179,7 @@ module Cassandra
       #
       # @return [Cassandra::Uuid] a new UUID
       def uuid
-        Uuid.new(SecureRandom.uuid)
+        Uuid.new(::SecureRandom.uuid)
       end
 
       private

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '2.1.7'.freeze
+  VERSION = '3.0.0.beta.1'.freeze
 end

data/lib/datastax/cassandra.rb

@@ -33,12 +33,15 @@ module DataStax
   end
 
   previous = nil
+  murmur3  = nil
   if defined?(::Cassandra)
     previous = ::Cassandra
+    murmur3  = ::Cassandra::Murmur3
     Object.send(:remove_const, :Cassandra)
   end
   include 'cassandra'
-  DataStax::Cassandra::Murmur3 = ::Cassandra::Murmur3
-  Object.send(:remove_const, :Cassandra)
+  murmur3 ||= ::Cassandra::Murmur3
+  DataStax::Cassandra::Murmur3 = murmur3
+  Object.send(:remove_const, :Cassandra) if defined?(::Cassandra)
   ::Cassandra = previous if previous
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 3.0.0.beta.1
 platform: ruby
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione
@@ -72,6 +72,8 @@ files:
 - lib/cassandra/address_resolution/policies.rb
 - lib/cassandra/address_resolution/policies/ec2_multi_region.rb
 - lib/cassandra/address_resolution/policies/none.rb
+- lib/cassandra/aggregate.rb
+- lib/cassandra/argument.rb
 - lib/cassandra/auth.rb
 - lib/cassandra/auth/providers.rb
 - lib/cassandra/auth/providers/password.rb
@@ -85,6 +87,9 @@ files:
 - lib/cassandra/cluster/options.rb
 - lib/cassandra/cluster/registry.rb
 - lib/cassandra/cluster/schema.rb
+- lib/cassandra/cluster/schema/cql_type_parser.rb
+- lib/cassandra/cluster/schema/fetchers.rb
+- lib/cassandra/cluster/schema/fqcn_type_parser.rb
 - lib/cassandra/cluster/schema/partitioners.rb
 - lib/cassandra/cluster/schema/partitioners/murmur3.rb
 - lib/cassandra/cluster/schema/partitioners/ordered.rb
@@ -93,7 +98,6 @@ files:
 - lib/cassandra/cluster/schema/replication_strategies/network_topology.rb
 - lib/cassandra/cluster/schema/replication_strategies/none.rb
 - lib/cassandra/cluster/schema/replication_strategies/simple.rb
-- lib/cassandra/cluster/schema/type_parser.rb
 - lib/cassandra/column.rb
 - lib/cassandra/compression.rb
 - lib/cassandra/compression/compressors/lz4.rb
@@ -104,6 +108,7 @@ files:
 - lib/cassandra/execution/options.rb
 - lib/cassandra/execution/trace.rb
 - lib/cassandra/executors.rb
+- lib/cassandra/function.rb
 - lib/cassandra/future.rb
 - lib/cassandra/host.rb
 - lib/cassandra/keyspace.rb
@@ -137,8 +142,10 @@ files:
 - lib/cassandra/protocol/responses/authenticate_response.rb
 - lib/cassandra/protocol/responses/error_response.rb
 - lib/cassandra/protocol/responses/event_response.rb
+- lib/cassandra/protocol/responses/function_failure_error_response.rb
 - lib/cassandra/protocol/responses/prepared_result_response.rb
 - lib/cassandra/protocol/responses/raw_rows_result_response.rb
+- lib/cassandra/protocol/responses/read_failure_error_response.rb
 - lib/cassandra/protocol/responses/read_timeout_error_response.rb
 - lib/cassandra/protocol/responses/ready_response.rb
 - lib/cassandra/protocol/responses/result_response.rb
@@ -152,9 +159,11 @@ files:
 - lib/cassandra/protocol/responses/unavailable_error_response.rb
 - lib/cassandra/protocol/responses/unprepared_error_response.rb
 - lib/cassandra/protocol/responses/void_result_response.rb
+- lib/cassandra/protocol/responses/write_failure_error_response.rb
 - lib/cassandra/protocol/responses/write_timeout_error_response.rb
 - lib/cassandra/protocol/v1.rb
 - lib/cassandra/protocol/v3.rb
+- lib/cassandra/protocol/v4.rb
 - lib/cassandra/reconnection.rb
 - lib/cassandra/reconnection/policies.rb
 - lib/cassandra/reconnection/policies/constant.rb
@@ -174,6 +183,7 @@ files:
 - lib/cassandra/statements/simple.rb
 - lib/cassandra/statements/void.rb
 - lib/cassandra/table.rb
+- lib/cassandra/time.rb
 - lib/cassandra/time_uuid.rb
 - lib/cassandra/tuple.rb
 - lib/cassandra/types.rb
@@ -203,12 +213,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Datastax Ruby Driver for Apache Cassandra