diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index e7ca8f64767146b92c6d604eb13890a7d64dd118..a094495b8a9552d060187a279a3b2f594c7c13be 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.81 2009/06/11 14:48:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.82 2009/10/08 22:34:57 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -388,8 +388,6 @@ gistindex_keytest(IndexTuple tuple,
giststate = so->giststate;
p = BufferGetPage(so->curbuf);
- IncrIndexProcessed();
-
scan->xs_recheck = false;
/*
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index ba1d6fbbf56dedb9f5fff011b783ff1a8eaf77ad..d5b3d200fcee8e547c9ef8265556ea7fea8f4a71 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/hash/hashutil.c,v 1.60 2009/06/11 14:48:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/hash/hashutil.c,v 1.61 2009/10/08 22:34:57 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,11 +38,7 @@ _hash_checkqual(IndexScanDesc scan, IndexTuple itup)
TupleDesc tupdesc = RelationGetDescr(scan->indexRelation);
ScanKey key = scan->keyData;
int scanKeySize = scan->numberOfKeys;
-#endif
-
- IncrIndexProcessed();
-#ifdef NOT_USED
while (scanKeySize > 0)
{
Datum datum;
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 1649307251cd8b0fdcb95f1af005c119509c45f1..b715f60d24fbc91318c8f02144732bd5dbc3e955 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtutils.c,v 1.93 2009/01/05 17:14:28 alvherre Exp $
+ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtutils.c,v 1.94 2009/10/08 22:34:57 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -819,8 +819,6 @@ _bt_checkkeys(IndexScanDesc scan,
tuple = (IndexTuple) PageGetItem(page, iid);
- IncrIndexProcessed();
-
tupdesc = RelationGetDescr(scan->indexRelation);
so = (BTScanOpaque) scan->opaque;
keysz = so->numberOfKeys;
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 493ec2b1af1dcba066804a63520507357865e37c..82b05dc4d1b488641d17e4ceff8ed10da65eebcc 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.330 2009/10/05 19:24:37 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.331 2009/10/08 22:34:57 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1704,7 +1704,6 @@ ExecSelect(TupleTableSlot *slot,
EState *estate)
{
(*dest->receiveSlot) (slot, dest);
- IncrRetrieved();
(estate->es_processed)++;
}
@@ -1800,7 +1799,6 @@ ExecInsert(TupleTableSlot *slot,
newId = heap_insert(resultRelationDesc, tuple,
estate->es_output_cid, 0, NULL);
- IncrAppended();
(estate->es_processed)++;
estate->es_lastoid = newId;
setLastTid(&(tuple->t_self));
@@ -1908,7 +1906,6 @@ ldelete:;
return;
}
- IncrDeleted();
(estate->es_processed)++;
/*
@@ -2089,7 +2086,6 @@ lreplace:;
return;
}
- IncrReplaced();
(estate->es_processed)++;
/*
@@ -3042,8 +3038,6 @@ intorel_receive(TupleTableSlot *slot, DestReceiver *self)
myState->bistate);
/* We know this is a newly created relation, so there are no indexes */
-
- IncrAppended();
}
/*
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 4f94bab1c6d28d2a05966a83632c5e43b3e3c587..b9b67da26f0f1fed2554f1c9f3d97ed75ba8af73 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.251 2009/08/06 20:44:31 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.252 2009/10/08 22:34:57 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -4814,8 +4814,6 @@ ExecQual(List *qual, ExprContext *econtext, bool resultForNull)
EV_nodeDisplay(qual);
EV_printf("\n");
- IncrProcessed();
-
/*
* Run in short-lived per-tuple context while computing expressions.
*/
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index c20c76cbae0087f659d312802d3d10c498135e8f..f28d8225f7a1f798039ce0aa1a993572cb36c220 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.162 2009/09/27 20:09:57 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.163 2009/10/08 22:34:57 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -53,85 +53,10 @@
#include "utils/tqual.h"
-/* ----------------------------------------------------------------
- * global counters for number of tuples processed, retrieved,
- * appended, replaced, deleted.
- * ----------------------------------------------------------------
- */
-int NTupleProcessed;
-int NTupleRetrieved;
-int NTupleReplaced;
-int NTupleAppended;
-int NTupleDeleted;
-int NIndexTupleInserted;
-int NIndexTupleProcessed;
-
-
static bool get_last_attnums(Node *node, ProjectionInfo *projInfo);
static void ShutdownExprContext(ExprContext *econtext, bool isCommit);
-/* ----------------------------------------------------------------
- * statistic functions
- * ----------------------------------------------------------------
- */
-
-/* ----------------------------------------------------------------
- * ResetTupleCount
- * ----------------------------------------------------------------
- */
-#ifdef NOT_USED
-void
-ResetTupleCount(void)
-{
- NTupleProcessed = 0;
- NTupleRetrieved = 0;
- NTupleAppended = 0;
- NTupleDeleted = 0;
- NTupleReplaced = 0;
- NIndexTupleProcessed = 0;
-}
-#endif
-
-/* ----------------------------------------------------------------
- * PrintTupleCount
- * ----------------------------------------------------------------
- */
-#ifdef NOT_USED
-void
-DisplayTupleCount(FILE *statfp)
-{
- if (NTupleProcessed > 0)
- fprintf(statfp, "!\t%d tuple%s processed, ", NTupleProcessed,
- (NTupleProcessed == 1) ? "" : "s");
- else
- {
- fprintf(statfp, "!\tno tuples processed.\n");
- return;
- }
- if (NIndexTupleProcessed > 0)
- fprintf(statfp, "%d indextuple%s processed, ", NIndexTupleProcessed,
- (NIndexTupleProcessed == 1) ? "" : "s");
- if (NIndexTupleInserted > 0)
- fprintf(statfp, "%d indextuple%s inserted, ", NIndexTupleInserted,
- (NIndexTupleInserted == 1) ? "" : "s");
- if (NTupleRetrieved > 0)
- fprintf(statfp, "%d tuple%s retrieved. ", NTupleRetrieved,
- (NTupleRetrieved == 1) ? "" : "s");
- if (NTupleAppended > 0)
- fprintf(statfp, "%d tuple%s appended. ", NTupleAppended,
- (NTupleAppended == 1) ? "" : "s");
- if (NTupleDeleted > 0)
- fprintf(statfp, "%d tuple%s deleted. ", NTupleDeleted,
- (NTupleDeleted == 1) ? "" : "s");
- if (NTupleReplaced > 0)
- fprintf(statfp, "%d tuple%s replaced. ", NTupleReplaced,
- (NTupleReplaced == 1) ? "" : "s");
- fprintf(statfp, "\n");
-}
-#endif
-
-
/* ----------------------------------------------------------------
* Executor state and memory management functions
* ----------------------------------------------------------------
@@ -1166,11 +1091,6 @@ ExecInsertIndexTuples(TupleTableSlot *slot,
*/
result = lappend_oid(result, RelationGetRelid(indexRelation));
}
-
- /*
- * keep track of index inserts for debugging
- */
- IncrIndexInserted();
}
return result;
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 2371999062a983b66f66997a7764c767fa251281..67deea796242b5c335d0ca22ec86f00fc5c057eb 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.573 2009/09/01 02:54:51 alvherre Exp $
+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.574 2009/10/08 22:34:57 tgl Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -3851,7 +3851,6 @@ ResetUsage(void)
getrusage(RUSAGE_SELF, &Save_r);
gettimeofday(&Save_t, NULL);
ResetBufferUsage();
- /* ResetTupleCount(); */
}
void
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index cdd2d6bb27164f6d161aee0e154369bcfa911b1e..8a1de90926c9c279904614b49c6bef832b9ef9a5 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -10,7 +10,7 @@
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/executor/execdebug.h,v 1.34 2009/01/01 17:23:58 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/executor/execdebug.h,v 1.35 2009/10/08 22:34:57 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,16 +30,6 @@
* ----------------------------------------------------------------
*/
-/* ----------------
- * EXEC_TUPLECOUNT is a #define which causes the
- * executor to keep track of tuple counts. This might be
- * causing some problems with the decstation stuff so
- * you might want to undefine this if you are doing work
- * on the decs - cim 10/20/89
- * ----------------
-#undef EXEC_TUPLECOUNT
- */
-
/* ----------------
* EXEC_NESTLOOPDEBUG is a flag which turns on debugging of the
* nest loop node by NL_printf() and ENL_printf() in nodeNestloop.c
@@ -79,40 +69,6 @@
#define T_OR_F(b) ((b) ? "true" : "false")
#define NULL_OR_TUPLE(slot) (TupIsNull(slot) ? "null" : "a tuple")
-
-/* ----------------
- * tuple count debugging defines
- * ----------------
- */
-#ifdef EXEC_TUPLECOUNT
-extern int NTupleProcessed;
-extern int NTupleRetrieved;
-extern int NTupleReplaced;
-extern int NTupleAppended;
-extern int NTupleDeleted;
-extern int NIndexTupleProcessed;
-extern int NIndexTupleInserted;
-
-#define IncrRetrieved() NTupleRetrieved++
-#define IncrAppended() NTupleAppended++
-#define IncrDeleted() NTupleDeleted++
-#define IncrReplaced() NTupleReplaced++
-#define IncrInserted() NTupleInserted++
-#define IncrProcessed() NTupleProcessed++
-#define IncrIndexProcessed() NIndexTupleProcessed++
-#define IncrIndexInserted() NIndexTupleInserted++
-#else
-/* stop compiler warnings */
-#define IncrRetrieved() (void)(0)
-#define IncrAppended() (void)(0)
-#define IncrDeleted() (void)(0)
-#define IncrReplaced() (void)(0)
-#define IncrInserted() (void)(0)
-#define IncrProcessed() (void)(0)
-#define IncrIndexProcessed() (void)(0)
-#define IncrIndexInserted() (void)(0)
-#endif /* EXEC_TUPLECOUNT */
-
/* ----------------
* nest loop debugging defines
* ----------------