diff options
author | Pavan Deolasee | 2015-05-29 09:38:01 +0000 |
---|---|---|
committer | Pavan Deolasee | 2015-05-29 09:38:01 +0000 |
commit | 7a27604da9beb8eb6c1052aa59a85173eb506711 (patch) | |
tree | 5b036988b47463cb5109685c5d6d20519bfd1cc7 | |
parent | 8f541f3d31dbc0b5646714a5eae576377e1511b1 (diff) |
Remove coordinator name tracking from GTM transaction info structure
This was not in use and hence removed
-rw-r--r-- | src/gtm/common/gtm_serialize.c | 36 | ||||
-rw-r--r-- | src/gtm/common/gtm_serialize_debug.c | 1 | ||||
-rw-r--r-- | src/gtm/main/gtm_standby.c | 1 | ||||
-rw-r--r-- | src/gtm/main/gtm_txn.c | 6 | ||||
-rw-r--r-- | src/include/gtm/gtm_txn.h | 1 |
5 files changed, 0 insertions, 45 deletions
diff --git a/src/gtm/common/gtm_serialize.c b/src/gtm/common/gtm_serialize.c index 28448c5541..6f9f97aae4 100644 --- a/src/gtm/common/gtm_serialize.c +++ b/src/gtm/common/gtm_serialize.c @@ -178,9 +178,6 @@ gtm_get_transactioninfo_size(GTM_TransactionInfo *data) len += sizeof(bool); /* gti_in_use */ len += sizeof(GlobalTransactionId); /* gti_gxid */ len += sizeof(GTM_TransactionStates); /* gti_state */ - len += sizeof(uint32); /* used to store length of gti_coordname*/ - if (data->gti_coordname != NULL) - len += strlen(data->gti_coordname); /* gti_coordname */ len += sizeof(GlobalTransactionId); /* gti_xmin */ len += sizeof(GTM_IsolationLevel); /* gti_isolevel */ len += sizeof(bool); /* gti_readonly */ @@ -240,22 +237,6 @@ gtm_serialize_transactioninfo(GTM_TransactionInfo *data, char *buf, size_t bufle memcpy(buf + len, &(data->gti_state), sizeof(GTM_TransactionStates)); len += sizeof(GTM_TransactionStates); - /* GTM_TransactionInfo.gti_coordname */ - if (data->gti_coordname != NULL) - { - namelen = (uint32)strlen(data->gti_coordname); - memcpy(buf + len, &namelen, sizeof(uint32)); - len += sizeof(uint32); - memcpy(buf + len, data->gti_coordname, namelen); - len += namelen; - } - else - { - namelen = 0; - memcpy(buf + len, &namelen, sizeof(uint32)); - len += sizeof(uint32); - } - /* GTM_TransactionInfo.gti_xmin */ memcpy(buf + len, &(data->gti_xmin), sizeof(GlobalTransactionId)); len += sizeof(GlobalTransactionId); @@ -365,23 +346,6 @@ gtm_deserialize_transactioninfo(GTM_TransactionInfo *data, const char *buf, size memcpy(&(data->gti_state), buf + len, sizeof(GTM_TransactionStates)); len += sizeof(GTM_TransactionStates); - /* GTM_TransactionInfo.gti_coordname */ - { - uint32 ll; - - memcpy(&ll, buf+len, sizeof(uint32)); - len += sizeof(uint32); - if (ll > 0) - { - data->gti_coordname = genAllocTop(sizeof(ll+1)); /* Should be allocated at TopMostContext */ - memcpy(data->gti_coordname, buf+len, ll); - data->gti_coordname[ll] = 0; - len += ll; - } - else - data->gti_coordname = NULL; - } - /* GTM_TransactionInfo.gti_xmin */ memcpy(&(data->gti_xmin), buf + len, sizeof(GlobalTransactionId)); len += sizeof(GlobalTransactionId); diff --git a/src/gtm/common/gtm_serialize_debug.c b/src/gtm/common/gtm_serialize_debug.c index eb5e6ce28f..a5d6e47425 100644 --- a/src/gtm/common/gtm_serialize_debug.c +++ b/src/gtm/common/gtm_serialize_debug.c @@ -40,7 +40,6 @@ dump_transactioninfo_elog(GTM_TransactionInfo *txn) elog(LOG, "gti_in_use: %d", txn->gti_in_use); elog(LOG, "gti_gxid: %d", txn->gti_gxid); elog(LOG, "gti_state: %d", txn->gti_state); - elog(LOG, "gti_coordname: %s", txn->gti_coordname); elog(LOG, "gti_xmin: %d", txn->gti_xmin); elog(LOG, "gti_isolevel: %d", txn->gti_isolevel); elog(LOG, "gti_readonly: %d", txn->gti_readonly); diff --git a/src/gtm/main/gtm_standby.c b/src/gtm/main/gtm_standby.c index 9cc2006ed7..6b30fd77bd 100644 --- a/src/gtm/main/gtm_standby.c +++ b/src/gtm/main/gtm_standby.c @@ -143,7 +143,6 @@ gtm_standby_restore_gxid(void) GTMTransactions.gt_transactions_array[handle].gti_in_use = txn.gt_transactions_array[i].gti_in_use; GTMTransactions.gt_transactions_array[handle].gti_gxid = txn.gt_transactions_array[i].gti_gxid; GTMTransactions.gt_transactions_array[handle].gti_state = txn.gt_transactions_array[i].gti_state; - GTMTransactions.gt_transactions_array[handle].gti_coordname = txn.gt_transactions_array[i].gti_coordname; 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; diff --git a/src/gtm/main/gtm_txn.c b/src/gtm/main/gtm_txn.c index fc09c4e5dc..b923559a67 100644 --- a/src/gtm/main/gtm_txn.c +++ b/src/gtm/main/gtm_txn.c @@ -822,7 +822,6 @@ init_GTM_TransactionInfo(GTM_TransactionInfo *gtm_txninfo, gtm_txninfo->gti_gxid = InvalidGlobalTransactionId; gtm_txninfo->gti_xmin = InvalidGlobalTransactionId; gtm_txninfo->gti_state = GTM_TXN_STARTING; - gtm_txninfo->gti_coordname = (coord_name ? pstrdup(coord_name) : NULL); gtm_txninfo->gti_isolevel = isolevel; gtm_txninfo->gti_readonly = readonly; @@ -869,11 +868,6 @@ clean_GTM_TransactionInfo(GTM_TransactionInfo *gtm_txninfo) gtm_txninfo->gti_in_use = false; gtm_txninfo->gti_snapshot_set = false; - if (gtm_txninfo->gti_coordname) - { - pfree(gtm_txninfo->gti_coordname); - gtm_txninfo->gti_coordname = NULL; - } if (gtm_txninfo->gti_gid) { pfree(gtm_txninfo->gti_gid); diff --git a/src/include/gtm/gtm_txn.h b/src/include/gtm/gtm_txn.h index 1dc855e6bc..db162bc1ae 100644 --- a/src/include/gtm/gtm_txn.h +++ b/src/include/gtm/gtm_txn.h @@ -116,7 +116,6 @@ typedef struct GTM_TransactionInfo bool gti_in_use; GlobalTransactionId gti_gxid; GTM_TransactionStates gti_state; - char *gti_coordname; GlobalTransactionId gti_xmin; GTM_IsolationLevel gti_isolevel; bool gti_readonly; |