Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0e550ff

Browse files
committed
Revert DTrace patch from Robert Lor
1 parent735cb96 commit0e550ff

File tree

15 files changed

+15
-112
lines changed

15 files changed

+15
-112
lines changed

‎src/backend/access/transam/slru.c

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
4242
* Portions Copyright (c) 1994, Regents of the University of California
4343
*
44-
* $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.46 2009/04/0219:14:33 momjian Exp $
44+
* $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.47 2009/04/0220:59:10 momjian Exp $
4545
*
4646
*-------------------------------------------------------------------------
4747
*/
@@ -57,7 +57,6 @@
5757
#include"storage/fd.h"
5858
#include"storage/shmem.h"
5959
#include"miscadmin.h"
60-
#include"pg_trace.h"
6160

6261

6362
/*
@@ -373,7 +372,6 @@ SimpleLruReadPage(SlruCtl ctl, int pageno, bool write_ok,
373372
{
374373
SlruSharedshared=ctl->shared;
375374

376-
TRACE_POSTGRESQL_SLRU_READPAGE_START((uintptr_t)ctl,pageno,write_ok,xid);
377375
/* Outer loop handles restart if we must wait for someone else's I/O */
378376
for (;;)
379377
{
@@ -401,7 +399,6 @@ SimpleLruReadPage(SlruCtl ctl, int pageno, bool write_ok,
401399
}
402400
/* Otherwise, it's ready to use */
403401
SlruRecentlyUsed(shared,slotno);
404-
TRACE_POSTGRESQL_SLRU_READPAGE_DONE(slotno);
405402
returnslotno;
406403
}
407404

@@ -449,7 +446,6 @@ SimpleLruReadPage(SlruCtl ctl, int pageno, bool write_ok,
449446
SlruReportIOError(ctl,pageno,xid);
450447

451448
SlruRecentlyUsed(shared,slotno);
452-
TRACE_POSTGRESQL_SLRU_READPAGE_DONE(slotno);
453449
returnslotno;
454450
}
455451
}
@@ -474,8 +470,6 @@ SimpleLruReadPage_ReadOnly(SlruCtl ctl, int pageno, TransactionId xid)
474470
SlruSharedshared=ctl->shared;
475471
intslotno;
476472

477-
TRACE_POSTGRESQL_SLRU_READPAGE_READONLY((uintptr_t)ctl,pageno,xid);
478-
479473
/* Try to find the page while holding only shared lock */
480474
LWLockAcquire(shared->ControlLock,LW_SHARED);
481475

@@ -517,8 +511,6 @@ SimpleLruWritePage(SlruCtl ctl, int slotno, SlruFlush fdata)
517511
intpageno=shared->page_number[slotno];
518512
boolok;
519513

520-
TRACE_POSTGRESQL_SLRU_WRITEPAGE_START((uintptr_t)ctl,pageno,slotno);
521-
522514
/* If a write is in progress, wait for it to finish */
523515
while (shared->page_status[slotno]==SLRU_PAGE_WRITE_IN_PROGRESS&&
524516
shared->page_number[slotno]==pageno)
@@ -533,10 +525,7 @@ SimpleLruWritePage(SlruCtl ctl, int slotno, SlruFlush fdata)
533525
if (!shared->page_dirty[slotno]||
534526
shared->page_status[slotno]!=SLRU_PAGE_VALID||
535527
shared->page_number[slotno]!=pageno)
536-
{
537-
TRACE_POSTGRESQL_SLRU_WRITEPAGE_DONE();
538528
return;
539-
}
540529

541530
/*
542531
* Mark the slot write-busy, and clear the dirtybit. After this point, a
@@ -580,8 +569,6 @@ SimpleLruWritePage(SlruCtl ctl, int slotno, SlruFlush fdata)
580569
/* Now it's okay to ereport if we failed */
581570
if (!ok)
582571
SlruReportIOError(ctl,pageno,InvalidTransactionId);
583-
584-
TRACE_POSTGRESQL_SLRU_WRITEPAGE_DONE();
585572
}
586573

