Hi,
Here's a patch for $SUBJECT based on the feedback here:
http://archives.postgresql.org/message-id/9053.1295888...@sss.pgh.pa.us
I intentionally decided to omit the information for Join Filter, since
the information can already be deduced from EXPLAIN ANALYZE output, and
for Left Joins and Anti Joins "Rows Removed by Join Filter" didn't
really make much sense.
The "Rows Removed by .." information is always shown by default (when
there is a Filter or Recheck Cond, of course), and I didn't feel like it
was worth it to add a new option for EXPLAIN to turn that information off.
As for documentation.. I'm really at a loss here. I tried numerous
different things for doc/src/sgml/perform.sgml, but I didn't feel like
any of them added anything. The EXPLAIN ANALYZE output seems quite
self-explanatory after all.
Attached are also the tests I used, and an example output.
--
Marko Tiikkaja http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Training & Services
BEGIN
CREATE TABLE
CREATE TABLE
CREATE TABLE
INSERT 0 200000
INSERT 0 10
INSERT 0 10
CREATE INDEX
CREATE SERVER
CREATE FOREIGN TABLE
CREATE FUNCTION
SET
SET
SET
SET
SET
SET
SET
SET
SET
QUERY PLAN
---------------------------------------------------------------------------------------------------------------------------------
Index Scan using foo_a_index on big_table (cost=0.00..2588.27 rows=333
width=8) (actual time=1.488..47.456 rows=65000 loops=1)
Index Cond: (a = 2)
Filter: (b > 5000)
Rows Removed by Filter: 1667
Total runtime: 57.127 ms
(5 rows)
SET
SET
SET
QUERY PLAN
------------------------------------------------------------------------------------------------------------------------------
Bitmap Heap Scan on big_table (cost=19.86..961.93 rows=333 width=8) (actual
time=13.673..67.979 rows=65000 loops=1)
Recheck Cond: (a = 2)
Rows Removed by Recheck Cond: 62526
Filter: (b > 5000)
Rows Removed by Filter: 1667
-> Bitmap Index Scan on foo_a_index (cost=0.00..19.77 rows=1000 width=0)
(actual time=12.309..12.309 rows=66667 loops=1)
Index Cond: (a = 2)
Total runtime: 78.757 ms
(8 rows)
RESET
SET
SET
QUERY PLAN
------------------------------------------------------------------------------------------------
Seq Scan on foo (cost=0.00..36.75 rows=713 width=8) (actual time=0.008..0.010
rows=5 loops=1)
Filter: (a > 5)
Rows Removed by Filter: 5
Total runtime: 0.031 ms
(4 rows)
QUERY PLAN
-------------------------------------------------------------------------------------------------------
Values Scan on "*VALUES*" (cost=0.00..0.15 rows=3 width=4) (actual
time=0.021..0.080 rows=5 loops=1)
Filter: (column1 > 5)
Rows Removed by Filter: 5
Total runtime: 0.189 ms
(4 rows)
QUERY PLAN
----------------------------------------------------------------------------------------------------------------------------------
CTE Scan on t (cost=3279.93..4052.35 rows=11443 width=4) (actual
time=0.020..0.033 rows=5 loops=1)
Filter: (a > 5)
Rows Removed by Filter: 5
CTE t
-> Recursive Union (cost=0.00..3279.93 rows=34330 width=4) (actual
time=0.009..0.025 rows=10 loops=1)
-> Function Scan on generate_series i (cost=0.00..10.00 rows=1000
width=4) (actual time=0.009..0.009 rows=5 loops=1)
-> WorkTable Scan on t (cost=0.00..258.33 rows=3333 width=4)
(actual time=0.002..0.003 rows=2 loops=2)
Filter: ((a + 5) <= 10)
Rows Removed by Filter: 2
Total runtime: 0.080 ms
(10 rows)
QUERY PLAN
--------------------------------------------------------------------------------------------------------------
Subquery Scan on ss (cost=0.00..58.15 rows=713 width=8) (actual
time=0.008..0.010 rows=5 loops=1)
Filter: (ss.i > 5)
Rows Removed by Filter: 5
-> Limit (cost=0.00..31.40 rows=2140 width=8) (actual time=0.004..0.004
rows=10 loops=1)
-> Seq Scan on foo (cost=0.00..31.40 rows=2140 width=8) (actual
time=0.003..0.003 rows=10 loops=1)
Total runtime: 0.056 ms
(6 rows)
QUERY PLAN
-------------------------------------------------------------------------------------------------------------------
Function Scan on generate_series i (cost=0.00..12.50 rows=333 width=4)
(actual time=0.010..0.012 rows=5 loops=1)
Filter: (i > 5)
Rows Removed by Filter: 5
Total runtime: 0.026 ms
(4 rows)
QUERY PLAN
---------------------------------------------------------------------------------------------------
Tid Scan on big_table (cost=0.00..4.02 rows=1 width=8) (actual
time=0.012..0.012 rows=0 loops=1)
TID Cond: (ctid = '(5,2)'::tid)
Filter: (a = 0)
Rows Removed by Filter: 1
Total runtime: 0.045 ms
(5 rows)
QUERY PLAN
-------------------------------------------------------------------------------------------------------
Foreign Scan on passwd (cost=0.00..1.92 rows=3 width=176) (actual
time=0.005..0.111 rows=31 loops=1)
Filter: (uid > 4)
Rows Removed by Filter: 5
Foreign File: /etc/passwd
Foreign File Size: 1848
Total runtime: 0.184 ms
(6 rows)
SET
QUERY PLAN
-------------------------------------------------------------------------------------------------------------
Nested Loop Left Join (cost=0.00..1269372.40 rows=7633 width=12) (actual
time=0.163..0.274 rows=5 loops=1)
Join Filter: (foo.a = bar.a)
Filter: is_even(bar.a)
Rows Removed by Filter: 5
-> Seq Scan on foo (cost=0.00..31.40 rows=2140 width=8) (actual
time=0.003..0.005 rows=10 loops=1)
-> Seq Scan on bar (cost=0.00..31.40 rows=2140 width=8) (actual
time=0.001..0.004 rows=10 loops=10)
Total runtime: 0.304 ms
(7 rows)
QUERY PLAN
------------------------------------------------------------------------------------------------------------
Nested Loop Left Join (cost=0.00..97749.15 rows=7629 width=12) (actual
time=0.243..0.331 rows=10 loops=1)
Join Filter: (foo.a = public.bar.a)
-> Seq Scan on foo (cost=0.00..31.40 rows=2140 width=8) (actual
time=0.023..0.029 rows=10 loops=1)
-> Seq Scan on bar (cost=0.00..36.75 rows=713 width=8) (actual
time=0.005..0.013 rows=5 loops=10)
Filter: (a > 5)
Rows Removed by Filter: 5
Total runtime: 0.396 ms
(7 rows)
SET
SET
QUERY PLAN
--------------------------------------------------------------------------------------------------------------
Merge Left Join (cost=299.56..6378.23 rows=7633 width=12) (actual
time=0.070..0.118 rows=5 loops=1)
Merge Cond: (foo.a = bar.a)
Filter: is_even(bar.a)
Rows Removed by Filter: 5
-> Sort (cost=149.78..155.13 rows=2140 width=8) (actual time=0.032..0.034
rows=10 loops=1)
Sort Key: foo.a
Sort Method: quicksort Memory: 25kB
-> Seq Scan on foo (cost=0.00..31.40 rows=2140 width=8) (actual
time=0.003..0.005 rows=10 loops=1)
-> Sort (cost=149.78..155.13 rows=2140 width=8) (actual time=0.011..0.012
rows=10 loops=1)
Sort Key: bar.a
Sort Method: quicksort Memory: 25kB
-> Seq Scan on bar (cost=0.00..31.40 rows=2140 width=8) (actual
time=0.001..0.004 rows=10 loops=1)
Total runtime: 0.182 ms
(13 rows)
SET
SET
QUERY PLAN
--------------------------------------------------------------------------------------------------------------
Hash Left Join (cost=58.15..6620.83 rows=7633 width=12) (actual
time=0.069..0.111 rows=5 loops=1)
Hash Cond: (foo.a = bar.a)
Filter: is_even(bar.a)
Rows Removed by Filter: 5
-> Seq Scan on foo (cost=0.00..31.40 rows=2140 width=8) (actual
time=0.005..0.007 rows=10 loops=1)
-> Hash (cost=31.40..31.40 rows=2140 width=8) (actual time=0.012..0.012
rows=10 loops=1)
Buckets: 1024 Batches: 1 Memory Usage: 1kB
-> Seq Scan on bar (cost=0.00..31.40 rows=2140 width=8) (actual
time=0.002..0.006 rows=10 loops=1)
Total runtime: 0.152 ms
(9 rows)
SET
QUERY PLAN
--------------------------------------------------------------------------------------------------------------
Group (cost=149.78..219.33 rows=214 width=8) (actual time=0.119..0.159 rows=5
loops=1)
Filter: is_even(foo.a)
Rows Removed by Filter: 5
-> Sort (cost=149.78..155.13 rows=2140 width=8) (actual time=0.082..0.082
rows=10 loops=1)
Sort Key: foo.a, foo.b
Sort Method: quicksort Memory: 25kB
-> Seq Scan on foo (cost=0.00..31.40 rows=2140 width=8) (actual
time=0.016..0.024 rows=10 loops=1)
Total runtime: 0.209 ms
(8 rows)
SET
QUERY PLAN
--------------------------------------------------------------------------------------------------------
HashAggregate (cost=42.10..97.74 rows=214 width=8) (actual time=0.033..0.088
rows=5 loops=1)
Filter: is_even(foo.a)
Rows Removed by Filter: 5
-> Seq Scan on foo (cost=0.00..31.40 rows=2140 width=8) (actual
time=0.004..0.006 rows=10 loops=1)
Total runtime: 0.123 ms
(5 rows)
SET
ROLLBACK
BEGIN;
CREATE TABLE foo(a int, b int);
CREATE TABLE bar(a int, b int);
CREATE TABLE big_table(a int, b int);
INSERT INTO big_table SELECT i%3, i FROM generate_series(1, 200000) i;
INSERT INTO foo SELECT i, i FROM generate_series(1, 10) i;
INSERT INTO bar SELECT i, i FROM generate_series(1, 10) i;
CREATE INDEX foo_a_index ON big_table(a);
CREATE SERVER file_server FOREIGN DATA WRAPPER file_fdw;
CREATE FOREIGN TABLE passwd (username text, pass text, uid int8, gid int8,
gecos text, home text, shell text) SERVER file_server OPTIONS (format 'text',
filename '/etc/passwd', delimiter ':', null '');
CREATE FUNCTION is_even(int) RETURNS boolean AS $$ BEGIN RETURN ($1 % 2) = 0;
END $$ LANGUAGE plpgsql;
SET enable_bitmapscan TO false;
SET enable_hashjoin TO false;
SET enable_indexscan TO false;
SET enable_mergejoin TO false;
SET enable_seqscan TO false;
SET enable_nestloop TO false;
SET enable_hashagg TO false;
SET enable_material TO false;
-- Filter on Index Scan
SET enable_indexscan TO true;
EXPLAIN ANALYZE SELECT * FROM big_table WHERE a=2 AND b > 5000;
SET enable_indexscan TO false;
-- Recheck Cond and Filter on Bitmap Heap Scan
SET enable_bitmapscan TO true;
SET work_mem TO '64kB';
EXPLAIN ANALYZE SELECT * FROM big_table WHERE a=2 AND b > 5000;
RESET work_mem;
SET enable_bitmapscan TO false;
-- no ugly costs for the rest of the tests
SET enable_seqscan TO true;
-- Filter on Sequential Scan
EXPLAIN ANALYZE SELECT * FROM foo WHERE a > 5;
-- Filter on VALUES
EXPLAIN ANALYZE SELECT * FROM (VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10))
ss(i) WHERE i > 5;
-- Filter on CTE Scan and WorkTable Scan
EXPLAIN ANALYZE WITH RECURSIVE t(a) AS (SELECT i FROM generate_series(1,5) i
UNION ALL SELECT a+5 FROM t WHERE a+5 <= 10) SELECT * FROM t WHERE a > 5;
-- Filter on SubqueryScan
EXPLAIN ANALYZE SELECT * FROM (TABLE foo OFFSET 0) ss(i) WHERE i > 5;
-- Filter on Function Scan
EXPLAIN ANALYZE SELECT * FROM generate_series(1, 10) i WHERE i > 5;
-- Filter on Tid Scan
EXPLAIN ANALYZE SELECT * FROM big_table WHERE ctid = '(5,2)' AND a = 0;
-- Filter on Foreign Scan
EXPLAIN ANALYZE SELECT * FROM passwd WHERE uid > 4;
SET enable_nestloop TO true;
-- Filter on Nested Loop Join
EXPLAIN ANALYZE SELECT * FROM foo LEFT JOIN bar USING (a) WHERE is_even(bar.a);
-- Sane answers even when a node with Filter is called repeatedly
EXPLAIN ANALYZE SELECT * FROM foo LEFT JOIN (SELECT * FROM bar WHERE a > 5) bar
USING (a);
SET enable_nestloop TO false;
-- Filter on Merge Join
SET enable_mergejoin TO true;
EXPLAIN ANALYZE SELECT * FROM foo LEFT JOIN bar USING (a) WHERE is_even(bar.a);
SET enable_mergejoin TO false;
-- Filter on Hash Join
SET enable_hashjoin TO true;
EXPLAIN ANALYZE SELECT * FROM foo LEFT JOIN bar USING (a) WHERE is_even(bar.a);
SET enable_hashjoin TO false;
-- Filter on Group
EXPLAIN ANALYZE SELECT * FROM (SELECT a, b FROM foo GROUP BY 1, 2) ss WHERE
is_even(a);
-- Filter on (Hash) Aggregate
SET enable_hashagg TO true;
EXPLAIN ANALYZE SELECT * FROM (SELECT a, b FROM foo GROUP BY 1, 2) ss WHERE
is_even(a);
SET enable_hashagg TO false;
ROLLBACK;
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 6408d16..bc72bff 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -64,9 +64,15 @@ static void show_qual(List *qual, const char *qlabel,
static void show_scan_qual(List *qual, const char *qlabel,
PlanState *planstate, List *ancestors,
ExplainState *es);
+static void show_instrumented_scan_qual(List *qual, const char *qlabel,
+ PlanState *planstate, double nremoved,
+ List *ancestors, ExplainState *es);
static void show_upper_qual(List *qual, const char *qlabel,
PlanState *planstate, List *ancestors,
ExplainState *es);
+static void show_instrumented_upper_qual(List *qual, const char *qlabel,
+ PlanState *planstate, double nremoved,
+ List *ancestors, ExplainState *es);
static void show_sort_keys(SortState *sortstate, List *ancestors,
ExplainState *es);
static void show_merge_append_keys(MergeAppendState *mstate, List *ancestors,
@@ -1002,29 +1008,37 @@ ExplainNode(PlanState *planstate, List *ancestors,
"Index Cond", planstate,
ancestors, es);
show_scan_qual(((IndexScan *) plan)->indexorderbyorig,
"Order By", planstate,
ancestors, es);
- show_scan_qual(plan->qual, "Filter", planstate,
ancestors, es);
+ show_instrumented_scan_qual(plan->qual, "Filter",
planstate,
+
((ScanState *) planstate)->ss_qualnremoved,
+
ancestors, es);
break;
case T_BitmapIndexScan:
show_scan_qual(((BitmapIndexScan *)
plan)->indexqualorig,
"Index Cond", planstate,
ancestors, es);
break;
case T_BitmapHeapScan:
- show_scan_qual(((BitmapHeapScan *)
plan)->bitmapqualorig,
- "Recheck Cond", planstate,
ancestors, es);
+ show_instrumented_scan_qual(((BitmapHeapScan *)
plan)->bitmapqualorig,
+
"Recheck Cond", planstate,
+
((BitmapHeapScanState *) planstate)->bqonremoved,
+
ancestors, es);
/* FALL THRU */
case T_SeqScan:
case T_ValuesScan:
case T_CteScan:
case T_WorkTableScan:
case T_SubqueryScan:
- show_scan_qual(plan->qual, "Filter", planstate,
ancestors, es);
+ show_instrumented_scan_qual(plan->qual, "Filter",
planstate,
+
((ScanState *) planstate)->ss_qualnremoved,
+
ancestors, es);
break;
case T_FunctionScan:
if (es->verbose)
show_expression(((FunctionScan *)
plan)->funcexpr,
"Function
Call", planstate, ancestors,
es->verbose,
es);
- show_scan_qual(plan->qual, "Filter", planstate,
ancestors, es);
+ show_instrumented_scan_qual(plan->qual, "Filter",
planstate,
+
((ScanState *) planstate)->ss_qualnremoved,
+
ancestors, es);
break;
case T_TidScan:
{
@@ -1037,35 +1051,47 @@ ExplainNode(PlanState *planstate, List *ancestors,
if (list_length(tidquals) > 1)
tidquals =
list_make1(make_orclause(tidquals));
show_scan_qual(tidquals, "TID Cond", planstate,
ancestors, es);
- show_scan_qual(plan->qual, "Filter", planstate,
ancestors, es);
+ show_instrumented_scan_qual(plan->qual,
"Filter", planstate,
+
((ScanState *) planstate)->ss_qualnremoved,
+
ancestors, es);
}
break;
case T_ForeignScan:
- show_scan_qual(plan->qual, "Filter", planstate,
ancestors, es);
+ show_instrumented_scan_qual(plan->qual, "Filter",
planstate,
+
((ScanState *) planstate)->ss_qualnremoved,
+
ancestors, es);
show_foreignscan_info((ForeignScanState *) planstate,
es);
break;
case T_NestLoop:
show_upper_qual(((NestLoop *) plan)->join.joinqual,
"Join Filter",
planstate, ancestors, es);
- show_upper_qual(plan->qual, "Filter", planstate,
ancestors, es);
+ show_instrumented_upper_qual(plan->qual, "Filter",
planstate,
+
((JoinState *) planstate)->js_oqnremoved,
+
ancestors, es);
break;
case T_MergeJoin:
show_upper_qual(((MergeJoin *) plan)->mergeclauses,
"Merge Cond",
planstate, ancestors, es);
show_upper_qual(((MergeJoin *) plan)->join.joinqual,
"Join Filter",
planstate, ancestors, es);
- show_upper_qual(plan->qual, "Filter", planstate,
ancestors, es);
+ show_instrumented_upper_qual(plan->qual, "Filter",
planstate,
+
((JoinState *) planstate)->js_oqnremoved,
+
ancestors, es);
break;
case T_HashJoin:
show_upper_qual(((HashJoin *) plan)->hashclauses,
"Hash Cond", planstate,
ancestors, es);
show_upper_qual(((HashJoin *) plan)->join.joinqual,
"Join Filter",
planstate, ancestors, es);
- show_upper_qual(plan->qual, "Filter", planstate,
ancestors, es);
+ show_instrumented_upper_qual(plan->qual, "Filter",
planstate,
+
((JoinState *) planstate)->js_oqnremoved,
+
ancestors, es);
break;
case T_Agg:
case T_Group:
- show_upper_qual(plan->qual, "Filter", planstate,
ancestors, es);
+ show_instrumented_upper_qual(plan->qual, "Filter",
planstate,
+
((ScanState *) planstate)->ss_qualnremoved,
+
ancestors, es);
break;
case T_Sort:
show_sort_keys((SortState *) planstate, ancestors, es);
@@ -1356,6 +1382,26 @@ show_scan_qual(List *qual, const char *qlabel,
}
/*
+ * Show a qualifier expression and instrumentation information (if in EXPLAIN
+ * ANALYZE) for a scan plan node
+ */
+static void
+show_instrumented_scan_qual(List *qual, const char *qlabel,
+ PlanState *planstate,
double nremoved,
+ List *ancestors,
ExplainState *es)
+{
+ show_scan_qual(qual, qlabel, planstate, ancestors, es);
+
+ if (qual && es->analyze)
+ {
+ char buf[256];
+ snprintf(buf, sizeof(buf), "Rows Removed by %s", qlabel);
+ ExplainPropertyFloat(buf, nremoved /
planstate->instrument->nloops, 0, es);
+ }
+}
+
+
+/*
* Show a qualifier expression for an upper-level plan node
*/
static void
@@ -1369,6 +1415,21 @@ show_upper_qual(List *qual, const char *qlabel,
show_qual(qual, qlabel, planstate, ancestors, useprefix, es);
}
+static void
+show_instrumented_upper_qual(List *qual, const char *qlabel,
+ PlanState *planstate,
double nremoved,
+ List *ancestors,
ExplainState *es)
+{
+ show_upper_qual(qual, qlabel, planstate, ancestors, es);
+
+ if (qual && es->analyze)
+ {
+ char buf[256];
+ snprintf(buf, sizeof(buf), "Rows Removed by %s", qlabel);
+ ExplainPropertyFloat(buf, nremoved /
planstate->instrument->nloops, 0, es);
+ }
+}
+
/*
* Show the sort keys for a Sort node.
*/
diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c
index e900588..2de6b56 100644
--- a/src/backend/executor/execScan.c
+++ b/src/backend/executor/execScan.c
@@ -223,6 +223,7 @@ ExecScan(ScanState *node,
/*
* Tuple fails qual, so free per-tuple memory and try again.
*/
+ node->ss_qualnremoved += 1;
ResetExprContext(econtext);
}
}
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 13d7723..0249c63 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -1204,6 +1204,8 @@ agg_retrieve_direct(AggState *aggstate)
return result;
}
}
+ else
+ aggstate->ss.ss_qualnremoved += 1;
}
/* No more groups */
@@ -1354,6 +1356,8 @@ agg_retrieve_hash_table(AggState *aggstate)
return result;
}
}
+ else
+ aggstate->ss.ss_qualnremoved += 1;
}
/* No more groups */
@@ -1387,6 +1391,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
aggstate = makeNode(AggState);
aggstate->ss.ps.plan = (Plan *) node;
aggstate->ss.ps.state = estate;
+ aggstate->ss.ss_qualnremoved = 0;
aggstate->aggs = NIL;
aggstate->numaggs = 0;
diff --git a/src/backend/executor/nodeBitmapHeapscan.c
b/src/backend/executor/nodeBitmapHeapscan.c
index 8e50fb1..abb9ff4 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -278,6 +278,7 @@ BitmapHeapNext(BitmapHeapScanState *node)
if (!ExecQual(node->bitmapqualorig, econtext, false))
{
/* Fails recheck, so drop it and loop back for
another */
+ node->bqonremoved += 1;
ExecClearTuple(slot);
continue;
}
@@ -542,7 +543,10 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState
*estate, int eflags)
scanstate = makeNode(BitmapHeapScanState);
scanstate->ss.ps.plan = (Plan *) node;
scanstate->ss.ps.state = estate;
+ scanstate->ss.ss_qualnremoved = 0;
+
+ scanstate->bqonremoved = 0;
scanstate->tbm = NULL;
scanstate->tbmiterator = NULL;
scanstate->tbmres = NULL;
diff --git a/src/backend/executor/nodeBitmapIndexscan.c
b/src/backend/executor/nodeBitmapIndexscan.c
index 9a56fd4..4dd1367 100644
--- a/src/backend/executor/nodeBitmapIndexscan.c
+++ b/src/backend/executor/nodeBitmapIndexscan.c
@@ -207,6 +207,7 @@ ExecInitBitmapIndexScan(BitmapIndexScan *node, EState
*estate, int eflags)
indexstate = makeNode(BitmapIndexScanState);
indexstate->ss.ps.plan = (Plan *) node;
indexstate->ss.ps.state = estate;
+ indexstate->ss.ss_qualnremoved = 0;
/* normally we don't make the result bitmap till runtime */
indexstate->biss_result = NULL;
diff --git a/src/backend/executor/nodeCtescan.c
b/src/backend/executor/nodeCtescan.c
index ec39f29..fdef1e8 100644
--- a/src/backend/executor/nodeCtescan.c
+++ b/src/backend/executor/nodeCtescan.c
@@ -191,6 +191,7 @@ ExecInitCteScan(CteScan *node, EState *estate, int eflags)
scanstate = makeNode(CteScanState);
scanstate->ss.ps.plan = (Plan *) node;
scanstate->ss.ps.state = estate;
+ scanstate->ss.ss_qualnremoved = 0;
scanstate->eflags = eflags;
scanstate->cte_table = NULL;
scanstate->eof_cte = false;
diff --git a/src/backend/executor/nodeForeignscan.c
b/src/backend/executor/nodeForeignscan.c
index 841ae69..6a25fd7 100644
--- a/src/backend/executor/nodeForeignscan.c
+++ b/src/backend/executor/nodeForeignscan.c
@@ -114,6 +114,7 @@ ExecInitForeignScan(ForeignScan *node, EState *estate, int
eflags)
scanstate = makeNode(ForeignScanState);
scanstate->ss.ps.plan = (Plan *) node;
scanstate->ss.ps.state = estate;
+ scanstate->ss.ss_qualnremoved = 0;
/*
* Miscellaneous initialization
diff --git a/src/backend/executor/nodeFunctionscan.c
b/src/backend/executor/nodeFunctionscan.c
index 5d5727e..894208c 100644
--- a/src/backend/executor/nodeFunctionscan.c
+++ b/src/backend/executor/nodeFunctionscan.c
@@ -133,6 +133,7 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate,
int eflags)
scanstate = makeNode(FunctionScanState);
scanstate->ss.ps.plan = (Plan *) node;
scanstate->ss.ps.state = estate;
+ scanstate->ss.ss_qualnremoved = 0;
scanstate->eflags = eflags;
/*
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index fa403e5..f167a39 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -118,6 +118,8 @@ ExecGroup(GroupState *node)
return result;
}
}
+ else
+ node->ss.ss_qualnremoved += 1;
}
/*
@@ -179,6 +181,8 @@ ExecGroup(GroupState *node)
return result;
}
}
+ else
+ node->ss.ss_qualnremoved += 1;
}
/* NOTREACHED */
@@ -206,6 +210,7 @@ ExecInitGroup(Group *node, EState *estate, int eflags)
grpstate = makeNode(GroupState);
grpstate->ss.ps.plan = (Plan *) node;
grpstate->ss.ps.state = estate;
+ grpstate->ss.ss_qualnremoved = 0;
grpstate->grp_done = FALSE;
/*
diff --git a/src/backend/executor/nodeHashjoin.c
b/src/backend/executor/nodeHashjoin.c
index 3a66981..11aa4a6 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -325,6 +325,8 @@ ExecHashJoin(HashJoinState *node)
return result;
}
}
+ else
+ node->js.js_oqnremoved += 1;
}
break;
@@ -360,6 +362,8 @@ ExecHashJoin(HashJoinState *node)
return result;
}
}
+ else
+ node->js.js_oqnremoved += 1;
}
break;
@@ -397,6 +401,8 @@ ExecHashJoin(HashJoinState *node)
return result;
}
}
+ else
+ node->js.js_oqnremoved += 1;
break;
case HJ_NEED_NEW_BATCH:
@@ -442,6 +448,7 @@ ExecInitHashJoin(HashJoin *node, EState *estate, int eflags)
hjstate = makeNode(HashJoinState);
hjstate->js.ps.plan = (Plan *) node;
hjstate->js.ps.state = estate;
+ hjstate->js.js_oqnremoved = 0;
/*
* Miscellaneous initialization
diff --git a/src/backend/executor/nodeIndexscan.c
b/src/backend/executor/nodeIndexscan.c
index 955008e..cb705f4 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -468,6 +468,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int
eflags)
indexstate = makeNode(IndexScanState);
indexstate->ss.ps.plan = (Plan *) node;
indexstate->ss.ps.state = estate;
+ indexstate->ss.ss_qualnremoved = 0;
/*
* Miscellaneous initialization
diff --git a/src/backend/executor/nodeMergejoin.c
b/src/backend/executor/nodeMergejoin.c
index e23dd6c..b3a1b10 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -893,6 +893,8 @@ ExecMergeJoin(MergeJoinState *node)
return result;
}
}
+ else
+ node->js.js_oqnremoved += 1;
}
break;
@@ -1503,6 +1505,7 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int
eflags)
mergestate = makeNode(MergeJoinState);
mergestate->js.ps.plan = (Plan *) node;
mergestate->js.ps.state = estate;
+ mergestate->js.js_oqnremoved = 0;
/*
* Miscellaneous initialization
diff --git a/src/backend/executor/nodeNestloop.c
b/src/backend/executor/nodeNestloop.c
index e98bc0f..a4b9c92 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -214,6 +214,8 @@ ExecNestLoop(NestLoopState *node)
return result;
}
}
+ else
+ node->js.js_oqnremoved += 1;
}
/*
@@ -270,6 +272,8 @@ ExecNestLoop(NestLoopState *node)
return result;
}
}
+ else
+ node->js.js_oqnremoved += 1;
}
/*
@@ -302,6 +306,7 @@ ExecInitNestLoop(NestLoop *node, EState *estate, int eflags)
nlstate = makeNode(NestLoopState);
nlstate->js.ps.plan = (Plan *) node;
nlstate->js.ps.state = estate;
+ nlstate->js.js_oqnremoved = 0;
/*
* Miscellaneous initialization
diff --git a/src/backend/executor/nodeSeqscan.c
b/src/backend/executor/nodeSeqscan.c
index 5b652c9..7a115c9 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -169,6 +169,7 @@ ExecInitSeqScan(SeqScan *node, EState *estate, int eflags)
scanstate = makeNode(SeqScanState);
scanstate->ps.plan = (Plan *) node;
scanstate->ps.state = estate;
+ scanstate->ss_qualnremoved = 0;
/*
* Miscellaneous initialization
diff --git a/src/backend/executor/nodeSubqueryscan.c
b/src/backend/executor/nodeSubqueryscan.c
index 7e4d5de..26e0e70 100644
--- a/src/backend/executor/nodeSubqueryscan.c
+++ b/src/backend/executor/nodeSubqueryscan.c
@@ -109,6 +109,7 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate,
int eflags)
subquerystate = makeNode(SubqueryScanState);
subquerystate->ss.ps.plan = (Plan *) node;
subquerystate->ss.ps.state = estate;
+ subquerystate->ss.ss_qualnremoved = 0;
/*
* Miscellaneous initialization
diff --git a/src/backend/executor/nodeTidscan.c
b/src/backend/executor/nodeTidscan.c
index 69f47ff..68d61b9 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -491,6 +491,7 @@ ExecInitTidScan(TidScan *node, EState *estate, int eflags)
tidstate = makeNode(TidScanState);
tidstate->ss.ps.plan = (Plan *) node;
tidstate->ss.ps.state = estate;
+ tidstate->ss.ss_qualnremoved = 0;
/*
* Miscellaneous initialization
diff --git a/src/backend/executor/nodeValuesscan.c
b/src/backend/executor/nodeValuesscan.c
index d5260e4..5d474f6 100644
--- a/src/backend/executor/nodeValuesscan.c
+++ b/src/backend/executor/nodeValuesscan.c
@@ -205,6 +205,7 @@ ExecInitValuesScan(ValuesScan *node, EState *estate, int
eflags)
scanstate = makeNode(ValuesScanState);
scanstate->ss.ps.plan = (Plan *) node;
scanstate->ss.ps.state = estate;
+ scanstate->ss.ss_qualnremoved = 0;
/*
* Miscellaneous initialization
diff --git a/src/backend/executor/nodeWorktablescan.c
b/src/backend/executor/nodeWorktablescan.c
index bdebb6d..762605f 100644
--- a/src/backend/executor/nodeWorktablescan.c
+++ b/src/backend/executor/nodeWorktablescan.c
@@ -146,6 +146,7 @@ ExecInitWorkTableScan(WorkTableScan *node, EState *estate,
int eflags)
scanstate = makeNode(WorkTableScanState);
scanstate->ss.ps.plan = (Plan *) node;
scanstate->ss.ps.state = estate;
+ scanstate->ss.ss_qualnremoved = 0;
scanstate->rustate = NULL; /* we'll set this later */
/*
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index b3eed7d..7139e8c 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -1170,6 +1170,7 @@ typedef struct ScanState
Relation ss_currentRelation;
HeapScanDesc ss_currentScanDesc;
TupleTableSlot *ss_ScanTupleSlot;
+ double ss_qualnremoved; /* number of rows removed by ps.qual */
} ScanState;
/*
@@ -1280,6 +1281,7 @@ typedef struct BitmapHeapScanState
{
ScanState ss; /* its first field is
NodeTag */
List *bitmapqualorig;
+ double bqonremoved; /* number of rows removed by
bitmapqualorig */
TIDBitmap *tbm;
TBMIterator *tbmiterator;
TBMIterateResult *tbmres;
@@ -1438,6 +1440,7 @@ typedef struct JoinState
PlanState ps;
JoinType jointype;
List *joinqual; /* JOIN quals (in addition to ps.qual)
*/
+ double js_oqnremoved; /* number of rows removed by otherqual
(ps.qual) */
} JoinState;
/* ----------------
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
