Fix minor issues with new unicode {de,re}composition code

michaelpq · michaelpq · commit ceaeac54f75f · 2020-11-07T10:15:58.000+09:00
The table generation script would incorrectly complain in the recomposition sorting when matching code points. This would not have caused the generation of an incorrect table. Note that this condition is not reachable yet, but could have been reached with future updates. pg_bswap.h does not need to be included in the frontend.x Author: John Naylor Discussion: https://postgr.es/m/CAFBsxsGWmExpvv=61vtDKCs7+kBbhkwBDL2Ph9CacziFKnV_yw@mail.gmail.com
diff --git a/src/common/unicode/generate-unicode_norm_table.pl b/src/common/unicode/generate-unicode_norm_table.pl
@@ -400,7 +400,7 @@ sub recomp_sort
 	my $bcode = hex($b->{code});
 
 	return -1 if $acode < $bcode;
-	return -1 if $acode > $bcode;
+	return 1  if $acode > $bcode;
 
 	die "found duplicate entries of recomposeable code pairs";
 }
diff --git a/src/common/unicode_norm.c b/src/common/unicode_norm.c
@@ -22,10 +22,10 @@
 #ifndef FRONTEND
 #include "common/unicode_norm_hashfunc.h"
 #include "common/unicode_normprops_table.h"
+#include "port/pg_bswap.h"
 #else
 #include "common/unicode_norm_table.h"
 #endif
-#include "port/pg_bswap.h"
 
 #ifndef FRONTEND
 #define ALLOC(size) palloc(size)

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ sub recomp_sort`
`400`	`400`	`my $bcode = hex($b->{code});`
`401`	`401`
`402`	`402`	`return -1 if $acode < $bcode;`
`403`		`- return -1 if $acode > $bcode;`
	`403`	`+ return 1 if $acode > $bcode;`
`404`	`404`
`405`	`405`	`die "found duplicate entries of recomposeable code pairs";`
`406`	`406`	`}`