cassanity 0.4.0 → 0.5.0

data/lib/cassanity/retry_strategies/retry_n_times.rb

@@ -0,0 +1,29 @@
+require 'cassanity/retry_strategies/retry_strategy'
+
+module Cassanity
+  module RetryStrategies
+    class RetryNTimes < RetryStrategy
+      # Private
+      attr_reader :retries
+
+      # Public: initialize the retry strategy.
+      #
+      # args - The Hash of arguments.
+      #        :retries - the number of times to retry an unsuccessful call
+      #                   before failing.
+      def initialize(args = {})
+        # By default, there's no retries - if the call fails, you
+        # get the error propagated to you.
+        @retries = args[:retries] || 0
+      end
+
+      # Private: re-raise the exception from the last call if it's been retried
+      # more than the maximum allowed amount.
+      def fail(attempts, error)
+        if attempts > @retries
+          raise error
+        end
+      end
+    end
+  end
+end

data/lib/cassanity/retry_strategies/retry_strategy.rb

@@ -0,0 +1,35 @@
+module Cassanity
+  module RetryStrategies
+    class RetryStrategy
+      # Internal: override in subclass.
+      #
+      # attempts    - how many times the unsuccessful call has been tried so far
+      # last_error  - the error raised by the unsuccessful call
+      def fail(attempts, last_error)
+        raise 'not implemented'
+      end
+
+      # Public: execute the given block, and handle errors raised
+      # by the CassandraCQL 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.
+      #
+      # payload  - A Hash from an instrumenter to store a retry count in, or nil if
+      #            the number of retries shouldn't be tracked.
+      def execute(payload = nil)
+        return unless block_given?
+
+        attempt = 0
+
+        while attempt += 1
+          begin
+            payload[:attempts] = attempt unless payload.nil?
+            return yield
+          rescue CassandraCQL::Error::InvalidRequestException, Thrift::Exception => e
+            fail(attempt, e)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cassanity/version.rb

@@ -1,3 +1,3 @@
 module Cassanity
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/helper.rb

@@ -1,9 +1,11 @@
 $:.unshift(File.expand_path('../../lib', __FILE__))
 
+require 'pathname'
 require 'rubygems'
 require 'bundler'
 
 Bundler.require :default
+Dotenv.load
 
 require 'cassanity'
 
@@ -18,6 +20,7 @@ RSpec.configure do |config|
   config.alias_example_to :fit, :focused => true
   config.alias_example_to :xit, :pending => true
   config.run_all_when_everything_filtered = true
+  config.fail_fast = true
 
   config.backtrace_clean_patterns = [
     /lib\/rspec\/(core|expectations|matchers|mocks)/,
@@ -25,3 +28,8 @@ 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}"

data/spec/integration/cassanity/column_family_spec.rb

@@ -3,10 +3,10 @@ require 'cassanity/keyspace'
 
 describe Cassanity::ColumnFamily do
   let(:keyspace_name)               { 'cassanity_test' }
-  let(:column_family_name)          { 'apps' }
-  let(:counters_column_family_name) { 'counters' }
+  let(:column_family_name)          { :apps }
+  let(:counters_column_family_name) { :counters }
 
-  let(:client) { Cassanity::Client.new }
+  let(:client) { Cassanity::Client.new(CassanityServers) }
   let(:driver) { client.driver }
 
   let(:keyspace) { client[keyspace_name] }
@@ -33,40 +33,41 @@ describe Cassanity::ColumnFamily do
   }
 
   before do
-    client_drop_keyspace(driver, keyspace_name)
-    client_create_keyspace(driver, keyspace_name)
-    client_create_column_family(driver, column_family_name, "id text PRIMARY KEY, name text")
-    client_create_column_family(driver, counters_column_family_name, "id text PRIMARY KEY, views counter")
+    driver_drop_keyspace(driver, keyspace_name)
+    driver_create_keyspace(driver, keyspace_name)
+    driver_create_column_family(driver, column_family_name, "id text PRIMARY KEY, name text")
+    driver_create_column_family(driver, counters_column_family_name, "id text PRIMARY KEY, views counter")
   end
 
   after do
