Fix 64-bit constants.

Alexander Korotkov · Alexander Korotkov · commit d2554c37c310 · 2016-11-21T14:23:37.000+03:00
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
@@ -905,7 +905,7 @@ gistproperty(Oid index_oid, int attno,
 								 ObjectIdGetDatum(opcintype),
 								 ObjectIdGetDatum(opcintype),
 								 Int16GetDatum(procno));
-	isnull = false;
+	*isnull = false;
 
 	return true;
 }
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
@@ -57,6 +57,7 @@
 #include "storage/fd.h"
 #include "storage/shmem.h"
 #include "miscadmin.h"
+#include "utils/builtins.h"
 
 
 #define SlruFileName(ctl, path, seg) \
diff --git a/src/backend/access/transam/subtrans.c b/src/backend/access/transam/subtrans.c
@@ -253,9 +253,6 @@ StartupSUBTRANS(TransactionId oldestActiveXID)
 	{
 		(void) ZeroSUBTRANSPage(startPage);
 		startPage++;
-		/* must account for wraparound */
-		if (startPage > TransactionIdToPage(MaxTransactionId))
-			startPage = 0;
 	}
 	(void) ZeroSUBTRANSPage(startPage);
 
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
@@ -207,7 +207,7 @@ ExecCheckHeapTupleVisible(EState *estate,
 		 * visible to our snapshot.  (This would happen, for example, if
 		 * conflicting keys are proposed for insertion in a single command.)
 		 */
-		if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmin(tuple->t_data)))
+		if (!TransactionIdIsCurrentTransactionId(HeapTupleGetXmin(tuple)))
 			ereport(ERROR,
 					(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 			 errmsg("could not serialize access due to concurrent update")));
diff --git a/src/include/access/multixact.h b/src/include/access/multixact.h
@@ -20,13 +20,13 @@
  * and epoch of the first segment, so we start assigning multixact values from
  * 2.
  */
-#define InvalidMultiXactId	((MultiXactId) 0)
-#define FirstMultiXactId	((MultiXactId) 1)
-#define MaxMultiXactId		((MultiXactId) 0xFFFFFFFF)
+#define InvalidMultiXactId	UINT64CONST(0)
+#define FirstMultiXactId	UINT64CONST(1)
+#define MaxMultiXactId		UINT64CONST(0xFFFFFFFFFFFFFFFF)
 
 #define MultiXactIdIsValid(multi) ((multi) != InvalidMultiXactId)
 
-#define MaxMultiXactOffset	((MultiXactOffset) 0xFFFFFFFF)
+#define MaxMultiXactOffset	UINT64CONST(0xFFFFFFFFFFFFFFFF)
 
 /* Number of SLRU buffers to use for multixact */
 #define NUM_MXACTOFFSET_BUFFERS		8
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
@@ -28,11 +28,11 @@
  * Note: if you need to change it, you must change pg_class.h as well.
  * ----------------
  */
-#define InvalidTransactionId		((TransactionId) 0)
-#define BootstrapTransactionId		((TransactionId) 1)
-#define FrozenTransactionId			((TransactionId) 2)
-#define FirstNormalTransactionId	((TransactionId) 3)
-#define MaxTransactionId			((TransactionId) 0xFFFFFFFFFFFFFFFF)
+#define InvalidTransactionId		UINT64CONST(0)
+#define BootstrapTransactionId		UINT64CONST(1)
+#define FrozenTransactionId			UINT64CONST(2)
+#define FirstNormalTransactionId	UINT64CONST(3)
+#define MaxTransactionId			UINT64CONST(0xFFFFFFFFFFFFFFFF)
 #define MaxShortTransactionId		((TransactionId) 0x7FFFFFFF)
 
 /* ----------------

Original file line number	Diff line number	Diff line change
`@@ -905,7 +905,7 @@ gistproperty(Oid index_oid, int attno,`
`905`	`905`	`ObjectIdGetDatum(opcintype),`
`906`	`906`	`ObjectIdGetDatum(opcintype),`
`907`	`907`	`Int16GetDatum(procno));`
`908`		`- isnull = false;`
	`908`	`+ *isnull = false;`
`909`	`909`
`910`	`910`	`return true;`
`911`	`911`	`}`
Original file line number	Diff line number	Diff line change
`@@ -253,9 +253,6 @@ StartupSUBTRANS(TransactionId oldestActiveXID)`
`253`	`253`	`{`
`254`	`254`	`(void) ZeroSUBTRANSPage(startPage);`
`255`	`255`	`startPage++;`
`256`		`- /* must account for wraparound */`
`257`		`- if (startPage > TransactionIdToPage(MaxTransactionId))`
`258`		`- startPage = 0;`
`259`	`256`	`}`
`260`	`257`	`(void) ZeroSUBTRANSPage(startPage);`
`261`	`258`