gizzmo 0.3.2 → 0.3.3

data/README.rdoc

@@ -28,6 +28,10 @@ Run `gizzmo help` for up-to-date usage.
     PARENT=`gizzmo links $REPL | cut -f 1 | grep -v $REPL | head -1`
     gizzmo addlink $PARENT a_shard $NEW_WEIGHT
     gizzmo unwrap $REPL
+    
+== Contributing
+
+Contributions are welcome!  Please send a pull request, or if you're internal to Twitter, please make a branch!  Commits to master, and/or patches without minimal test coverage will be rejected/reverted.
 
 == Running tests
 

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/gizzmo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gizzmo}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2010-07-13}
+  s.date = %q{2010-07-14}
   s.default_executable = %q{gizzmo}
   s.description = %q{Gizzmo is a command-line client for managing gizzard clusters.}
   s.email = %q{kmaxwell@twitter.com}
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/gizzmo.rb",
      "lib/vendor/thrift_client/simple.rb",
      "test/config.yaml",
+     "test/expected/deep.txt",
      "test/expected/dry-wrap-table_b_0.txt",
      "test/expected/empty-file.txt",
      "test/expected/find-only-sql-shard-type.txt",

data/lib/gizzard/commands.rb

@@ -65,7 +65,7 @@ module Gizzard
       @roots = []
       argv.each do |arg|
         @id = ShardId.parse(arg)
-        @roots << up(@id)
+        @roots += roots_of(@id)
       end
       @roots.uniq.each do |root|
         output root.to_unix
@@ -73,15 +73,15 @@ module Gizzard
       end
     end
 
-    def up(id)
+    def roots_of(id)
       links = service.list_upward_links(id)
       if links.empty?
-        id
+        [id]
       else
-        links.map { |link| link.up_id }.find { |up_id| up(up_id) }
+        links.map { |link| roots_of(link.up_id) }.flatten
       end
     end
-
+    
     def down(id, depth = 0)
       service.list_downward_links(id).map do |link|
         printable = "  " * depth + link.down_id.to_unix

data/test/expected/deep.txt

@@ -0,0 +1,10 @@
+localhost/table_deep_repl_0
+  localhost/table_deep_repl_1
+    localhost/table_deep_repl_2
+      localhost/table_deep_repl_3
+        localhost/table_deep_repl_4
+          localhost/table_deep_repl_5
+            localhost/table_deep_repl_6
+              localhost/table_deep_repl_7
+                localhost/table_deep_repl_8
+                  localhost/table_deep_repl_9

data/test/expected/subtree-info.txt

@@ -29,5 +29,3 @@ localhost/table_b_8	com.twitter.service.flock.edges.SqlShard	unbusy
 localhost/table_repl_9	com.twitter.service.flock.edges.ReplicatingShard	unbusy
 localhost/table_a_9	com.twitter.service.flock.edges.SqlShard	unbusy
 localhost/table_b_9	com.twitter.service.flock.edges.SqlShard	unbusy
-localhost/replicating_table_b_0	com.twitter.service.flock.edges.ReplicatingShard	unbusy
-localhost/table_b_0	com.twitter.service.flock.edges.SqlShard	unbusy

data/test/expected/subtree.txt

@@ -10,8 +10,6 @@ localhost/table_repl_1
 localhost/table_repl_2
   localhost/table_a_2
   localhost/table_b_2
-localhost/blocked_table_a_3
-  localhost/table_a_3
 localhost/table_repl_4
   localhost/table_a_4
   localhost/table_b_4

data/test/test.sh

@@ -62,3 +62,14 @@ 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 | ../bin/gizzmo -Cconfig.yaml subtree 2>&1 | expect subtree.txt
+
+# test a deep tree
+g create localhost "table_deep_repl_0" com.twitter.service.flock.edges.ReplicatingShard
+for i in {1..9}
+do
+  last=$((i-1))
+  g create localhost "table_deep_repl_$i" com.twitter.service.flock.edges.ReplicatingShard
+  g addlink "localhost/table_deep_repl_$last" "localhost/table_deep_repl_$i" 2
+done
+
+g subtree localhost/table_deep_repl_5 | expect deep.txt

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 -07:00
+date: 2010-07-14 00:00:00 -07:00
 default_executable: gizzmo
 dependencies: []
 
@@ -42,6 +42,7 @@ files:
 - lib/gizzmo.rb
 - lib/vendor/thrift_client/simple.rb
 - test/config.yaml
+- test/expected/deep.txt
 - test/expected/dry-wrap-table_b_0.txt
 - test/expected/empty-file.txt
 - test/expected/find-only-sql-shard-type.txt