-    client_drop_keyspace(driver, keyspace_name)
+    driver_drop_keyspace(driver, keyspace_name)
   end
 
   it "knows if it exists" do
     subject.exists?.should be_true
-    client_drop_column_family(driver, column_family_name)
+    driver_drop_column_family(driver, column_family_name)
     subject.exists?.should be_false
   end
 
   it "can recreate when not created" do
-    client_drop_column_family(driver, column_family_name)
-    client_column_family?(driver, column_family_name).should be_false
+    driver_drop_column_family(driver, column_family_name)
+    driver_column_family?(driver, column_family_name).should be_false
     subject.recreate
-    client_column_family?(driver, column_family_name).should be_true
+    driver_column_family?(driver, column_family_name).should be_true
   end
 
   it "can recreate when already created" do
-    client_column_family?(driver, column_family_name).should be_true
+    driver_column_family?(driver, column_family_name).should be_true
     subject.recreate
-    client_column_family?(driver, column_family_name).should be_true
+    driver_column_family?(driver, column_family_name).should be_true
   end
 
   it "can create itself" do
     column_family = described_class.new(arguments.merge(name: 'people'))
     column_family.create
 
-    apps_column_family = driver.schema.column_families.fetch(column_family.name)
+    column_families = driver.schema.column_families
+    apps_column_family = column_families.fetch(column_family.name.to_s)
     apps_column_family.comment.should eq('For storing things')
 
     columns = apps_column_family.columns
@@ -89,41 +90,45 @@ describe Cassanity::ColumnFamily do
   end
 
   it "can drop" do
-    client_column_family?(driver, column_family_name).should be_true
+    driver_column_family?(driver, column_family_name).should be_true
     subject.drop
-    client_column_family?(driver, column_family_name).should be_false
+    driver_column_family?(driver, column_family_name).should be_false
   end
 
   it "can drop when using a different keyspace" do
-    client_column_family?(driver, column_family_name).should be_true
+    driver_column_family?(driver, column_family_name).should be_true
     driver.execute('USE system')
     subject.drop
-    client_column_family?(driver, column_family_name).should be_false
+    driver_column_family?(driver, column_family_name).should be_false
   end
 
   it "can alter" do
     subject.alter(add: {created_at: :timestamp})
 
-    apps_column_family = driver.schema.column_families.fetch(column_family_name)
+    column_families = driver.schema.column_families
+    apps_column_family = column_families.fetch(column_family_name.to_s)
     columns = apps_column_family.columns
     columns.should have_key('created_at')
     columns['created_at'].should eq('org.apache.cassandra.db.marshal.DateType')
 
     subject.alter(alter: {created_at: :timeuuid})
 
-    apps_column_family = driver.schema.column_families.fetch(column_family_name)
+    column_families = driver.schema.column_families
+    apps_column_family = column_families.fetch(column_family_name.to_s)
     columns = apps_column_family.columns
     columns.should have_key('created_at')
     columns['created_at'].should eq('org.apache.cassandra.db.marshal.TimeUUIDType')
 
     subject.alter(drop: :created_at)
 
-    apps_column_family = driver.schema.column_families.fetch(column_family_name)
+    column_families = driver.schema.column_families
+    apps_column_family = column_families.fetch(column_family_name.to_s)
     columns = apps_column_family.columns
     columns.should_not have_key('created_at')
 
     subject.alter(with: {comment: 'Some new comment'})
-    apps_column_family = driver.schema.column_families.fetch(column_family_name)
+    column_families = driver.schema.column_families
+    apps_column_family = column_families.fetch(column_family_name.to_s)
     apps_column_family.comment.should eq('Some new comment')
   end
 
@@ -133,7 +138,7 @@ describe Cassanity::ColumnFamily do
       column_name: :name,
     })
 
