cassandra_migrations 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 937a04d1bf915cd899134c271aa645421259fb3b
-  data.tar.gz: c0916a9b1fb7be0b142ad0515a3fca628953fe9c
+  metadata.gz: c812cb0c202ab7c93f145b144dc36664734588f4
+  data.tar.gz: 5aa232dd59bcd781a41b5e6bb7f2fb2b1b50b089
 SHA512:
-  metadata.gz: 557970e72c79f1b37035948c3f4990b99afd4a92c0e794d9251a252b9143a7f7a67be3767ef5fdbc4f204a990427d294d2eb351330561eae85935c445a8a571c
-  data.tar.gz: 38be1b8793e029e2d912699421c572906f60ceca0939b69951b4553e4b2f34fa5a0f51d9d570cfe95bf333add26447cb798afd1bab58c1f27f7730a4c04557dd
+  metadata.gz: 3eb66aa211265871e762ad3b56f1df6a79e5a0299174d3454ff38dc2b62eda8d981f591eb51efaa17331e669909c15ee53143b1f049d3440c93bd008aafb6d66
+  data.tar.gz: f3768b62b72d021660f7a6ef8bf634585ee777c8a8c84649d70d299b926e960d9121abd5ee35e619427bfaaf61498edbcdd5172dea764c6061679340dcd30f64

data/lib/cassandra_migrations/cassandra/keyspace_operations.rb

@@ -1,15 +1,16 @@
 # encoding: utf-8
+require 'cassandra'
 
 module CassandraMigrations
   module Cassandra
     module KeyspaceOperations
