|
24 | 24 | #include "utils/guc.h"
|
25 | 25 | #include "utils/logtape.h"
|
26 | 26 | #include "utils/pg_rusage.h"
|
27 |
| -#include "utils/probes.h" |
28 | 27 |
|
29 | 28 | #include "rum.h" /* RumItem */
|
30 | 29 |
|
|
40 | 39 | #define LogicalTapeRewindForWrite(x, y) LogicalTapeRewind((x), (y), true)
|
41 | 40 | #endif
|
42 | 41 |
|
43 |
| -#if PG_VERSION_NUM >= 110000 |
44 |
| -#define RUM_SORT_START(INT1, INT2, INT3, INT4, INT5) \ |
45 |
| -TRACE_POSTGRESQL_SORT_START(INT1, INT2, INT3, INT4, INT5, false) |
46 |
| -#else |
47 |
| -#define RUM_SORT_START(INT1, INT2, INT3, INT4, INT5) \ |
48 |
| -TRACE_POSTGRESQL_SORT_START(INT1, INT2, INT3, INT4, INT5) |
49 |
| -#endif |
50 |
| - |
51 | 42 | #if PG_VERSION_NUM >= 110000
|
52 | 43 | #define LogicalTapeSetCreate(X) LogicalTapeSetCreate(X, NULL, NULL, 1)
|
53 | 44 | #define LogicalTapeFreeze(X, Y) LogicalTapeFreeze(X, Y, NULL)
|
@@ -745,12 +736,6 @@ rum_tuplesort_begin_rum(int workMem, int nKeys, bool randomAccess,
|
745 | 736 |
|
746 | 737 | state->nKeys = nKeys;
|
747 | 738 |
|
748 |
| - RUM_SORT_START(INDEX_SORT, |
749 |
| - false, /* no unique check */ |
750 |
| - state->nKeys, |
751 |
| - workMem, |
752 |
| - randomAccess); |
753 |
| - |
754 | 739 | state->comparetup = comparetup_rum;
|
755 | 740 | state->copytup = copytup_rum;
|
756 | 741 | state->writetup = writetup_rum;
|
@@ -778,12 +763,6 @@ rum_tuplesort_begin_rumitem(int workMem, FmgrInfo *cmp)
|
778 | 763 | "begin rumitem sort: workMem = %d", workMem);
|
779 | 764 | #endif
|
780 | 765 |
|
781 |
| - RUM_SORT_START(INDEX_SORT, |
782 |
| - false, /* no unique check */ |
783 |
| - 2, |
784 |
| - workMem, |
785 |
| - false); |
786 |
| - |
787 | 766 | state->cmp = cmp;
|
788 | 767 | state->comparetup = comparetup_rumitem;
|
789 | 768 | state->copytup = copytup_rumitem;
|
@@ -841,15 +820,6 @@ rum_tuplesort_end(RumTuplesortstate *state)
|
841 | 820 | elog(LOG, "internal sort ended, %ld KB used: %s",
|
842 | 821 | spaceUsed, pg_rusage_show(&state->ru_start));
|
843 | 822 | }
|
844 |
| - |
845 |
| - TRACE_POSTGRESQL_SORT_DONE(state->tapeset != NULL, spaceUsed); |
846 |
| -#else |
847 |
| - |
848 |
| - /* |
849 |
| - * If you disabled TRACE_SORT, you can still probe sort__done, but you |
850 |
| - * ain't getting space-used stats. |
851 |
| - */ |
852 |
| - TRACE_POSTGRESQL_SORT_DONE(state->tapeset != NULL, 0L); |
853 | 823 | #endif
|
854 | 824 |
|
855 | 825 | /* Free any execution state created for CLUSTER case */
|
|
0 commit comments