Fix incorrect return value in pg_size_pretty(bigint)

david-rowley · david-rowley · commit 6de3a21bbc06 · 2021-07-09T14:04:40.000+12:00
Due to how pg_size_pretty(bigint) was implemented, it's possible that when given a negative number of bytes that the returning value would not match the equivalent positive return value when given the equivalent positive number of bytes. This was due to two separate issues. 1. The function used bit shifting to convert the number of bytes into larger units. The rounding performed by bit shifting is not the same as dividing. For example -3 >> 1 = -2, but -3 / 2 = -1. These two operations are only equivalent with positive numbers. 2. The half_rounded() macro rounded towards positive infinity. This meant that negative numbers rounded towards zero and positive numbers rounded away from zero. Here we fix #1 by dividing the values instead of bit shifting. We fix #2 by adjusting the half_rounded macro always to round away from zero. Additionally, adjust the pg_size_pretty(numeric) function to be more explicit that it's using division rather than bit shifting. A casual observer might have believed bit shifting was used due to a static function being named numeric_shift_right. However, that function was calculating the divisor from the number of bits and performed division. Here we make that more clear. This change is just cosmetic and does not affect the return value of the numeric version of the function. Here we also add a set of regression tests both versions of pg_size_pretty() which test the values directly before and after the function switches to the next unit. This bug was introduced in 8a1fab3. Prior to that negative values were always displayed in bytes. Author: Dean Rasheed, David Rowley Discussion: https://postgr.es/m/CAEZATCXnNW4HsmZnxhfezR5FuiGgp+mkY4AzcL5eRGO4fuadWg@mail.gmail.com Backpatch-through: 9.6, where the bug was introduced.
diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c
@@ -31,8 +31,8 @@
 #include "utils/relmapper.h"
 #include "utils/syscache.h"
 
-/* Divide by two and round towards positive infinity. */
-#define half_rounded(x)   (((x) + ((x) < 0 ? 0 : 1)) / 2)
+/* Divide by two and round away from zero */
+#define half_rounded(x)   (((x) + ((x) < 0 ? -1 : 1)) / 2)
 
 /* Return physical size of directory contents, or 0 if dir doesn't exist */
 static int64
