Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

Author: knizhnik

contrib/pg_tsdtm/pg_dtm.c

@@ -489,7 +489,7 @@ bool DtmXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
     static timestamp_t firstReportTime;
     static timestamp_t prevReportTime;
     static timestamp_t totalSleepTime;
-    static timestamp_t mnxSleepTime;
+    static timestamp_t maxSleepTime;
 #endif
     timestamp_t delay = MIN_WAIT_TIMEOUT;
     Assert(xid != InvalidTransactionId);

contrib/pg_tsdtm/tests/deploy/roles/postgres/tasks/main.yml

@@ -83,18 +83,6 @@
 - stat: path={{pg_datadir}}/postmaster.pid
   register: pg_pidfile
 
-# - name: stop postgres if it was running
-#   command: "{{pg_dst}}/bin/pg_ctl stop -w -D {{pg_datadir}}"
-#   environment:
-#     LD_LIBRARY_PATH: "{{pg_dst}}/lib"
-#   when: pg_pidfile.stat.exists
-
-- name: stop postgres if it was running
-  shell: "kill -9 `head -n 1 {{pg_datadir}}/postmaster.pid`"
-  environment:
-    LD_LIBRARY_PATH: "{{pg_dst}}/lib"
-  when: pg_pidfile.stat.exists
-
 - name: remove datadirs on datanodes
   command: "rm -rf {{pg_datadir}}"
   when: pg_destroy_and_init

src/backend/access/transam/clog.c

@@ -93,9 +93,9 @@ static void TransactionIdSetStatusBit(TransactionId xid, XidStatus status,
 static void set_status_by_pages(int nsubxids, TransactionId *subxids,
 					XidStatus status, XLogRecPtr lsn);
 
-void 
+void
 TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
-                           TransactionId *subxids, XidStatus status, XLogRecPtr lsn)
+							TransactionId *subxids, XidStatus status, XLogRecPtr lsn)
 {
 	return TM->SetTransactionStatus(xid, nsubxids, subxids, status, lsn);
 }
@@ -151,7 +151,7 @@ TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
  * but aren't yet in cache, as well as hinting pages not to fall out of
  * cache yet.
  */
-void 
+void
 PgTransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
 					TransactionId *subxids, XidStatus status, XLogRecPtr lsn)
 {

src/backend/access/transam/transam.c

@@ -256,12 +256,12 @@ TransactionIdIsKnownCompleted(TransactionId transactionId)
  * This commit operation is not guaranteed to be atomic, but if not, subxids
  * are correctly marked subcommit first.
  */
-void 
+void
 TransactionIdCommitTree(TransactionId xid, int nxids, TransactionId *xids)
 {
 	TransactionIdSetTreeStatus(xid, nxids, xids,
-                               TRANSACTION_STATUS_COMMITTED,
-                               InvalidXLogRecPtr);
+							   TRANSACTION_STATUS_COMMITTED,
+							   InvalidXLogRecPtr);
 }
 
 /*
@@ -273,7 +273,7 @@ TransactionIdAsyncCommitTree(TransactionId xid, int nxids, TransactionId *xids,
 							 XLogRecPtr lsn)
 {
 	TransactionIdSetTreeStatus(xid, nxids, xids,
-                               TRANSACTION_STATUS_COMMITTED, lsn);
+							   TRANSACTION_STATUS_COMMITTED, lsn);
 }
 
 /*

src/backend/access/transam/xact.c

@@ -1273,9 +1273,8 @@ RecordTransactionCommit(void)
 		/*
 		 * Now we may update the CLOG, if we wrote a COMMIT record above
 		 */
-		if (markXidCommitted) {
+		if (markXidCommitted)
 			TransactionIdCommitTree(xid, nchildren, children);
-		}
 	}
 	else
 	{
@@ -1297,9 +1296,8 @@ RecordTransactionCommit(void)
 		 * XLOG. Instead, we store the LSN up to which the XLOG must be
 		 * flushed before the CLOG may be updated.
 		 */
-		if (markXidCommitted) {
+		if (markXidCommitted)
 			TransactionIdAsyncCommitTree(xid, nchildren, children, XactLastRecEnd);
-		}
 	}
 
 	/*
@@ -5372,7 +5370,7 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
 		 * recovered. It's unlikely but it's good to be safe.
 		 */
 		TransactionIdAsyncCommitTree(
-				xid, parsed->nsubxacts, parsed->subxacts, lsn);
+							  xid, parsed->nsubxacts, parsed->subxacts, lsn);
 
 		/*
 		 * We must mark clog before we update the ProcArray.
@@ -5399,6 +5397,7 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
 		 */
 		StandbyReleaseLockTree(xid, 0, NULL);
 	}
