Yet another (minor) fix in BRIN

Started by Tomas Vondraabout 5 years ago5 messages
#1Tomas Vondra
tomas.vondra@enterprisedb.com
1 attachment(s)

Hi,

While rebasing some of the BRIN patches, I noticed some of the code in
brin_memtuple_initialize is duplicated. This happened in 8bf74967dab
which moved some of the code from brin_new_memtuple, not removing the
shared pieces. In practice this is benign, of course.

Barring objections I'll get the attached fix committed and backpatched.

regards

--
Tomas Vondra
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Attachments:

0001-Remove-duplicate-code-in-brin_memtuple_initialize.patchtext/x-patch; charset=UTF-8; name=0001-Remove-duplicate-code-in-brin_memtuple_initialize.patchDownload
From d97e3160921caa6d2191b7e8539d4d4f4816219c Mon Sep 17 00:00:00 2001
From: Tomas Vondra <tomas@2ndquadrant.com>
Date: Sun, 8 Nov 2020 02:11:45 +0100
Subject: [PATCH] Remove duplicate code in brin_memtuple_initialize

Commit 8bf74967dab moved some of the code from brin_new_memtuple to
brin_memtuple_initialize, but this resulted in some of the code being
duplicate. Fix by removing the duplicate lines and backpatch to 10.

Author: Tomas Vondra
Backpatch-through: 10
Discussion: TBD
---
 src/backend/access/brin/brin_tuple.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c
index 6774f597a4..17e50de530 100644
--- a/src/backend/access/brin/brin_tuple.c
+++ b/src/backend/access/brin/brin_tuple.c
@@ -491,9 +491,6 @@ brin_memtuple_initialize(BrinMemTuple *dtuple, BrinDesc *brdesc)
 				 sizeof(BrinValues) * brdesc->bd_tupdesc->natts);
 	for (i = 0; i < brdesc->bd_tupdesc->natts; i++)
 	{
-		dtuple->bt_columns[i].bv_allnulls = true;
-		dtuple->bt_columns[i].bv_hasnulls = false;
-
 		dtuple->bt_columns[i].bv_attno = i + 1;
 		dtuple->bt_columns[i].bv_allnulls = true;
 		dtuple->bt_columns[i].bv_hasnulls = false;
-- 
2.26.2

#2Alvaro Herrera
alvherre@alvh.no-ip.org
In reply to: Tomas Vondra (#1)
Re: Yet another (minor) fix in BRIN

On 2020-Nov-08, Tomas Vondra wrote:

While rebasing some of the BRIN patches, I noticed some of the code in
brin_memtuple_initialize is duplicated. This happened in 8bf74967dab
which moved some of the code from brin_new_memtuple, not removing the
shared pieces. In practice this is benign, of course.

Barring objections I'll get the attached fix committed and backpatched.

LGTM, thanks for noticing.

#3Tom Lane
tgl@sss.pgh.pa.us
In reply to: Alvaro Herrera (#2)
Re: Yet another (minor) fix in BRIN

Alvaro Herrera <alvherre@alvh.no-ip.org> writes:

On 2020-Nov-08, Tomas Vondra wrote:

While rebasing some of the BRIN patches, I noticed some of the code in
brin_memtuple_initialize is duplicated. This happened in 8bf74967dab
which moved some of the code from brin_new_memtuple, not removing the
shared pieces. In practice this is benign, of course.

Barring objections I'll get the attached fix committed and backpatched.

LGTM, thanks for noticing.

The weekend before stable-branch releases is probably not the best
time to be pushing "minor" fixes into those branches. I got my
fingers burned today, and so did Peter. Don't follow our example ;-)

regards, tom lane

#4Michael Paquier
michael@paquier.xyz
In reply to: Tom Lane (#3)
Re: Yet another (minor) fix in BRIN

On Sat, Nov 07, 2020 at 10:45:26PM -0500, Tom Lane wrote:

The weekend before stable-branch releases is probably not the best
time to be pushing "minor" fixes into those branches. I got my
fingers burned today, and so did Peter. Don't follow our example ;-)

You could just apply your stuff after the version is tagged (not
stamped as there could be urgent bug fixes between the stamp time and
the tag time, like packaing issues).
--
Michael

#5Tomas Vondra
tomas.vondra@enterprisedb.com
In reply to: Michael Paquier (#4)
Re: Yet another (minor) fix in BRIN

On 11/8/20 12:34 PM, Michael Paquier wrote:

On Sat, Nov 07, 2020 at 10:45:26PM -0500, Tom Lane wrote:

The weekend before stable-branch releases is probably not the best
time to be pushing "minor" fixes into those branches. I got my
fingers burned today, and so did Peter. Don't follow our example ;-)

You could just apply your stuff after the version is tagged (not
stamped as there could be urgent bug fixes between the stamp time and
the tag time, like packaing issues).

Yeah, that's what I was planning to do - I was not suggesting I'll push
this right away. Or at least I did not mean to. Sorry if that was not
quite clear.

regards

--
Tomas Vondra
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company