@@ -542,25 +542,29 @@ pg_size_pretty(PG_FUNCTION_ARGS)
 		snprintf(buf, sizeof(buf), INT64_FORMAT " bytes", size);
 	else
 	{
-		size >>= 9;				/* keep one extra bit for rounding */
+		/*
+		 * We use divide instead of bit shifting so that behavior matches for
+		 * both positive and negative size values.
+		 */
+		size /= (1 << 9);		/* keep one extra bit for rounding */
 		if (Abs(size) < limit2)
 			snprintf(buf, sizeof(buf), INT64_FORMAT " kB",
 					 half_rounded(size));
 		else
 		{
-			size >>= 10;
+			size /= (1 << 10);
 			if (Abs(size) < limit2)
 				snprintf(buf, sizeof(buf), INT64_FORMAT " MB",
 						 half_rounded(size));
 			else
 			{
-				size >>= 10;
+				size /= (1 << 10);
 				if (Abs(size) < limit2)
 					snprintf(buf, sizeof(buf), INT64_FORMAT " GB",
 							 half_rounded(size));
 				else
 				{
-					size >>= 10;
+					size /= (1 << 10);
 					snprintf(buf, sizeof(buf), INT64_FORMAT " TB",
 							 half_rounded(size));
 				}
@@ -621,13 +625,13 @@ numeric_half_rounded(Numeric n)
 }
 
 static Numeric
-numeric_shift_right(Numeric n, unsigned count)
+numeric_truncated_divide(Numeric n, int64 divisor)
 {
 	Datum		d = NumericGetDatum(n);
 	Datum		divisor_numeric;
 	Datum		result;
 
-	divisor_numeric = NumericGetDatum(int64_to_numeric(((int64) 1) << count));
+	divisor_numeric = NumericGetDatum(int64_to_numeric(divisor));
 	result = DirectFunctionCall2(numeric_div_trunc, d, divisor_numeric);
 	return DatumGetNumeric(result);
 }
@@ -650,8 +654,8 @@ pg_size_pretty_numeric(PG_FUNCTION_ARGS)
 	else
 	{
 		/* keep one extra bit for rounding */
-		/* size >>= 9 */
-		size = numeric_shift_right(size, 9);
+		/* size /= (1 << 9) */
+		size = numeric_truncated_divide(size, 1 << 9);
 
 		if (numeric_is_less(numeric_absolute(size), limit2))
 		{
@@ -660,17 +664,18 @@ pg_size_pretty_numeric(PG_FUNCTION_ARGS)
 		}
 		else
 		{
-			/* size >>= 10 */
-			size = numeric_shift_right(size, 10);
+			/* size /= (1 << 10) */
+			size = numeric_truncated_divide(size, 1 << 10);
+
 			if (numeric_is_less(numeric_absolute(size), limit2))
 			{
 				size = numeric_half_rounded(size);
 				result = psprintf("%s MB", numeric_to_cstring(size));
 			}
 			else
 			{
-				/* size >>= 10 */
-				size = numeric_shift_right(size, 10);
+				/* size /= (1 << 10) */
+				size = numeric_truncated_divide(size, 1 << 10);
 
 				if (numeric_is_less(numeric_absolute(size), limit2))
 				{
@@ -679,8 +684,8 @@ pg_size_pretty_numeric(PG_FUNCTION_ARGS)
 				}
 				else
 				{
-					/* size >>= 10 */
-					size = numeric_shift_right(size, 10);
+					/* size /= (1 << 10) */
+					size = numeric_truncated_divide(size, 1 << 10);
 					size = numeric_half_rounded(size);
 					result = psprintf("%s TB", numeric_to_cstring(size));
 				}
diff --git a/src/test/regress/expected/dbsize.out b/src/test/regress/expected/dbsize.out
@@ -35,6 +35,48 @@ SELECT size, pg_size_pretty(size), pg_size_pretty(-1 * size) FROM
  1000000000000000.5 | 909 TB         | -909 TB
 (12 rows)
 
+-- test where units change up
+SELECT size, pg_size_pretty(size), pg_size_pretty(-1 * size) FROM
+    (VALUES (10239::bigint), (10240::bigint),
+            (10485247::bigint), (10485248::bigint),
+            (10736893951::bigint), (10736893952::bigint),
+            (10994579406847::bigint), (10994579406848::bigint),
+            (11258449312612351::bigint), (11258449312612352::bigint)) x(size);
+       size        | pg_size_pretty | pg_size_pretty 
+-------------------+----------------+----------------
+             10239 | 10239 bytes    | -10239 bytes
+             10240 | 10 kB          | -10 kB
+          10485247 | 10239 kB       | -10239 kB
+          10485248 | 10 MB          | -10 MB
+       10736893951 | 10239 MB       | -10239 MB
+       10736893952 | 10 GB          | -10 GB
+    10994579406847 | 10239 GB       | -10239 GB
+    10994579406848 | 10 TB          | -10 TB
+ 11258449312612351 | 10239 TB       | -10239 TB
+ 11258449312612352 | 10240 TB       | -10240 TB
+(10 rows)
+
+SELECT size, pg_size_pretty(size), pg_size_pretty(-1 * size) FROM
+    (VALUES (10239::numeric), (10240::numeric),
+            (10485247::numeric), (10485248::numeric),
+            (10736893951::numeric), (10736893952::numeric),
+            (10994579406847::numeric), (10994579406848::numeric),
+            (11258449312612351::numeric), (11258449312612352::numeric)) x(size);
+       size        | pg_size_pretty | pg_size_pretty 
+-------------------+----------------+----------------
+             10239 | 10239 bytes    | -10239 bytes
+             10240 | 10 kB          | -10 kB
+          10485247 | 10239 kB       | -10239 kB
+          10485248 | 10 MB          | -10 MB
+       10736893951 | 10239 MB       | -10239 MB
+       10736893952 | 10 GB          | -10 GB
+    10994579406847 | 10239 GB       | -10239 GB
+    10994579406848 | 10 TB          | -10 TB
+ 11258449312612351 | 10239 TB       | -10239 TB
+ 11258449312612352 | 10240 TB       | -10240 TB
+(10 rows)
+
+-- pg_size_bytes() tests
 SELECT size, pg_size_bytes(size) FROM
     (VALUES ('1'), ('123bytes'), ('1kB'), ('1MB'), (' 1 GB'), ('1.5 GB '),
             ('1TB'), ('3000 TB'), ('1e6 MB')) x(size);
diff --git a/src/test/regress/sql/dbsize.sql b/src/test/regress/sql/dbsize.sql
@@ -11,6 +11,22 @@ SELECT size, pg_size_pretty(size), pg_size_pretty(-1 * size) FROM
             (1000000000.5::numeric), (1000000000000.5::numeric),
             (1000000000000000.5::numeric)) x(size);
 
+-- test where units change up
+SELECT size, pg_size_pretty(size), pg_size_pretty(-1 * size) FROM
+    (VALUES (10239::bigint), (10240::bigint),
+            (10485247::bigint), (10485248::bigint),
+            (10736893951::bigint), (10736893952::bigint),
+            (10994579406847::bigint), (10994579406848::bigint),
+            (11258449312612351::bigint), (11258449312612352::bigint)) x(size);
+
+SELECT size, pg_size_pretty(size), pg_size_pretty(-1 * size) FROM
+    (VALUES (10239::numeric), (10240::numeric),
+            (10485247::numeric), (10485248::numeric),
+            (10736893951::numeric), (10736893952::numeric),
+            (10994579406847::numeric), (10994579406848::numeric),
+            (11258449312612351::numeric), (11258449312612352::numeric)) x(size);
+
+-- pg_size_bytes() tests
 SELECT size, pg_size_bytes(size) FROM
     (VALUES ('1'), ('123bytes'), ('1kB'), ('1MB'), (' 1 GB'), ('1.5 GB '),
             ('1TB'), ('3000 TB'), ('1e6 MB')) x(size);

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@`
`31`	`31`	`#include "utils/relmapper.h"`
`32`	`32`	`#include "utils/syscache.h"`
`33`	`33`
`34`		`-/* Divide by two and round towards positive infinity. */`
`35`		`-#define half_rounded(x) (((x) + ((x) < 0 ? 0 : 1)) / 2)`
	`34`	`+/* Divide by two and round away from zero */`
	`35`	`+#define half_rounded(x) (((x) + ((x) < 0 ? -1 : 1)) / 2)`
`36`	`36`
`37`	`37`	`/* Return physical size of directory contents, or 0 if dir doesn't exist */`
`38`	`38`	`static int64`
`@@ -542,25 +542,29 @@ pg_size_pretty(PG_FUNCTION_ARGS)`
`542`	`542`	`snprintf(buf, sizeof(buf), INT64_FORMAT " bytes", size);`
`543`	`543`	`else`
`544`	`544`	`{`
`545`		`- size >>= 9; /* keep one extra bit for rounding */`
	`545`	`+ /*`
	`546`	`+ * We use divide instead of bit shifting so that behavior matches for`
	`547`	`+ * both positive and negative size values.`
	`548`	`+ */`
	`549`	`+ size /= (1 << 9); /* keep one extra bit for rounding */`
`546`	`550`	`if (Abs(size) < limit2)`
`547`	`551`	`snprintf(buf, sizeof(buf), INT64_FORMAT " kB",`
`548`	`552`	`half_rounded(size));`
`549`	`553`	`else`
`550`	`554`	`{`
`551`		`- size >>= 10;`
	`555`	`+ size /= (1 << 10);`
`552`	`556`	`if (Abs(size) < limit2)`
`553`	`557`	`snprintf(buf, sizeof(buf), INT64_FORMAT " MB",`
`554`	`558`	`half_rounded(size));`
`555`	`559`	`else`
`556`	`560`	`{`
`557`		`- size >>= 10;`
	`561`	`+ size /= (1 << 10);`
`558`	`562`	`if (Abs(size) < limit2)`
`559`	`563`	`snprintf(buf, sizeof(buf), INT64_FORMAT " GB",`
`560`	`564`	`half_rounded(size));`
`561`	`565`	`else`
`562`	`566`	`{`
`563`		`- size >>= 10;`
	`567`	`+ size /= (1 << 10);`
`564`	`568`	`snprintf(buf, sizeof(buf), INT64_FORMAT " TB",`
`565`	`569`	`half_rounded(size));`
`566`	`570`	`}`
`@@ -621,13 +625,13 @@ numeric_half_rounded(Numeric n)`
`621`	`625`	`}`
`622`	`626`
`623`	`627`	`static Numeric`
`624`		`-numeric_shift_right(Numeric n, unsigned count)`
	`628`	`+numeric_truncated_divide(Numeric n, int64 divisor)`
`625`	`629`	`{`
`626`	`630`	`Datum d = NumericGetDatum(n);`
`627`	`631`	`Datum divisor_numeric;`
`628`	`632`	`Datum result;`
`629`	`633`
`630`		`- divisor_numeric = NumericGetDatum(int64_to_numeric(((int64) 1) << count));`
	`634`	`+ divisor_numeric = NumericGetDatum(int64_to_numeric(divisor));`
`631`	`635`	`result = DirectFunctionCall2(numeric_div_trunc, d, divisor_numeric);`
`632`	`636`	`return DatumGetNumeric(result);`
`633`	`637`	`}`
`@@ -650,8 +654,8 @@ pg_size_pretty_numeric(PG_FUNCTION_ARGS)`
`650`	`654`	`else`
`651`	`655`	`{`
`652`	`656`	`/* keep one extra bit for rounding */`
`653`		`- /* size >>= 9 */`
`654`		`- size = numeric_shift_right(size, 9);`
	`657`	`+ /* size /= (1 << 9) */`
	`658`	`+ size = numeric_truncated_divide(size, 1 << 9);`
`655`	`659`
`656`	`660`	`if (numeric_is_less(numeric_absolute(size), limit2))`
`657`	`661`	`{`
`@@ -660,17 +664,18 @@ pg_size_pretty_numeric(PG_FUNCTION_ARGS)`
`660`	`664`	`}`
`661`	`665`	`else`
`662`	`666`	`{`
`663`		`- /* size >>= 10 */`
`664`		`- size = numeric_shift_right(size, 10);`
	`667`	`+ /* size /= (1 << 10) */`
	`668`	`+ size = numeric_truncated_divide(size, 1 << 10);`
	`669`	`+`
`665`	`670`	`if (numeric_is_less(numeric_absolute(size), limit2))`
`666`	`671`	`{`
`667`	`672`	`size = numeric_half_rounded(size);`
`668`	`673`	`result = psprintf("%s MB", numeric_to_cstring(size));`
`669`	`674`	`}`
`670`	`675`	`else`
`671`	`676`	`{`
`672`		`- /* size >>= 10 */`
`673`		`- size = numeric_shift_right(size, 10);`
	`677`	`+ /* size /= (1 << 10) */`
	`678`	`+ size = numeric_truncated_divide(size, 1 << 10);`
`674`	`679`
`675`	`680`	`if (numeric_is_less(numeric_absolute(size), limit2))`
`676`	`681`	`{`
`@@ -679,8 +684,8 @@ pg_size_pretty_numeric(PG_FUNCTION_ARGS)`
`679`	`684`	`}`
`680`	`685`	`else`
`681`	`686`	`{`
`682`		`- /* size >>= 10 */`
`683`		`- size = numeric_shift_right(size, 10);`
	`687`	`+ /* size /= (1 << 10) */`
	`688`	`+ size = numeric_truncated_divide(size, 1 << 10);`
`684`	`689`	`size = numeric_half_rounded(size);`
`685`	`690`	`result = psprintf("%s TB", numeric_to_cstring(size));`
`686`	`691`	`}`