Skip to content

Commit c970292

Browse files
tglsfdctglsfdc
committed
Remove very ancient tuple-counting infrastructure (IncrRetrieved() and
friends). This code has all been ifdef'd out for many years, and doesn't seem to have any prospect of becoming any more useful in the future. EXPLAIN ANALYZE is what people use in practice, and I think if we did want process-wide counters we'd be more likely to put in dtrace events for that than try to resurrect this code. Get rid of it so as to have one less detail to worry about while refactoring execMain.c.
1 parent 474f825 commit c970292

File tree

8 files changed

+8
-149
lines changed

8 files changed

+8
-149
lines changed

‎src/backend/access/gist/gistget.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.81 2009/06/11 14:48:53 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.82 2009/10/08 22:34:57 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -388,8 +388,6 @@ gistindex_keytest(IndexTuple tuple,
388388
giststate = so->giststate;
389389
p = BufferGetPage(so->curbuf);
390390

391-
IncrIndexProcessed();
392-
393391
scan->xs_recheck = false;
394392

395393
/*

‎src/backend/access/hash/hashutil.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/hash/hashutil.c,v 1.60 2009/06/11 14:48:53 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/hash/hashutil.c,v 1.61 2009/10/08 22:34:57 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -38,11 +38,7 @@ _hash_checkqual(IndexScanDesc scan, IndexTuple itup)
3838
TupleDesc tupdesc = RelationGetDescr(scan->indexRelation);
3939
ScanKey key = scan->keyData;
4040
int scanKeySize = scan->numberOfKeys;
41-
#endif
42-
43-
IncrIndexProcessed();
4441

45-
#ifdef NOT_USED
4642
while (scanKeySize > 0)
4743
{
4844
Datum datum;

‎src/backend/access/nbtree/nbtutils.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtutils.c,v 1.93 2009/01/05 17:14:28 alvherre Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtutils.c,v 1.94 2009/10/08 22:34:57 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -819,8 +819,6 @@ _bt_checkkeys(IndexScanDesc scan,
819819

820820
tuple = (IndexTuple) PageGetItem(page, iid);
821821

822-
IncrIndexProcessed();
823-
824822
tupdesc = RelationGetDescr(scan->indexRelation);
825823
so = (BTScanOpaque) scan->opaque;
826824
keysz = so->numberOfKeys;

‎src/backend/executor/execMain.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
*
2828
* IDENTIFICATION
29-
* $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.330 2009/10/05 19:24:37 tgl Exp $
29+
* $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.331 2009/10/08 22:34:57 tgl Exp $
3030
*
3131
*-------------------------------------------------------------------------
3232
*/
@@ -1704,7 +1704,6 @@ ExecSelect(TupleTableSlot *slot,
17041704
EState *estate)
17051705
{
17061706
(*dest->receiveSlot) (slot, dest);
1707-
IncrRetrieved();
17081707
(estate->es_processed)++;
17091708
}
17101709

@@ -1800,7 +1799,6 @@ ExecInsert(TupleTableSlot *slot,
18001799
newId = heap_insert(resultRelationDesc, tuple,
18011800
estate->es_output_cid, 0, NULL);
18021801

1803-
IncrAppended();
18041802
(estate->es_processed)++;
18051803
estate->es_lastoid = newId;
18061804
setLastTid(&(tuple->t_self));
@@ -1908,7 +1906,6 @@ ldelete:;
19081906
return;
19091907
}
19101908

1911-
IncrDeleted();
19121909
(estate->es_processed)++;
19131910

19141911
/*
@@ -2089,7 +2086,6 @@ lreplace:;
20892086
return;
20902087
}
20912088

2092-
IncrReplaced();
20932089
(estate->es_processed)++;
20942090

20952091
/*
@@ -3042,8 +3038,6 @@ intorel_receive(TupleTableSlot *slot, DestReceiver *self)
30423038
myState->bistate);
30433039

30443040
/* We know this is a newly created relation, so there are no indexes */
3045-
3046-
IncrAppended();
30473041
}
30483042

