NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit0b5e33f

committed

Remove use of byte-masking macros in record_image_cmp

These were introduced in4cbb646, butafter further analysis and testing, they should not be necessary andprobably weren't the part of that commit that fixed anything.Reviewed-by: Michael Paquier <michael.paquier@gmail.com>

1 parent4a3fdbd commit0b5e33fCopy full SHA for 0b5e33f

File tree

1 file changed

-62

lines changed

src/backend/utils/adt
- rowtypes.c

1 file changed

-62

lines changed

`‎src/backend/utils/adt/rowtypes.c`

Lines changed: 3 additions & 62 deletions

Original file line number	Diff line number	Diff line change
`@@ -1467,45 +1467,8 @@ record_image_cmp(FunctionCallInfo fcinfo)`
`1467`	`1467`	`}`
`1468`	`1468`	`elseif (att1->attbyval)`
`1469`	`1469`	`{`
`1470`		`-switch (att1->attlen)`
`1471`		`-{`
`1472`		`-case1:`
`1473`		`-if (GET_1_BYTE(values1[i1])!=`
`1474`		`-GET_1_BYTE(values2[i2]))`
`1475`		`-{`
`1476`		`-cmpresult= (GET_1_BYTE(values1[i1])<`
`1477`		`-GET_1_BYTE(values2[i2])) ?-1 :1;`
`1478`		`-}`
`1479`		`-break;`
`1480`		`-case2:`
`1481`		`-if (GET_2_BYTES(values1[i1])!=`
`1482`		`-GET_2_BYTES(values2[i2]))`
`1483`		`-{`
`1484`		`-cmpresult= (GET_2_BYTES(values1[i1])<`
`1485`		`-GET_2_BYTES(values2[i2])) ?-1 :1;`
`1486`		`-}`
`1487`		`-break;`
`1488`		`-case4:`
`1489`		`-if (GET_4_BYTES(values1[i1])!=`
`1490`		`-GET_4_BYTES(values2[i2]))`
`1491`		`-{`
`1492`		`-cmpresult= (GET_4_BYTES(values1[i1])<`
`1493`		`-GET_4_BYTES(values2[i2])) ?-1 :1;`
`1494`		`-}`
`1495`		`-break;`
`1496`		`-#ifSIZEOF_DATUM==8`
`1497`		`-case8:`
`1498`		`-if (GET_8_BYTES(values1[i1])!=`
`1499`		`-GET_8_BYTES(values2[i2]))`
`1500`		`-{`
`1501`		`-cmpresult= (GET_8_BYTES(values1[i1])<`
`1502`		`-GET_8_BYTES(values2[i2])) ?-1 :1;`
`1503`		`-}`
`1504`		`-break;`
`1505`		`-#endif`
`1506`		`-default:`
`1507`		`-Assert(false);/* cannot happen */`
`1508`		`-}`
	`1470`	`+if (values1[i1]!=values2[i2])`
	`1471`	`+cmpresult= (values1[i1]<values2[i2]) ?-1 :1;`
`1509`	`1472`	`}`
`1510`	`1473`	`else`
`1511`	`1474`	`{`
`@@ -1739,29 +1702,7 @@ record_image_eq(PG_FUNCTION_ARGS)`
`1739`	`1702`	`}`
`1740`	`1703`	`elseif (att1->attbyval)`
`1741`	`1704`	`{`
`1742`		`-switch (att1->attlen)`
`1743`		`-{`
`1744`		`-case1:`
`1745`		`-result= (GET_1_BYTE(values1[i1])==`
`1746`		`-GET_1_BYTE(values2[i2]));`
`1747`		`-break;`
`1748`		`-case2:`
`1749`		`-result= (GET_2_BYTES(values1[i1])==`
`1750`		`-GET_2_BYTES(values2[i2]));`
`1751`		`-break;`
`1752`		`-case4:`
`1753`		`-result= (GET_4_BYTES(values1[i1])==`
`1754`		`-GET_4_BYTES(values2[i2]));`
`1755`		`-break;`
`1756`		`-#ifSIZEOF_DATUM==8`
`1757`		`-case8:`
`1758`		`-result= (GET_8_BYTES(values1[i1])==`
`1759`		`-GET_8_BYTES(values2[i2]));`
`1760`		`-break;`
`1761`		`-#endif`
`1762`		`-default:`
`1763`		`-Assert(false);/* cannot happen */`
`1764`		`-}`
	`1705`	`+result= (values1[i1]==values2[i2]);`
`1765`	`1706`	`}`
`1766`	`1707`	`else`
`1767`	`1708`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0b5e33f

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/rowtypes.c`

0 commit comments