587574
/*
@@ -606,8 +593,6 @@ SlruPhysicalReadPage(SlruCtl ctl, int pageno, int slotno)
606593

607594
SlruFileName(ctl,path,segno);
608595

609-
TRACE_POSTGRESQL_SLRU_READPAGE_PHYSICAL_START((uintptr_t)ctl,path,pageno,slotno);
610-
611596
/*
612597
* In a crash-and-restart situation, it's possible for us to receive
613598
* commands to set the commit status of transactions whose bits are in
@@ -622,15 +607,13 @@ SlruPhysicalReadPage(SlruCtl ctl, int pageno, int slotno)
622607
{
623608
slru_errcause=SLRU_OPEN_FAILED;
624609
slru_errno=errno;
625-
TRACE_POSTGRESQL_SLRU_READPAGE_PHYSICAL_DONE(false,slru_errcause,slru_errno);
626610
return false;
627611
}
628612

629613
ereport(LOG,
630614
(errmsg("file \"%s\" doesn't exist, reading as zeroes",
631615
path)));
632616
MemSet(shared->page_buffer[slotno],0,BLCKSZ);
633-
TRACE_POSTGRESQL_SLRU_READPAGE_PHYSICAL_DONE(true,-1,-1);
634617
return true;
635618
}
636619

@@ -639,7 +622,6 @@ SlruPhysicalReadPage(SlruCtl ctl, int pageno, int slotno)
639622
slru_errcause=SLRU_SEEK_FAILED;
640623
slru_errno=errno;
641624
close(fd);
642-
TRACE_POSTGRESQL_SLRU_READPAGE_PHYSICAL_DONE(false,slru_errcause,slru_errno);
643625
return false;
644626
}
645627

@@ -649,20 +631,16 @@ SlruPhysicalReadPage(SlruCtl ctl, int pageno, int slotno)
649631
slru_errcause=SLRU_READ_FAILED;
650632
slru_errno=errno;
651633
close(fd);
652-
TRACE_POSTGRESQL_SLRU_READPAGE_PHYSICAL_DONE(false,slru_errcause,slru_errno);
653634
return false;
654635
}
655636

656637
if (close(fd))
657638
{
658639
slru_errcause=SLRU_CLOSE_FAILED;
659640
slru_errno=errno;
660-
TRACE_POSTGRESQL_SLRU_READPAGE_PHYSICAL_DONE(false,slru_errcause,slru_errno);
661641
return false;
662642
}
663643

664-
TRACE_POSTGRESQL_SLRU_READPAGE_PHYSICAL_DONE(true,-1,-1);
665-
666644
return true;
667645
}
668646

@@ -690,8 +668,6 @@ SlruPhysicalWritePage(SlruCtl ctl, int pageno, int slotno, SlruFlush fdata)
690668
charpath[MAXPGPATH];
691669
intfd=-1;
692670

693-
TRACE_POSTGRESQL_SLRU_WRITEPAGE_PHYSICAL_START((uintptr_t)ctl,pageno,slotno);
694-
695671
/*
696672
* Honor the write-WAL-before-data rule, if appropriate, so that we do not
697673
* write out data before associated WAL records. This is the same action
@@ -777,7 +753,6 @@ SlruPhysicalWritePage(SlruCtl ctl, int pageno, int slotno, SlruFlush fdata)
777753
{
778754
slru_errcause=SLRU_OPEN_FAILED;
779755
slru_errno=errno;
780-
TRACE_POSTGRESQL_SLRU_WRITEPAGE_PHYSICAL_DONE(false,slru_errcause,slru_errno);
781756
return false;
782757
}
783758

@@ -806,7 +781,6 @@ SlruPhysicalWritePage(SlruCtl ctl, int pageno, int slotno, SlruFlush fdata)
806781
slru_errno=errno;
807782
if (!fdata)
808783
close(fd);
809-
TRACE_POSTGRESQL_SLRU_WRITEPAGE_PHYSICAL_DONE(false,slru_errcause,slru_errno);
810784
return false;
811785
}
812786

@@ -820,7 +794,6 @@ SlruPhysicalWritePage(SlruCtl ctl, int pageno, int slotno, SlruFlush fdata)
820794
slru_errno=errno;
821795
if (!fdata)
822796
close(fd);
823-
TRACE_POSTGRESQL_SLRU_WRITEPAGE_PHYSICAL_DONE(false,slru_errcause,slru_errno);
824797
return false;
825798
}
826799

@@ -835,20 +808,17 @@ SlruPhysicalWritePage(SlruCtl ctl, int pageno, int slotno, SlruFlush fdata)
835808
slru_errcause=SLRU_FSYNC_FAILED;
836809
slru_errno=errno;
837810
close(fd);
838-
TRACE_POSTGRESQL_SLRU_WRITEPAGE_PHYSICAL_DONE(false,slru_errcause,slru_errno);
839811
return false;
840812
}
841813

842814
if (close(fd))
843815
{
844816
slru_errcause=SLRU_CLOSE_FAILED;
845817
slru_errno=errno;
846-
TRACE_POSTGRESQL_SLRU_WRITEPAGE_PHYSICAL_DONE(false,slru_errcause,slru_errno);
847818
return false;
848819
}
849820
}
850821

851-
TRACE_POSTGRESQL_SLRU_WRITEPAGE_PHYSICAL_DONE(true,-1,-1);
852822
return true;
853823
}
854824

‎src/backend/executor/execScan.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $PostgreSQL: pgsql/src/backend/executor/execScan.c,v 1.45 2009/04/0219:14:33 momjian Exp $
15+
* $PostgreSQL: pgsql/src/backend/executor/execScan.c,v 1.46 2009/04/0220:59:10 momjian Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
1919
#include"postgres.h"
2020

2121
#include"executor/executor.h"
2222
#include"miscadmin.h"
23-
#include"pg_trace.h"
2423
#include"utils/memutils.h"
2524

2625

@@ -61,8 +60,6 @@ ExecScan(ScanState *node,
6160
qual=node->ps.qual;
6261
projInfo=node->ps.ps_ProjInfo;
6362

64-
TRACE_POSTGRESQL_EXECUTOR_SCAN((uintptr_t)node, ((Scan*)node->ps.plan)->scanrelid, (uintptr_t)accessMtd);
65-
6663
/*
6764
* If we have neither a qual to check nor a projection to do, just skip
6865
* all the overhead and return the raw scan tuple.

‎src/backend/executor/nodeAgg.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
* Portions Copyright (c) 1994, Regents of the University of California
6262
*
6363
* IDENTIFICATION
64-
* $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.165 2009/04/0219:14:33 momjian Exp $
64+
* $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.166 2009/04/0220:59:10 momjian Exp $
6565
*
6666
*-------------------------------------------------------------------------
6767
*/
@@ -79,7 +79,6 @@
7979
#include"parser/parse_agg.h"
8080
#include"parser/parse_coerce.h"
8181
#include"parser/parse_oper.h"
82-
#include"pg_trace.h"
8382
#include"utils/acl.h"
8483
#include"utils/builtins.h"
8584
#include"utils/lsyscache.h"
@@ -815,8 +814,6 @@ ExecAgg(AggState *node)
815814
if (node->agg_done)
816815
returnNULL;
817816