30493043
/*

‎src/backend/executor/execQual.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.251 2009/08/06 20:44:31 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.252 2009/10/08 22:34:57 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -4814,8 +4814,6 @@ ExecQual(List *qual, ExprContext *econtext, bool resultForNull)
48144814
EV_nodeDisplay(qual);
48154815
EV_printf("\n");
48164816

4817-
IncrProcessed();
4818-
48194817
/*
48204818
* Run in short-lived per-tuple context while computing expressions.
48214819
*/

‎src/backend/executor/execUtils.c

Lines changed: 1 addition & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.162 2009/09/27 20:09:57 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.163 2009/10/08 22:34:57 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -53,85 +53,10 @@
5353
#include "utils/tqual.h"
5454

5555

56-
/* ----------------------------------------------------------------
57-
* global counters for number of tuples processed, retrieved,
58-
* appended, replaced, deleted.
59-
* ----------------------------------------------------------------
60-
*/
61-
int NTupleProcessed;
62-
int NTupleRetrieved;
63-
int NTupleReplaced;
64-
int NTupleAppended;
65-
int NTupleDeleted;
66-
int NIndexTupleInserted;
67-
int NIndexTupleProcessed;
68-
69-
7056
static bool get_last_attnums(Node *node, ProjectionInfo *projInfo);
7157
static void ShutdownExprContext(ExprContext *econtext, bool isCommit);
7258

7359

74-
/* ----------------------------------------------------------------
75-
* statistic functions
76-
* ----------------------------------------------------------------
77-
*/
78-
79-
/* ----------------------------------------------------------------
80-
* ResetTupleCount
81-
* ----------------------------------------------------------------
82-
*/
83-
#ifdef NOT_USED
84-
void
85-
ResetTupleCount(void)
86-
{
87-
NTupleProcessed = 0;
88-
NTupleRetrieved = 0;
89-
NTupleAppended = 0;
90-
NTupleDeleted = 0;
91-
NTupleReplaced = 0;
92-
NIndexTupleProcessed = 0;
93-
}
94-
#endif
95-
96-
/* ----------------------------------------------------------------
97-
* PrintTupleCount
98-
* ----------------------------------------------------------------
99-
*/
100-
#ifdef NOT_USED
101-
void
102-
DisplayTupleCount(FILE *statfp)
103-
{
104-
if (NTupleProcessed > 0)
105-
fprintf(statfp, "!\t%d tuple%s processed, ", NTupleProcessed,
106-
(NTupleProcessed == 1) ? "" : "s");
107-
else
108-
{
109-
fprintf(statfp, "!\tno tuples processed.\n");
110-
return;
111-
}
112-
if (NIndexTupleProcessed > 0)
113-
fprintf(statfp, "%d indextuple%s processed, ", NIndexTupleProcessed,
114-
(NIndexTupleProcessed == 1) ? "" : "s");
115-
if (NIndexTupleInserted > 0)
116-
fprintf(statfp, "%d indextuple%s inserted, ", NIndexTupleInserted,
117-
(NIndexTupleInserted == 1) ? "" : "s");
118-
if (NTupleRetrieved > 0)
119-
fprintf(statfp, "%d tuple%s retrieved. ", NTupleRetrieved,
120-
(NTupleRetrieved == 1) ? "" : "s");
121-
if (NTupleAppended > 0)
122-
fprintf(statfp, "%d tuple%s appended. ", NTupleAppended,
123-
(NTupleAppended == 1) ? "" : "s");
124-
if (NTupleDeleted > 0)
125-
fprintf(statfp, "%d tuple%s deleted. ", NTupleDeleted,
126-
(NTupleDeleted == 1) ? "" : "s");
127-
if (NTupleReplaced > 0)
128-
fprintf(statfp, "%d tuple%s replaced. ", NTupleReplaced,
129-
(NTupleReplaced == 1) ? "" : "s");
130-
fprintf(statfp, "\n");
131-
}
132-
#endif
133-
134-
13560
/* ----------------------------------------------------------------
13661
* Executor state and memory management functions
13762
* ----------------------------------------------------------------
@@ -1166,11 +1091,6 @@ ExecInsertIndexTuples(TupleTableSlot *slot,
11661091
*/
11671092
result = lappend_oid(result, RelationGetRelid(indexRelation));
11681093
}
1169-
1170-
/*
1171-
* keep track of index inserts for debugging
1172-
*/
1173-
IncrIndexInserted();
11741094
}
11751095