+
 	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
 	{
 		/* recover apply progress */
@@ -5609,8 +5608,9 @@ xact_redo(XLogReaderState *record)
 		elog(PANIC, "xact_redo: unknown op code %u", info);
 }
 
-void MarkAsAborted()
+void
+MarkAsAborted()
 {
-    CurrentTransactionState->state = TRANS_INPROGRESS;
-    CurrentTransactionState->blockState = TBLOCK_STARTED;
+	CurrentTransactionState->state = TRANS_INPROGRESS;
+	CurrentTransactionState->blockState = TBLOCK_STARTED;
 }

src/backend/access/transam/xtm.c

@@ -25,7 +25,7 @@ TransactionId PgGetGlobalTransactionId(void)
 
 bool PgDetectGlobalDeadLock(PGPROC* proc)
 {
-    return false;
+	return false;
 }
 
 char const* PgGetTransactionManagerName(void)
@@ -42,7 +42,7 @@ TransactionManager PgTM = {
 	PgTransactionIdIsInProgress,
 	PgGetGlobalTransactionId,
 	PgXidInMVCCSnapshot,
-    PgDetectGlobalDeadLock,
+	PgDetectGlobalDeadLock,
 	PgGetTransactionManagerName
 };
 

src/backend/commands/indexcmds.c

@@ -34,7 +34,6 @@
 #include "commands/tablespace.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
-#include "funcapi.h"
 #include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/planner.h"
@@ -53,9 +52,6 @@
 #include "utils/snapmgr.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
-#include "utils/ruleutils.h"
-#include "executor/executor.h"
-#include "executor/spi.h"
 
 
 /* non-export function prototypes */
@@ -284,160 +280,6 @@ CheckIndexCompatible(Oid oldId,
 	return ret;
 }
 
