git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 489ca33)

Remove redundant setting of hashkey after insertion

author John Naylor <john.naylor@postgresql.org>

2023年11月30日 08:25:57 +0000 (15:25 +0700)

committer John Naylor <john.naylor@postgresql.org>

2023年11月30日 08:25:57 +0000 (15:25 +0700)

It's not necessary to fill the key field in most cases, since
hash_search has already done that. Some existing call sites have an
assert or comment that this contract has been fulfilled, but those
are quite old and that practice seems unnecessary here.

While at it, remove a nearby redundant assignment that a smart compiler
will elide anyway.

Zhao Junwang, with some adjustments by me

Reviewed by Nathan Bossart, with additional feedback from Tom Lane

Discussion: http://postgr.es/m/CAEG8a3%2BUPF%3DR2QGPgJMF2mKh8xPd1H2TmfH77zPuVUFdBpiGUA%40mail.gmail.com

contrib/dblink/dblink.c patch | blob | blame | history

src/backend/commands/async.c patch | blob | blame | history

src/backend/commands/tablecmds.c patch | blob | blame | history

src/backend/replication/logical/applyparallelworker.c patch | blob | blame | history

src/backend/replication/logical/relation.c patch | blob | blame | history

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c

index 195b278f55903bf48cd12fe784e2d27beea23036..27bd0d31fdfe20c644e6a79a1955c794bc969d12 100644 (file)

--- a/contrib/dblink/dblink.c

+++ b/contrib/dblink/dblink.c

@@ -2574,7 +2574,6 @@ createNewConnection(const char *name, remoteConn *rconn)

}

hentry->rconn = rconn;

- strlcpy(hentry->name, name, sizeof(hentry->name));

}

static void

diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c

index 2651d8904b62386bb4bf069545986b0353d8773c..264f25a8f9caa0fbcfe3fe6de871049ce10d6708 100644 (file)

--- a/src/backend/commands/async.c

+++ b/src/backend/commands/async.c

@@ -2305,15 +2305,13 @@ AddEventToPendingNotifies(Notification *n)

foreach(l, pendingNotifies->events)

{

Notification *oldn = (Notification *) lfirst(l);

- NotificationHash *hentry;

bool found;

- hentry = (NotificationHash *) hash_search(pendingNotifies->hashtab,

- &oldn,

- HASH_ENTER,

- &found);

+ (void) hash_search(pendingNotifies->hashtab,

+ &oldn,

+ HASH_ENTER,

+ &found);

Assert(!found);

- hentry->event = oldn;

}

}

@@ -2323,15 +2321,13 @@ AddEventToPendingNotifies(Notification *n)

/* Add event to the hash table if needed */

if (pendingNotifies->hashtab != NULL)

{

- NotificationHash *hentry;

bool found;

- hentry = (NotificationHash *) hash_search(pendingNotifies->hashtab,

- &n,

- HASH_ENTER,

- &found);

+ (void) hash_search(pendingNotifies->hashtab,

+ &n,

+ HASH_ENTER,

+ &found);

Assert(!found);

- hentry->event = n;

}

}

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c

index 323d9bf87020ac8b83ce928ce502652ca23dab37..7206da7c53c06490c8eea369da3a65fdf045ba07 100644 (file)

--- a/src/backend/commands/tablecmds.c

+++ b/src/backend/commands/tablecmds.c

@@ -2104,10 +2104,7 @@ ExecuteTruncateGuts(List *explicit_rels,

/* Find or create cached entry for the foreign table */

ft_info = hash_search(ft_htab, &serverid, HASH_ENTER, &found);

if (!found)

- {

- ft_info->serverid = serverid;

ft_info->rels = NIL;

- }

/*

* Save the foreign table in the entry of the server that the

diff --git a/src/backend/replication/logical/applyparallelworker.c b/src/backend/replication/logical/applyparallelworker.c

index 9b37736f8e5e536ba1eb22d28eb865a224de064d..b84a8a6db255fd59f70da9dac69c196687b87276 100644 (file)

--- a/src/backend/replication/logical/applyparallelworker.c

+++ b/src/backend/replication/logical/applyparallelworker.c

@@ -509,7 +509,6 @@ pa_allocate_worker(TransactionId xid)

winfo->in_use = true;

winfo->serialize_changes = false;

entry->winfo = winfo;

- entry->xid = xid;

}

/*

diff --git a/src/backend/replication/logical/relation.c b/src/backend/replication/logical/relation.c

index d62eefed1384e1783b78c441ef704f38a482b0c4..a581ac9a4d8678d7264974019d79eff569ebf302 100644 (file)

--- a/src/backend/replication/logical/relation.c

+++ b/src/backend/replication/logical/relation.c

@@ -657,7 +657,6 @@ logicalrep_partition_open(LogicalRepRelMapEntry *root,

int i;

/* Remote relation is copied as-is from the root entry. */

- entry = &part_entry->relmapentry;

entry->remoterel.remoteid = remoterel->remoteid;

entry->remoterel.nspname = pstrdup(remoterel->nspname);

entry->remoterel.relname = pstrdup(remoterel->relname);

This is the main PostgreSQL git repository.