Dead code elimination

Author: kelvich

src/ddd.c

@@ -493,21 +493,6 @@ MtmDetectGlobalDeadLockForXid(TransactionId xid)
 	hasDeadlock = MtmGraphFindLoop(&graph, &gtid);
 	mtm_log(DeadlockCheck, "Distributed deadlock check by backend %d for %u:" XID_FMT " = %d",
 		MyProcPid, gtid.node, gtid.xid, hasDeadlock);
-	// if (!hasDeadlock) {
-	// 	/* There is no deadlock loop in graph, but deadlock can be caused by lack of apply workers: if all of them are busy, then some transactions
-	// 	 * can not be appied just because there are no vacant workers and it cause additional dependency between transactions which is not
-	// 	 * refelected in lock graph
-	// 	 */
-	// 	timestamp_t lastPeekTime = minBgwGetLastPeekTime(&Mtm->pool);
-	// 	if (lastPeekTime != 0 && MtmGetSystemTime() - lastPeekTime >= MSEC_TO_USEC(DeadlockTimeout)) {
-	// 		hasDeadlock = true;
-	// 		MTM_ELOG(WARNING, "Apply workers were blocked more than %d msec",
-	// 			 (int)USEC_TO_MSEC(MtmGetSystemTime() - lastPeekTime));
-	// 	} else {
-	// 		MTM_LOG1("Enable deadlock timeout in backend %d for transaction %llu", MyProcPid, (long64)xid);
-	// 		enable_timeout_after(DEADLOCK_TIMEOUT, DeadlockTimeout);
-	// 	}
-	// }
 
 	if (!hasDeadlock)
 	{

src/ddl.c

@@ -657,7 +657,6 @@ MtmProcessUtilityReceiver(PlannedStmt *pstmt, const char *queryString,
 		{
 			case T_CreateTableSpaceStmt:
 			case T_DropTableSpaceStmt:
-			// case T_VacuumStmt:
 				Assert(MtmCapturedDDL == NULL);
 				MtmCapturedDDL = copyObject(parsetree);
 				captured = true;
@@ -1205,11 +1204,6 @@ MtmApplyDDLMessage(const char *messageBody, bool transactional)
 
 		switch (nodeTag(MtmCapturedDDL))
 		{
-			// case T_VacuumStmt:
-			// {
-			// 	ExecVacuum((VacuumStmt *) MtmCapturedDDL, 1);
-			// 	break;
-			// }
 			case T_IndexStmt:
 			{
 				IndexStmt *indexStmt = (IndexStmt *) MtmCapturedDDL;

src/dmq.c

@@ -269,7 +269,6 @@ dmq_init(int send_timeout)
 	PreviousShmemStartupHook = shmem_startup_hook;
 	shmem_startup_hook = dmq_shmem_startup_hook;
 
-	// on_proc_exit(dmq_at_exit, 0);
 }
 
 static Size
@@ -292,14 +291,6 @@ dmq_toc_size()
  *
  *****************************************************************************/
 
-// static void
-// fe_close(PGconn *conn)
-// {
-// 	PQputCopyEnd(conn, NULL);
-// 	PQflush(conn);
-// 	PQfinish(conn);
-// }
-
 static int
 fe_send(PGconn *conn, char *msg, size_t len)
 {
@@ -448,9 +439,7 @@ dmq_sender_main(Datum main_arg)
 
 					if (ret < 0)
 					{
-						// Assert(PQstatus(conns[conn_id].pgconn) != CONNECTION_OK);
 						conns[conn_id].state = Idle;
-						// DeleteWaitEvent(set, conns[conn_id].pos);
 
 						mtm_log(DmqStateFinal,
 								"[DMQ] failed to send message to %s: %s",
@@ -568,8 +557,6 @@ dmq_sender_main(Datum main_arg)
 					if (ret < 0)
 					{
 						conns[conn_id].state = Idle;
-						// DeleteWaitEvent(set, conns[conn_id].pos);
-						// Assert(PQstatus(conns[i].pgconn) != CONNECTION_OK);
 
 						mtm_log(DmqStateFinal,
 								"[DMQ] failed to send heartbeat to %s: %s",
@@ -1205,7 +1192,6 @@ ensure_outq_handle()
 	if (dmq_local.mq_outh != NULL)
 		return;
 
-	// Assert(dmq_state->handle != DSM_HANDLE_INVALID);
 	seg = dsm_attach(dmq_state->out_dsm);
 	if (seg == NULL)
 		ereport(ERROR,
@@ -1223,8 +1209,6 @@ ensure_outq_handle()
 	outq = shm_toc_lookup(toc, MyProc->pgprocno, false);
 	shm_mq_set_sender(outq, MyProc);
 
-	// elog(LOG, "XXXshm_mq_set_sender %d", MyProc->pgprocno);
-
 	oldctx = MemoryContextSwitchTo(TopMemoryContext);
 	dmq_local.mq_outh = shm_mq_attach(outq, seg, NULL);
 	MemoryContextSwitchTo(oldctx);
@@ -1431,7 +1415,6 @@ dmq_detach_receiver(char *sender_name)
 
 	if (dmq_local.inhandles[handle_id].dsm_seg)
 	{
-		// dsm_unpin_mapping(dmq_local.inhandles[handle_id].dsm_seg);
 		dsm_detach(dmq_local.inhandles[handle_id].dsm_seg);
 		dmq_local.inhandles[handle_id].dsm_seg =  NULL;
 	}
@@ -1542,7 +1525,6 @@ dmq_pop(DmqSenderId *sender_id, StringInfo msg, uint64 mask)
 					*sender_id = i;
 					return false;
 				}
-				// mtm_log(ERROR, "[DMQ] dmq_pop: failed to reattach");
 			}
 		}
 

src/multimaster.c

@@ -600,9 +600,6 @@ mtm_init_cluster(PG_FUNCTION_ARGS)
 	PGconn	  **peer_conns;
 	StringInfoData local_query;
 
-	// if (!check_config())
-	// 	mtm_log(ERROR, "Multimaster config is not ok, refusing to work");
-
 	/* parse array with peer connstrings */
 	Assert(ARR_ELEMTYPE(peers_arr) == TEXTOID);
 	Assert(ARR_NDIM(peers_arr) == 1);

src/pglogical_apply.c

@@ -487,20 +487,6 @@ process_remote_begin(StringInfo s, GlobalTransactionId *gtid)
 
 	suppress_internal_consistency_checks = true;
 
-	// AcceptInvalidationMessages();
-	// if (!receiver_mtm_cfg_valid)
-	// {
-	// 	if (receiver_mtm_cfg)
-	// 		pfree(receiver_mtm_cfg);
-
-	// 	receiver_mtm_cfg = MtmLoadConfig();
-
-	// 	if (receiver_mtm_cfg->my_node_id == 0)
-	// 		proc_exit(0);
-
-	// 	receiver_mtm_cfg_valid = true;
-	// }
-
 	return true;
 }
 

src/pglogical_receiver.c

@@ -780,7 +780,6 @@ pglogical_receiver_main(Datum main_arg)
 					{
 						int64 now = feGetCurrentTimestamp();
 
-						// MtmUpdateLsnMapping(nodeId, walEnd);
 						/* Leave if feedback is not sent properly */
 						sendFeedback(conn, now, nodeId);
 					}