external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move databaseOid from SharedConnStatsHashKey to SharedConnStatsHashEntry

pull/7286/head
ivyazmitinov 2023-10-05 15:50:20 +07:00
parent edcdbe67b1
commit b2051bffd7
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/distributed/connection/shared_connection_stats.c
View File

@ -68,18 +68,13 @@ typedef struct SharedConnStatsHashKey
*/ */
char hostname[MAX_NODE_LENGTH]; char hostname[MAX_NODE_LENGTH];
int32 port; int32 port;
/*
* Given that citus.shared_max_pool_size can be defined per database, we
* should keep track of shared connections per database.
*/
Oid databaseOid;
} SharedConnStatsHashKey; } SharedConnStatsHashKey;
/* hash entry for per worker stats */ /* hash entry for per worker stats */
typedef struct SharedConnStatsHashEntry typedef struct SharedConnStatsHashEntry
{ {
SharedConnStatsHashKey key; SharedConnStatsHashKey key;
Oid databaseOid;
int connectionCount; int connectionCount;
} SharedConnStatsHashEntry; } SharedConnStatsHashEntry;
@ -169,7 +164,7 @@ StoreAllRemoteConnectionStats(Tuplestorestate *tupleStore, TupleDesc tupleDescri
memset(values, 0, sizeof(values)); memset(values, 0, sizeof(values));
memset(isNulls, false, sizeof(isNulls)); memset(isNulls, false, sizeof(isNulls));
char *databaseName = get_database_name(connectionEntry->key.databaseOid); char *databaseName = get_database_name(connectionEntry->databaseOid);
if (databaseName == NULL) if (databaseName == NULL)
{ {
/* database might have been dropped */ /* database might have been dropped */
@ -308,7 +303,6 @@ TryToIncrementSharedConnectionCounter(const char *hostname, int port)
} }
connKey.port = port; connKey.port = port;
connKey.databaseOid = MyDatabaseId;
/* /*
* Handle adaptive connection management for the local node slightly different * Handle adaptive connection management for the local node slightly different
@ -363,6 +357,7 @@ TryToIncrementSharedConnectionCounter(const char *hostname, int port)
{ {
/* we successfully allocated the entry for the first time, so initialize it */ /* we successfully allocated the entry for the first time, so initialize it */
connectionEntry->connectionCount = 1; connectionEntry->connectionCount = 1;
connectionEntry->databaseOid = MyDatabaseId;
counterIncremented = true; counterIncremented = true;
} }
@ -435,7 +430,6 @@ IncrementSharedConnectionCounter(const char *hostname, int port)
} }
connKey.port = port; connKey.port = port;
connKey.databaseOid = MyDatabaseId;
LockConnectionSharedMemory(LW_EXCLUSIVE); LockConnectionSharedMemory(LW_EXCLUSIVE);
@ -467,6 +461,7 @@ IncrementSharedConnectionCounter(const char *hostname, int port)
{ {
/* we successfully allocated the entry for the first time, so initialize it */ /* we successfully allocated the entry for the first time, so initialize it */
connectionEntry->connectionCount = 0; connectionEntry->connectionCount = 0;
connectionEntry->databaseOid = MyDatabaseId;
} }
connectionEntry->connectionCount += 1; connectionEntry->connectionCount += 1;
@ -503,7 +498,6 @@ DecrementSharedConnectionCounter(const char *hostname, int port)
} }
connKey.port = port; connKey.port = port;
connKey.databaseOid = MyDatabaseId;
LockConnectionSharedMemory(LW_EXCLUSIVE); LockConnectionSharedMemory(LW_EXCLUSIVE);
@ -807,7 +801,6 @@ SharedConnectionHashHash(const void *key, Size keysize)
uint32 hash = string_hash(entry->hostname, NAMEDATALEN); uint32 hash = string_hash(entry->hostname, NAMEDATALEN);
hash = hash_combine(hash, hash_uint32(entry->port)); hash = hash_combine(hash, hash_uint32(entry->port));
hash = hash_combine(hash, hash_uint32(entry->databaseOid));
return hash; return hash;
} }
@ -820,8 +813,7 @@ SharedConnectionHashCompare(const void *a, const void *b, Size keysize)
SharedConnStatsHashKey *cb = (SharedConnStatsHashKey *) b; SharedConnStatsHashKey *cb = (SharedConnStatsHashKey *) b;
if (strncmp(ca->hostname, cb->hostname, MAX_NODE_LENGTH) != 0 || if (strncmp(ca->hostname, cb->hostname, MAX_NODE_LENGTH) != 0 ||
ca->port != cb->port || ca->port != cb->port)
ca->databaseOid != cb->databaseOid)
{ {
return 1; return 1;
} }