-    apps = driver.schema.column_families['apps']
+    apps = driver.schema.column_families.fetch(column_family_name.to_s)
     apps_meta = apps.column_metadata
     index = apps_meta.detect { |c| c.index_name == 'apps_name_index' }
     index.should_not be_nil
@@ -142,7 +147,7 @@ describe Cassanity::ColumnFamily do
       name: :apps_name_index,
     })
 
-    apps = driver.schema.column_families['apps']
+    apps = driver.schema.column_families.fetch(column_family_name.to_s)
     apps_meta = apps.column_metadata
     index = apps_meta.detect { |c| c.index_name == 'apps_name_index' }
     index.should be_nil
@@ -307,4 +312,10 @@ describe Cassanity::ColumnFamily do
     result = driver.execute("SELECT * FROM #{column_family_name} WHERE id = '2'")
     result.rows.should eq(1)
   end
+
+  it "can get columns" do
+    columns = subject.columns
+    columns.map(&:name).should eq([:name])
+    columns.map(&:type).should eq([:text])
+  end
 end

data/spec/integration/cassanity/connection_spec.rb

@@ -6,22 +6,22 @@ describe Cassanity::Connection do
   let(:keyspace_name)      { 'cassanity_test' }
   let(:column_family_name) { 'apps' }
 
-  let(:client) { Cassanity::Client.new }
+  let(:client) { Cassanity::Client.new(CassanityServers) }
   let(:driver) { client.driver }
 
   subject { client.connection }
 
   before do
-    client_drop_keyspace(driver, keyspace_name)
+    driver_drop_keyspace(driver, keyspace_name)
   end
 
   after do
-    client_drop_keyspace(driver, keyspace_name)
+    driver_drop_keyspace(driver, keyspace_name)
   end
 
   it "can batch" do
