Use correct datum macros in more tuplesort specialization functions.

j-naylor · j-naylor · commit 7761b9faabae · 2022-05-12T09:20:32.000+07:00
Also clarify that ApplySignedSortComparator() is not built on 32-bit machines. Folow-up to c90c165 Reviewed-by: David Rowley Discussion: https://www.postgresql.org/message-id/CAFBsxsFmt4_JUP8XgSJqwaAS9a9s8K8_PvMu%3Dj%3DDfwU%3D8QjNPw%40mail.gmail.com
diff --git a/src/include/utils/sortsupport.h b/src/include/utils/sortsupport.h
@@ -262,6 +262,7 @@ ApplyUnsignedSortComparator(Datum datum1, bool isNull1,
 	return compare;
 }
 
+#if SIZEOF_DATUM >= 8
 static inline int
 ApplySignedSortComparator(Datum datum1, bool isNull1,
 						  Datum datum2, bool isNull2,
@@ -287,19 +288,15 @@ ApplySignedSortComparator(Datum datum1, bool isNull1,
 	}
 	else
 	{
-#if SIZEOF_DATUM == 8
-		compare = (int64) datum1 < (int64) datum2 ? -1 :
-			(int64) datum1 > (int64) datum2 ? 1 : 0;
-#else
-		compare = (int32) datum1 < (int32) datum2 ? -1 :
-			(int32) datum1 > (int32) datum2 ? 1 : 0;
-#endif
+		compare = DatumGetInt64(datum1) < DatumGetInt64(datum2) ? -1 :
+			DatumGetInt64(datum1) > DatumGetInt64(datum2) ? 1 : 0;
 		if (ssup->ssup_reverse)
 			INVERT_COMPARE_RESULT(compare);
 	}
 
 	return compare;
 }
+#endif
 
 static inline int
 ApplyInt32SortComparator(Datum datum1, bool isNull1,
@@ -326,8 +323,8 @@ ApplyInt32SortComparator(Datum datum1, bool isNull1,
 	}
 	else
 	{
-		compare = (int32) datum1 < (int32) datum2 ? -1 :
-			(int32) datum1 > (int32) datum2 ? 1 : 0;
+		compare = DatumGetInt32(datum1) < DatumGetInt32(datum2) ? -1 :
+			DatumGetInt32(datum1) > DatumGetInt32(datum2) ? 1 : 0;
 		if (ssup->ssup_reverse)
 			INVERT_COMPARE_RESULT(compare);
 	}

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ ApplyUnsignedSortComparator(Datum datum1, bool isNull1,`
`262`	`262`	`return compare;`
`263`	`263`	`}`
`264`	`264`
	`265`	`+#if SIZEOF_DATUM >= 8`
`265`	`266`	`static inline int`
`266`	`267`	`ApplySignedSortComparator(Datum datum1, bool isNull1,`
`267`	`268`	`Datum datum2, bool isNull2,`
`@@ -287,19 +288,15 @@ ApplySignedSortComparator(Datum datum1, bool isNull1,`
`287`	`288`	`}`
`288`	`289`	`else`
`289`	`290`	`{`
`290`		`-#if SIZEOF_DATUM == 8`
`291`		`- compare = (int64) datum1 < (int64) datum2 ? -1 :`
`292`		`- (int64) datum1 > (int64) datum2 ? 1 : 0;`
`293`		`-#else`
`294`		`- compare = (int32) datum1 < (int32) datum2 ? -1 :`
`295`		`- (int32) datum1 > (int32) datum2 ? 1 : 0;`
`296`		`-#endif`
	`291`	`+ compare = DatumGetInt64(datum1) < DatumGetInt64(datum2) ? -1 :`
	`292`	`+ DatumGetInt64(datum1) > DatumGetInt64(datum2) ? 1 : 0;`
`297`	`293`	`if (ssup->ssup_reverse)`
`298`	`294`	`INVERT_COMPARE_RESULT(compare);`
`299`	`295`	`}`
`300`	`296`
`301`	`297`	`return compare;`
`302`	`298`	`}`
	`299`	`+#endif`
`303`	`300`
`304`	`301`	`static inline int`
`305`	`302`	`ApplyInt32SortComparator(Datum datum1, bool isNull1,`
`@@ -326,8 +323,8 @@ ApplyInt32SortComparator(Datum datum1, bool isNull1,`
`326`	`323`	`}`
`327`	`324`	`else`
`328`	`325`	`{`
`329`		`- compare = (int32) datum1 < (int32) datum2 ? -1 :`
`330`		`- (int32) datum1 > (int32) datum2 ? 1 : 0;`
	`326`	`+ compare = DatumGetInt32(datum1) < DatumGetInt32(datum2) ? -1 :`
	`327`	`+ DatumGetInt32(datum1) > DatumGetInt32(datum2) ? 1 : 0;`
`331`	`328`	`if (ssup->ssup_reverse)`
`332`	`329`	`INVERT_COMPARE_RESULT(compare);`
`333`	`330`	`}`