818-
TRACE_POSTGRESQL_EXECUTOR_AGG((uintptr_t)node, ((Agg*)node->ss.ps.plan)->aggstrategy);
819-
820817
/*
821818
* Check to see if we're still projecting out tuples from a previous agg
822819
* tuple (because there is a function-returning-set in the projection

‎src/backend/executor/nodeGroup.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* locate group boundaries.
1616
*
1717
* IDENTIFICATION
18-
* $PostgreSQL: pgsql/src/backend/executor/nodeGroup.c,v 1.74 2009/04/0219:14:33 momjian Exp $
18+
* $PostgreSQL: pgsql/src/backend/executor/nodeGroup.c,v 1.75 2009/04/0220:59:10 momjian Exp $
1919
*
2020
*-------------------------------------------------------------------------
2121
*/
@@ -24,7 +24,6 @@
2424

2525
#include"executor/executor.h"
2626
#include"executor/nodeGroup.h"
27-
#include"pg_trace.h"
2827

2928

3029
/*
@@ -50,8 +49,6 @@ ExecGroup(GroupState *node)
5049
numCols= ((Group*)node->ss.ps.plan)->numCols;
5150
grpColIdx= ((Group*)node->ss.ps.plan)->grpColIdx;
5251

53-
TRACE_POSTGRESQL_EXECUTOR_GROUP((uintptr_t)node,numCols);
54-
5552
/*
5653
* Check to see if we're still projecting out tuples from a previous group
5754
* tuple (because there is a function-returning-set in the projection

‎src/backend/executor/nodeHash.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.119 2009/04/0219:14:33 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.120 2009/04/0220:59:10 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -33,7 +33,6 @@
3333
#include"executor/nodeHashjoin.h"
3434
#include"miscadmin.h"
3535
#include"parser/parse_expr.h"
36-
#include"pg_trace.h"
3736
#include"utils/dynahash.h"
3837
#include"utils/memutils.h"
3938
#include"utils/lsyscache.h"
@@ -80,8 +79,6 @@ MultiExecHash(HashState *node)
8079
ExprContext*econtext;
8180
uint32hashvalue;
8281

83-
TRACE_POSTGRESQL_EXECUTOR_HASH_MULTI((uintptr_t)node);
84-
8582
/* must provide our own instrumentation support */
8683
if (node->ps.instrument)
8784
InstrStartNode(node->ps.instrument);