-    client_create_keyspace(driver, keyspace_name)
-    client_create_column_family(driver, column_family_name, "id text PRIMARY KEY, name text")
+    driver_create_keyspace(driver, keyspace_name)
+    driver_create_column_family(driver, column_family_name, "id text PRIMARY KEY, name text")
 
     subject.batch({
       keyspace_name: keyspace_name,
@@ -46,8 +46,8 @@ describe Cassanity::Connection do
   end
 
   it "knows keyspaces" do
-    client_create_keyspace(driver, 'something1')
-    client_create_keyspace(driver, 'something2')
+    driver_create_keyspace(driver, :something1)
+    driver_create_keyspace(driver, :something2)
 
     result = subject.keyspaces
     result.each do |keyspace|
@@ -56,10 +56,10 @@ describe Cassanity::Connection do
     end
 
     names = result.map(&:name)
-    names.should include('something1')
-    names.should include('something2')
+    names.should include(:something1)
+    names.should include(:something2)
 
-    client_drop_keyspace(driver, 'something1')
-    client_drop_keyspace(driver, 'something2')
+    driver_drop_keyspace(driver, :something1)
+    driver_drop_keyspace(driver, :something2)
   end
 end

data/spec/integration/cassanity/fixtures/migrations/20130224135000_create_users.rb

@@ -0,0 +1,17 @@
+class CreateUsers < Cassanity::Migration
+  def up
+    create_column_family :users, {
+      primary_key: :id,
+      columns: {
+        id: :timeuuid,
+        name: :text,
+        age: :int,
+        updated_at: :timestamp,
+      },
+    }
+  end
+
+  def down
+    drop_column_family :users
+  end
+end

data/spec/integration/cassanity/fixtures/migrations/20130225135002_create_apps.rb

@@ -0,0 +1,15 @@
+class CreateApps < Cassanity::Migration
+  def up
+    create_column_family :apps, {
+      primary_key: :id,
+      columns: {
+        id: :timeuuid,
+        name: :text,
+      },
+    }
+  end
+
+  def down
+    drop_column_family :apps
+  end
+end

data/spec/integration/cassanity/fixtures/migrations/20130226135004_add_username_to_users.rb

@@ -0,0 +1,9 @@
+class AddUsernameToUsers < Cassanity::Migration
+  def up
+    add_column :users, :username, :text
+  end
+
+  def down
+    drop_column :users, :username
+  end
+end

data/spec/integration/cassanity/instrumentation/log_subscriber_spec.rb

@@ -0,0 +1,71 @@
+require 'helper'
+require 'cassanity/instrumentation/log_subscriber'
+
+describe Cassanity::Instrumentation::LogSubscriber do
+  let(:client) {
+    Cassanity::Client.new(CassanityServers, {
+      instrumenter: ActiveSupport::Notifications,
+    })
+  }
+
+  let(:keyspace) { client[:cassanity_test] }
+
+  let(:column_family) {
+    keyspace.column_family({
+      name: :apps,
+      schema: {
+        primary_key: :id,
+        columns: {
+          id: :timeuuid,
+          name: :text,
+        },
+      },
+    })
+  }
+
+  before do
+    @io = StringIO.new
+    Cassanity::Instrumentation::LogSubscriber.logger = Logger.new(@io)
+
+    keyspace.recreate
+    column_family.recreate
+  end
+
+  after do
+    Cassanity::Instrumentation::LogSubscriber.logger = nil
+  end
+
+  it "works" do
+    column_family.insert({
+      data: {
+        id: SimpleUUID::UUID.new,
+        name: 'GitHub.com',
+      },
+    })
+
+    query = "INSERT INTO cassanity_test.apps (id, name) VALUES (?, ?)"
+    log = @io.string
+    log.should match(/#{Regexp.escape(query)}/i)
+    log.should match(/UUID/i)
+    log.should match(/GitHub\.com/i)
+  end
+
+  it "does not fail when no bind variables" do
+    client.keyspaces
+    query = "SELECT * FROM system.schema_keyspaces"
+    log = @io.string
+    log.should match(/#{Regexp.escape(query)}/i)
+  end
+
+  it "works through exceptions" do
+    client.driver.should_receive(:execute).and_raise(StandardError.new('boom'))
+    begin
+      client.keyspaces
+    rescue StandardError => e
+    end
+
+    query = "SELECT * FROM system.schema_keyspaces"
+    log = @io.string.split("\n").last
+    log.should match(/#{Regexp.escape(query)}/i)
+  end
+end

data/spec/integration/cassanity/instrumentation/metriks_subscriber_spec.rb

@@ -0,0 +1,48 @@
+require 'helper'
+require 'cassanity/instrumentation/metriks'
+
+describe Cassanity::Instrumentation::MetriksSubscriber do
+  let(:client) {
+    Cassanity::Client.new(CassanityServers, {
+      instrumenter: ActiveSupport::Notifications,
+    })
+  }
+
+  let(:keyspace) { client[:cassanity_test] }
+
+  let(:column_family) {
+    keyspace.column_family({
+      name: :apps,
+      schema: {
+        primary_key: :id,
+        columns: {
+          id: :timeuuid,
+          name: :text,
+        },
+      },
+    })
+  }
+
+  before do
+    keyspace.recreate
+    column_family.recreate
+  end
+
+  it "updates timers when cql calls happen" do
+    # Clear the registry so we don't count the operations required to re-create
+    # the keyspace and column family.
+    Metriks::Registry.default.clear
+
+    column_family.insert({
+      data: {
+        id: SimpleUUID::UUID.new,
+        name: 'GitHub.com',
+      },
+    })
+
+    Metriks.timer('cassanity.cql').count.should be(1)
+    Metriks.timer('cassanity.column_family.apps.cql').count.should be(1)
+    Metriks.timer('cassanity.command.column_family_insert.cql').count.should be(1)
+    Metriks.timer('cassanity.column_family.apps.column_family_insert.cql').count.should be(1)
+  end
+end