prevent extra-copy of RumSortItem

feodor · feodor · commit 8114a676a471 · 2016-05-18T02:12:12.000+03:00
diff --git a/rumget.c b/rumget.c
@@ -2216,7 +2216,9 @@ insertScanItem(RumScanOpaque so, bool recheck)
 	RumSortItem *item;
 	int i, j;
 
-	item = (RumSortItem *)palloc(RumSortItemSize(so->norderbys));
+	item = (RumSortItem *)
+		MemoryContextAlloc(rum_tuplesort_get_memorycontext(so->sortstate),
+						   RumSortItemSize(so->norderbys));
 	item->iptr = so->iptr;
 	item->recheck = recheck;
 
@@ -2264,7 +2266,6 @@ insertScanItem(RumScanOpaque so, bool recheck)
 		j++;
 	}
 	rum_tuplesort_putrum(so->sortstate, item);
-	pfree(item);
 }
 
 bool
diff --git a/rumsort.c b/rumsort.c
@@ -911,6 +911,12 @@ rum_tuplesort_begin_common(int workMem, bool randomAccess)
 	return state;
 }
 
+MemoryContext
+rum_tuplesort_get_memorycontext(Tuplesortstate *state)
+{
+	return state->sortcontext;
+}
+
 Tuplesortstate *
 rum_tuplesort_begin_heap(TupleDesc tupDesc,
 					 int nkeys, AttrNumber *attNums,
@@ -1536,15 +1542,12 @@ rum_tuplesort_putrum(Tuplesortstate *state, RumSortItem *item)
 {
 	MemoryContext oldcontext = MemoryContextSwitchTo(state->sortcontext);
 	SortTuple	stup;
-	RumSortItem *itemCopy = palloc(RumSortItemSize(state->nKeys));
-
-	memcpy(itemCopy, item, RumSortItemSize(state->nKeys));
 
 	/*
 	 * Copy the given tuple into memory we control, and decrease availMem.
 	 * Then call the common code.
 	 */
-	COPYTUP(state, &stup, (void *) itemCopy);
+	COPYTUP(state, &stup, (void *) item);
 
 	puttuple_common(state, &stup);
 
diff --git a/rumsort.h b/rumsort.h
@@ -67,6 +67,7 @@ typedef struct
 
 #define RumSortItemSize(nKeys) (offsetof(RumSortItem,data)+(nKeys)*sizeof(float8))
 
+extern MemoryContext rum_tuplesort_get_memorycontext(Tuplesortstate *state);
 extern Tuplesortstate *rum_tuplesort_begin_heap(TupleDesc tupDesc,
 					 int nkeys, AttrNumber *attNums,
 					 Oid *sortOperators, Oid *sortCollations,
