database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Remove use of byte-masking macros in record_image_cmp

Browse Source 
These were introduced in 4cbb646334, but
after further analysis and testing, they should not be necessary and
probably weren't the part of that commit that fixed anything.

Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
This commit is contained in:
Peter Eisentraut
2018-01-23 10:55:40 -05:00
parent 4a3fdbdf76
commit 0b5e33f667
1 changed files with 3 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/backend/utils/adt/rowtypes.c
View File

@ -1467,45 +1467,8 @@ record_image_cmp(FunctionCallInfo fcinfo)
} }
else if (att1->attbyval) else if (att1->attbyval)
{ {
switch (att1->attlen) if (values1[i1] != values2[i2])
{ cmpresult = (values1[i1] < values2[i2]) ? -1 : 1;
case 1:
if (GET_1_BYTE(values1[i1]) !=
GET_1_BYTE(values2[i2]))
{
cmpresult = (GET_1_BYTE(values1[i1]) <
GET_1_BYTE(values2[i2])) ? -1 : 1;
}
break;
case 2:
if (GET_2_BYTES(values1[i1]) !=
GET_2_BYTES(values2[i2]))
{
cmpresult = (GET_2_BYTES(values1[i1]) <
GET_2_BYTES(values2[i2])) ? -1 : 1;
}
break;
case 4:
if (GET_4_BYTES(values1[i1]) !=
GET_4_BYTES(values2[i2]))
{
cmpresult = (GET_4_BYTES(values1[i1]) <
GET_4_BYTES(values2[i2])) ? -1 : 1;
}
break;
#if SIZEOF_DATUM == 8
case 8:
if (GET_8_BYTES(values1[i1]) !=
GET_8_BYTES(values2[i2]))
{
cmpresult = (GET_8_BYTES(values1[i1]) <
GET_8_BYTES(values2[i2])) ? -1 : 1;
}
break;
#endif
default:
Assert(false); /* cannot happen */
}
} }
else else
{ {
@ -1739,29 +1702,7 @@ record_image_eq(PG_FUNCTION_ARGS)
} }
else if (att1->attbyval) else if (att1->attbyval)
{ {
switch (att1->attlen) result = (values1[i1] == values2[i2]);
{
case 1:
result = (GET_1_BYTE(values1[i1]) ==
GET_1_BYTE(values2[i2]));
break;
case 2:
result = (GET_2_BYTES(values1[i1]) ==
GET_2_BYTES(values2[i2]));
break;
case 4:
result = (GET_4_BYTES(values1[i1]) ==
GET_4_BYTES(values2[i2]));
break;
#if SIZEOF_DATUM == 8
case 8:
result = (GET_8_BYTES(values1[i1]) ==
GET_8_BYTES(values2[i2]));
break;
#endif
default:
Assert(false); /* cannot happen */
}
} }
else else
{ {