From b78364df1850a09ece442a138118f4be1a451366 Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Tue, 28 Jun 2016 16:01:13 -0400
Subject: [PATCH] Remove unused arguments in two GiST subroutines
These arguments became unused in commit 2c03216d8311. Noticed while
skimming code for unrelated development.
This is cosmetic, so no backpatch.
---
src/backend/access/gist/gist.c | 6 +++---
src/backend/access/gist/gistvacuum.c | 2 +-
src/backend/access/gist/gistxlog.c | 4 ++--
src/include/access/gist_private.h | 5 ++---
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index fdf0c5a5cf4..e8034b9cd6d 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -467,7 +467,7 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
/* Write the WAL record */
if (RelationNeedsWAL(rel))
- recptr = gistXLogSplit(rel->rd_node, blkno, is_leaf,
+ recptr = gistXLogSplit(is_leaf,
dist, oldrlink, oldnsn, leftchildbuf,
markfollowright);
else
@@ -523,7 +523,7 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
ndeloffs = 1;
}
- recptr = gistXLogUpdate(rel->rd_node, buffer,
+ recptr = gistXLogUpdate(buffer,
deloffs, ndeloffs, itup, ntup,
leftchildbuf);
@@ -1541,7 +1541,7 @@ gistvacuumpage(Relation rel, Page page, Buffer buffer)
{
XLogRecPtr recptr;
- recptr = gistXLogUpdate(rel->rd_node, buffer,
+ recptr = gistXLogUpdate(buffer,
deletable, ndeletable,
NULL, 0, InvalidBuffer);
diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c
index 7947ff9dbe6..53e5cea580f 100644
--- a/src/backend/access/gist/gistvacuum.c
+++ b/src/backend/access/gist/gistvacuum.c
@@ -223,7 +223,7 @@ gistbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
{
XLogRecPtr recptr;
- recptr = gistXLogUpdate(rel->rd_node, buffer,
+ recptr = gistXLogUpdate(buffer,
todelete, ntodelete,
NULL, 0, InvalidBuffer);
PageSetLSN(page, recptr);
diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c
index b48e97cc66e..01c7ef7ea67 100644
--- a/src/backend/access/gist/gistxlog.c
+++ b/src/backend/access/gist/gistxlog.c
@@ -323,7 +323,7 @@ gist_xlog_cleanup(void)
* Write WAL record of a page split.
*/
XLogRecPtr
-gistXLogSplit(RelFileNode node, BlockNumber blkno, bool page_is_leaf,
+gistXLogSplit(bool page_is_leaf,
SplitedPageLayout *dist,
BlockNumber origrlink, GistNSN orignsn,
Buffer leftchildbuf, bool markfollowright)
@@ -387,7 +387,7 @@ gistXLogSplit(RelFileNode node, BlockNumber blkno, bool page_is_leaf,
* to log the whole buffer contents instead.
*/
XLogRecPtr
-gistXLogUpdate(RelFileNode node, Buffer buffer,
+gistXLogUpdate(Buffer buffer,
OffsetNumber *todelete, int ntodelete,
IndexTuple *itup, int ituplen,
Buffer leftchildbuf)
diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h
index f9732ba7fb9..23e0fe31978 100644
--- a/src/include/access/gist_private.h
+++ b/src/include/access/gist_private.h
@@ -465,13 +465,12 @@ extern const char *gist_identify(uint8 info);
extern void gist_xlog_startup(void);
extern void gist_xlog_cleanup(void);
-extern XLogRecPtr gistXLogUpdate(RelFileNode node, Buffer buffer,
+extern XLogRecPtr gistXLogUpdate(Buffer buffer,
OffsetNumber *todelete, int ntodelete,
IndexTuple *itup, int ntup,
Buffer leftchild);
-extern XLogRecPtr gistXLogSplit(RelFileNode node,
- BlockNumber blkno, bool page_is_leaf,
+extern XLogRecPtr gistXLogSplit(bool page_is_leaf,
SplitedPageLayout *dist,
BlockNumber origrlink, GistNSN oldnsn,
Buffer leftchild, bool markfollowright);
--
GitLab