Merge branch 'public_master'

Author: feodor

src/rum_ts_utils.c

@@ -873,7 +873,7 @@ Cover(DocRepresentation *doc, uint32 len, QueryRepresentation *qr,
 
 	memset(qr->operandData, 0, sizeof(qr->operandData[0]) * qr->length);
 
-	ext->p = 0x7fffffff;
+	ext->p = PG_INT32_MAX;
 	ext->q = 0;
 	ptr = doc + ext->pos;
 

src/rumscan.c

@@ -41,6 +41,13 @@ rumbeginscan(Relation rel, int nkeys, int norderbys)
 
 	initRumState(&so->rumstate, scan->indexRelation);
 
+#if PG_VERSION_NUM >= 120000
+	/*
+	 * Starting from PG 12 we need to invalidate result's item pointer. Earlier
+	 * it was done by invalidating scan->xs_ctup by RelationGetIndexScan().
+	 */
+	ItemPointerSetInvalid(&scan->xs_heaptid);
+#endif
 	scan->opaque = so;
 
 	return scan;

src/rumsort.c

@@ -24,7 +24,6 @@
 #include "utils/guc.h"
 #include "utils/logtape.h"
 #include "utils/pg_rusage.h"
-#include "utils/probes.h"
 
 #include "rum.h" /* RumItem */
 
@@ -40,14 +39,6 @@
 #define LogicalTapeRewindForWrite(x, y) LogicalTapeRewind((x), (y), true)
 #endif
 
-#if PG_VERSION_NUM >= 110000
-#define RUM_SORT_START(INT1, INT2, INT3, INT4, INT5) \
-TRACE_POSTGRESQL_SORT_START(INT1, INT2, INT3, INT4, INT5, false)
-#else
-#define RUM_SORT_START(INT1, INT2, INT3, INT4, INT5) \
-TRACE_POSTGRESQL_SORT_START(INT1, INT2, INT3, INT4, INT5)
-#endif
-
 #if PG_VERSION_NUM >= 110000
 #define LogicalTapeSetCreate(X) LogicalTapeSetCreate(X, NULL, NULL, 1)
 #define LogicalTapeFreeze(X, Y) LogicalTapeFreeze(X, Y, NULL)
@@ -57,6 +48,11 @@ TRACE_POSTGRESQL_SORT_START(INT1, INT2, INT3, INT4, INT5)
  * Below are copied definitions from src/backend/utils/sort/tuplesort.c.
  */
 
+/* GUC variables */
+#ifdef TRACE_SORT
+bool		trace_sort = false;
+#endif
+
 typedef struct
 {
 	void	   *tuple;			/* the tuple proper */
@@ -740,12 +736,6 @@ rum_tuplesort_begin_rum(int workMem, int nKeys, bool randomAccess,
 
 	state->nKeys = nKeys;
 
-	RUM_SORT_START(INDEX_SORT,
-				   false,	/* no unique check */
-				   state->nKeys,
-				   workMem,
-				   randomAccess);
-
 	state->comparetup = comparetup_rum;
 	state->copytup = copytup_rum;
 	state->writetup = writetup_rum;
@@ -773,12 +763,6 @@ rum_tuplesort_begin_rumitem(int workMem, FmgrInfo *cmp)
 			 "begin rumitem sort: workMem = %d", workMem);
 #endif
 
-	RUM_SORT_START(INDEX_SORT,
-				   false,	/* no unique check */
-				   2,
-				   workMem,
-				   false);
-
 	state->cmp = cmp;
 	state->comparetup = comparetup_rumitem;
 	state->copytup = copytup_rumitem;
@@ -836,15 +820,6 @@ rum_tuplesort_end(RumTuplesortstate *state)
 			elog(LOG, "internal sort ended, %ld KB used: %s",
 				 spaceUsed, pg_rusage_show(&state->ru_start));
 	}
-
-	TRACE_POSTGRESQL_SORT_DONE(state->tapeset != NULL, spaceUsed);
-#else
-
-	/*
-	 * If you disabled TRACE_SORT, you can still probe sort__done, but you
-	 * ain't getting space-used stats.
-	 */
-	TRACE_POSTGRESQL_SORT_DONE(state->tapeset != NULL, 0L);
 #endif
 
 	/* Free any execution state created for CLUSTER case */