Commit7761b9f

committed

Use correct datum macros in more tuplesort specialization functions.

Also clarify that ApplySignedSortComparator() is not built on 32-bit machines.Folow-up toc90c165Reviewed-by: David RowleyDiscussion:https://www.postgresql.org/message-id/CAFBsxsFmt4_JUP8XgSJqwaAS9a9s8K8_PvMu%3Dj%3DDfwU%3D8QjNPw%40mail.gmail.com

1 parentd70b95a commit7761b9fCopy full SHA for 7761b9f

File tree

-9

lines changed

-9

lines changed

Lines changed: 6 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ ApplyUnsignedSortComparator(Datum datum1, bool isNull1,`
`262`	`262`	`returncompare;`
`263`	`263`	`}`
`264`	`264`
	`265`	`+#ifSIZEOF_DATUM >=8`
`265`	`266`	`staticinlineint`
`266`	`267`	`ApplySignedSortComparator(Datumdatum1,boolisNull1,`
`267`	`268`	`Datumdatum2,boolisNull2,`
`@@ -287,19 +288,15 @@ ApplySignedSortComparator(Datum datum1, bool isNull1,`
`287`	`288`	`}`
`288`	`289`	`else`
`289`	`290`	`{`
`290`		`-#ifSIZEOF_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`	`returncompare;`
`302`	`298`	`}`
	`299`	`+#endif`
`303`	`300`
`304`	`301`	`staticinlineint`
`305`	`302`	`ApplyInt32SortComparator(Datumdatum1,boolisNull1,`
`@@ -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`	`}`

Comments

(0)