Merge branch 'PGPROEE9_6' into PGPROEE9_6_sha2_scram_port_v3_task_CORE-416

vbwagner · vbwagner · commit fb32615d118c · 2016-12-05T17:48:42.000+03:00
diff --git a/contrib/pgpro_scheduler/src/cron_string.h b/contrib/pgpro_scheduler/src/cron_string.h
@@ -41,7 +41,11 @@ typedef struct {
 } cron_ent_t;
 
 void destroyCronEnt(cron_ent_t *);
-void _cps_set_error(int num, const char *message, ...) __attribute__ ((format (gnu_printf, 2, 3)));;
+void _cps_set_error(int num, const char *message, ...) 
+#ifdef __GNUC__
+__attribute__ ((format (gnu_printf, 2, 3)))
+#endif
+;;
 char *get_cps_error(void);
 int _cps_string_has(char *str, char c);
 char *_cps_append_string(char *str, char *to_add);
diff --git a/contrib/pgpro_scheduler/src/scheduler_job.h b/contrib/pgpro_scheduler/src/scheduler_job.h
@@ -30,7 +30,11 @@ typedef struct {
 job_t *init_scheduler_job(job_t *j);
 job_t *get_expired_jobs(char *nodename, int *n, int *is_error);
 job_t *get_jobs_to_do(char *nodename, int *n, int *is_error);
-job_t *set_job_error(job_t *j, const char *fmt, ...) __attribute__ ((format (gnu_printf, 2, 3)));;
+job_t *set_job_error(job_t *j, const char *fmt, ...)
+#ifdef __GNUC__
+__attribute__ ((format (gnu_printf, 2, 3)));
+#endif
+;
 int move_job_to_log(job_t *j, bool status);
 void destroy_job(job_t *j, int selfdestroy);
 
diff --git a/contrib/rum/src/rum.h b/contrib/rum/src/rum.h
@@ -495,7 +495,7 @@ extern void rumPrepareEntryScan(RumBtree btree, OffsetNumber attnum,
 					RumState * rumstate);
 extern void rumEntryFillRoot(RumBtree btree, Buffer root, Buffer lbuf, Buffer rbuf,
 				 Page page, Page lpage, Page rpage);
-extern IndexTuple rumPageGetLinkItup(Buffer buf, Page page);
+extern IndexTuple rumPageGetLinkItup(RumBtree btree, Buffer buf, Page page);
 extern void rumReadTuple(RumState * rumstate, OffsetNumber attnum,
 			 IndexTuple itup, RumKey * items);
 extern void rumReadTuplePointers(RumState * rumstate, OffsetNumber attnum,
diff --git a/contrib/rum/src/rumentrypage.c b/contrib/rum/src/rumentrypage.c
@@ -65,7 +65,8 @@ rumReadTuplePointers(RumState * rumstate, OffsetNumber attnum,
  * block number is inserted into t_tid.
  */
 static IndexTuple
-RumFormInteriorTuple(IndexTuple itup, Page page, BlockNumber childblk)
+RumFormInteriorTuple(RumBtree btree, IndexTuple itup, Page page,
+					 BlockNumber childblk)
 {
 	IndexTuple	nitup;
 	RumNullCategory category;
@@ -92,10 +93,10 @@ RumFormInteriorTuple(IndexTuple itup, Page page, BlockNumber childblk)
 	/* Now insert the correct downlink */
 	RumSetDownlink(nitup, childblk);
 
-	category = RumGetNullCategory(itup);
-	if (category == RUM_CAT_NULL_KEY || category == RUM_CAT_EMPTY_ITEM ||
-		category == RUM_CAT_NULL_ITEM)
+	rumtuple_get_key(btree->rumstate, itup, &category);
+	if (category != RUM_CAT_NORM_KEY)
 	{
+		Assert(IndexTupleHasNulls(itup));
 		nitup->t_info |= INDEX_NULL_MASK;
 		RumSetNullCategory(nitup, category);
 	}
@@ -487,7 +488,7 @@ entrySplitPage(RumBtree btree, Buffer lbuf, Buffer rbuf,
 		ptr += MAXALIGN(IndexTupleSize(itup));
 	}
 
-	btree->entry = RumFormInteriorTuple(leftrightmost, newlPage,
+	btree->entry = RumFormInteriorTuple(btree, leftrightmost, newlPage,
 										BufferGetBlockNumber(lbuf));
 
 	btree->rightblkno = BufferGetBlockNumber(rbuf);
@@ -499,13 +500,13 @@ entrySplitPage(RumBtree btree, Buffer lbuf, Buffer rbuf,
  * return newly allocated rightmost tuple
  */
 IndexTuple
-rumPageGetLinkItup(Buffer buf, Page page)
+rumPageGetLinkItup(RumBtree btree, Buffer buf, Page page)
 {
 	IndexTuple	itup,
 				nitup;
 
 	itup = getRightMostTuple(page);
-	nitup = RumFormInteriorTuple(itup, page, BufferGetBlockNumber(buf));
+	nitup = RumFormInteriorTuple(btree, itup, page, BufferGetBlockNumber(buf));
 
 	return nitup;
 }
@@ -520,12 +521,12 @@ rumEntryFillRoot(RumBtree btree, Buffer root, Buffer lbuf, Buffer rbuf,
 {
 	IndexTuple	itup;
 
-	itup = rumPageGetLinkItup(lbuf, lpage);
+	itup = rumPageGetLinkItup(btree, lbuf, lpage);
 	if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, false, false) == InvalidOffsetNumber)
 		elog(ERROR, "failed to add item to index root page");
 	pfree(itup);
 
-	itup = rumPageGetLinkItup(rbuf, rpage);
+	itup = rumPageGetLinkItup(btree, rbuf, rpage);
 	if (PageAddItem(page, (Item) itup, IndexTupleSize(itup), InvalidOffsetNumber, false, false) == InvalidOffsetNumber)
 		elog(ERROR, "failed to add item to index root page");
 	pfree(itup);
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
@@ -202,7 +202,7 @@ SimpleLruInit(SlruCtl ctl, const char *name, int nslots, int nlsns,
 		shared->page_dirty = (bool *) (ptr + offset);
 		offset += MAXALIGN(nslots * sizeof(bool));
 		shared->page_number = (int64 *) (ptr + offset);
-		offset += MAXALIGN(nslots * sizeof(int));
+		offset += MAXALIGN(nslots * sizeof(int64));
 		shared->page_lru_count = (int *) (ptr + offset);
 		offset += MAXALIGN(nslots * sizeof(int));
 
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
@@ -1387,7 +1387,11 @@ transferCheckControlData(Archive *fout, const char *transfer_dir, bool isRestore
 	}
 	else
 	{
+#ifdef __GNUC__		
 		char dumpedInfo[strlen(serverInfo)];
+#else	
+		char dumpedInfo[1024];
+#endif		
 		/*
 		 * In restore mode read info from pg_control in transfer_dir
 		 * and compare it with the result of select. In case of any
diff --git a/src/include/pgtime.h b/src/include/pgtime.h
@@ -70,7 +70,7 @@ extern size_t pg_strftime(char *s, size_t max, const char *format,
 
 /* these functions and variables are in pgtz.c */
 
-extern pg_tz *session_timezone;
+extern PGDLLIMPORT pg_tz *session_timezone;
 extern pg_tz *log_timezone;
 
 extern void pg_timezone_initialize(void);

Original file line number	Diff line number	Diff line change
`@@ -1387,7 +1387,11 @@ transferCheckControlData(Archive fout, const char transfer_dir, bool isRestore`
`1387`	`1387`	`}`
`1388`	`1388`	`else`
`1389`	`1389`	`{`
	`1390`	`+#ifdef __GNUC__`
`1390`	`1391`	`char dumpedInfo[strlen(serverInfo)];`
	`1392`	`+#else`
	`1393`	`+ char dumpedInfo[1024];`
	`1394`	`+#endif`
`1391`	`1395`	`/*`
`1392`	`1396`	`* In restore mode read info from pg_control in transfer_dir`
`1393`	`1397`	`* and compare it with the result of select. In case of any`