From 020cdb4dc4c2dd8137dfbb66daab4a0793b91dd9 Mon Sep 17 00:00:00 2001
From: Marko Kreen <markokr@gmail.com>
Date: Fri, 17 Sep 2010 06:12:00 +0300
Subject: [PATCH] londiste: helpstr reorg, add --reset and --rewind

---
 python/londiste.py | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/python/londiste.py b/python/londiste.py
index b1d42985..7584e59f 100755
--- a/python/londiste.py
+++ b/python/londiste.py
@@ -82,23 +82,9 @@ class Londiste(skytools.DBScript):
         p = skytools.DBScript.init_optparse(self, parser)
         p.set_usage(command_usage.strip())
 
-        g = optparse.OptionGroup(p, "expert options")
-        g.add_option("--all", action="store_true",
-                help = "add: include add possible tables")
-        g.add_option("--force", action="store_true",
-                help = "add: ignore table differences, repair: ignore lag")
-        g.add_option("--expect-sync", action="store_true", dest="expect_sync",
-                help = "add: no copy needed", default=False)
-        g.add_option("--skip-truncate", action="store_true", dest="skip_truncate",
-                help = "add: keep old data", default=False)
-        p.add_option("--copy-condition", dest="copy_condition",
-                help = "copy: where expression")
+        g = optparse.OptionGroup(p, "options for cascading")
         g.add_option("--provider",
                 help = "init: upstream node temp connect string")
-        g.add_option("--create", action="store_true",
-                help = "add: create table/seq if not exist")
-        g.add_option("--create-only",
-                help = "add: create table/seq if not exist (seq,pkey,full,indexes,fkeys)")
         g.add_option("--target",
                 help = "switchover: target node")
         g.add_option("--merge",
@@ -109,11 +95,35 @@ class Londiste(skytools.DBScript):
                 help = "takeover: old node was root")
         g.add_option("--dead-branch", action = 'store_true',
                 help = "takeover: old node was branch")
-        p.add_option("--trigger-arg", action="append",
+        p.add_option_group(g)
+        g = optparse.OptionGroup(p, "repair queue position")
+        g.add_option("--rewind", action = "store_true",
+                help = "change queue position according to destination")
+        g.add_option("--reset", action = "store_true",
+                help = "reset queue pos on destination side")
+        p.add_option_group(g)
+
+        g = optparse.OptionGroup(p, "options for add")
+        g.add_option("--all", action="store_true",
+                help = "add: include add possible tables")
+        g.add_option("--force", action="store_true",
+                help = "add: ignore table differences, repair: ignore lag")
+        g.add_option("--expect-sync", action="store_true", dest="expect_sync",
+                help = "add: no copy needed", default=False)
+        g.add_option("--skip-truncate", action="store_true", dest="skip_truncate",
+                help = "add: keep old data", default=False)
+        g.add_option("--create", action="store_true",
+                help = "add: create table/seq if not exist")
+        g.add_option("--create-only",
+                help = "add: create table/seq if not exist (seq,pkey,full,indexes,fkeys)")
+        g.add_option("--trigger-arg", action="append",
                 help="add: Custom trigger arg")
-        p.add_option("--handler", action="append",
+        g.add_option("--handler", action="append",
                 help="add: Custom handler for table")
+        g.add_option("--copy-condition", dest="copy_condition",
+                help = "add: set WHERE expression for copy")
         p.add_option_group(g)
+
         return p
 
 if __name__ == '__main__':
-- 
2.39.5