Merge branch 'PGPROEE10_pg_upgrade_merge' into PGPROEE10_DEV

Author: vbwagner

contrib/pageinspect/expected/page.out

@@ -46,7 +46,7 @@ SELECT get_raw_page('test1', 0) = get_raw_page('test1', 'main', 0);
 SELECT pagesize, version FROM page_header(get_raw_page('test1', 0));
  pagesize | version 
 ----------+---------
-     8192 |       4
+     8192 |     254
 (1 row)
 
 SELECT page_checksum(get_raw_page('test1', 0), 0) IS NOT NULL AS silly_checksum_test;

src/backend/access/nbtree/nbtxlog.c

@@ -1010,7 +1010,6 @@ btree_xlog_unlink_page(uint8 info, XLogReaderState *record)
 	_bt_pageinit(page, BufferGetPageSize(buffer));
 	pageop = (BTPageOpaque) PageGetSpecialPointer(page);
 
-	pageop->btpo1.btpo_prev = leftsib;
 	pageop->btpo_next = rightsib;
 	BTP_SET_XACT(pageop, xlrec->btpo_xact);
 	pageop->btpo_flags = BTP_DELETED;

src/backend/access/transam/xlog.c

@@ -42,6 +42,7 @@
 #include "catalog/pg_database.h"
 #include "commands/tablespace.h"
 #include "commands/waitlsn.h"
+#include "common/edition.h"
 #include "common/controldata_utils.h"
 #include "miscadmin.h"
 #include "pgstat.h"
@@ -4421,6 +4422,8 @@ WriteControlFile(void)
 	Assert(sizeof(ControlFile->icu_version) == sizeof(UVersionInfo));
 	u_getVersion(ControlFile->icu_version);
 #endif
+	CONTROLFILE_SET_OLDVERSION(ControlFile, 0);
+	CONTROLFILE_SET_OLDEDITION(ControlFile, PG_UNKNOWN);
 
 	/* Contents are protected with a CRC */
 	INIT_CRC32C(ControlFile->crc);

src/backend/storage/buffer/Makefile

@@ -12,6 +12,6 @@ subdir = src/backend/storage/buffer
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = block_repair.o buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o
+OBJS = block_repair.o buf_table.o buf_init.o bufmgr.o freelist.o heap_convert.o localbuf.o
 
 include $(top_srcdir)/src/backend/common.mk

src/backend/storage/buffer/bufmgr.c

@@ -32,7 +32,6 @@
 
 #include <sys/file.h>
 #include <unistd.h>
-
 #include "access/xlog.h"
 #include "catalog/catalog.h"
 #include "catalog/storage.h"
@@ -432,10 +431,9 @@ ForgetPrivateRefCountEntry(PrivateRefCountEntry *ref)
 )
 
 
-static Buffer ReadBuffer_common(SMgrRelation reln, char relpersistence,
-				  char relkind, ForkNumber forkNum, BlockNumber blockNum,
-				  ReadBufferMode mode, BufferAccessStrategy strategy,
-				  bool *hit);
+static Buffer ReadBuffer_common(Relation reln, SMgrRelation smgr, char relpersistence,
+				  ForkNumber forkNum, BlockNumber blockNum, ReadBufferMode mode,
+				  BufferAccessStrategy strategy, bool *hit);
 static bool PinBuffer(BufferDesc *buf, BufferAccessStrategy strategy);
 static void PinBuffer_Locked(BufferDesc *buf);
 static void UnpinBuffer(BufferDesc *buf, bool fixOwner);
@@ -754,8 +752,7 @@ ReadBufferExtended(Relation reln, ForkNumber forkNum, BlockNumber blockNum,
 	 * miss.
 	 */
 	pgstat_count_buffer_read(reln);
-	buf = ReadBuffer_common(reln->rd_smgr, reln->rd_rel->relpersistence,
-							reln->rd_rel->relkind,
+	buf = ReadBuffer_common(reln, reln->rd_smgr, reln->rd_rel->relpersistence,
 							forkNum, blockNum, mode, strategy, &hit);
 	if (hit)
 		pgstat_count_buffer_hit(reln);
@@ -783,9 +780,8 @@ ReadBufferWithoutRelcache(RelFileNode rnode, ForkNumber forkNum,
 
 	Assert(InRecovery || InRepair);
 
-	return ReadBuffer_common(smgr, RELPERSISTENCE_PERMANENT, RELKIND_UNKNOWN,
-							 forkNum, blockNum,
-							 mode, strategy, &hit);
+	return ReadBuffer_common(NULL, smgr, RELPERSISTENCE_PERMANENT, forkNum,
+							 blockNum, mode, strategy, &hit);
 }
 
 
@@ -795,7 +791,7 @@ ReadBufferWithoutRelcache(RelFileNode rnode, ForkNumber forkNum,
  * *hit is set to true if the request was satisfied from shared buffer cache.
  */
 static Buffer
-ReadBuffer_common(SMgrRelation smgr, char relpersistence, char relkind,\
+ReadBuffer_common(Relation reln, SMgrRelation smgr, char relpersistence,
 				  ForkNumber forkNum, BlockNumber blockNum, ReadBufferMode mode,
 				  BufferAccessStrategy strategy, bool *hit)
 {
@@ -831,7 +827,7 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, char relkind,\
 	 * Here we do all the work needed for cache initialization.
 	 */
 	if (isLocalBuf
-		&& relkind == RELKIND_RELATION
+		&& reln->rd_rel->relkind == RELKIND_RELATION
 		&& forkNum == MAIN_FORKNUM)
 	{
 		bool		ttiIsFound;
@@ -1130,6 +1126,16 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, char relkind,\
 										relpath(smgr->smgr_rnode, forkNum))));
 				}
 			}
+
+			if (PageGetPageLayoutVersion(bufBlock) != PG_PAGE_LAYOUT_VERSION)
+			{
+				Buffer	buf = BufferDescriptorGetBuffer(bufHdr);
+
+				/* TODO: Lock is aquired below. Think about it */
+				LWLockAcquire(BufferDescriptorGetContentLock(bufHdr), LW_EXCLUSIVE);
+				convert_page(reln, bufBlock, buf, blockNum);
+				LWLockRelease(BufferDescriptorGetContentLock(bufHdr));
+			}
 		}
 	}