database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Revert DTrace patch from Robert Lor

Browse Source
This commit is contained in:
Bruce Momjian
2009-04-02 20:59:10 +00:00
parent 735cb9692d
commit 0e550ff617
15 changed files with 15 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/executor/execScan.c
View File

@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/execScan.c,v 1.45 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/execScan.c,v 1.46 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -20,7 +20,6 @@
#include "executor/executor.h"
#include "miscadmin.h"
#include "pg_trace.h"
#include "utils/memutils.h"
@ -61,8 +60,6 @@ ExecScan(ScanState *node,
qual = node->ps.qual;
projInfo = node->ps.ps_ProjInfo;
TRACE_POSTGRESQL_EXECUTOR_SCAN((uintptr_t)node, ((Scan *)node->ps.plan)->scanrelid, (uintptr_t)accessMtd);
/*
* If we have neither a qual to check nor a projection to do, just skip
* all the overhead and return the raw scan tuple.

5
src/backend/executor/nodeAgg.c
View File

@ -61,7 +61,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.165 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.166 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -79,7 +79,6 @@
#include "parser/parse_agg.h"
#include "parser/parse_coerce.h"
#include "parser/parse_oper.h"
#include "pg_trace.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
@ -815,8 +814,6 @@ ExecAgg(AggState *node)
if (node->agg_done)
return NULL;
TRACE_POSTGRESQL_EXECUTOR_AGG((uintptr_t)node, ((Agg *) node->ss.ps.plan)->aggstrategy);
/*
* Check to see if we're still projecting out tuples from a previous agg
* tuple (because there is a function-returning-set in the projection

5
src/backend/executor/nodeGroup.c
View File

@ -15,7 +15,7 @@
* locate group boundaries.
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeGroup.c,v 1.74 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeGroup.c,v 1.75 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -24,7 +24,6 @@
#include "executor/executor.h"
#include "executor/nodeGroup.h"
#include "pg_trace.h"
/*
@ -50,8 +49,6 @@ ExecGroup(GroupState *node)
numCols = ((Group *) node->ss.ps.plan)->numCols;
grpColIdx = ((Group *) node->ss.ps.plan)->grpColIdx;
TRACE_POSTGRESQL_EXECUTOR_GROUP((uintptr_t)node, numCols);
/*
* Check to see if we're still projecting out tuples from a previous group
* tuple (because there is a function-returning-set in the projection

5
src/backend/executor/nodeHash.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.119 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.120 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -33,7 +33,6 @@
#include "executor/nodeHashjoin.h"
#include "miscadmin.h"
#include "parser/parse_expr.h"
#include "pg_trace.h"
#include "utils/dynahash.h"
#include "utils/memutils.h"
#include "utils/lsyscache.h"
@ -80,8 +79,6 @@ MultiExecHash(HashState *node)
ExprContext *econtext;
uint32 hashvalue;
TRACE_POSTGRESQL_EXECUTOR_HASH_MULTI((uintptr_t)node);
/* must provide our own instrumentation support */
if (node->ps.instrument)
InstrStartNode(node->ps.instrument);

5
src/backend/executor/nodeHashjoin.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeHashjoin.c,v 1.99 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeHashjoin.c,v 1.100 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -19,7 +19,6 @@
#include "executor/hashjoin.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
#include "pg_trace.h"
#include "utils/memutils.h"
@ -62,8 +61,6 @@ ExecHashJoin(HashJoinState *node)
uint32 hashvalue;
int batchno;
TRACE_POSTGRESQL_EXECUTOR_HASHJOIN((uintptr_t)node);
/*
* get information from HashJoin node
*/

5
src/backend/executor/nodeLimit.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.37 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.38 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -23,7 +23,6 @@
#include "executor/executor.h"
#include "executor/nodeLimit.h"
#include "pg_trace.h"
static void recompute_limits(LimitState *node);
@ -42,8 +41,6 @@ ExecLimit(LimitState *node)
TupleTableSlot *slot;
PlanState *outerPlan;
TRACE_POSTGRESQL_EXECUTOR_LIMIT((uintptr_t)node);
/*
* get information from the node
*/

5
src/backend/executor/nodeMaterial.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeMaterial.c,v 1.67 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeMaterial.c,v 1.68 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -24,7 +24,6 @@
#include "executor/executor.h"
#include "executor/nodeMaterial.h"
#include "miscadmin.h"
#include "pg_trace.h"
/* ----------------------------------------------------------------
* ExecMaterial
@ -46,8 +45,6 @@ ExecMaterial(MaterialState *node)
bool eof_tuplestore;
TupleTableSlot *slot;
TRACE_POSTGRESQL_EXECUTOR_MATERIAL((uintptr_t)node);
/*
* get state info from node
*/

5
src/backend/executor/nodeMergejoin.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.95 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.96 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -98,7 +98,6 @@
#include "executor/execdefs.h"
#include "executor/nodeMergejoin.h"
#include "miscadmin.h"
#include "pg_trace.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
@ -566,8 +565,6 @@ ExecMergeJoin(MergeJoinState *node)
bool doFillOuter;
bool doFillInner;
TRACE_POSTGRESQL_EXECUTOR_MERGEJOIN((uintptr_t)node);
/*
* get information from node
*/

5
src/backend/executor/nodeNestloop.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeNestloop.c,v 1.51 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeNestloop.c,v 1.52 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -23,7 +23,6 @@
#include "executor/execdebug.h"
#include "executor/nodeNestloop.h"
#include "pg_trace.h"
#include "utils/memutils.h"
@ -68,8 +67,6 @@ ExecNestLoop(NestLoopState *node)
List *otherqual;
ExprContext *econtext;
TRACE_POSTGRESQL_EXECUTOR_NESTLOOP((uintptr_t)node);
/*
* get information from the node
*/

5
src/backend/executor/nodeSetOp.c
View File

@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeSetOp.c,v 1.29 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeSetOp.c,v 1.30 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -46,7 +46,6 @@
#include "executor/executor.h"
#include "executor/nodeSetOp.h"
#include "pg_trace.h"
#include "utils/memutils.h"
@ -197,8 +196,6 @@ ExecSetOp(SetOpState *node)
SetOp *plannode = (SetOp *) node->ps.plan;
TupleTableSlot *resultTupleSlot = node->ps.ps_ResultTupleSlot;
TRACE_POSTGRESQL_EXECUTOR_SETOP((uintptr_t)node);
/*
* If the previously-returned tuple needs to be returned more than once,
* keep returning it.

5
src/backend/executor/nodeSort.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeSort.c,v 1.64 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeSort.c,v 1.65 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -18,7 +18,6 @@
#include "executor/execdebug.h"
#include "executor/nodeSort.h"
#include "miscadmin.h"
#include "pg_trace.h"
#include "utils/tuplesort.h"
@ -54,8 +53,6 @@ ExecSort(SortState *node)
dir = estate->es_direction;
tuplesortstate = (Tuplesortstate *) node->tuplesortstate;
TRACE_POSTGRESQL_EXECUTOR_SORT((uintptr_t)node, dir);
/*
* If first time through, read all tuples from outer plan and pass them to
* tuplesort.c. Subsequent calls just fetch tuples from tuplesort.

7
src/backend/executor/nodeSubplan.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.97 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.98 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -24,7 +24,6 @@
#include "executor/nodeSubplan.h"
#include "nodes/makefuncs.h"
#include "optimizer/clauses.h"
#include "pg_trace.h"
#include "utils/array.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
@ -93,8 +92,6 @@ ExecHashSubPlan(SubPlanState *node,
ExprContext *innerecontext = node->innerecontext;
TupleTableSlot *slot;
TRACE_POSTGRESQL_EXECUTOR_SUBPLAN_HASH((uintptr_t)node);
/* Shouldn't have any direct correlation Vars */
if (subplan->parParam != NIL || node->args != NIL)
elog(ERROR, "hashed subplan with direct correlation not supported");
@ -230,8 +227,6 @@ ExecScanSubPlan(SubPlanState *node,
ListCell *l;
ArrayBuildState *astate = NULL;
TRACE_POSTGRESQL_EXECUTOR_SUBPLAN_SCAN((uintptr_t)node);
/*
* We are probably in a short-lived expression-evaluation context. Switch
* to the per-query context for manipulating the child plan's chgParam,

5
src/backend/executor/nodeUnique.c
View File

@ -16,7 +16,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeUnique.c,v 1.59 2009/04/02 19:14:33 momjian Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeUnique.c,v 1.60 2009/04/02 20:59:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -35,7 +35,6 @@
#include "executor/executor.h"
#include "executor/nodeUnique.h"
#include "pg_trace.h"
#include "utils/memutils.h"
@ -51,8 +50,6 @@ ExecUnique(UniqueState *node)
TupleTableSlot *slot;
PlanState *outerPlan;
TRACE_POSTGRESQL_EXECUTOR_UNIQUE((uintptr_t)node);
/*
* get information from the node
*/