cassandra-driver 1.0.0.beta.3-java → 1.0.0-java

data/lib/cassandra/util.rb

@@ -103,7 +103,7 @@ module Cassandra
       when false     then io.print(FALSE_STR)
       when true      then io.print(TRUE_STR)
       else
-        raise "unsupported type: #{object.inspect}"
+        raise ::ArgumentError, "unsupported type: #{object.inspect}"
       end
 
       io.string
@@ -137,6 +137,136 @@ module Cassandra
       DBL_QUOT + name + DBL_QUOT
     end
 
+    def assert_type(type, value, message = nil, &block)
+      return if value.nil?
+
+      case type
+      when ::Array
+        case type.first
+        when :list
+          assert_instance_of(::Array, value, message, &block)
+          value.each do |v|
+            assert_type(type[1], v)
+          end
+        when :set
+          assert_instance_of(::Set, value, message, &block)
+          value.each do |v|
+            assert_type(type[1], v)
+          end
+        when :map
+          assert_instance_of(::Hash, value, message, &block)
+          value.each do |k, v|
+            assert_type(type[1], k)
+            assert_type(type[2], v)
+          end
+        else
+          raise ::RuntimeError, "unsupported complex type #{type.inspect}"
+        end
+      else
+        case type
+        when :ascii then assert_instance_of(::String, value, message, &block)
+        when :bigint then assert_instance_of(::Numeric, value, message, &block)
+        when :blob then assert_instance_of(::String, value, message, &block)
+        when :boolean then assert_instance_of_one_of([::TrueClass, ::FalseClass], value, message, &block)
+        when :counter then assert_instance_of(::Numeric, value, message, &block)
+        when :decimal then assert_instance_of(::BigDecimal, value, message, &block)
+        when :double then assert_instance_of(::Float, value, message, &block)
+        when :float then assert_instance_of(::Float, value, message, &block)
+        when :inet then assert_instance_of(::IPAddr, value, message, &block)
+        when :int then assert_instance_of(::Numeric, value, message, &block)
+        when :text then assert_instance_of(::String, value, message, &block)
+        when :varchar then assert_instance_of(::String, value, message, &block)
+        when :timestamp then assert_instance_of(::Time, value, message, &block)
+        when :timeuuid then assert_instance_of(TimeUuid, value, message, &block)
+        when :uuid then assert_instance_of(Uuid, value, message, &block)
+        when :varint then assert_instance_of(::Numeric, value, message, &block)
+        else
+          raise ::RuntimeError, "unsupported type #{type.inspect}"
+        end
+      end
+    end
+
+    def assert_instance_of(kind, value, message = nil, &block)
+      unless value.is_a?(kind)
+        message   = yield if block_given?
+        message ||= "value must be an instance of #{kind}, #{value.inspect} given"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_instance_of_one_of(kinds, value, message = nil, &block)
+      unless kinds.any? {|kind| value.is_a?(kind)}
+        message   = yield if block_given?
+        message ||= "value must be an instance of one of #{kinds.inspect}, #{value.inspect} given"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_responds_to(method, value, message = nil, &block)
+      unless value.respond_to?(method)
+        message   = yield if block_given?
+        message ||= "value #{value.inspect} must respond to #{method.inspect}, but doesn't"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_responds_to_all(methods, value, message = nil, &block)
+      unless methods.all? {|method| value.respond_to?(method)}
+        message   = yield if block_given?
+        message ||= "value #{value.inspect} must respond to all methods #{methods.inspect}, but doesn't"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_not_empty(value, message = nil, &block)
+      if value.empty?
+        message   = yield if block_given?
+        message ||= "value cannot be empty"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_file_exists(path, message = nil, &block)
+      unless ::File.exists?(path)
+        message   = yield if block_given?
+        message ||= "expected file at #{path.inspect} to exist, but it doesn't"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_one_of(range, value, message = nil, &block)
+      unless range.include?(value)
+        message   = yield if block_given?
+        message ||= "value must be included in #{value.inspect}, #{value.inspect} given"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert(condition, message = nil, &block)
+      unless condition
+        message   = yield if block_given?
+        message ||= "assertion failed"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_equal(expected, actual, message = nil, &block)
+      unless expected == actual
+        message   = yield if block_given?
+        message ||= "expected #{actual.inspect} to equal #{expected.inspect}"
+
+        raise ::ArgumentError, message
+      end
+    end
+
     # @private
     LOWERCASE_REGEXP = /[[:lower:]\_]*/
     # @private