-  
+
       def create_keyspace!(env)
         config = Config.configurations[env]
         begin
           execute(
             "CREATE KEYSPACE #{config.keyspace} \
-             WITH replication = { \ 
+             WITH replication = { \
                'class':'#{config.replication['class']}', \
                'replication_factor': #{config.replication['replication_factor']} \
              }"
@@ -20,16 +21,16 @@ module CassandraMigrations
           raise exception
         end
       end
-      
+
       def drop_keyspace!(env)
         config = Config.configurations[env]
         begin
           execute("DROP KEYSPACE #{config.keyspace}")
-        rescue Cql::QueryError
+        rescue ::Cassandra::Errors::QueryError
           raise Errors::UnexistingKeyspaceError, config.keyspace
         end
       end
-    
+
     end
   end
 end

data/lib/cassandra_migrations/cassandra.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 
 require 'yaml'
-require 'cql'
+require 'cassandra'
+require_relative 'cql-rb-wrapper'
 require 'cassandra_migrations/cassandra/queries'
 require 'cassandra_migrations/cassandra/query_result'
 require 'cassandra_migrations/cassandra/keyspace_operations'
@@ -10,9 +11,9 @@ module CassandraMigrations
   module Cassandra
     extend Queries
     extend KeyspaceOperations
-  
+
     mattr_accessor :client
-    
+
     def self.start!
       begin
         # setup keyspace use
@@ -20,10 +21,10 @@ module CassandraMigrations
       rescue Errors::MissingConfigurationError
         # It's acceptable to not have a configuration file, that's why we rescue this exception.
         # On the other hand, if the user try to execute a query this same exception won't be rescued
-        Rails.logger.try(:warn, "There is no config/cassandra.yml. Skipping connection to Cassandra...") 
+        Rails.logger.try(:warn, "There is no config/cassandra.yml. Skipping connection to Cassandra...")
       end
     end
-    
+
     def self.restart!
       raise Errors::ClientNotStartedError unless client
 
@@ -31,7 +32,7 @@ module CassandraMigrations
       self.client = nil
       start!
     end
-    
+
     def self.shutdown!
       raise Errors::ClientNotStartedError unless client
 
@@ -50,7 +51,8 @@ module CassandraMigrations
 
       begin
         client.use(keyspace)
-      rescue Cql::QueryError # keyspace does not exist
+      rescue Exception => e # keyspace does not exist
+        puts "#{e} : #{e.message}"
         raise Errors::UnexistingKeyspaceError, keyspace
       end
     end
@@ -60,17 +62,18 @@ module CassandraMigrations
       Rails.logger.try(:info, "\e[1;35m [Cassandra Migrations] \e[0m #{cql.to_s}")
       result = client.execute(cql)
       QueryResult.new(result) if result
-    end  
-    
+    end
+
   private
-    
+
     def self.connect_to_server
-      Rails.logger.try(:info, "Connecting to Cassandra on #{Config.host}:#{Config.port}")
-      
+      connection_params = Config.connection_config_for_env
+      Rails.logger.try(:info, "Connecting to Cassandra on #{connection_params}")
+
       begin
-        self.client = Cql::Client.connect(:host => Config.host, :port => Config.port)
-      rescue Cql::Io::ConnectionError => e
-        raise Errors::ConnectionError, e.message      
+        self.client = Client.connect(connection_params)
+      rescue Ione::Io::ConnectionError => e
+        raise Errors::ConnectionError, e.message
       end
     end
   end

data/lib/cassandra_migrations/config.rb

@@ -3,7 +3,15 @@
 module CassandraMigrations
   module Config
 
-    FIELDS = %w(host port keyspace replication)
+    # See valid options at https://github.com/datastax/ruby-driver/blob/master/lib/cassandra.rb#L163
+    CASSANDRA_CONNECTION_VALID_FIELDS = [
+       :credentials, :auth_provider, :compression, :hosts, :logger, :port,
+       :load_balancing_policy, :reconnection_policy, :retry_policy, :listeners,
+       :consistency, :trace, :page_size, :compressor, :username, :password,
+       :ssl, :server_cert, :client_cert, :private_key, :passphrase,
+       :connect_timeout, :futures_factory]
+
+    FIELDS = CASSANDRA_CONNECTION_VALID_FIELDS.map(&:to_s) + %w(keyspace replication)
 
     Configuration = Struct.new(*FIELDS.map(&:to_sym))
 
@@ -17,7 +25,24 @@ module CassandraMigrations
       load_config unless configurations
       self.configurations[Rails.env].send(method_sym)
     end
-    
+
+    def self.connection_config_for_env
+      env_config = Hash[self.configurations[Rails.env].each_pair.to_a]
+
+      # support for old configuration param :port (singular)
+      if env_config.include?(:port)
+        env_config[:ports] = [env_config[:port]]
+      end
+
+      env_config.keep_if do |k,v|
+        CASSANDRA_CONNECTION_VALID_FIELDS.include?(k) && v
+      end
+
+      Hash[self.configurations[Rails.env].each_pair.to_a].keep_if do |k,v|
+        CASSANDRA_CONNECTION_VALID_FIELDS.include?(k) && v
+      end
+    end
+
   private
 
     def self.load_config
@@ -32,6 +57,6 @@ module CassandraMigrations
         raise Errors::MissingConfigurationError
       end
     end
-  
+
   end
 end

data/lib/cassandra_migrations/cql-rb-wrapper.rb

@@ -0,0 +1,92 @@
+# encoding: utf-8
+
+require 'cassandra'
+require 'ione'
+
+class PreparedStatement
+  attr_reader :statement
+
+  def initialize(client, statement)
+    @client = client
+    @statement = statement
+  end
+
+  def execute(*args)
+    @client.execute(@statement, *args)
+  end
+end
+
+class BatchStatement
+  def initialize(client, batch)
+    @client = client
+    @batch = batch
+  end
+
+  def execute(options = {})
+    @client.execute(@batch, options)
+  end
+
+  def add(*args)
+    @batch.add(*args)
+    self
+  end
+end
+
+class Client
+  def self.connect(options)
+    @cluster = Cassandra.connect(options)
+    self.new(@cluster)
+  end
+
+  def use(keyspace)
+    if @sessions[keyspace]
+      @session = @sessions[keyspace]
+    else
+      @session = @cluster.connect(keyspace)
+      @sessions[keyspace] = @session
+    end
+  end
+
+  def initialize(cluster, keyspace = nil)
+    @cluster = cluster
+    @sessions = {}
+    if keyspace
+      @session = cluster.connect(keyspace)
+      @sessions[keyspace] = @session
+    else
+      @session = @cluster.connect()
+      @sessions[:default] = @session
+    end
+  end
+
+  def execute(*args)
+    @session.execute(*args)
+  end
+
+  def prepare(statement, options = {})
+    s = @session.prepare(statement, options)
+    PreparedStatement.new(self, s)
+  end
+
+  def batch(type = :logged, options = {})
+    batch = BatchStatement.new(self, @session.send(:"#{type}_batch"))
+    if block_given?
+      yield(batch)
+      batch.execute(options)
+    else
+      batch
+    end
+  end
+
+  def close
+    @session.close
+  end
+
+  def keyspace
+    @session.keyspace
+  end
+
+  def connected?
+    @session.instance_variable_get('@state') == :connected
+  end
+end

data/lib/cassandra_migrations/errors.rb

@@ -15,36 +15,36 @@ module CassandraMigrations
         end
       end
     end
-    
+
     class ClientNotStartedError < CassandraError
       def initialize
         super("Cassandra.start! has not been called yet! Can't execute queries before connecting to server...")
       end
     end
-    
+
     class MissingConfigurationError < CassandraError
       def initialize(msg=nil)
         super(msg || "config/cassandra.yml is missing! Run 'prepare_for_cassandra .' in the rails root directory.")
       end
     end
-    
+
     class UnexistingKeyspaceError < CassandraError
-      def initialize(keyspace)
-        super("Keyspace #{keyspace} does not exist. Run rake cassandra:create.")
+      def initialize(keyspace, e = nil)
+        super(%[Keyspace #{keyspace} does not exist. Run rake cassandra:create. #{"(#{e.message})" if e}])
       end
     end
-    
+
     class ConnectionError < CassandraError
       def initialize(msg)
         super(msg)
       end
     end
-    
+
     class MigrationDefinitionError < CassandraError
       def initialize(msg)
         super(msg)
       end
     end
-    
+
   end
 end

data/lib/cassandra_migrations/migration/table_definition.rb

@@ -78,7 +78,7 @@ module CassandraMigrations
 
         if (@columns_name_type_hash.values.include? :counter)
           non_key_columns = @columns_name_type_hash.keys - @primary_keys
-          counter_columns = [@columns_name_type_hash.select { |name, type| type == :counter }.first[0]]
+          counter_columns = @columns_name_type_hash.select { |name, type| type == :counter }.keys
           if (non_key_columns - counter_columns).present?
             raise Errors::MigrationDefinitionError, 'Non key fields not allowed in tables with counter'
           end

data/lib/cassandra_migrations/migrator.rb

@@ -2,32 +2,32 @@
 
 module CassandraMigrations
   module Migrator
-    
+
     METADATA_TABLE = 'cassandra_migrations_metadata'
-    
+
     def self.up_to_latest!
       current_version = read_current_version
-  
+
       new_migrations = get_all_migration_names.sort.select do |migration_name|
         get_version_from_migration_name(migration_name) > current_version
       end
-        
+
       if !new_migrations.empty?
         new_migrations.each { |migration| up(migration) }
       end
-      
+
       new_migrations.size
     end
-  
+
     def self.rollback!(count=1)
       current_version = read_current_version
-      
+
       executed_migrations = get_all_migration_names.sort.reverse.select do |migration_name|
         get_version_from_migration_name(migration_name) <= current_version
       end
-      
+
       down_count = 0
-      
+
       if !executed_migrations.empty?
         count.times do |i|
           if executed_migrations[i]
@@ -36,32 +36,32 @@ module CassandraMigrations
           end
         end
       end
-      
+
       down_count
     end
-  
+
     def self.read_current_version
       begin
         Cassandra.select(METADATA_TABLE, :selection => "data_name='version'", :projection => 'data_value').first['data_value'].to_i
-      rescue Cql::QueryError # table cassandra_migrations_metadata does not exist
-        Cassandra.execute("CREATE TABLE #{METADATA_TABLE} (data_name varchar PRIMARY KEY, data_value varchar)") 
+      rescue ::Cassandra::Errors::QueryError => e # table cassandra_migrations_metadata does not exist
+        Cassandra.execute("CREATE TABLE #{METADATA_TABLE} (data_name varchar PRIMARY KEY, data_value varchar)")
         Cassandra.write!(METADATA_TABLE, {:data_name => 'version', :data_value => '0'})
         return 0
       end
     end
-    
+
 private
-  
+
     def self.up(migration_name)
       # load migration
       require migration_name
       # run migration
       get_class_from_migration_name(migration_name).new.migrate(:up)
-      
+
       # update version
       Cassandra.write!(METADATA_TABLE, {:data_name => 'version', :data_value => get_version_from_migration_name(migration_name).to_s})
     end
-    
+
     def self.down(migration_name, previous_migration_name=nil)
       # load migration
       require migration_name
@@ -75,15 +75,15 @@ private
         Cassandra.write!(METADATA_TABLE, {:data_name => 'version', :data_value => '0'})
       end
     end
-    
+
     def self.get_all_migration_names
       Dir[Rails.root.join("db", "cassandra_migrate/[0-9]*_*.rb")]
     end
-  
+
     def self.get_class_from_migration_name(filename)
-      filename.match(/[0-9]{14}_(.+)\.rb$/).captures.first.camelize.constantize    
-    end  
-    
+      filename.match(/[0-9]{14}_(.+)\.rb$/).captures.first.camelize.constantize
+    end
+
     def self.get_version_from_migration_name(migration_name)
       migration_name.match(/([0-9]{14})_.+\.rb$/).captures.first.to_i
     end

data/template/cassandra.yml

@@ -1,5 +1,5 @@
 development:
-  host: '127.0.0.1'
+  hosts: ['127.0.0.1']
   port: 9042
   keyspace: 'my_keyspace_name'
   replication:
@@ -7,15 +7,15 @@ development:
     replication_factor: 1
 
 test:
-  host: '127.0.0.1'
+  hosts: ['127.0.0.1']
   port: 9042
   keyspace: 'my_keyspace_name_test'
   replication:
     class: 'SimpleStrategy'
     replication_factor: 1
-    
+
 production:
-  host: '127.0.0.1'
+  hosts: ['127.0.0.1']
   port: 9042
   keyspace: 'my_keyspace_name_production'
   replication:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Henrique Gubert
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cql-rb
+  name: cassandra-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.0.0.beta.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.0.0.beta.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
@@ -101,28 +101,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,7 @@ files:
 - lib/cassandra_migrations/cassandra/queries.rb
 - lib/cassandra_migrations/cassandra/query_result.rb
 - lib/cassandra_migrations/config.rb
+- lib/cassandra_migrations/cql-rb-wrapper.rb
 - lib/cassandra_migrations/errors.rb
 - lib/cassandra_migrations/migration.rb
 - lib/cassandra_migrations/migration/column_operations.rb
@@ -188,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Cassandra schema management for a multi-environment developer.