cassandra_backup 0.1.1 → 0.2.0

data/cassandra_backup.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'cassandra_backup'
-  s.version = '0.1.1'
+  s.version = '0.2.0'
   s.description = 'Cassandra Backup'
   s.summary = 'Cassandra Backup'
   s.authors = ['Infogroup']

data/lib/cassandra_backup/command.rb

@@ -27,6 +27,12 @@ module CassandraBackup
         opts.on('-w', '--where=\'where_conditions\'') do |v|
           options[:where] = v
         end
+        opts.on('--[no-]create-info', "Write out CREATE statements. Defaults to true.") do |v|
+          options[:create_info] = v
+        end
+        opts.on('--[no-]data', "Write out table data.  Defaults to true.") do |v|
+          options[:data] = v
+        end
         opts.on('-h', 'Show this help message.') do
           $stdout.puts opts; exit
         end
@@ -44,4 +50,4 @@ module CassandraBackup
         (options[name] ||= []).concat value.split(/\s|,/)
       end
   end
-end
+end

data/lib/cassandra_backup/config.rb

@@ -1,46 +1,31 @@
 module CassandraBackup
   class Config
+    DEFAULT_OPTIONS = {
+      input: STDIN,
+      output: STDOUT,
+      data: true,
+      create_info: true,
+      servers: ['127.0.0.1:9160']
+    }
+
     attr_reader :options
     def initialize(options = {})
-      @options = options
-
+      @options = DEFAULT_OPTIONS.dup.update(options)
       require_version!
     end
 
-    def servers
-      if options[:servers]
-        options[:servers]
-      else
-        ['127.0.0.1:9160']
+    [:servers, :input, :output, :create_info, :data, :keyspace, :tables, :where].each do |option|
+      define_method option do
+        options[option]
       end
     end
 
-    def input
-      options[:input] || STDIN
-    end
-
-    def output
-      options[:output] || STDOUT
-    end
-
     def require_version!
       if options[:version]
         require "cassandra-cql/#{options[:version]}"
       end
     end
 
-    def keyspace
-      options[:keyspace]
-    end
-
-    def tables
-      options[:tables]
-    end    
-
-    def where
-      options[:where]
-    end
-
     def connection
       if keyspace
         options = {keyspace: keyspace}
@@ -50,4 +35,4 @@ module CassandraBackup
       @connection ||= CassandraCQL::Database.new(servers, options)
     end
   end
-end
+end

data/lib/cassandra_backup/dumper.rb

@@ -4,9 +4,7 @@ module CassandraBackup
       new(command.config).run
     end
 
-    attr_reader :config
-    attr_reader :cqlsh
-    attr_reader :primary_keys
+    attr_reader :config, :cqlsh, :primary_keys
     def initialize(config)
       @config = config
       @cqlsh = CassandraBackup::Cqlsh.new(config)
@@ -15,24 +13,29 @@ module CassandraBackup
 
     def run
       table_names.each { |table_name| dump_table_schema(table_name) }
-      table_names.each { |table_name| dump_table_rows(table_name) }
+      table_names.each { |table_name| dump_table_rows(table_name) } if config.data
     end
 
     def dump_table_schema(table_name)
       table_description = cqlsh.exec("DESCRIBE COLUMNFAMILY #{table_name}")
       capture_primary_key(table_name, table_description)
-      config.output.puts(table_description)
-      config.output.puts
+
+      if config.create_info
+        config.output.puts(table_description)
+        config.output.puts
+      end
     end
 
     def dump_table_rows(table_name)
+      return unless config.data
+
       primary_key = primary_key_for(table_name)
       each_row(table_name) do |row|
         next if row.keys.size == 1 && row.keys.first == primary_key
 
         colummns = CassandraCQL::Statement.quote(row.keys)
         values = CassandraCQL::Statement.quote(row.values.map { |v| CassandraCQL::Statement.escape(v) })
-        
+
         config.output.puts "INSERT INTO #{table_name} (#{colummns}) VALUES (#{values});"
       end
     end
@@ -53,7 +56,7 @@ module CassandraBackup
       def primary_key_for(table_name)
         primary_keys[table_name] || 'id'
       end
-    
+
       def capture_primary_key(table_name, table_description)
         if table_description =~ /^\s*(\w+).*PRIMARY KEY/
           primary_keys[table_name] = $1
@@ -62,7 +65,9 @@ module CassandraBackup
 
       def each_row(table_name)
         primary_key = primary_key_for(table_name)
-        cassandra_result = execute "SELECT * FROM #{table_name}"
+        select_cql = "SELECT * FROM #{table_name}"
+
+        cassandra_result = execute_with_where(select_cql, [config.where])
 
         while cassandra_result.rows > 0
           last_fetch = nil
@@ -72,7 +77,17 @@ module CassandraBackup
           end
 
           where_cql = "'#{primary_key}' > '#{last_fetch[primary_key]}'"
-          cassandra_result = execute "SELECT * FROM #{table_name} WHERE #{where_cql}"
+          cassandra_result = execute_with_where(select_cql, [where_cql, config.where])
+        end
+      end
+
+      def execute_with_where(select_cql, wheres)
+        wheres = wheres.compact
+
+        if wheres.any?
+          execute "#{select_cql} WHERE #{wheres.join(' AND ')}"
+        else
+          execute select_cql
         end
       end
   end

data/test/cassandra_backup/command_test.rb

@@ -13,6 +13,11 @@ class CassandraBackup::CommandTest < MiniTest::Spec
     end
   end
 