11761096
return result;

‎src/backend/tcop/postgres.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.573 2009/09/01 02:54:51 alvherre Exp $
11+
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.574 2009/10/08 22:34:57 tgl Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -3851,7 +3851,6 @@ ResetUsage(void)
38513851
getrusage(RUSAGE_SELF, &Save_r);
38523852
gettimeofday(&Save_t, NULL);
38533853
ResetBufferUsage();
3854-
/* ResetTupleCount(); */
38553854
}
38563855

38573856
void

‎src/include/executor/execdebug.h

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
1111
* Portions Copyright (c) 1994, Regents of the University of California
1212
*
13-
* $PostgreSQL: pgsql/src/include/executor/execdebug.h,v 1.34 2009/01/01 17:23:58 momjian Exp $
13+
* $PostgreSQL: pgsql/src/include/executor/execdebug.h,v 1.35 2009/10/08 22:34:57 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -30,16 +30,6 @@
3030
* ----------------------------------------------------------------
3131
*/
3232

33-
/* ----------------
34-
* EXEC_TUPLECOUNT is a #define which causes the
35-
* executor to keep track of tuple counts. This might be
36-
* causing some problems with the decstation stuff so
37-
* you might want to undefine this if you are doing work
38-
* on the decs - cim 10/20/89
39-
* ----------------
40-
#undef EXEC_TUPLECOUNT
41-
*/
42-
4333
/* ----------------
4434
* EXEC_NESTLOOPDEBUG is a flag which turns on debugging of the
4535
* nest loop node by NL_printf() and ENL_printf() in nodeNestloop.c
@@ -79,40 +69,6 @@
7969
#define T_OR_F(b) ((b) ? "true" : "false")
8070
#define NULL_OR_TUPLE(slot) (TupIsNull(slot) ? "null" : "a tuple")
8171

82-
83-
/* ----------------
84-
* tuple count debugging defines
85-
* ----------------
86-
*/
87-
#ifdef EXEC_TUPLECOUNT
88-
extern int NTupleProcessed;
89-
extern int NTupleRetrieved;
90-
extern int NTupleReplaced;
91-
extern int NTupleAppended;
92-
extern int NTupleDeleted;
93-
extern int NIndexTupleProcessed;
94-
extern int NIndexTupleInserted;
95-
96-
#define IncrRetrieved() NTupleRetrieved++
97-
#define IncrAppended() NTupleAppended++
98-
#define IncrDeleted() NTupleDeleted++
99-
#define IncrReplaced() NTupleReplaced++
100-
#define IncrInserted() NTupleInserted++
101-
#define IncrProcessed() NTupleProcessed++
102-
#define IncrIndexProcessed() NIndexTupleProcessed++
103-
#define IncrIndexInserted() NIndexTupleInserted++
104-
#else
105-
/* stop compiler warnings */
106-
#define IncrRetrieved() (void)(0)
107-
#define IncrAppended() (void)(0)
108-
#define IncrDeleted() (void)(0)
109-
#define IncrReplaced() (void)(0)
110-
#define IncrInserted() (void)(0)
111-
#define IncrProcessed() (void)(0)
112-
#define IncrIndexProcessed() (void)(0)
113-
#define IncrIndexInserted() (void)(0)
114-
#endif /* EXEC_TUPLECOUNT */
115-
11672
/* ----------------
11773
* nest loop debugging defines
11874
* ----------------

0 commit comments

Comments
 (0)