Skip to content
This repository has been archived by the owner on Sep 18, 2021. It is now read-only.

Commit

Permalink
WIP: Need to convert Op+Args to the Command objects... sigh.
Browse files Browse the repository at this point in the history
  • Loading branch information
Stu Hood committed Mar 22, 2012
1 parent 7ff6c9e commit 0e17e4e
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
24 changes: 23 additions & 1 deletion lib/gizzard/thrift.rb
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,32 @@ def inspect
end
end

AddLinkRequest = T.make_struct(:AddLinkRequest,
T::Field.new(:up_id, struct(ShardId), 1),
T::Field.new(:down_id, struct(ShardId), 2),
T::Field.new(:weight, T::I32, 3)
)

RemoveLinkRequest = T.make_struct(:RemoveLinkRequest,
T::Field.new(:up_id, struct(ShardId), 1),
T::Field.new(:down_id, struct(ShardId), 2),
)

# a union: exactly one entry should be set
TransformCommand = T.make_struct(:TransformCommand,
T::Field.new(:create_shard, struct(ShardInfo), 1),
T::Field.new(:delete_shard, struct(ShardId), 2),
T::Field.new(:add_link, struct(AddLinkRequest), 3),
T::Field.new(:remove_link, struct(RemoveLinkRequest), 4),
T::Field.new(:set_forwarding, struct(Forwarding), 5),
T::Field.new(:remove_forwarding, struct(Forwarding), 6),
T::Field.new(:commit, T::BOOL, 7),
)

LogEntry = T.make_struct(:LogEntry,
T::Field.new(:id, T::I32, 1),
# this is a binary field
T::Field.new(:content, T::STRING, 2)
T::Field.new(:command, struct(TransformCommand), 2)
)

class LogEntry
Expand Down
2 changes: 1 addition & 1 deletion test/test_server/project/build/Project.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class GizzmoServerProject(info: ProjectInfo) extends StandardProject(info) {
override def filterScalaJars = false

val scalaTools = "org.scala-lang" % "scala-compiler" % "2.7.7"
val gizzard = "com.twitter" % "gizzard" % "3.0.5-SNAPSHOT-stuhood"
val gizzard = "com.twitter" % "gizzard" % "3.0.8-SNAPSHOT-2-stuhood"
val querulous = "com.twitter" % "querulous" % "2.6.5"

val specs = "org.scala-tools.testing" % "specs" % "1.6.2.1" % "test"
Expand Down

0 comments on commit 0e17e4e

Please sign in to comment.