Rename gti_backend_id to gti_proxy_client_id which is a better description of

what it holds

6 files changed, 16 insertions, 16 deletions

diff --git a/src/gtm/common/gtm_serialize.c b/src/gtm/common/gtm_serialize.c
index 8fdc3a17aa..28448c5541 100644
--- a/src/gtm/common/gtm_serialize.c
+++ b/src/gtm/common/gtm_serialize.c
@@ -184,7 +184,7 @@ gtm_get_transactioninfo_size(GTM_TransactionInfo *data)
 	len += sizeof(GlobalTransactionId);		/* gti_xmin */
 	len += sizeof(GTM_IsolationLevel);		/* gti_isolevel */
 	len += sizeof(bool);				/* gti_readonly */
-	len += sizeof(GTMProxy_ConnID);			/* gti_backend_id */
+	len += sizeof(GTMProxy_ConnID);			/* gti_proxy_client_id */
 	len += sizeof(uint32);				/* gti_nodestring length */
 	if (data->nodestring != NULL)
 		len += strlen(data->nodestring);
@@ -268,8 +268,8 @@ gtm_serialize_transactioninfo(GTM_TransactionInfo *data, char *buf, size_t bufle
 	memcpy(buf + len, &(data->gti_readonly), sizeof(bool));
 	len += sizeof(bool);
 
-	/* GTM_TransactionInfo.gti_backend_id */
-	memcpy(buf + len, &(data->gti_backend_id), sizeof(GTMProxy_ConnID));
+	/* GTM_TransactionInfo.gti_proxy_client_id */
+	memcpy(buf + len, &(data->gti_proxy_client_id), sizeof(GTMProxy_ConnID));
 	len += sizeof(GTMProxy_ConnID);
 
 	/* GTM_TransactionInfo.nodestring */
@@ -394,8 +394,8 @@ gtm_deserialize_transactioninfo(GTM_TransactionInfo *data, const char *buf, size
 	memcpy(&(data->gti_readonly), buf + len, sizeof(bool));
 	len += sizeof(bool);
 
-	/* GTM_TransactionInfo.gti_backend_id */
-	memcpy(&(data->gti_backend_id), buf + len, sizeof(GTMProxy_ConnID));
+	/* GTM_TransactionInfo.gti_proxy_client_id */
+	memcpy(&(data->gti_proxy_client_id), buf + len, sizeof(GTMProxy_ConnID));
 	len += sizeof(GTMProxy_ConnID);
 
 	/* GTM_TransactionInfo.gti_nodestring */
diff --git a/src/gtm/common/gtm_serialize_debug.c b/src/gtm/common/gtm_serialize_debug.c
index 7832c4ee5a..eb5e6ce28f 100644
--- a/src/gtm/common/gtm_serialize_debug.c
+++ b/src/gtm/common/gtm_serialize_debug.c
@@ -44,7 +44,7 @@ dump_transactioninfo_elog(GTM_TransactionInfo *txn)
 	elog(LOG, "gti_xmin: %d", txn->gti_xmin);
 	elog(LOG, "gti_isolevel: %d", txn->gti_isolevel);
 	elog(LOG, "gti_readonly: %d", txn->gti_readonly);
-	elog(LOG, "gti_backend_id: %d", txn->gti_backend_id);
+	elog(LOG, "gti_proxy_client_id: %d", txn->gti_proxy_client_id);
 	elog(LOG, "gti_nodestring: %s", txn->nodestring);
 	elog(LOG, "gti_gid: %s", txn->gti_gid);
 
diff --git a/src/gtm/main/gtm_standby.c b/src/gtm/main/gtm_standby.c
index 758701395f..9cc2006ed7 100644
--- a/src/gtm/main/gtm_standby.c
+++ b/src/gtm/main/gtm_standby.c
@@ -147,7 +147,7 @@ gtm_standby_restore_gxid(void)
 		GTMTransactions.gt_transactions_array[handle].gti_xmin = txn.gt_transactions_array[i].gti_xmin;
 		GTMTransactions.gt_transactions_array[handle].gti_isolevel = txn.gt_transactions_array[i].gti_isolevel;
 		GTMTransactions.gt_transactions_array[handle].gti_readonly = txn.gt_transactions_array[i].gti_readonly;
-		GTMTransactions.gt_transactions_array[handle].gti_backend_id = txn.gt_transactions_array[i].gti_backend_id;
+		GTMTransactions.gt_transactions_array[handle].gti_proxy_client_id = txn.gt_transactions_array[i].gti_proxy_client_id;
 
 		if (txn.gt_transactions_array[i].nodestring == NULL )
 			GTMTransactions.gt_transactions_array[handle].nodestring = NULL;
diff --git a/src/gtm/main/gtm_txn.c b/src/gtm/main/gtm_txn.c
index 80be45c798..065a391321 100644
--- a/src/gtm/main/gtm_txn.c
+++ b/src/gtm/main/gtm_txn.c
@@ -318,7 +318,7 @@ GTM_RemoveAllTransInfos(uint32 client_id, int backend_id)
 			(gtm_txninfo->gti_state != GTM_TXN_PREPARED) &&
 			(gtm_txninfo->gti_state != GTM_TXN_PREPARE_IN_PROGRESS) &&
 			(GTM_CLIENT_ID_EQ(gtm_txninfo->gti_client_id, client_id)) &&
-			((gtm_txninfo->gti_backend_id == backend_id) || (backend_id == -1)))
+			((gtm_txninfo->gti_proxy_client_id == backend_id) || (backend_id == -1)))
 		{
 			/* remove the entry */
 			GTMTransactions.gt_open_transactions = gtm_list_delete_cell(GTMTransactions.gt_open_transactions, cell, prev);
@@ -331,7 +331,7 @@ GTM_RemoveAllTransInfos(uint32 client_id, int backend_id)
 
 			elog(DEBUG1, "GTM_RemoveAllTransInfos: removing transaction id %u, %u:%u %d:%d",
 					gtm_txninfo->gti_gxid, gtm_txninfo->gti_client_id,
-					client_id, gtm_txninfo->gti_backend_id, backend_id);
+					client_id, gtm_txninfo->gti_proxy_client_id, backend_id);
 			/*
 			 * Now mark the transaction as aborted and mark the structure as not-in-use
 			 */
