Change on-disk representation of NUMERIC datatype so that the sign_dscale

tglsfdc · tglsfdc · commit f828f878e96b · 2007-09-25T22:21:55.000Z
word comes before the weight instead of after.  This will allow future
binary-compatible extension of the representation to support compact formats,
as discussed on pgsql-hackers around 2007/06/18.  The reason to do it now is
that we've already pretty well broken any chance of simple in-place upgrade
from 8.2 to 8.3, but it's possible that 8.3 to 8.4 (or whenever we get around
to squeezing NUMERIC) could otherwise be data-compatible.
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.428 2007/09/25 20:03:38 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.429 2007/09/25 22:21:55 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	200709241
+#define CATALOG_VERSION_NO	200709251
 
 #endif
diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1998-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/utils/numeric.h,v 1.24 2007/02/27 23:48:10 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/numeric.h,v 1.25 2007/09/25 22:21:55 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -63,14 +63,14 @@
 typedef struct NumericData
 {
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	int16		n_weight;		/* Weight of 1st digit	*/
 	uint16		n_sign_dscale;	/* Sign + display scale */
+	int16		n_weight;		/* Weight of 1st digit	*/
 	char		n_data[1];		/* Digits (really array of NumericDigit) */
 } NumericData;
 
 typedef NumericData *Numeric;
 
-#define NUMERIC_HDRSZ	(VARHDRSZ + sizeof(int16) + sizeof(uint16))
+#define NUMERIC_HDRSZ	(VARHDRSZ + sizeof(uint16) + sizeof(int16))
 
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`38`	`38`	`* Portions Copyright (c) 1994, Regents of the University of California`
`39`	`39`	`*`
`40`		`- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.428 2007/09/25 20:03:38 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.429 2007/09/25 22:21:55 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`*-------------------------------------------------------------------------`
`43`	`43`	`*/`
`@@ -53,6 +53,6 @@`
`53`	`53`	`*/`
`54`	`54`
`55`	`55`	`/* yyyymmddN */`
`56`		`-#define CATALOG_VERSION_NO 200709241`
	`56`	`+#define CATALOG_VERSION_NO 200709251`
`57`	`57`
`58`	`58`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* Copyright (c) 1998-2007, PostgreSQL Global Development Group`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/include/utils/numeric.h,v 1.24 2007/02/27 23:48:10 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/include/utils/numeric.h,v 1.25 2007/09/25 22:21:55 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -63,14 +63,14 @@`
`63`	`63`	`typedef struct NumericData`
`64`	`64`	`{`
`65`	`65`	`int32 vl_len_; /* varlena header (do not touch directly!) */`
`66`		`- int16 n_weight; /* Weight of 1st digit */`
`67`	`66`	`uint16 n_sign_dscale; /* Sign + display scale */`
	`67`	`+ int16 n_weight; /* Weight of 1st digit */`
`68`	`68`	`char n_data[1]; /* Digits (really array of NumericDigit) */`
`69`	`69`	`} NumericData;`
`70`	`70`
`71`	`71`	`typedef NumericData *Numeric;`
`72`	`72`
`73`		`-#define NUMERIC_HDRSZ (VARHDRSZ + sizeof(int16) + sizeof(uint16))`
	`73`	`+#define NUMERIC_HDRSZ (VARHDRSZ + sizeof(uint16) + sizeof(int16))`
`74`	`74`
`75`	`75`
`76`	`76`	`/*`