-static void 
-UpdateIndex(Oid indexRelationId, Node* whereClause)
-{
-	Datum		values[Natts_pg_index];
-	bool		isnull[Natts_pg_index];
-	HeapTuple   oldTuple;
-	HeapTuple   newTuple;
-	Relation	pg_index;
-
-	pg_index = heap_open(IndexRelationId, RowExclusiveLock);
-	oldTuple = SearchSysCacheCopy1(INDEXRELID, ObjectIdGetDatum(indexRelationId));
-	if (!HeapTupleIsValid(oldTuple))
-		elog(ERROR, "cache lookup failed for index %u", indexRelationId);
-
-	heap_deform_tuple(oldTuple, RelationGetDescr(pg_index), values, isnull);
-	values[Anum_pg_index_indpred - 1] = CStringGetTextDatum(nodeToString(whereClause));
-	isnull[Anum_pg_index_indpred - 1] = false;
-	newTuple = heap_form_tuple(RelationGetDescr(pg_index), values, isnull);
-	simple_heap_update(pg_index, &oldTuple->t_self, newTuple);
-	CatalogUpdateIndexes(pg_index, newTuple);
-	heap_freetuple(newTuple);
-	heap_freetuple(oldTuple);
-	heap_close(pg_index, NoLock);
-}
-
-void
-AlterIndex(Oid indexRelationId, IndexStmt *stmt)
-{
-	char* select;
-	Oid heapRelationId;
-	IndexUniqueCheck checkUnique;
-	Datum		values[INDEX_MAX_KEYS];
-	bool		isnull[INDEX_MAX_KEYS];
-	Relation heapRelation;
-	Relation indexRelation;
-    SPIPlanPtr plan;
-    Portal portal;
-	HeapTuple tuple;
-	TupleTableSlot *slot;
-	ItemPointer tupleid;
-	IndexInfo  *indexInfo;
-	EState *estate;
-	Oid	namespaceId;
-	List*       deparseCtx;
-	char*       oldIndexPredicate;
-	char*       newIndexPredicate;
-	char*       relationName;
-
-	Assert(stmt->whereClause);
-	CheckPredicate((Expr *) stmt->whereClause);
-
-	/* Open and lock the parent heap relation */
-	heapRelationId = IndexGetRelation(indexRelationId, false);
-	heapRelation = heap_open(heapRelationId, AccessShareLock);
-
-	/* Open the target index relation */
-	/*	indexRelation = index_open(indexRelationId, RowExclusiveLock); */
-	indexRelation = index_open(indexRelationId, ShareUpdateExclusiveLock);
-	/* indexRelation = index_open(indexRelationId, AccessShareLock); */
-	namespaceId = RelationGetNamespace(indexRelation);
-
-	indexInfo = BuildIndexInfo(indexRelation);
-	Assert(!indexInfo->ii_ExclusionOps);
- 
-	/*
-	 * Generate the constraint and default execution states
-	 */
-	estate = CreateExecutorState();
-
-	checkUnique = indexRelation->rd_index->indisunique ? UNIQUE_CHECK_YES : UNIQUE_CHECK_NO;
-
-	slot = MakeSingleTupleTableSlot(RelationGetDescr(heapRelation));
-	
-	deparseCtx = deparse_context_for(RelationGetRelationName(heapRelation), heapRelationId);
-	relationName = quote_qualified_identifier(get_namespace_name(namespaceId),
-											  get_rel_name(heapRelationId)),
-	newIndexPredicate = deparse_expression(stmt->whereClause, deparseCtx, false, false);
-	oldIndexPredicate = indexInfo->ii_Predicate 
-		? deparse_expression((Node*)make_ands_explicit(indexInfo->ii_Predicate), deparseCtx, false, false)
-		: "true";
-
-    SPI_connect();
-
-	select = psprintf("select * from  %s where %s and not (%s) limit 1",
-					  relationName, oldIndexPredicate, newIndexPredicate);
-	if (SPI_execute(select, true, 1) != SPI_OK_SELECT) 
-	{
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_CURSOR_STATE),
-				 errmsg("Failed to execute statement %s", select)));		
-	}	
-	if (SPI_processed) { 
-		/* There is no way in Postgres to exclude records from index, so we have to completelty rebuild index in this case */
-		bool relpersistence = indexRelation->rd_rel->relpersistence;
-		index_close(indexRelation, NoLock);
-		indexRelation->rd_indpred = make_ands_implicit((Expr *) stmt->whereClause);
-		indexRelation = NULL;
-		UpdateIndex(indexRelationId, stmt->whereClause);
-		reindex_index(indexRelationId, false, relpersistence, 0);		
-	} else { 
-		select = psprintf("select * from %s where %s and not (%s)",
-						  relationName, newIndexPredicate, oldIndexPredicate);
-		plan = SPI_prepare(select, 0, NULL); 
-		if (plan == NULL) {
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_CURSOR_STATE),
-					 errmsg("Failed to preapre statement %s", select)));
-		} 
-		portal = SPI_cursor_open(NULL, plan, NULL, NULL, true);
-		if (portal == NULL) { 
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_CURSOR_STATE),
-					 errmsg("Failed to open cursor for %s", select)));
-		}	
-		while (true)
-		{
-			SPI_cursor_fetch(portal, true, 1);
-			if (!SPI_processed) { 
-				break;
-			}										
-			tuple = SPI_tuptable->vals[0];
-			tupleid = &tuple->t_data->t_ctid;
-			ExecStoreTuple(tuple, slot, InvalidBuffer, false);
-			
-			FormIndexDatum(indexInfo,
-						   slot,
-						   estate,
-						   values,
-						   isnull);
-			index_insert(indexRelation, /* index relation */
-						 values,	/* array of index Datums */
-						 isnull,	/* null flags */
-						 tupleid,		/* tid of heap tuple */
-						 heapRelation,	/* heap relation */
-						 checkUnique);	/* type of uniqueness check to do */
-			
-			SPI_freetuple(tuple);
-			SPI_freetuptable(SPI_tuptable);
-		}
-		SPI_cursor_close(portal);
-
-		UpdateIndex(indexRelationId, stmt->whereClause);
-	}
-    SPI_finish();
-
-	ExecDropSingleTupleTableSlot(slot);
-	FreeExecutorState(estate);
-
-	heap_close(heapRelation, NoLock);
-	if (indexRelation) {
-		index_close(indexRelation, NoLock);
-	}
-}
-
 /*
  * DefineIndex
  *		Creates a new index.

src/backend/nodes/copyfuncs.c

@@ -3128,7 +3128,6 @@ _copyIndexStmt(const IndexStmt *from)
 	COPY_SCALAR_FIELD(transformed);
 	COPY_SCALAR_FIELD(concurrent);
 	COPY_SCALAR_FIELD(if_not_exists);
-	COPY_SCALAR_FIELD(is_alter);
 
 	return newnode;
 }

src/backend/nodes/equalfuncs.c

@@ -1243,7 +1243,6 @@ _equalIndexStmt(const IndexStmt *a, const IndexStmt *b)
 	COMPARE_SCALAR_FIELD(transformed);
 	COMPARE_SCALAR_FIELD(concurrent);
 	COMPARE_SCALAR_FIELD(if_not_exists);
-	COMPARE_SCALAR_FIELD(is_alter);
 
 	return true;
 }

src/backend/nodes/outfuncs.c

@@ -2191,7 +2191,6 @@ _outIndexStmt(StringInfo str, const IndexStmt *node)
 	WRITE_BOOL_FIELD(transformed);
 	WRITE_BOOL_FIELD(concurrent);
 	WRITE_BOOL_FIELD(if_not_exists);
-	WRITE_BOOL_FIELD(is_alter);
 }
 
 static void