+  def test_boolean_options
+    assert_equal false, command('zombies --no-data').options[:data]
+    assert_equal false, command('zombies --no-create-info').options[:create_info]
+  end
+
   def test_array_options
     [:servers, :tables].each do |option|
       assert_nil command('zombies').options[option]
@@ -22,6 +27,14 @@ class CassandraBackup::CommandTest < MiniTest::Spec
     end
   end
 
+  def test_boolean_options
+    [ { "create-info" => :create_info }, { "data" => :data }].each do |option|
+      assert_nil command('zombies').options[option.values.first]
+      assert command("zombies --#{option.keys.first}").options[option.values.first], "--#{option} should enable command"
+      refute command("zombies --no-#{option.keys.first}").options[option.values.first], "--no-#{option} should disable command"
+    end
+  end
+
   def test_config
     assert_kind_of CassandraBackup::Config, command('zombies').config
   end
@@ -30,4 +43,4 @@ class CassandraBackup::CommandTest < MiniTest::Spec
     def command(line)
       CassandraBackup::Command.new Shellwords.shellsplit(line)
     end
-end
+end

data/test/cassandra_backup/config_test.rb

@@ -1,19 +1,12 @@
 require 'helper'
 
 class CassandraBackup::ConfigTest < MiniTest::Spec
-  def test_servers
+  def test_defaults
     assert_equal ['127.0.0.1:9160'], config.servers
-    assert_equal ['foo'], config(servers: ['foo']).servers
-  end
-
-  def test_input
     assert_equal STDIN, config.input
-    refute_equal STDIN, config(input: StringIO.new).input
-  end
-
-  def test_output
     assert_equal STDOUT, config.output
-    refute_equal STDOUT, config(output: StringIO.new).output
+    assert_equal true, config.data
+    assert_equal true, config.create_info
   end
 
   def test_require_version

data/test/cassandra_backup/dumper_test.rb

@@ -6,38 +6,73 @@ class CassandraBackup::DumperTest < MiniTest::Spec
     assert_equal ['presidents'], create_dumper(tables: ['presidents']).table_names
   end
 
-  def test_dump_table_schema
-    output = StringIO.new
-    dumper = create_dumper output: output
+  def test_dump_create_info
+    dumper = create_dumper tables: ['senators']
 
-    dumper.dump_table_schema('senators')
+    output = run_dumper(dumper)
 
-    output.rewind
-    lines = output.readlines
-    assert_match /CREATE TABLE senators/, lines.first
-    assert_equal "\n", lines.last
+    assert_match /CREATE TABLE senators/, output
     assert_equal({"senators" => "id"}, dumper.primary_keys)
   end
 
-  def test_dump_table_rows
-    output = StringIO.new
-    dumper = create_dumper output: output
+  def test_bypass_create_info
+    dumper = create_dumper create_info: false, tables: ['senators']
+
+    output = run_dumper(dumper)
+
+    refute_match /CREATE TABLE/, output
+    assert_equal({"senators" => "id"}, dumper.primary_keys)
+  end
+
+  def test_dump_data
+    dumper = create_dumper
     dumper.execute "TRUNCATE senators"
     dumper.execute "INSERT INTO senators ('id', 'name', 'state') VALUES ('abc', 'K''la', 'WA')"
     dumper.execute "INSERT INTO senators ('id', 'name', 'state') VALUES ('xyz', 'Bob', 'NY')"
 
-    dumper.dump_table_rows('senators')
+    output = run_dumper(dumper)
 
-    output.rewind
-    lines = output.readlines
+    assert output.include?("INSERT INTO senators ('id','name','state') VALUES ('xyz','Bob','NY');")
+  end
+
+  def test_dump_data_with_where
+    dumper = create_dumper where: "'state' = 'WA'", tables: ['senators']
+    dumper.execute "TRUNCATE senators"
+    dumper.execute "INSERT INTO senators ('id', 'name', 'state') VALUES ('abc', 'Patty Murray', 'WA')"
+    dumper.execute "INSERT INTO senators ('id', 'name', 'state') VALUES ('xyz', 'John McCain', 'AZ')"
+
+    output = run_dumper(dumper)
+
+    assert_match /Patty Murray/, output
+    refute_match /John McCain/, output
+  end
 
-    assert_equal 2, lines.size
-    assert lines.include?("INSERT INTO senators ('id','name','state') VALUES ('abc','K''la','WA');\n")
-    assert lines.include?("INSERT INTO senators ('id','name','state') VALUES ('xyz','Bob','NY');\n")
-  end  
+  def test_bypass_data
+    dumper = create_dumper data: false, tables: ['senators']
+
+    dumper.execute "TRUNCATE senators"
+    dumper.execute "INSERT INTO senators ('id', 'name', 'state') VALUES ('abc', 'K''la', 'WA')"
+
+    output = run_dumper(dumper)
+
+    assert_match /CREATE TABLE senators/, output
+    refute_match /INSERT INTO senators/, output
+  end
 
   private
+    def config(options = {})
+      CassandraBackup::Config.new(options.merge(keyspace: 'cassandra_dump_test'))
+    end
+
     def create_dumper(options = {})
-      CassandraBackup::Dumper.new CassandraBackup::Config.new(options.merge(keyspace: 'cassandra_dump_test'))
+      CassandraBackup::Dumper.new config(options)
+    end
+
+    def run_dumper(dumper)
+      output = StringIO.new
+      dumper.config.options[:output] = output
+      dumper.run
+      output.rewind
+      output.readlines.to_s
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_backup
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-03 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-cql