zpc_gitlink
/
openGauss-server
forked from huawei/openGauss-server
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!1209 修复内存泄漏问题 

Merge pull request !1209 from maxiang/memory-2
This commit is contained in:
opengauss-bot 2021-08-12 09:55:53 +00:00 committed by Gitee
parent 3bec247d73 e1b9418050
commit 78c42f2a25
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/gausskernel/process/postmaster/twophasecleaner.cpp
View File

@ -473,6 +473,8 @@ static void GetDatabaseList(PGconn* conn, DatabaseNames** dbList)
res = PQexec(conn, STMT_GET_DATABASE_LIST);
if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK) {
PQclear(res);
PQfinish(conn);
conn = NULL;
ereport(ERROR, (errcode(ERRCODE_INVALID_STATUS),
errmsg("Could not obtain database list : %s",
PQerrorMessage(conn))));
@ -544,6 +546,8 @@ static void GetTempSchemaList(PGconn* conn, TempSchemaInfo** tempSchemaList)
res = PQexec(conn, STMT_GET_TEMP_SCHEMA_LIST);
if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK) {
PQclear(res);
PQfinish(conn);
conn = NULL;
ereport(ERROR, (errcode(ERRCODE_INVALID_STATUS),
errmsg("Could not obtain temp schema list : %s",
PQerrorMessage(conn))));
@ -554,6 +558,9 @@ static void GetTempSchemaList(PGconn* conn, TempSchemaInfo** tempSchemaList)
for (int i = 0; i < tempSchemaCount; i++) {
nspname = PQgetvalue(res, i, 0);
if (strchr(&nspname[7], '_') == NULL) {
PQclear(res);
PQfinish(conn);
conn = NULL;
ereport(ERROR, (errcode(ERRCODE_INVALID_STATUS),
errmsg("Error when parse schema name : %s",
PQerrorMessage(conn))));
@ -624,6 +631,8 @@ static void GetActiveBackendList(PGconn* conn, ActiveBackendInfo** activeBackend
res = PQexec(conn, STMT_ACTIVE_BACKEND_LIST);
if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK) {
PQclear(res);
PQfinish(conn);
conn = NULL;
ereport(ERROR, (errcode(ERRCODE_INVALID_STATUS),
errmsg("Could not obtain active backend list : %s",
PQerrorMessage(conn))));
@ -681,6 +690,9 @@ static void DropTempSchema(PGconn* conn, char* nspname)
/* If exec is not success, give an log and go on. */
if (res == NULL || PQresultStatus(res) != PGRES_COMMAND_OK) {
PQclear(res);
PQfinish(conn);
conn = NULL;
ereport(ERROR, (errcode(ERRCODE_INVALID_STATUS),
errmsg("Could not drop temp schema %s, %s: %s\n",
nspname, toastnspName, PQresultErrorMessage(res))));
@ -713,21 +725,30 @@ static void DropTempSchemas(PGconn* conn)
* These items are DN'name, timelineID, tempID, sessionID.
*/
const char* lastPos = strrchr(tempSchema->tempSchemaName, '_');
if (lastPos == NULL)
if (lastPos == NULL) {
PQfinish(conn);
conn = NULL;
elog(ERROR, "strrchr failed, can't find '%c' in '%s'\n", '_', tempSchema->tempSchemaName);
}
int64 sessionID = strtoll(lastPos + 1, NULL, 10);
rc = strncpy_s(tempBuffer, sizeof(tempBuffer), tempSchema->tempSchemaName,
lastPos - tempSchema->tempSchemaName);
securec_check_c(rc, "\0", "\0");
const char* secondLastPos = strrchr(tempBuffer, '_');
if (secondLastPos == NULL)
if (secondLastPos == NULL) {
PQfinish(conn);
conn = NULL;
elog(ERROR, "strrchr failed, can't find '%c' in '%s'\n", '_', tempBuffer);
}
uint32 tempID = strtol(secondLastPos + 1, NULL, 10);
rc = strncpy_s(tempBuffer2, sizeof(tempBuffer2), tempBuffer, secondLastPos - tempBuffer);
securec_check_c(rc, "\0", "\0");
const char* thirdLastPos = strrchr(tempBuffer2, '_');
if (thirdLastPos == NULL)
if (thirdLastPos == NULL) {
PQfinish(conn);
conn = NULL;
elog(ERROR, "strrchr failed, can't find '%c' in '%s'\n", '_', tempBuffer2);
}
uint32 timeLineID = strtol(thirdLastPos + 1, NULL, 10);
activeBackend = activeBackendList;
@ -780,6 +801,8 @@ static bool DropTempNamespace()
NULL, NULL, curDatabase->databaseName, PGXC_CLEAN, "auto");
if (conn == NULL) {
PQfinish(conn);
conn = NULL;
ereport(ERROR, (errcode(ERRCODE_INVALID_STATUS),
(errmsg("Could not connect to the database %s.",
curDatabase->databaseName))));