data/lib/cassandra/uuid.rb

@@ -22,7 +22,7 @@ module Cassandra
   # This is a very basic implementation of UUIDs and exists more or less just
   # to encode and decode UUIDs from and to Cassandra.
   #
-  # If you want to generate UUIDs see {Cassandra::TimeUuid::Generator}.
+  # If you want to generate UUIDs see {Cassandra::Uuid::Generator}.
   #
   class Uuid
     # Creates a new UUID either from a string (expected to be on the standard 8-4-4-4-12 form, or just 32 characters without hyphens), or from a 128 bit number.
@@ -88,17 +88,19 @@ module Cassandra
       # @private
       def from_s(str)
         str = str.gsub(HYPHEN, EMPTY_STRING)
-        raise ArgumentError, "Expected 32 hexadecimal digits but got #{str.length}" unless str.length == 32
-        raise ArgumentError, "invalid value for Integer(): \"#{str}\"" unless str =~ HEX_RE
+        raise ::ArgumentError, "Expected 32 hexadecimal digits but got #{str.length}" unless str.length == 32
+        raise ::ArgumentError, "invalid value for Integer(): \"#{str}\"" unless str =~ HEX_RE
         Integer(str, 16)
       end
     else
       # @private
       def from_s(str)
         str = str.gsub(HYPHEN, EMPTY_STRING)
-        raise ArgumentError, "Expected 32 hexadecimal digits but got #{str.length}" unless str.length == 32
+        raise ::ArgumentError, "Expected 32 hexadecimal digits but got #{str.length}" unless str.length == 32
         Integer(str, 16)
       end
     end
   end
 end
+
+require 'cassandra/uuid/generator'

data/lib/cassandra/uuid/generator.rb

