Fix oversight in backpatch of 6cae9d2

akorotkov · akorotkov · commit 2f0434e8e96f · 2019-09-19T23:39:26.000+03:00
During backpatch of 6cae9d2 Float8GetDatum() was accidentally removed. This commit turns it back. Reported-by: Erik Rijkers Discussion: https://postgr.es/m/6d51305e1159241cabee132f7efc7eff%40xs4all.nl Author: Tom Lane Backpatch-through: from 11 to 9.5
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
@@ -577,7 +577,7 @@ getNextNearest(IndexScanDesc scan)
 					if (!scan->xs_orderbynulls[i])
 						pfree(DatumGetPointer(scan->xs_orderbyvals[i]));
 #endif
-					scan->xs_orderbyvals[i] = item->distances[i].value;
+					scan->xs_orderbyvals[i] = Float8GetDatum(item->distances[i].value);
 					scan->xs_orderbynulls[i] = item->distances[i].isnull;
 				}
 				else if (so->orderByTypes[i] == FLOAT4OID)

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ getNextNearest(IndexScanDesc scan)`
`577`	`577`	`if (!scan->xs_orderbynulls[i])`
`578`	`578`	`pfree(DatumGetPointer(scan->xs_orderbyvals[i]));`
`579`	`579`	`#endif`
`580`		`- scan->xs_orderbyvals[i] = item->distances[i].value;`
	`580`	`+ scan->xs_orderbyvals[i] = Float8GetDatum(item->distances[i].value);`
`581`	`581`	`scan->xs_orderbynulls[i] = item->distances[i].isnull;`
`582`	`582`	`}`
`583`	`583`	`else if (so->orderByTypes[i] == FLOAT4OID)`