Options sorted in a slightly more rational order

dvarrazzo · dvarrazzo · commit 7617e07f1001 · 2013-04-17T01:44:50.000+01:00
--no-order now is almost useless, but list it next to --order-by.
--jobs only specifies how to do something, not what to do. On the
same basis probably --no-analyze should be pushed further up.
diff --git a/bin/pg_repack.c b/bin/pg_repack.c
@@ -1452,10 +1452,10 @@ pgut_help(bool details)
 
 	printf("Options:\n");
 	printf("  -a, --all                 repack all databases\n");
-	printf("  -j --jobs                 Use this many parallel jobs for each table\n");
-	printf("  -n, --no-order            do vacuum full instead of cluster\n");
-	printf("  -o, --order-by=COLUMNS    order by columns instead of cluster keys\n");
 	printf("  -t, --table=TABLE         repack specific table only\n");
+	printf("  -o, --order-by=COLUMNS    order by columns instead of cluster keys\n");
+	printf("  -n, --no-order            do vacuum full instead of cluster\n");
+	printf("  -j --jobs                 Use this many parallel jobs for each table\n");
 	printf("  -T, --wait-timeout=SECS   timeout to cancel other backends on conflict\n");
 	printf("  -Z, --no-analyze          don't analyze at end\n");
 }
diff --git a/doc/pg_repack.rst b/doc/pg_repack.rst
@@ -117,10 +117,10 @@ The following options can be specified in ``OPTIONS``.
 
 Options:
   -a, --all                 repack all databases
-  -j, --jobs                Use this many parallel jobs for each table
-  -n, --no-order            do vacuum full instead of cluster
-  -o, --order-by=COLUMNS    order by columns instead of cluster keys
   -t, --table=TABLE         repack specific table only
+  -o, --order-by=COLUMNS    order by columns instead of cluster keys
+  -n, --no-order            do vacuum full instead of cluster
+  -j, --jobs                Use this many parallel jobs for each table
   -T, --wait-timeout=SECS   timeout to cancel other backends on conflict
   -Z, --no-analyze          don't analyze at end
 
@@ -142,25 +142,26 @@ Generic options:
 Reorg Options
 ^^^^^^^^^^^^^
 
-Options to order rows. If not specified, pg_repack performs an online CLUSTER
-using cluster indexes. Only one option can be specified. You may also specify
-target tables or databases.
-
-``-j``, ``--jobs``
-   Create the specified number of extra connections to PostgreSQL, and
-   use these extra connections to parallelize the rebuild of indexes
-   on each table. If your PostgreSQL server has extra cores and disk
-   I/O available, this can be a useful way to speed up pg_repack.
+``-a``, ``--all``
+    Attempt repack all the databases of the cluster. Databases where the
+    ``pg_repack`` extension is not installed will be skipped.
 
-``-n``, ``--no-order``
-    Perform an online VACUUM FULL.
+``-t TABLE``, ``--table=TABLE``
+    Reorganize the specified table only. By default, all eligible tables in
+    the target databases are reorganized.
 
 ``-o COLUMNS [,...]``, ``--order-by=COLUMNS [,...]``
     Perform an online CLUSTER ordered by the specified columns.
 
-``-t TABLE``, ``--table=TABLE``
-    Reorganize the specified table only. By default, all eligible tables in
-    the target databases are reorganized.
+``-n``, ``--no-order``
+    Perform an online VACUUM FULL.  Since version 1.2 this is the default for
+    non-clustered tables.
+
+``-j``, ``--jobs``
+    Create the specified number of extra connections to PostgreSQL, and
+    use these extra connections to parallelize the rebuild of indexes
+    on each table. If your PostgreSQL server has extra cores and disk
+    I/O available, this can be a useful way to speed up pg_repack.
 
 ``-T SECS``, ``--wait-timeout=SECS``
     pg_repack needs to take an exclusive lock at the end of the
@@ -175,6 +176,7 @@ target tables or databases.
     Disable ANALYZE after the reorganization. If not specified, run ANALYZE
     after the reorganization.
 
+
 Connection Options
 ^^^^^^^^^^^^^^^^^^
 