@@ -0,0 +1,207 @@
+# encoding: utf-8
+
+#--
+# Copyright 2013-2014 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
+  class Uuid
+    # A UUID generator.
+    #
+    # This class can be used to genereate Apache Cassandra timeuuid and uuid
+    # values.
+    #
+    # @see Cassandra::Uuid::Generator#now Generating a sequence time UUIDs
+    #   with reasonable uniqueness guarantees.
+    # @see Cassandra::Uuid::Generator#at Generating a time UUID for a given
+    #   time object or unix timestamp.
+    # @see Cassandra::Uuid::Generator#uuid Generating completely random v4
+    #   UUIDs.
+    #
+    # @note Instances of this class are absolutely not threadsafe. You should
+    #   never share instances between threads.
+    #
+    class Generator
+      # Create a new UUID generator.
+      #
+      # The clock ID and node ID components are set to random numbers when the
+      # generator is created. These are used for generation of time UUIDs only.
+      #
+      # @param [Integer] node_id an alternate node ID
+      # @param [Integer] clock_id an alternate clock ID
+      # @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)
+        raise ::ArgumentError, "invalid clock" unless clock.respond_to?(:now)
+
+        @node_id  = Integer(node_id)
+        @clock_id = Integer(clock_id)
+        @clock    = clock
+      end
+
+      # Returns a new UUID with a time component that is the current time.
+      #
+      # If two calls to {#now} happen within the time afforded by the system
+      # clock resolution a counter is incremented and added to the time
+      # component.
+      #
+      # If the clock moves backwards the clock ID is reset to a new random
+      # number.
+      #
+      # @example Creating a sequential TimeUuids for the current time
+      #   generator = Cassandra::Uuid::Generator.new
+      #   timeuuids = 5.times.map { generator.now }
+      #
+      #   puts timeuuids.zip(timeuuids.map(&:to_time)).map(&:inspect)
+      #
+      #   # Outputs:
+      #   # [8614b7d0-5646-11e4-8e54-6761d3995ef3, 2014-10-17 21:42:42 UTC]
+      #   # [8614b91a-5646-11e4-8e54-6761d3995ef3, 2014-10-17 21:42:42 UTC]
+      #   # [8614b960-5646-11e4-8e54-6761d3995ef3, 2014-10-17 21:42:42 UTC]
+      #   # [8614b99c-5646-11e4-8e54-6761d3995ef3, 2014-10-17 21:42:42 UTC]
+      #   # [8614b9ce-5646-11e4-8e54-6761d3995ef3, 2014-10-17 21:42:42 UTC]
+      #
+      # @see Time.now
+      #
+      # @return [Cassandra::TimeUuid] a new UUID
+      def now
+        now   = @clock.now
+        usecs = now.to_i * 1_000_000 + now.usec
+        if @last_usecs && @last_usecs - @sequence <= usecs && usecs <= @last_usecs
+          @sequence += 1
+        elsif @last_usecs && @last_usecs > usecs
+          @sequence = 0
+          @clock_id = SecureRandom.random_number(65536)
+        else
+          @sequence = 0
+        end
+        @last_usecs = usecs + @sequence
+        from_usecs(@last_usecs)
+      end
+
+      # Returns a new UUID with a time component based on the specified Time.
+      # A piece of jitter is added to ensure that multiple calls with the same
+      # time do not generate the same UUID (if you want determinism you can set
+      # the second parameter to zero).
+      #
+      # @overload at(time, jitter = SecureRandom.random_number(65536))
+      #   @param [Time] time a Time instance
+      #   @param [Integer] jitter a number of microseconds to add to the time
+      #   @return [Cassandra::TimeUuid] a new UUID
+      # @overload at(seconds_with_frac, jitter = SecureRandom.random_number(65536))
+      #   @param [Numeric] seconds_with_frac can be {Integer}, {Float},
+      #     {Rational}, or other {Numeric}
+      #   @param [Integer] jitter a number of microseconds to add to the time
+      #   @return [Cassandra::TimeUuid] a new UUID
+      # @overload at(seconds, microseconds_with_frac, jitter = SecureRandom.random_number(65536))
+      #   @param [Integer] seconds
+      #   @param [Numeric] microseconds_with_frac can be {Integer}, {Float},
+      #     {Rational}, or other {Numeric}
+      #   @param [Integer] jitter a number of microseconds to add to the time
+      #   @return [Cassandra::TimeUuid] a new UUID
+      #
+      # @note the `jitter` argument accepted by all variants of this method is
+      #   required to add randomness to generated {Cassandra::TimeUuid} and
+      #   might affect the order of generated timestamps. You should set
+      #   `jitter` to 0 when the source time(stamp)s are unique.
+      #
+      # @example Creating a TimeUuid from a Time instance
+      #   generator = Cassandra::Uuid::Generator.new
+      #   timeuuid  = generator.at(Time.at(1413582460))
+      #
+      #   puts timeuuid.to_time
+      #
+      #   # Outputs:
+      #   # 2014-10-17 21:47:40 UTC
+      #
+      # @example Creating a TimeUuid from a timestamp
+      #   generator = Cassandra::Uuid::Generator.new
+      #   timeuuid  = generator.at(1413582423)
+      #
+      #   puts timeuuid.to_time
+      #
+      #   # Outputs:
+      #   # 2014-10-17 21:47:03 UTC
+      #
+      # @example Avoid jitter in generated TimeUuid
+      #   timestamp = 1413582418
+      #   generator = Cassandra::Uuid::Generator.new
+      #   timeuuid  = generator.at(timestamp, 0)
+      #
+      #   puts timeuuid.to_time.to_i
+      #
+      #   # Outputs:
+      #   # 1413582418
+      #
+      # @raise [ArgumentError] when given no arguments or more than 3 arguments
+      #
+      # @see Time.at
+      def at(*args)
+        raise ::ArgumentError, "not enough arguments" if args.empty?
+        raise ::ArgumentError, "too many arguments"   if args.size > 3
+
+        if args.first.is_a?(Time)
+          time   = 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)
+        end
+
+        from_usecs(time.to_i * 1_000_000 + time.usec + jitter)
+      end
+
+      # Returns a completely random version 4 UUID.
+      #
+      # @example Generating a random Uuid
+      #   generator = Cassandra::Uuid::Generator.new
+      #   uuid      = generator.uuid
+      #
+      #   puts uuid
+      #
+      #   # Outputs:
+      #   # 664dedae-e162-4bc0-9066-b9f1968252aa
+      #
+      # @see SecureRandom.uuid
+      #
+      # @return [Cassandra::Uuid] a new UUID
+      def uuid
+        Uuid.new(SecureRandom.uuid)
+      end
+
+      private
+
+      # @private
+      def from_usecs(usecs)
+        t = TimeUuid::GREGORIAN_OFFSET + usecs * 10
+        time_hi  = t & 0x0fff000000000000
+        time_mid = t & 0x0000ffff00000000
+        time_low = t & 0x00000000ffffffff
+        version  = 1
+        clock_id = @clock_id & 0x3fff
+        node_id  = @node_id & 0xffffffffffff
+        variant  = 0x8000
+
+        n  = (time_low << 96) | (time_mid << 48) | (time_hi << 16)
+        n |= version << 76
+        n |= (clock_id | variant) << 48
+        n |= node_id
+
+        TimeUuid.new(n)
+      end
+    end
+  end
+end

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '1.0.0.beta.3'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.3
+  version: 1.0.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione
@@ -17,12 +17,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0.pre4
+        version: '1.2'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0.pre4
+        version: '1.2'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -62,79 +62,61 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- .yardopts
+- README.md
 - lib/cassandra.rb
