Merge remote-tracking branch 'pg/master' into fast2pc

Author: kelvich

configure

@@ -827,6 +827,7 @@ with_python
 with_gssapi
 with_krb_srvnam
 with_pam
+with_bsd_auth
 with_ldap
 with_bonjour
 with_openssl
@@ -1516,6 +1517,7 @@ Optional Packages:
   --with-krb-srvnam=NAME  default service principal name in Kerberos (GSSAPI)
                           [postgres]
   --with-pam              build with PAM support
+  --with-bsd-auth         build with BSD Authentication support
   --with-ldap             build with LDAP support
   --with-bonjour          build with Bonjour support
   --with-openssl          build with OpenSSL support
@@ -5570,6 +5572,41 @@ fi
 $as_echo "$with_pam" >&6; }
 
 
+#
+# BSD AUTH
+#
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with BSD Authentication support" >&5
+$as_echo_n "checking whether to build with BSD Authentication support... " >&6; }
+
+
+
+# Check whether --with-bsd-auth was given.
+if test "${with_bsd_auth+set}" = set; then :
+  withval=$with_bsd_auth;
+  case $withval in
+    yes)
+
+$as_echo "#define USE_BSD_AUTH 1" >>confdefs.h
+
+      ;;
+    no)
+      :
+      ;;
+    *)
+      as_fn_error $? "no argument expected for --with-bsd-auth option" "$LINENO" 5
+      ;;
+  esac
+
+else
+  with_bsd_auth=no
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_bsd_auth" >&5
+$as_echo "$with_bsd_auth" >&6; }
+
+
 #
 # LDAP
 #
@@ -10522,6 +10559,17 @@ fi
 
 done
 
+fi
+
+if test "$with_bsd_auth" = yes ; then
+  ac_fn_c_check_header_mongrel "$LINENO" "bsd_auth.h" "ac_cv_header_bsd_auth_h" "$ac_includes_default"
+if test "x$ac_cv_header_bsd_auth_h" = xyes; then :
+
+else
+  as_fn_error $? "header file <bsd_auth.h> is required for BSD Authentication support" "$LINENO" 5
+fi
+
+
 fi
 
 if test "$with_systemd" = yes ; then

configure.in

