From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Rajnoha Date: Thu, 11 Aug 2022 11:06:14 +0000 (GMT) Subject: main - report: fix pe_start column type from NUM to SIZ Message-ID: <20220811110614.59E4B3858C74@sourceware.org> List-Id: To: lvm-devel@redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=fc8fda641781d0978ff22ad0a59d5a19b5e450e1 Commit: fc8fda641781d0978ff22ad0a59d5a19b5e450e1 Parent: b318c9c20f40be1583e7d0751a733f77be173012 Author: Peter Rajnoha AuthorDate: Fri Aug 5 11:02:25 2022 +0200 Committer: Peter Rajnoha CommitterDate: Thu Aug 11 11:10:11 2022 +0200 report: fix pe_start column type from NUM to SIZ The 'pe_start' column was incorrectly marked as being of type NUM. This was not correct as pe_start is actually of type SIZ, which means it can have a size suffix and hence it's not a pure numeric value. Proper column type is important for selection to work correctly, so we can also do comparisons while using suffixes. This is also important for new "json_std" output format which does not put double quotes around pure numeric values. With pe_start incorrectly marked as NUM instead of SIZ, this produced invalid JSON output like '"pe_start" = 1.00m' because it contained the 'm' (or other) size suffix. If properly marked as SIZ, this is then put in double quotes like '"pe_start" = "1.00m"'. --- lib/report/columns.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/report/columns.h b/lib/report/columns.h index 7e450dace..d702635d2 100644 --- a/lib/report/columns.h +++ b/lib/report/columns.h @@ -191,7 +191,7 @@ FIELD(LABEL, label, NUM, "PExtVsn", type, 0, pvextvsn, pv_ext_vsn, "PV header ex /* * PVS type fields */ -FIELD(PVS, pv, NUM, "1st PE", pe_start, 7, size64, pe_start, "Offset to the start of data on the underlying device.", 0) +FIELD(PVS, pv, SIZ, "1st PE", pe_start, 7, size64, pe_start, "Offset to the start of data on the underlying device.", 0) FIELD(PVS, pv, SIZ, "PSize", id, 0, pvsize, pv_size, "Size of PV in current units.", 0) FIELD(PVS, pv, SIZ, "PFree", id, 0, pvfree, pv_free, "Total amount of unallocated space in current units.", 0) FIELD(PVS, pv, SIZ, "Used", id, 0, pvused, pv_used, "Total amount of allocated space in current units.", 0)