+- lib/cassandra/address_resolution.rb
+- lib/cassandra/address_resolution/policies.rb
+- lib/cassandra/address_resolution/policies/ec2_multi_region.rb
+- lib/cassandra/address_resolution/policies/none.rb
 - lib/cassandra/auth.rb
-- lib/cassandra/client.rb
-- lib/cassandra/cluster.rb
-- lib/cassandra/column.rb
-- lib/cassandra/compression.rb
-- lib/cassandra/driver.rb
-- lib/cassandra/errors.rb
-- lib/cassandra/future.rb
-- lib/cassandra/host.rb
-- lib/cassandra/keyspace.rb
-- lib/cassandra/listener.rb
-- lib/cassandra/load_balancing.rb
-- lib/cassandra/protocol.rb
-- lib/cassandra/reconnection.rb
-- lib/cassandra/result.rb
-- lib/cassandra/retry.rb
-- lib/cassandra/session.rb
-- lib/cassandra/statement.rb
-- lib/cassandra/statements.rb
-- lib/cassandra/table.rb
-- lib/cassandra/time_uuid.rb
-- lib/cassandra/util.rb
-- lib/cassandra/uuid.rb
-- lib/cassandra/version.rb
 - lib/cassandra/auth/providers.rb
 - lib/cassandra/auth/providers/password.rb
-- lib/cassandra/client/batch.rb
-- lib/cassandra/client/client.rb
-- lib/cassandra/client/column_metadata.rb
-- lib/cassandra/client/connection_manager.rb
-- lib/cassandra/client/connector.rb
-- lib/cassandra/client/execute_options_decoder.rb
-- lib/cassandra/client/null_logger.rb
-- lib/cassandra/client/peer_discovery.rb
-- lib/cassandra/client/prepared_statement.rb
-- lib/cassandra/client/query_result.rb
-- lib/cassandra/client/request_runner.rb
-- lib/cassandra/client/result_metadata.rb
-- lib/cassandra/client/void_result.rb
+- lib/cassandra/cluster.rb
 - lib/cassandra/cluster/client.rb
+- lib/cassandra/cluster/connection_pool.rb
 - lib/cassandra/cluster/connector.rb
 - lib/cassandra/cluster/control_connection.rb
+- lib/cassandra/cluster/failed_connection.rb
 - lib/cassandra/cluster/metadata.rb
 - lib/cassandra/cluster/options.rb
 - lib/cassandra/cluster/registry.rb
 - lib/cassandra/cluster/schema.rb
 - lib/cassandra/cluster/schema/partitioners.rb
