gizzmo 0.1.4 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/gizzmo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gizzmo}
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
      "test/expected/dry-wrap-table_b_0.txt",
      "test/expected/empty-file.txt",
      "test/expected/find-only-sql-shard-type.txt",
+     "test/expected/forwardings.txt",
      "test/expected/help-info.txt",
      "test/expected/info.txt",
      "test/expected/links-for-replicating_table_b_0.txt",

data/lib/gizzard/commands.rb

@@ -24,6 +24,27 @@ module Gizzard
     end
   end
   
+  class AddforwardingCommand < Command
+    def run
+      help! if argv.length != 3
+      table_id, base_id, shard_id_text = argv
+      shard_id = ShardId.parse(shard_id_text)
+      service.set_forwarding(Forwarding.new(table_id.to_i, base_id.to_i, shard_id))
+    end
+  end
+
+  class ForwardingsCommand < Command
+    def run
+      service.get_forwardings().sort_by do |f|
+        [ ((f.table_id.abs << 1) + (f.table_id < 0 ? 1 : 0)), f.base_id ]
+      end.reject do |forwarding|
+        @command_options.table_ids && !@command_options.table_ids.include?(forwarding.table_id)
+      end.each do |forwarding|
+        puts [ forwarding.table_id, forwarding.base_id, forwarding.shard_id.to_unix ].join("\t")
+      end
+    end
+  end
+
   class SubtreeCommand < Command
     def run
       @roots = []

data/lib/gizzmo.rb

@@ -46,6 +46,17 @@ subcommands = {
   'delete' => OptionParser.new do |opts|
     opts.banner = "Usage: #{$0} delete SHARD_ID_TO_DELETE [MORE SHARD_IDS]"
   end,
+  'addforwarding' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{$0} addforwarding TABLE_ID BASE_ID SHARD_ID"
+  end,
+  'forwardings' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{$0} show [options]"
+  
+    opts.on("-t", "--tables=IDS", "Show only the specified table ids (comma separated)") do |table_ids|
+      subcommand_options.table_ids ||= []
+      subcommand_options.table_ids +=  table_ids.split(",").map { |s| s.to_i }
+    end
+  end,
   'unwrap' => OptionParser.new do |opts|
     opts.banner = "Usage: #{$0} unwrap SHARD_ID_TO_REMOVE [MORE SHARD_IDS]"
   end,
@@ -110,6 +121,10 @@ global = OptionParser.new do |opts|
   opts.on("-L", "--log=LOG_FILE", "Path to LOG_FILE") do |file|
     global_options.log = file
   end
+  
+  opts.on("-f", "--force", "Don't display confirmation dialogs") do |force|
+    global_options.force = force
+  end
 end
 
 # Print banner if no args

data/test/expected/forwardings.txt

@@ -0,0 +1 @@
+1	0	localhost/table_a_3

data/test/test.sh

@@ -4,25 +4,13 @@ function g {
   # echo "> g $@" >&2
   ../bin/gizzmo -Cconfig.yaml "$@" 2>&1
 }
+
 function expect {
   diff -u - "expected/$1" && echo "    success." || echo "    failed." && exit 1
 }
 
-# set -ex
-
-if ["$FLOCK_ENV" -eq ""]; then
-  FLOCK_ENV=development
-fi
-
-for i in 1 2
-do
-  for type in edges groups
-  do
-    db="flock_${type}_${FLOCK_ENV}_${i}"
-    echo "drop database if exists $db; create database $db; " | mysql -u"$DB_USERNAME" --password="$DB_PASSWORD"
-    cat recreate.sql | mysql -u"$DB_USERNAME" --password="$DB_PASSWORD" "$db"
-  done
-done
+g find -hlocalhost | xargs ../bin/gizzmo -Cconfig.yaml delete
+g find -hlocalhost | expect empty-file.txt
 
 for i in {0..9}
 do
@@ -37,7 +25,9 @@ for i in `g find -h localhost`; do g info $i; done | expect info.txt
 g find -hlocalhost | expect original-find.txt
 g find -hlocalhost -tSqlShard | expect find-only-sql-shard-type.txt
 
-# Dry run this
+g addforwarding 1 0 localhost/table_a_3
+g forwardings | expect forwardings.txt
+g unforward 1 0 localhost/table_a_3
 
 g -D wrap com.twitter.service.flock.edges.ReplicatingShard localhost/table_b_0 | expect dry-wrap-table_b_0.txt
 g wrap com.twitter.service.flock.edges.ReplicatingShard localhost/table_b_0 | expect wrap-table_b_0.txt
@@ -54,7 +44,3 @@ g links localhost/table_b_0 | expect empty-file.txt
 
 g wrap com.twitter.gizzard.shards.BlockedShard localhost/table_a_3
 g find -hlocalhost | xargs ../bin/gizzmo -Cconfig.yaml subtree 2>&1 | expect subtree.txt
-
-g find -hlocalhost | xargs ../bin/gizzmo -Cconfig.yaml delete
-g find -hlocalhost | expect empty-file.txt
-

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -45,6 +45,7 @@ files:
 - test/expected/dry-wrap-table_b_0.txt
 - test/expected/empty-file.txt
 - test/expected/find-only-sql-shard-type.txt
+- test/expected/forwardings.txt
 - test/expected/help-info.txt
 - test/expected/info.txt
 - test/expected/links-for-replicating_table_b_0.txt