@@ -673,6 +673,16 @@ PGAC_ARG_BOOL(with, pam, no,
 AC_MSG_RESULT([$with_pam])
 
 
+#
+# BSD AUTH
+#
+AC_MSG_CHECKING([whether to build with BSD Authentication support])
+PGAC_ARG_BOOL(with, bsd-auth, no,
+              [build with BSD Authentication support],
+              [AC_DEFINE([USE_BSD_AUTH], 1, [Define to 1 to build with BSD Authentication support. (--with-bsd-auth)])])
+AC_MSG_RESULT([$with_bsd_auth])
+
+
 #
 # LDAP
 #
@@ -1269,6 +1279,10 @@ if test "$with_pam" = yes ; then
                                      [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
 fi
 
+if test "$with_bsd_auth" = yes ; then
+  AC_CHECK_HEADER(bsd_auth.h, [], [AC_MSG_ERROR([header file <bsd_auth.h> is required for BSD Authentication support])])
+fi
+
 if test "$with_systemd" = yes ; then
   AC_CHECK_HEADER(systemd/sd-daemon.h, [], [AC_MSG_ERROR([header file <systemd/sd-daemon.h> is required for systemd support])])
 fi

contrib/bloom/blinsert.c

@@ -200,44 +200,47 @@ blinsert(Relation index, Datum *values, bool *isnull,
 
 	/*
 	 * At first, try to insert new tuple to the first page in notFullPage
-	 * array.  If success we don't need to modify the meta page.
+	 * array.  If successful, we don't need to modify the meta page.
 	 */
 	metaBuffer = ReadBuffer(index, BLOOM_METAPAGE_BLKNO);
 	LockBuffer(metaBuffer, BUFFER_LOCK_SHARE);
-	metaData = BloomPageGetMeta(BufferGetPage(metaBuffer));
+	metaData = BloomPageGetMeta(BufferGetPage(metaBuffer, NULL, NULL,
+											  BGP_NO_SNAPSHOT_TEST));
 
 	if (metaData->nEnd > metaData->nStart)
 	{
 		Page		page;
 
 		blkno = metaData->notFullPage[metaData->nStart];
-
 		Assert(blkno != InvalidBlockNumber);
+
+		/* Don't hold metabuffer lock while doing insert */
 		LockBuffer(metaBuffer, BUFFER_LOCK_UNLOCK);
 
 		buffer = ReadBuffer(index, blkno);
 		LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
+
 		state = GenericXLogStart(index);
 		page = GenericXLogRegister(state, buffer, false);
 
 		if (BloomPageAddItem(&blstate, page, itup))
 		{
+			/* Success!  Apply the change, clean up, and exit */
 			GenericXLogFinish(state);
 			UnlockReleaseBuffer(buffer);
 			ReleaseBuffer(metaBuffer);
 			MemoryContextSwitchTo(oldCtx);
 			MemoryContextDelete(insertCtx);
 			return false;
 		}
-		else
-		{
-			GenericXLogAbort(state);
-			UnlockReleaseBuffer(buffer);
-		}
+
+		/* Didn't fit, must try other pages */
+		GenericXLogAbort(state);
+		UnlockReleaseBuffer(buffer);
 	}
 	else
 	{
-		/* First page in notFullPage isn't suitable */
+		/* No entries in notFullPage */
 		LockBuffer(metaBuffer, BUFFER_LOCK_UNLOCK);
 	}
 
@@ -247,20 +250,30 @@ blinsert(Relation index, Datum *values, bool *isnull,
 	 */
 	LockBuffer(metaBuffer, BUFFER_LOCK_EXCLUSIVE);
 
-	state = GenericXLogStart(index);
-	metaPage = GenericXLogRegister(state, metaBuffer, false);
-	metaData = BloomPageGetMeta(metaPage);
-
-	/*
-	 * Iterate over notFullPage array.  Skip page we already tried first.
-	 */
+	/* nStart might have changed while we didn't have lock */
 	nStart = metaData->nStart;
-	if (metaData->nEnd > nStart &&
+
+	/* Skip first page if we already tried it above */
+	if (nStart < metaData->nEnd &&
 		blkno == metaData->notFullPage[nStart])
 		nStart++;
 
-	while (metaData->nEnd > nStart)
+	/*
+	 * This loop iterates for each page we try from the notFullPage array, and
+	 * will also initialize a GenericXLogState for the fallback case of having
+	 * to allocate a new page.
+	 */
+	for (;;)
 	{
+		state = GenericXLogStart(index);
+
+		/* get modifiable copy of metapage */
+		metaPage = GenericXLogRegister(state, metaBuffer, false);
+		metaData = BloomPageGetMeta(metaPage);
+
+		if (nStart >= metaData->nEnd)
+			break;				/* no more entries in notFullPage array */
+
 		blkno = metaData->notFullPage[nStart];
 		Assert(blkno != InvalidBlockNumber);
 
@@ -270,6 +283,7 @@ blinsert(Relation index, Datum *values, bool *isnull,
 
 		if (BloomPageAddItem(&blstate, page, itup))
 		{
+			/* Success!  Apply the changes, clean up, and exit */
 			metaData->nStart = nStart;
 			GenericXLogFinish(state);
 			UnlockReleaseBuffer(buffer);
@@ -278,41 +292,41 @@ blinsert(Relation index, Datum *values, bool *isnull,
 			MemoryContextDelete(insertCtx);
 			return false;
 		}
-		else
-		{
-			GenericXLogUnregister(state, buffer);
-			UnlockReleaseBuffer(buffer);
-		}
+
+		/* Didn't fit, must try other pages */
+		GenericXLogAbort(state);
+		UnlockReleaseBuffer(buffer);
 		nStart++;
 	}
 
-	GenericXLogAbort(state);
-
 	/*
 	 * Didn't find place to insert in notFullPage array.  Allocate new page.
+	 * (XXX is it good to do this while holding ex-lock on the metapage??)
 	 */
 	buffer = BloomNewBuffer(index);
 
-	state = GenericXLogStart(index);
-	metaPage = GenericXLogRegister(state, metaBuffer, false);
-	metaData = BloomPageGetMeta(metaPage);
 	page = GenericXLogRegister(state, buffer, true);
 	BloomInitPage(page, 0);
 
 	if (!BloomPageAddItem(&blstate, page, itup))
 	{
-		/* We shouldn't be here since we're inserting to the empty page */
+		/* We shouldn't be here since we're inserting to an empty page */
 		elog(ERROR, "could not add new bloom tuple to empty page");
 	}
 
+	/* Reset notFullPage array to contain just this new page */
 	metaData->nStart = 0;
 	metaData->nEnd = 1;
 	metaData->notFullPage[0] = BufferGetBlockNumber(buffer);
 
+	/* Apply the changes, clean up, and exit */
 	GenericXLogFinish(state);
 
 	UnlockReleaseBuffer(buffer);
 	UnlockReleaseBuffer(metaBuffer);
 
+	MemoryContextSwitchTo(oldCtx);
+	MemoryContextDelete(insertCtx);
+
 	return false;
 }

contrib/bloom/blscan.c

@@ -138,7 +138,8 @@ blgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
 									blkno, RBM_NORMAL, bas);
 
 		LockBuffer(buffer, BUFFER_LOCK_SHARE);
-		page = BufferGetPage(buffer);
+		page = BufferGetPage(buffer, scan->xs_snapshot, scan->indexRelation,
+							 BGP_TEST_FOR_OLD_SNAPSHOT);
 
 		if (!BloomPageIsDeleted(page))
 		{

contrib/bloom/blutils.c

@@ -139,11 +139,12 @@ initBloomState(BloomState *state, Relation index)
 		buffer = ReadBuffer(index, BLOOM_METAPAGE_BLKNO);
 		LockBuffer(buffer, BUFFER_LOCK_SHARE);
 
-		page = BufferGetPage(buffer);
+		page = BufferGetPage(buffer, NULL, NULL, BGP_NO_SNAPSHOT_TEST);
 
 		if (!BloomPageIsMeta(page))
 			elog(ERROR, "Relation is not a bloom index");
-		meta = BloomPageGetMeta(BufferGetPage(buffer));
+		meta = BloomPageGetMeta(BufferGetPage(buffer, NULL, NULL,
+											  BGP_NO_SNAPSHOT_TEST));
 
 		if (meta->magickNumber != BLOOM_MAGICK_NUMBER)
 			elog(ERROR, "Relation is not a bloom index");
@@ -315,7 +316,8 @@ BloomNewBuffer(Relation index)
 		 */
 		if (ConditionalLockBuffer(buffer))
 		{
-			Page		page = BufferGetPage(buffer);
+			Page		page = BufferGetPage(buffer, NULL, NULL,
+											 BGP_NO_SNAPSHOT_TEST);
 
 			if (PageIsNew(page))
 				return buffer;	/* OK to use, if never initialized */

contrib/bloom/blvacuum.c

@@ -194,7 +194,7 @@ blvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
 		buffer = ReadBufferExtended(index, MAIN_FORKNUM, blkno,
 									RBM_NORMAL, info->strategy);
 		LockBuffer(buffer, BUFFER_LOCK_SHARE);
-		page = (Page) BufferGetPage(buffer);
+		page = BufferGetPage(buffer, NULL, NULL, BGP_NO_SNAPSHOT_TEST);
 
 		if (BloomPageIsDeleted(page))
 		{