Reduce indentation/parenthesization of set operations in rule/view dumps.

A query such as "SELECT x UNION SELECT y UNION SELECT z UNION ..."
produces a left-deep nested parse tree, which we formerly showed in its
full nested glory and with all the possible parentheses.  This does little
for readability, though, and long UNION lists resulting in excessive
indentation are common.  Instead, let's omit parentheses and indent all
the subqueries at the same level in such cases.

This patch skips indentation/parenthesization whenever the lefthand input
of a SetOperationStmt is another SetOperationStmt of the same kind and
ALL/DISTINCT property.  We could teach the code the exact syntactic
precedence of set operations and thereby avoid parenthesization in some
more cases, but it's not clear that that'd be a readability win: it seems
better to parenthesize if the set operation changes.  (As an example,
if there's one UNION in a long list of UNION ALL, it now stands out like
a sore thumb, which seems like a good thing.)

Back-patch to 9.3.  This completes our response to a complaint from Greg
Stark that since commit 62e666400d there's a performance problem in pg_dump
for views containing long UNION sequences (or other types of deeply nested
constructs).  The previous commit 0601cb54da
handles the general problem, but this one makes the specific case of UNION
lists look a lot nicer.

src/backend/utils/adt/ruleutils.c

@@ -4714,42 +4714,59 @@ get_setop_query(Node *setOp, Query *query, deparse_context *context,
 	else if (IsA(setOp, SetOperationStmt))
 	{
 		SetOperationStmt *op = (SetOperationStmt *) setOp;
-
-		if (PRETTY_INDENT(context))
-		{
-			context->indentLevel += PRETTYINDENT_STD;
-			appendStringInfoSpaces(buf, PRETTYINDENT_STD);
-		}
+		int			subindent;
 
 		/*
-		 * We force parens whenever nesting two SetOperationStmts. There are
-		 * some cases in which parens are needed around a leaf query too, but
-		 * those are more easily handled at the next level down (see code
-		 * above).
+		 * We force parens when nesting two SetOperationStmts, except when the
+		 * lefthand input is another setop of the same kind.  Syntactically,
+		 * we could omit parens in rather more cases, but it seems best to use
+		 * parens to flag cases where the setop operator changes.  If we use
+		 * parens, we also increase the indentation level for the child query.
+		 *
+		 * There are some cases in which parens are needed around a leaf query
+		 * too, but those are more easily handled at the next level down (see
+		 * code above).
 		 */
-		need_paren = !IsA(op->larg, RangeTblRef);
+		if (IsA(op->larg, SetOperationStmt))
+		{
+			SetOperationStmt *lop = (SetOperationStmt *) op->larg;
+
+			if (op->op == lop->op && op->all == lop->all)
+				need_paren = false;
+			else
+				need_paren = true;
+		}
+		else
+			need_paren = false;
 
 		if (need_paren)
+		{
 			appendStringInfoChar(buf, '(');
-		get_setop_query(op->larg, query, context, resultDesc);
-		if (need_paren)
-			appendStringInfoChar(buf, ')');
+			subindent = PRETTYINDENT_STD;
+			appendContextKeyword(context, "", subindent, 0, 0);
+		}
+		else
+			subindent = 0;
 
-		if (!PRETTY_INDENT(context))
+		get_setop_query(op->larg, query, context, resultDesc);
+
+		if (need_paren)
+			appendContextKeyword(context, ") ", -subindent, 0, 0);
+		else if (PRETTY_INDENT(context))
+			appendContextKeyword(context, "", -subindent, 0, 0);
+		else
 			appendStringInfoChar(buf, ' ');
+
 		switch (op->op)
 		{
 			case SETOP_UNION:
-				appendContextKeyword(context, "UNION ",
-									 -PRETTYINDENT_STD, PRETTYINDENT_STD, 0);
+				appendStringInfoString(buf, "UNION ");
 				break;
 			case SETOP_INTERSECT:
-				appendContextKeyword(context, "INTERSECT ",
-									 -PRETTYINDENT_STD, PRETTYINDENT_STD, 0);
+				appendStringInfoString(buf, "INTERSECT ");
 				break;
 			case SETOP_EXCEPT:
-				appendContextKeyword(context, "EXCEPT ",
-									 -PRETTYINDENT_STD, PRETTYINDENT_STD, 0);
+				appendStringInfoString(buf, "EXCEPT ");
 				break;
 			default:
 				elog(ERROR, "unrecognized set op: %d",
@@ -4758,19 +4775,29 @@ get_setop_query(Node *setOp, Query *query, deparse_context *context,
 		if (op->all)
 			appendStringInfoString(buf, "ALL ");
 
-		if (PRETTY_INDENT(context))
-			appendContextKeyword(context, "", 0, 0, 0);
-
-		need_paren = !IsA(op->rarg, RangeTblRef);
+		/* Always parenthesize if RHS is another setop */
+		need_paren = IsA(op->rarg, SetOperationStmt);
 
+		/*
+		 * The indentation code here is deliberately a bit different from that
+		 * for the lefthand input, because we want the line breaks in
+		 * different places.
+		 */
 		if (need_paren)
+		{
 			appendStringInfoChar(buf, '(');
+			subindent = PRETTYINDENT_STD;
+		}
+		else
+			subindent = 0;
+		appendContextKeyword(context, "", subindent, 0, 0);
+
 		get_setop_query(op->rarg, query, context, resultDesc);
-		if (need_paren)
-			appendStringInfoChar(buf, ')');
 
 		if (PRETTY_INDENT(context))
-			context->indentLevel -= PRETTYINDENT_STD;
+			context->indentLevel -= subindent;
+		if (need_paren)
+			appendContextKeyword(context, ")", 0, 0, 0);
 	}
 	else
 	{

src/test/regress/expected/create_view.out

@@ -1091,7 +1091,7 @@ union all
 select * from tt7 full join tt8 using (x), tt8 tt8x;
 select pg_get_viewdef('vv2', true);
                  pg_get_viewdef                 
---------------------------------------------------------
+------------------------------------------------
   SELECT v.a,                                  +
      v.b,                                      +
      v.c,                                      +
@@ -1117,7 +1117,7 @@ select * from
   tt7 tt7x full join tt8 tt8x using (x);
 select pg_get_viewdef('vv3', true);
                    pg_get_viewdef                    
--------------------------------------------------------------
+-----------------------------------------------------
   SELECT v.a,                                       +
      v.b,                                           +
      v.c,                                           +
@@ -1146,7 +1146,7 @@ select * from
   tt7 tt7x full join tt8 tt8x using (x) full join tt8 tt8y using (x);
 select pg_get_viewdef('vv4', true);
                       pg_get_viewdef                      
-------------------------------------------------------------------
+----------------------------------------------------------
   SELECT v.a,                                            +
      v.b,                                                +
      v.c,                                                +
@@ -1176,7 +1176,7 @@ alter table tt7 drop column zz;
 alter table tt8 add column z2 int;
 select pg_get_viewdef('vv2', true);
                  pg_get_viewdef                 
---------------------------------------------------------
+------------------------------------------------
   SELECT v.a,                                  +
      v.b,                                      +
      v.c,                                      +
@@ -1196,7 +1196,7 @@ select pg_get_viewdef('vv2', true);
 
 select pg_get_viewdef('vv3', true);
                    pg_get_viewdef                    
--------------------------------------------------------------
+-----------------------------------------------------
   SELECT v.a,                                       +
      v.b,                                           +
      v.c,                                           +
@@ -1219,7 +1219,7 @@ select pg_get_viewdef('vv3', true);
 
 select pg_get_viewdef('vv4', true);
                       pg_get_viewdef                      
-------------------------------------------------------------------
+----------------------------------------------------------
   SELECT v.a,                                            +
      v.b,                                                +
      v.c,                                                +
@@ -1253,7 +1253,7 @@ union all
 select * from tt7a left join tt8a using (x), tt8a tt8ax;
 select pg_get_viewdef('vv2a', true);
                      pg_get_viewdef                     
-----------------------------------------------------------------
+--------------------------------------------------------
   SELECT v.a,                                          +
      v.b,                                              +
      v.c,                                              +

src/test/regress/expected/rules.out

@@ -1401,7 +1401,7 @@ pg_rules| SELECT n.nspname AS schemaname,
      JOIN pg_class c ON ((c.oid = r.ev_class)))
      LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace)))
   WHERE (r.rulename <> '_RETURN'::name);
-pg_seclabels|        (        (        (        (        (        (        (        (        (         SELECT l.objoid,
+pg_seclabels| SELECT l.objoid,
     l.classoid,
     l.objsubid,
         CASE
@@ -1440,7 +1440,7 @@ pg_seclabels|        (        (        (        (        (        (        (
      JOIN pg_class rel ON (((l.classoid = rel.tableoid) AND (l.objoid = rel.oid))))
      JOIN pg_attribute att ON (((rel.oid = att.attrelid) AND (l.objsubid = att.attnum))))
      JOIN pg_namespace nsp ON ((rel.relnamespace = nsp.oid)))
-            WHERE (l.objsubid <> 0))
+  WHERE (l.objsubid <> 0)
 UNION ALL
  SELECT l.objoid,
     l.classoid,
@@ -1461,7 +1461,7 @@ pg_seclabels|        (        (        (        (        (        (        (
    FROM ((pg_seclabel l
      JOIN pg_proc pro ON (((l.classoid = pro.tableoid) AND (l.objoid = pro.oid))))
      JOIN pg_namespace nsp ON ((pro.pronamespace = nsp.oid)))
-          WHERE (l.objsubid = 0))
+  WHERE (l.objsubid = 0)
 UNION ALL
  SELECT l.objoid,
     l.classoid,
@@ -1480,7 +1480,7 @@ pg_seclabels|        (        (        (        (        (        (        (
    FROM ((pg_seclabel l
      JOIN pg_type typ ON (((l.classoid = typ.tableoid) AND (l.objoid = typ.oid))))
      JOIN pg_namespace nsp ON ((typ.typnamespace = nsp.oid)))
-        WHERE (l.objsubid = 0))
+  WHERE (l.objsubid = 0)
 UNION ALL
  SELECT l.objoid,
     l.classoid,
@@ -1492,7 +1492,7 @@ pg_seclabels|        (        (        (        (        (        (        (
     l.label
    FROM (pg_seclabel l
      JOIN pg_largeobject_metadata lom ON ((l.objoid = lom.oid)))
-      WHERE ((l.classoid = ('pg_largeobject'::regclass)::oid) AND (l.objsubid = 0)))
+  WHERE ((l.classoid = ('pg_largeobject'::regclass)::oid) AND (l.objsubid = 0))
 UNION ALL
  SELECT l.objoid,
     l.classoid,
@@ -1504,7 +1504,7 @@ UNION ALL
     l.label
    FROM (pg_seclabel l
      JOIN pg_language lan ON (((l.classoid = lan.tableoid) AND (l.objoid = lan.oid))))
-    WHERE (l.objsubid = 0))
+  WHERE (l.objsubid = 0)
 UNION ALL
  SELECT l.objoid,
     l.classoid,
@@ -1516,7 +1516,7 @@ UNION ALL
     l.label
    FROM (pg_seclabel l
      JOIN pg_namespace nsp ON (((l.classoid = nsp.tableoid) AND (l.objoid = nsp.oid))))
-  WHERE (l.objsubid = 0))
+  WHERE (l.objsubid = 0)
 UNION ALL
  SELECT l.objoid,
     l.classoid,
@@ -1528,7 +1528,7 @@ UNION ALL
     l.label
    FROM (pg_seclabel l
      JOIN pg_event_trigger evt ON (((l.classoid = evt.tableoid) AND (l.objoid = evt.oid))))
-                                  WHERE (l.objsubid = 0))
+  WHERE (l.objsubid = 0)
 UNION ALL
  SELECT l.objoid,
     l.classoid,
@@ -1539,7 +1539,7 @@ UNION ALL
     l.provider,
     l.label
    FROM (pg_shseclabel l
-                             JOIN pg_database dat ON (((l.classoid = dat.tableoid) AND (l.objoid = dat.oid)))))
+     JOIN pg_database dat ON (((l.classoid = dat.tableoid) AND (l.objoid = dat.oid))))
 UNION ALL
  SELECT l.objoid,
     l.classoid,
@@ -1550,7 +1550,7 @@ UNION ALL
     l.provider,
     l.label
    FROM (pg_shseclabel l
-                     JOIN pg_tablespace spc ON (((l.classoid = spc.tableoid) AND (l.objoid = spc.oid)))))
+     JOIN pg_tablespace spc ON (((l.classoid = spc.tableoid) AND (l.objoid = spc.oid))))
 UNION ALL
  SELECT l.objoid,
     l.classoid,

src/test/regress/expected/with.out

@@ -301,7 +301,7 @@ SELECT * FROM vsubdepartment ORDER BY name;
 -- Check reverse listing
 SELECT pg_get_viewdef('vsubdepartment'::regclass);
                 pg_get_viewdef                 
--------------------------------------------------------
+-----------------------------------------------
   WITH RECURSIVE subdepartment AS (           +
           SELECT department.id,               +
              department.parent_department,    +
@@ -324,7 +324,7 @@ SELECT pg_get_viewdef('vsubdepartment'::regclass);
 
 SELECT pg_get_viewdef('vsubdepartment'::regclass, true);
                pg_get_viewdef                
------------------------------------------------------
+---------------------------------------------
   WITH RECURSIVE subdepartment AS (         +
           SELECT department.id,             +
              department.parent_department,  +