-- lib/cassandra/cluster/schema/replication_strategies.rb
-- lib/cassandra/cluster/schema/type_parser.rb
 - lib/cassandra/cluster/schema/partitioners/murmur3.rb
 - lib/cassandra/cluster/schema/partitioners/ordered.rb
 - lib/cassandra/cluster/schema/partitioners/random.rb
+- lib/cassandra/cluster/schema/replication_strategies.rb
 - 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
 - lib/cassandra/compression/compressors/snappy.rb
+- lib/cassandra/driver.rb
+- lib/cassandra/errors.rb
 - lib/cassandra/execution/info.rb
 - lib/cassandra/execution/options.rb
 - lib/cassandra/execution/trace.rb
+- lib/cassandra/future.rb
+- lib/cassandra/host.rb
+- lib/cassandra/keyspace.rb
+- lib/cassandra/listener.rb
+- lib/cassandra/load_balancing.rb
 - lib/cassandra/load_balancing/policies.rb
 - lib/cassandra/load_balancing/policies/dc_aware_round_robin.rb
 - lib/cassandra/load_balancing/policies/round_robin.rb
 - lib/cassandra/load_balancing/policies/token_aware.rb
 - lib/cassandra/load_balancing/policies/white_list.rb
+- lib/cassandra/null_logger.rb
+- lib/cassandra/protocol.rb
 - lib/cassandra/protocol/cql_byte_buffer.rb
 - lib/cassandra/protocol/cql_protocol_handler.rb
 - lib/cassandra/protocol/frame_decoder.rb
 - lib/cassandra/protocol/frame_encoder.rb
 - lib/cassandra/protocol/request.rb
-- lib/cassandra/protocol/response.rb
-- lib/cassandra/protocol/type_converter.rb
 - lib/cassandra/protocol/requests/auth_response_request.rb
 - lib/cassandra/protocol/requests/batch_request.rb
 - lib/cassandra/protocol/requests/credentials_request.rb
@@ -145,6 +127,7 @@ files:
 - lib/cassandra/protocol/requests/register_request.rb
 - lib/cassandra/protocol/requests/startup_request.rb
 - lib/cassandra/protocol/requests/void_query_request.rb
+- lib/cassandra/protocol/response.rb
 - lib/cassandra/protocol/responses/auth_challenge_response.rb
 - lib/cassandra/protocol/responses/auth_success_response.rb
 - lib/cassandra/protocol/responses/authenticate_response.rb
@@ -163,20 +146,31 @@ files:
 - lib/cassandra/protocol/responses/supported_response.rb
 - lib/cassandra/protocol/responses/topology_change_event_response.rb
 - lib/cassandra/protocol/responses/void_result_response.rb
+- lib/cassandra/protocol/type_converter.rb
+- lib/cassandra/reconnection.rb
 - lib/cassandra/reconnection/policies.rb
 - lib/cassandra/reconnection/policies/constant.rb
 - lib/cassandra/reconnection/policies/exponential.rb
+- lib/cassandra/result.rb
+- lib/cassandra/retry.rb
 - lib/cassandra/retry/policies.rb
 - lib/cassandra/retry/policies/default.rb
 - lib/cassandra/retry/policies/downgrading_consistency.rb
 - lib/cassandra/retry/policies/fallthrough.rb
+- lib/cassandra/session.rb
+- lib/cassandra/statement.rb
+- lib/cassandra/statements.rb
 - lib/cassandra/statements/batch.rb
 - lib/cassandra/statements/bound.rb
 - lib/cassandra/statements/prepared.rb
 - lib/cassandra/statements/simple.rb
 - lib/cassandra/statements/void.rb
-- README.md
-- .yardopts
+- lib/cassandra/table.rb
+- lib/cassandra/time_uuid.rb
+- lib/cassandra/util.rb
+- lib/cassandra/uuid.rb
+- lib/cassandra/uuid/generator.rb
+- lib/cassandra/version.rb
 - lib/cassandra_murmur3.jar
 homepage: http://datastax.github.io/ruby-driver
 licenses:
@@ -198,12 +192,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.2
 signing_key:
 specification_version: 4
 summary: Datastax Ruby Driver for Apache Cassandra