cassandra-schema 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8952ab5b3596d5370d883b95b1fd0729db5aa1d
-  data.tar.gz: 89eb6476ec2461fe77b5f531c1c42a7bdbb27e7d
+  metadata.gz: 646b6d54404b35f5f4925709947d873dc7bf2880
+  data.tar.gz: 5550c316d8f6fa5460f7db981654344e347a5252
 SHA512:
-  metadata.gz: 9e7e3df43fa96784a8486aa3b4f1215090d718b92e77590c9b12e5a88f9abfe92ffd7cf0656917e6826436922ccef564e3791908149bd98522fb419870ef89d6
-  data.tar.gz: 220f759eff1b2c967b559d6850018087e38a6e58bbf13374229dcdbe12de2ea7dfc73f3e11556c5beeefc47c056597bf0c1fd8efb444fefc3ab889a989e790f6
+  metadata.gz: c4a88f2462cafff564678761264402e76da9574f9d1b6df02ce008363a51cc96b7af3d06ceb0354e7de61b2e4d90e94d51354b75b9f9a41325463ade1bd5298f
+  data.tar.gz: c64a715befaed5b60ff833ad8a61a4ef07ac67e50a842d94fc3595c9f9e5d3ef7c14966f25373b990bc9671f6163668f6ef2e5d7afeae973179520e9f5bbe16f

data/.gems-test

@@ -1,2 +1,3 @@
 cassandra-driver -v 3.2.0
 lz4-ruby -v 0.3.3
+mocha -v 1.3.0

data/README.md

@@ -4,6 +4,11 @@ Simple reversible schema migrations for cassandra.
 
 ## Changelog
 
+### Version `0.3.0`
+
+- Add `query_timeout` option for running migration commands. Default 30 seconds.
+- Log relevant exception message when running migrations
+
 ### Version `0.2.0`
 
 - Refactor `schema_information` queries to use LWT and `:quorum` consistency level
@@ -65,6 +70,7 @@ migrator = CassandraSchema::Migrator.new(
   connection: CONN, # any connection object implementing `execute` method
   migrations: CassandraSchema.migrations, # list of migrations
   logger: Logger.new, # any logger object implementing `info` and `error` methods
+  options: {}, # additional configuration
 )
 ```
 
@@ -82,6 +88,15 @@ migrator.migrate(2)
 
 CassandraSchema tracks which migrations you have already run.
 
+
+### Options
+
+name | default | description
+---- | ------- | -----------
+lock | true    | whether the Migrator must lock the schema before running migrations
+lock_timeout | 30 | number of seconds for auto-unlocking schema
+query_timeout | 30 | number of seconds after which to time out the command if it hasn’t completed
+
 ## Installation
 
 You can install it using rubygems.

data/cassandra-schema.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cassandra-schema"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
   s.summary = "Cassandra schema migrations"
   s.license = "MIT"
   s.description = "Simple reversible schema migrations for Cassandra."

data/lib/cassandra-schema/migrator.rb

@@ -5,8 +5,9 @@ module CassandraSchema
     attr_reader :connection, :current_version, :options
 
     DEFAULT_OPTIONS = {
-      lock:         true,
-      lock_timeout: 30,
+      lock:          true,
+      lock_timeout:  30,
+      query_timeout: 30,
     }
 
     def initialize(connection:, migrations:, logger: Logger.new(STDOUT), options: {})
@@ -54,6 +55,7 @@ module CassandraSchema
         @logger.info "Current version: #{current_version}"
         @logger.info "Done!"
       rescue => ex
+        @logger.error ex.message if ex.message && !ex.message.empty?
         @logger.info "Failed migrating all files. Current schema version: #{@current_version}"
       ensure
         unlock_schema if @options.fetch(:lock)
@@ -161,7 +163,7 @@ module CassandraSchema
       index    = 0
 
       commands.each do |command|
-        unless execute_command(command)
+        unless execute_command(command, timeout: @options.fetch(:query_timeout))
           message = "Failed migrating to version #{target}."
 
           if index > 0
@@ -174,7 +176,9 @@ module CassandraSchema
               .fetch(direction == :up ? :down : :up)
               .last(index)
 
-            results = recover_commands.map { |cmd| execute_command(cmd) }
+            results = recover_commands.map { |cmd|
+              execute_command(cmd, timeout: @options.fetch(:query_timeout))
+            }
 
             message += results.all? ? "Ok." : "Failed."
           end
@@ -190,9 +194,9 @@ module CassandraSchema
       update_version(new_version)
     end
 
-    def execute_command(command)
+    def execute_command(command, options)
       begin
-        @connection.execute command
+        @connection.execute command, options
         true
       rescue => ex
         @logger.error ex.message

data/test/migrator_test.rb

@@ -1,4 +1,5 @@
 require "minitest/autorun"
+require "mocha/setup"
 
 require_relative "support/connections"
 require_relative "../lib/cassandra-schema/migrator"
@@ -185,6 +186,25 @@ describe "CassandraSchema::Migrator" do
 
       assert_equal "Nothing to migrate.", logger_b.stdout.pop
     end
+
+    it "runs commands with custom timeout" do
+      migrator = CassandraSchema::Migrator.new(
+        connection: CONN,
+        migrations: CassandraSchema.migrations,
+        logger:     @fake_logger,
+        options:   { query_timeout: 45 },
+      )
+
+      migrator.expects(:execute_command).times(4).with(anything, { timeout: 45 }).returns(true)
+
+      migrator.expects(:lock_schema).returns(true)
+      migrator.expects(:get_current_version).returns(0)
+      migrator.expects(:update_version).times(2)
+      migrator.expects(:renew_lock).times(2)
+      migrator.expects(:unlock_schema)
+
+      migrator.migrate
+    end
   end
 
   describe "migrating down" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-schema
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Lautaro Orazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies: []
 description: Simple reversible schema migrations for Cassandra.
 email: