Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbf39b3a

Browse files
committed
Further sync postgres_fdw's "Relations" output with the rest of EXPLAIN.
EXPLAIN generally only adds schema qualifications to table names whenVERBOSE is specified. In postgres_fdw's "Relations" output, tablenames were always so qualified, but that was an implementationrestriction: in the original coding, we didn't have access to theverbose flag at the time the string was generated. After the coderearrangement of commit4526951, we do have that info availableat the right time, so make this output follow the normal rule.Discussion:https://postgr.es/m/12424.1575168015@sss.pgh.pa.us
1 parent68ab982 commitbf39b3a

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

‎contrib/postgres_fdw/expected/postgres_fdw.out

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8480,15 +8480,15 @@ ANALYZE fprt2_p2;
84808480
-- inner join three tables
84818481
EXPLAIN (COSTS OFF)
84828482
SELECT t1.a,t2.b,t3.c FROM fprt1 t1 INNER JOIN fprt2 t2 ON (t1.a = t2.b) INNER JOIN fprt1 t3 ON (t2.b = t3.a) WHERE t1.a % 25 =0 ORDER BY 1,2,3;
8483-
QUERY PLAN
8484-
--------------------------------------------------------------------------------------------------------------------------
8483+
QUERY PLAN
8484+
-----------------------------------------------------------------------------------------------------
84858485
Sort
84868486
Sort Key: t1.a, t3.c
84878487
-> Append
84888488
-> Foreign Scan
8489-
Relations: ((public.ftprt1_p1 t1) INNER JOIN (public.ftprt2_p1 t2)) INNER JOIN (public.ftprt1_p1 t3)
8489+
Relations: ((ftprt1_p1 t1) INNER JOIN (ftprt2_p1 t2)) INNER JOIN (ftprt1_p1 t3)
84908490
-> Foreign Scan
8491-
Relations: ((public.ftprt1_p2 t1_1) INNER JOIN (public.ftprt2_p2 t2_1)) INNER JOIN (public.ftprt1_p2 t3_1)
8491+
Relations: ((ftprt1_p2 t1_1) INNER JOIN (ftprt2_p2 t2_1)) INNER JOIN (ftprt1_p2 t3_1)
84928492
(7 rows)
84938493

84948494
SELECT t1.a,t2.b,t3.c FROM fprt1 t1 INNER JOIN fprt2 t2 ON (t1.a = t2.b) INNER JOIN fprt1 t3 ON (t2.b = t3.a) WHERE t1.a % 25 =0 ORDER BY 1,2,3;
@@ -8561,15 +8561,15 @@ SELECT t1.wr, t2.wr FROM (SELECT t1 wr, a FROM fprt1 t1 WHERE t1.a % 25 = 0) t1
85618561
-- join with lateral reference
85628562
EXPLAIN (COSTS OFF)
85638563
SELECT t1.a,t1.b FROM fprt1 t1, LATERAL (SELECT t2.a, t2.b FROM fprt2 t2 WHERE t1.a = t2.b AND t1.b = t2.a) q WHERE t1.a%25 = 0 ORDER BY 1,2;
8564-
QUERY PLAN
8565-
-------------------------------------------------------------------------------------
8564+
QUERY PLAN
8565+
-----------------------------------------------------------------------
85668566
Sort
85678567
Sort Key: t1.a, t1.b
85688568
-> Append
85698569
-> Foreign Scan
8570-
Relations: (public.ftprt1_p1 t1) INNER JOIN (public.ftprt2_p1 t2)
8570+
Relations: (ftprt1_p1 t1) INNER JOIN (ftprt2_p1 t2)
85718571
-> Foreign Scan
8572-
Relations: (public.ftprt1_p2 t1_1) INNER JOIN (public.ftprt2_p2 t2_1)
8572+
Relations: (ftprt1_p2 t1_1) INNER JOIN (ftprt2_p2 t2_1)
85738573
(7 rows)
85748574

85758575
SELECT t1.a,t1.b FROM fprt1 t1, LATERAL (SELECT t2.a, t2.b FROM fprt2 t2 WHERE t1.a = t2.b AND t1.b = t2.a) q WHERE t1.a%25 = 0 ORDER BY 1,2;
@@ -8689,17 +8689,17 @@ SELECT a, sum(b), min(b), count(*) FROM pagg_tab GROUP BY a HAVING avg(b) < 22 O
86898689
SET enable_partitionwise_aggregate TO true;
86908690
EXPLAIN (COSTS OFF)
86918691
SELECT a, sum(b), min(b), count(*) FROM pagg_tab GROUP BY a HAVING avg(b) < 22 ORDER BY 1;
8692-
QUERY PLAN
8693-
------------------------------------------------------------------------
8692+
QUERY PLAN
8693+
-----------------------------------------------------------------
86948694
Sort
86958695
Sort Key: pagg_tab.a
86968696
-> Append
86978697
-> Foreign Scan
8698-
Relations: Aggregate on (public.fpagg_tab_p1 pagg_tab)
8698+
Relations: Aggregate on (fpagg_tab_p1 pagg_tab)
86998699
-> Foreign Scan
8700-
Relations: Aggregate on (public.fpagg_tab_p2 pagg_tab_1)
8700+
Relations: Aggregate on (fpagg_tab_p2 pagg_tab_1)
87018701
-> Foreign Scan
8702-
Relations: Aggregate on (public.fpagg_tab_p3 pagg_tab_2)
8702+
Relations: Aggregate on (fpagg_tab_p3 pagg_tab_2)
87038703
(9 rows)
87048704

87058705
SELECT a, sum(b), min(b), count(*) FROM pagg_tab GROUP BY a HAVING avg(b) < 22 ORDER BY 1;

‎contrib/postgres_fdw/postgres_fdw.c

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2571,7 +2571,6 @@ postgresExplainForeignScan(ForeignScanState *node, ExplainState *es)
25712571
{
25722572
intrti=strtol(ptr,&ptr,10);
25732573
RangeTblEntry*rte;
2574-
char*namespace;
25752574
char*relname;
25762575
char*refname;
25772576

@@ -2580,11 +2579,19 @@ postgresExplainForeignScan(ForeignScanState *node, ExplainState *es)
25802579
rte=rt_fetch(rti,es->rtable);
25812580
Assert(rte->rtekind==RTE_RELATION);
25822581
/* This logic should agree with explain.c's ExplainTargetRel */
2583-
namespace=get_namespace_name(get_rel_namespace(rte->relid));
25842582
relname=get_rel_name(rte->relid);
2585-
appendStringInfo(relations,"%s.%s",
2586-
quote_identifier(namespace),
2587-
quote_identifier(relname));
2583+
if (es->verbose)
2584+
{
2585+
char*namespace;
2586+
2587+
namespace=get_namespace_name(get_rel_namespace(rte->relid));
2588+
appendStringInfo(relations,"%s.%s",
2589+
quote_identifier(namespace),
2590+
quote_identifier(relname));
2591+
}
2592+
else
2593+
appendStringInfo(relations,"%s",
2594+
quote_identifier(relname));
25882595
refname= (char*)list_nth(es->rtable_names,rti-1);
25892596
if (refname==NULL)
25902597
refname=rte->eref->aliasname;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp