1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-30 21:42:05 +03:00

Revert "Show index search count in EXPLAIN ANALYZE."

This reverts commit 5ead85fbc8.

This commit shows test failures with debug_parallel_query=regress.  The
underlying issue needs to be debugged, so revert for now.
This commit is contained in:
Peter Geoghegan
2025-03-05 10:27:31 -05:00
parent 4603903d29
commit d00107cd63
22 changed files with 49 additions and 310 deletions

View File

@ -13,7 +13,6 @@
*/
#include "postgres.h"
#include "access/relscan.h"
#include "access/xact.h"
#include "catalog/pg_type.h"
#include "commands/createas.h"
@ -126,7 +125,6 @@ static void show_recursive_union_info(RecursiveUnionState *rstate,
static void show_memoize_info(MemoizeState *mstate, List *ancestors,
ExplainState *es);
static void show_hashagg_info(AggState *aggstate, ExplainState *es);
static void show_indexsearches_info(PlanState *planstate, ExplainState *es);
static void show_tidbitmap_info(BitmapHeapScanState *planstate,
ExplainState *es);
static void show_instrumentation_count(const char *qlabel, int which,
@ -2098,7 +2096,6 @@ ExplainNode(PlanState *planstate, List *ancestors,
if (plan->qual)
show_instrumentation_count("Rows Removed by Filter", 1,
planstate, es);
show_indexsearches_info(planstate, es);
break;
case T_IndexOnlyScan:
show_scan_qual(((IndexOnlyScan *) plan)->indexqual,
@ -2115,12 +2112,10 @@ ExplainNode(PlanState *planstate, List *ancestors,
if (es->analyze)
ExplainPropertyFloat("Heap Fetches", NULL,
planstate->instrument->ntuples2, 0, es);
show_indexsearches_info(planstate, es);
break;
case T_BitmapIndexScan:
show_scan_qual(((BitmapIndexScan *) plan)->indexqualorig,
"Index Cond", planstate, ancestors, es);
show_indexsearches_info(planstate, es);
break;
case T_BitmapHeapScan:
show_scan_qual(((BitmapHeapScan *) plan)->bitmapqualorig,
@ -3860,41 +3855,6 @@ show_hashagg_info(AggState *aggstate, ExplainState *es)
}
}
/*
* Show the total number of index searches performed by a
* IndexScan/IndexOnlyScan/BitmapIndexScan node
*/
static void
show_indexsearches_info(PlanState *planstate, ExplainState *es)
{
Plan *plan = planstate->plan;
struct IndexScanDescData *scanDesc = NULL;
uint64 nsearches = 0;
if (!es->analyze)
return;
switch (nodeTag(plan))
{
case T_IndexScan:
scanDesc = ((IndexScanState *) planstate)->iss_ScanDesc;
break;
case T_IndexOnlyScan:
scanDesc = ((IndexOnlyScanState *) planstate)->ioss_ScanDesc;
break;
case T_BitmapIndexScan:
scanDesc = ((BitmapIndexScanState *) planstate)->biss_ScanDesc;
break;
default:
break;
}
if (scanDesc)
nsearches = scanDesc->nsearches;
ExplainPropertyUInteger("Index Searches", NULL, nsearches, es);
}
/*
* Show exact/lossy pages for a BitmapHeapScan node
*/