cassanity 0.5.1 → 0.6.0.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7892f054f8690a99ae75b121cc43d873c917566a
+  data.tar.gz: 19c266c25056ef75b019463cca2d9bb49133ea72
+SHA512:
+  metadata.gz: 76cbbe3e3afdf0e741325d8e48fd11b51ac08718ab60f423a6ebf6f31c067a48382598605652ab3cedc3e30cdc401f3f0c7860981f82d49749e6fe9d50755a2c
+  data.tar.gz: 909558dee131c53a6c648f2f3148ac44d00f2065bbd33049a46923f793dcac6b36f1b3cd45385b1be96bafa452a927ec7c7467629b4a300b1427649bd83b8431

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 gem 'dotenv'
 gem 'rake'
 gem 'rspec', '~> 2.8'
-gem 'activesupport', :require => false
+gem 'activesupport', '~>3.2', :require => false
 gem 'metriks', :require => false
 gem 'statsd-ruby', :require => false
 

data/README.md

@@ -1,25 +1,13 @@
-# Cassanity
+# Cassanity [![Build Status](https://secure.travis-ci.org/jnunemaker/cassanity.png?branch=master)](http://travis-ci.org/jnunemaker/cassanity)
 
 Layer of goodness on top of cassandra-cql so you do not have to write CQL strings all over the place.
 