‎src/backend/executor/nodeHashjoin.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/nodeHashjoin.c,v 1.99 2009/04/0219:14:33 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/nodeHashjoin.c,v 1.100 2009/04/0220:59:10 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -19,7 +19,6 @@
1919
#include"executor/hashjoin.h"
2020
#include"executor/nodeHash.h"
2121
#include"executor/nodeHashjoin.h"
22-
#include"pg_trace.h"
2322
#include"utils/memutils.h"
2423

2524

@@ -62,8 +61,6 @@ ExecHashJoin(HashJoinState *node)
6261
uint32hashvalue;
6362
intbatchno;
6463

65-
TRACE_POSTGRESQL_EXECUTOR_HASHJOIN((uintptr_t)node);
66-
6764
/*
6865
* get information from HashJoin node
6966
*/

‎src/backend/executor/nodeLimit.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.37 2009/04/0219:14:33 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.38 2009/04/0220:59:10 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -23,7 +23,6 @@
2323

2424
#include"executor/executor.h"
2525
#include"executor/nodeLimit.h"
26-
#include"pg_trace.h"
2726

2827
staticvoidrecompute_limits(LimitState*node);
2928

@@ -42,8 +41,6 @@ ExecLimit(LimitState *node)
4241
TupleTableSlot*slot;
4342
PlanState*outerPlan;
4443

45-
TRACE_POSTGRESQL_EXECUTOR_LIMIT((uintptr_t)node);
46-
4744
/*
4845
* get information from the node
4946
*/

‎src/backend/executor/nodeMaterial.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/nodeMaterial.c,v 1.67 2009/04/0219:14:33 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/nodeMaterial.c,v 1.68 2009/04/0220:59:10 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -24,7 +24,6 @@
2424
#include"executor/executor.h"
2525
#include"executor/nodeMaterial.h"
2626
#include"miscadmin.h"
27-
#include"pg_trace.h"
2827

2928
/* ----------------------------------------------------------------
3029
*ExecMaterial
@@ -46,8 +45,6 @@ ExecMaterial(MaterialState *node)
4645
booleof_tuplestore;
4746
TupleTableSlot*slot;
4847

49-
TRACE_POSTGRESQL_EXECUTOR_MATERIAL((uintptr_t)node);
50-
5148
/*
5249
* get state info from node
5350
*/

‎src/backend/executor/nodeMergejoin.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.95 2009/04/0219:14:33 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.96 2009/04/0220:59:10 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -98,7 +98,6 @@
9898
#include"executor/execdefs.h"
9999
#include"executor/nodeMergejoin.h"
100100
#include"miscadmin.h"
101-
#include"pg_trace.h"
102101
#include"utils/acl.h"
103102
#include"utils/lsyscache.h"
104103
#include"utils/memutils.h"
@@ -566,8 +565,6 @@ ExecMergeJoin(MergeJoinState *node)
566565
booldoFillOuter;
567566
booldoFillInner;
568567

569-
TRACE_POSTGRESQL_EXECUTOR_MERGEJOIN((uintptr_t)node);
570-
571568
/*
572569
* get information from node
573570
*/

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp