Use puttuple_common function from vanilla tuplesort

pashkinelfe · pashkinelfe · commit f608c366f98c · 2021-11-29T19:07:06.000+04:00
diff --git a/src/rumsort.c b/src/rumsort.c
@@ -65,7 +65,6 @@ static int	comparetup_rumitem(const SortTuple *a, const SortTuple *b,
 static void copytup_rum(RumTuplesortstate * state, SortTuple *stup, void *tup);
 static void copytup_rumitem(RumTuplesortstate * state, SortTuple *stup, void *tup);
 static void *rum_tuplesort_getrum_internal(RumTuplesortstate * state, bool forward, bool *should_free);
-static void rum_tuplesort_putrum_internal(RumTuplesortstate * state, void *item);
 
 static int
 compare_rum_itempointer(ItemPointerData p1, ItemPointerData p2)
@@ -370,33 +369,16 @@ rum_tuplesort_get_memorycontext(RumTuplesortstate * state)
 	return state->sortcontext;
 }
 
-static void
-rum_tuplesort_putrum_internal(RumTuplesortstate * state, void *item)
-{
-	MemoryContext oldcontext = MemoryContextSwitchTo(state->sortcontext);
-	SortTuple	stup;
-
-	/*
-	 * Copy the given tuple into memory we control, and decrease availMem.
-	 * Then call the common code.
-	 */
-	COPYTUP(state, &stup, item);
-
-	puttuple_common(state, &stup);
-
-	MemoryContextSwitchTo(oldcontext);
-}
-
 void
-rum_tuplesort_putrum(RumTuplesortstate * state, RumSortItem * item)
+rum_tuplesort_putrum(RumTuplesortstate *state, RumSortItem *item)
 {
-	rum_tuplesort_putrum_internal(state, item);
+	tuplesort_puttupleslot(state, (TupleTableSlot *) item);
 }
 
 void
-rum_tuplesort_putrumitem(RumTuplesortstate * state, RumScanItem * item)
+rum_tuplesort_putrumitem(RumTuplesortstate *state, RumScanItem *item)
 {
-	rum_tuplesort_putrum_internal(state, item);
+	tuplesort_puttupleslot(state, (TupleTableSlot *) item);
 }
 
 void