@@ -846,7 +846,7 @@ init_GTM_TransactionInfo(GTM_TransactionInfo *gtm_txninfo,
 	 * irrespective of whether the remote client is a GTM proxy or a PG
 	 * backend.
 	 *
-	 * gti_backend_id: is the identifier assigned by the GTM proxy to its
+	 * gti_proxy_client_id: is the identifier assigned by the GTM proxy to its
 	 * client. Proxy sends us this identifier and we track it in the list of
 	 * open transactions. If a backend disconnects from the proxy, it sends us
 	 * a MSG_BACKEND_DISCONNECT message, along with the backend identifier. As
@@ -854,7 +854,7 @@ init_GTM_TransactionInfo(GTM_TransactionInfo *gtm_txninfo,
 	 * the backend.
 	 */ 
 	gtm_txninfo->gti_client_id = client_id;
-	gtm_txninfo->gti_backend_id = connid;
+	gtm_txninfo->gti_proxy_client_id = connid;
 }
 
 
diff --git a/src/gtm/test/test_serialize.c b/src/gtm/test/test_serialize.c
index eab15af6cf..8d0bde372e 100644
--- a/src/gtm/test/test_serialize.c
+++ b/src/gtm/test/test_serialize.c
@@ -78,7 +78,7 @@ build_dummy_gtm_transactioninfo()
   data = (GTM_TransactionInfo *)malloc( sizeof(GTM_TransactionInfo) );
 
   data->gti_handle = 3;
-  data->gti_backend_id = 13;
+  data->gti_proxy_client_id = 13;
   data->gti_datanodecount = 0;
   data->gti_datanodes = NULL;
   data->gti_coordcount = 0;
@@ -144,7 +144,7 @@ test_transactioninfo_1(void)
   printf("deserialized.\n");
 
   _ASSERT(data2->gti_handle==3);
-  _ASSERT(data2->gti_backend_id==13);
+  _ASSERT(data2->gti_proxy_client_id==13);
   _ASSERT(data2->gti_datanodecount==3);
   _ASSERT(data2->gti_coordcount==5);
   _ASSERT(data2->gti_current_snapshot.sn_xmin==128);
@@ -221,9 +221,9 @@ test_transactions_1(void)
   printf("gt_lastslot=%d\n",
 	 data2->gt_lastslot);
 
-  printf("gti_handle=%d, gti_backend_id=%d\n", 
+  printf("gti_handle=%d, gti_proxy_client_id=%d\n", 
 	 data2->gt_transactions_array[0].gti_handle,
-	 data2->gt_transactions_array[0].gti_backend_id);
+	 data2->gt_transactions_array[0].gti_proxy_client_id);
 
   TEARDOWN();
 
diff --git a/src/include/gtm/gtm_txn.h b/src/include/gtm/gtm_txn.h
index 2b338d570d..1dc855e6bc 100644
--- a/src/include/gtm/gtm_txn.h
+++ b/src/include/gtm/gtm_txn.h
@@ -120,7 +120,7 @@ typedef struct GTM_TransactionInfo
 	GlobalTransactionId		gti_xmin;
 	GTM_IsolationLevel		gti_isolevel;
 	bool					gti_readonly;
-	GTMProxy_ConnID			gti_backend_id;
+	GTMProxy_ConnID			gti_proxy_client_id;
 	char					*nodestring; /* List of nodes prepared */
 	char					*gti_gid;