-## Note about Cassandra 1.2
-
-At this time, cassandra 1.2 is not supported. Under the hood, cassanity uses [cassandra-cql](https://github.com/kreynolds/cassandra-cql), which does not currently support 1.2. It needs the thrift bindings ([initial pull request](https://github.com/kreynolds/cassandra-cql/pull/39)) updated for 1.2 or to wrap the new binary protocol ([initial pull request](https://github.com/kreynolds/cassandra-cql/pull/40)). I'm hoping to work on this in February or March, but if you want to take a stab, that would be awesome.
-
 ## Installation
 
 Add this line to your application's Gemfile:
 
     gem 'cassanity'
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install cassanity
-
 ## Usage
 
 ```ruby
@@ -110,9 +98,8 @@ You can also do a lot more. Here are a few more [examples](https://github.com/jn
 
 ## Compatibility
 
-* Ruby 1.9.3
-* Cassandra CQL 3.x
-* Any version of cassandra that works with cassandra-cql and supports CQL 3.
+* Ruby >= 1.9.3
+* Cassandra >= 1.2 with CQL >= 3.1.0
 
 ## Contributing
 

data/cassanity.gemspec

@@ -17,5 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'cassandra-cql', '~> 1.1.3'
+  gem.add_dependency 'cql-rb', '~>1.1', '>=1.1.1'
+
+  gem.add_development_dependency 'simple_uuid', '~>0.4'
 end

data/examples/keyspaces.rb

@@ -15,8 +15,8 @@ pp keyspace
 
 # you can also provide options
 keyspace = client.keyspace('cassanity_examples', {
-  strategy_class: 'SimpleStrategy',
-  strategy_options: {
+  replication: {
+    class: 'SimpleStrategy',
     replication_factor: 1,
   },
 })

data/lib/cassanity/argument_generators/column_families.rb

@@ -8,7 +8,7 @@ module Cassanity
         cql = 'SELECT * FROM system.schema_columnfamilies'
 
         if (keyspace_name = args[:keyspace_name])
-          cql << ' WHERE "keyspace" = ?'
+          cql << ' WHERE "keyspace_name" = ?'
           variables << keyspace_name
         end
 

data/lib/cassanity/argument_generators/columns.rb

@@ -15,11 +15,11 @@ module Cassanity
         cql = 'SELECT * FROM system.schema_columns'
 
         if (keyspace_name = args[:keyspace_name])
-          where[:keyspace] = keyspace_name
+          where[:keyspace_name] = keyspace_name
         end
 
         if (column_family_name = args[:column_family_name])
-          where[:columnfamily] = column_family_name
+          where[:columnfamily_name] = column_family_name
         end
 
         where_cql, *where_variables = @where_clause.call(where: where)

data/lib/cassanity/argument_generators/keyspace_create.rb

@@ -14,22 +14,9 @@ module Cassanity
         name = args.fetch(:keyspace_name)
         cql = "CREATE KEYSPACE #{name}"
 
-        with = {
-          strategy_class: default_strategy_class,
-          strategy_options: default_strategy_options,
-        }
-
-        if args[:strategy_class]
-          with[:strategy_class] = args[:strategy_class]
-        end
-
-        if args[:strategy_options]
-          args[:strategy_options].each do |key, value|
-            with[:strategy_options][key] = value
-          end
-        end
+        replication = default_replication_options.merge(args[:replication] || {})
 
-        with_cql, *with_variables = @with_clause.call(with: with)
+        with_cql, *with_variables = @with_clause.call(with: { replication: replication })
         cql << with_cql
         variables.concat(with_variables)
 
@@ -37,13 +24,9 @@ module Cassanity
       end
 
       # Private
-      def default_strategy_class
-        'SimpleStrategy'
-      end
-
-      # Private
-      def default_strategy_options
+      def default_replication_options
         {
+          class: 'SimpleStrategy',
           replication_factor: 1,
         }
       end

data/lib/cassanity/argument_generators/with_clause.rb

@@ -17,15 +17,8 @@ module Cassanity
               withs << "COMPACT STORAGE"
             end
           else
-            if value.is_a?(Hash)
-              value.each do |sub_key, sub_value|
-                withs << "#{key}:#{sub_key} = ?"
-                variables << sub_value
-              end
-            else
-              withs << "#{key} = ?"
-              variables << value
-            end
+            withs << "#{key} = ?"
+            variables << value
           end
         end
 

data/lib/cassanity/client.rb

@@ -1,16 +1,16 @@
 require 'forwardable'
-require 'cassandra-cql'
-require 'cassanity/executors/cassandra_cql'
+require 'cql'
+require 'cassanity/executors/cql_rb'
 require 'cassanity/connection'
 
 module Cassanity
   class Client
     extend Forwardable
 
-    # Public: The instance of the CassandraCQL::Database being used.
+    # Public: The instance of the Cql::Client being used.
     attr_reader :driver
 
-    # Public: The instance of the Cassanity::Executors::CassandraCQL that will
+    # Public: The instance of the Cassanity::Executors::CqlRb that will
     # execute all queries.
     attr_reader :executor
 
@@ -22,18 +22,21 @@ module Cassanity
     #
     # servers - The String or Array of Strings representing the servers to
     #           connect to.
-    # options - The Hash of CassandraCQL::Database options.
-    # thrift_options - The Hash of CassandraCQL::Database thrift client options.
-    def initialize(servers = nil, options = {}, thrift_options = {})
-      @servers        = servers || '127.0.0.1:9160'
-      @options        = options.merge(cql_version: '3.0.0')
-      @thrift_options = thrift_options.dup
+    # port - The Integer representing the port to connect to Cassandra with.
+    #        This must be the same for all hosts.
+    # options - The Hash of Cql::Client options.
+    #   :default_consistency - default consistency for the connection
+    #   (if not specified, set to :quorum)
+    def initialize(servers = nil, port = nil, options = {})
+      servers ||= ['127.0.0.1']
+      port    ||= 9042
+
+      @options        = options.merge(hosts: servers, port: port)
       @instrumenter   = @options.delete(:instrumenter)
       @retry_strategy = @options.delete(:retry_strategy)
 
-      @driver = CassandraCQL::Database.new(@servers, @options, @thrift_options)
-
-      @executor = Cassanity::Executors::CassandraCql.new({
+      @driver = Cql::Client.connect(@options)
+      @executor = Cassanity::Executors::CqlRb.new({
         driver: @driver,
         instrumenter: @instrumenter,
         retry_strategy: @retry_strategy,

data/lib/cassanity/executors/{cassandra_cql.rb → cql_rb.rb}

@@ -1,6 +1,7 @@
 require 'forwardable'
-require 'cassandra-cql'
+require 'cql'
 require 'cassanity/error'
+require 'cassanity/statement'
 require 'cassanity/instrumenters/noop'
 require 'cassanity/argument_generators/keyspaces'
 require 'cassanity/argument_generators/keyspace_create'
@@ -29,7 +30,7 @@ require 'cassanity/retry_strategies/exponential_backoff'
 
 module Cassanity
   module Executors
-    class CassandraCql
+    class CqlRb
       extend Forwardable
 
       # Private: Hash of commands to related argument generators.
@@ -88,7 +89,7 @@ module Cassanity
       # Internal: Initializes a cassandra-cql based CQL executor.
       #
       # args - The Hash of arguments.
-      #        :driver - The CassandraCQL::Database connection instance.
+      #        :driver - The Cql::Client connection instance.
       #        :instrumenter - What should be used to instrument all the things
       #                        (default: Cassanity::Instrumenters::Noop).
       #        :argument_generators - A Hash where each key is a command name
@@ -100,13 +101,13 @@ module Cassanity
       #                               transformer that responds to `call`
       #                               (optional).
       #        :retry_strategy      - What retry strategy to use on failed
-      #                               CassandraCQL calls
+      #                               Cql::Client calls
       #                               (default: Cassanity::Instrumenters::RetryNTimes)
       #
       # Examples
       #
-      #   driver = CassandraCQL::Database.new('host', cql_version: '3.0.0')
-      #   Cassanity::Executors::CassandraCql.new(driver: driver)
+      #   driver = Cql::Client.connect(hosts: ['cassandra.example.com'])
+      #   Cassanity::Executors::CqlRb.new(driver: driver)
       #
       def initialize(args = {})
         @driver = args.fetch(:driver)
@@ -148,20 +149,36 @@ module Cassanity
           arguments = args[:arguments]
 
           if arguments
+            # TODO: As a temporary measure, we remove this deprecated option
+            # while we have time to update each gem (e.g., adapter-cassanity)
+            # that sets it. Consistency should be specified at the connection
+            # level for now.
+            if arguments[:using]
+              arguments[:using].delete(:consistency)
+            end
+
+            # Instrumentation parameters
             if (keyspace_name = arguments[:keyspace_name])
               payload[:keyspace_name] = keyspace_name
             end
-
             if (column_family_name = arguments[:column_family_name])
               payload[:column_family_name] = column_family_name
             end
+
+            # Select keyspace before query runs
+            if command != :keyspace_create && (keyspace_name = arguments[:keyspace_name])
+              @driver.use(keyspace_name)
+            end
           end
 
           begin
-            execute_arguments = generator.call(arguments)
-            payload[:cql] = execute_arguments[0]
-            payload[:cql_variables] = execute_arguments[1..-1]
-            result = @retry_strategy.execute(payload) { @driver.execute(*execute_arguments) }
+            cql, *variables = generator.call(arguments)
+            payload[:cql] = cql
+            payload[:cql_variables] = variables
+
+            statement = Cassanity::Statement.new(cql)
+            result = @retry_strategy.execute(payload) { @driver.execute(statement.interpolate(variables)) }
+
             transformer = @result_transformers.fetch(command, Mirror)
             transformed_result = transformer.call(result, args[:transformer_arguments])
             payload[:result] = transformed_result

data/lib/cassanity/keyspace.rb

@@ -9,26 +9,20 @@ module Cassanity
     attr_reader :executor
 
     # Internal
-    attr_reader :strategy_class
-
-    # Internal
-    attr_reader :strategy_options
+    attr_reader :replication
 
     # Public: Initializes a Keyspace.
     #
     # args - The Hash of arguments (default: {}).
     #        :name - The String name of the keyspace.
     #        :executor - What will execute the queries. Must respond to `call`.
-    #        :strategy_class - The String strategy class name to use when
-    #                          creating keyspace.
-    #        :strategy_options - The Hash of strategy options to use when
-    #                            creating keyspace.
+    #        :replication - Hash of replication options (e.g., :class,
+    #                       :replication_factor)
     #
     def initialize(args = {})
       @name = args.fetch(:name).to_sym
       @executor = args.fetch(:executor)
-      @strategy_class = args[:strategy_class]
-      @strategy_options = args[:strategy_options]
+      @replication = args.fetch(:replication, {})
     end
 
     # Public: Returns true or false depending on if keyspace exists in the
@@ -57,8 +51,8 @@ module Cassanity
     #
     #   # override options from initialization
     #   create({
-    #     strategy_class: 'NetworkTopologyStrategy',
-    #     strategy_options: {
+    #     replication: {
+    #       class: 'NetworkTopologyStrategy',
     #       dc1: 1,
     #       dc2: 3,
     #     }
@@ -67,16 +61,7 @@ module Cassanity
     # Returns whatever is returned by executor.
     def create(args = {})
       create_arguments = {}.merge(args)
-
-      if @strategy_class
-        create_arguments[:strategy_class] = @strategy_class
-      end
-
-      if @strategy_options
-        strategy_options = args[:strategy_options] || {}
-        create_arguments[:strategy_options] = strategy_options.merge(@strategy_options)
-      end
-
+      create_arguments[:replication] = @replication.merge(create_arguments[:replication] || {})
       create_arguments[:keyspace_name] = @name
 
       @executor.call({

data/lib/cassanity/migrator.rb

@@ -52,7 +52,7 @@ module Cassanity
     def migrated_up(migration)
       column_family.insert({
         data: {
-          version: migration.version,
+          version: migration.version.to_s,
           name: migration.name,
           migrated_at: Time.now.utc,
         },
@@ -63,7 +63,7 @@ module Cassanity
     def migrated_down(migration)
       column_family.delete({
         where: {
-          version: migration.version,
+          version: migration.version.to_s,
           name: migration.name,
         },
       })

data/lib/cassanity/result_transformers/column_families.rb

@@ -7,7 +7,7 @@ module Cassanity
       # Internal: Turns result into Array of column families.
       def call(result, args = {})
         column_families = []
-        result.fetch_hash do |row|
+        result.each do |row|
           column_families << ColumnFamily.new({
             name: row['columnfamily'] || row['columnfamily_name'],
             keyspace: args[:keyspace],

data/lib/cassanity/result_transformers/columns.rb

@@ -7,9 +7,9 @@ module Cassanity
       # Internal: Turns result into Array of column families.
       def call(result, args = {})
         columns = []
-        result.fetch_hash do |row|
+        result.each do |row|
           columns << Column.new({
-            name: row['column'],
+            name: row['column_name'],
             type: row['validator'],
             column_family: args[:column_family],
           })

data/lib/cassanity/result_transformers/keyspaces.rb

@@ -7,7 +7,7 @@ module Cassanity
       # Internal: Turns result into Array of keyspaces.
       def call(result, args = {})
         keyspaces = []
-        result.fetch_hash do |row|
+        result.each do |row|
           name = row['name'] || row['keyspace'] || row['keyspace_name']
           keyspaces << Keyspace.new({
             name: name,

data/lib/cassanity/result_transformers/result_to_array.rb

@@ -4,11 +4,7 @@ module Cassanity
 
       # Internal: Turns result into Array of Hashes.
       def call(result, args = nil)
-        rows = []
-        result.fetch_hash do |row|
-          rows << row
-        end
-        rows
+        result.map { |row| row }
       end
     end
   end

data/lib/cassanity/retry_strategies/retry_strategy.rb

@@ -10,7 +10,7 @@ module Cassanity
       end
 
       # Public: execute the given block, and handle errors raised
-      # by the CassandraCQL driver. Call the retry method (overridden in your
+      # by the Cql::Client driver. Call the retry method (overridden in your
       # subclass) on each failed attempt with a current retry count and
       # the error raised by the block.
       #
@@ -25,11 +25,11 @@ module Cassanity
           begin
             payload[:attempts] = attempt unless payload.nil?
             return yield
-          rescue CassandraCQL::Error::InvalidRequestException, Thrift::Exception => e
+          rescue Cql::CqlError => e
             fail(attempt, e)
           end
         end
       end
     end
   end
-end
+end

data/lib/cassanity/statement.rb

@@ -0,0 +1,58 @@
+require 'bigdecimal'
+require 'date'
+require 'time'
+
+module Cassanity
+  class Statement
+    def initialize(cql, options = {})
+      @cql = cql
+      @options = options
+
+      @cql_version = @options.fetch(:cql_version, '3.0.0')
+    end
+
+    def interpolate(variables)
+      e = variables.to_enum
+      @cql.gsub(/\?/) { quote(e.next) }
+    end
+
+    private
+    def quote(var)
+      if Array === var
+        var.map { |v| quote(v) }.join(',')
+      elsif Hash === var
+        %({#{var.map { |k, v| "#{quote(k)}:#{quote(v)}" }.join(',')}})
+      elsif String === var
+        %('#{escape_string(var)}')
+      elsif BigDecimal === var && cql2?
+        %('#{var.to_s}')
+      elsif Numeric === var
+        var.to_s
+      elsif Date === var
+        %('#{var.strftime('%Y-%m-%d')}')
+      elsif Time === var
+        (var.to_f * 1000).to_i
+      elsif TrueClass === var || FalseClass === var
+        if cql2?
+          %('#{var.to_s}')
+        else
+          var.to_s
+        end
+      elsif var.respond_to?(:to_guid)
+        var.to_guid
+      elsif var.respond_to?(:to_s)
+        %('#{var.to_s}')
+      else
+        raise ArgumentError, "Unable to escape #{var} (of type #{var.class})"
+      end
+    end
+
+    def escape_string(str)
+      str.gsub("'", "''")
+    end
+
+    def cql2?
+      @cql_version.start_with?('2')
+    end
+  end
+end

data/lib/cassanity/version.rb

@@ -1,3 +1,3 @@
 module Cassanity
-  VERSION = "0.5.1"
+  VERSION = "0.6.0.beta1"
 end

data/spec/helper.rb

@@ -29,7 +29,5 @@ RSpec.configure do |config|
   config.include CassanityHelpers
 end
 
-host = ENV.fetch('CASSANITY_HOST', '127.0.0.1')
-port = ENV.fetch('CASSANITY_PORT', '9160')
-
-CassanityServers = "#{host}:#{port}"
+CassanityHost = Array(ENV.fetch('CASSANITY_HOST', '127.0.0.1'))
+CassanityPort = ENV.fetch('CASSANITY_PORT', '9042').to_i