Hello. The commit leaves three warnings for -Wunused-but-set-variable. Two of them are not assertion-only but really not used at all.
I also found that nodeMerge.c has one such variable. regards. At Thu, 5 Apr 2018 15:43:55 +0900, Masahiko Sawada <sawada.m...@gmail.com> wrote in <CAD21AoAtYzXeuhPqGw89KxqcJWpSKxWRNkYzyJxAqJHZham==q...@mail.gmail.com> > On Thu, Apr 5, 2018 at 2:40 PM, Masahiko Sawada <sawada.m...@gmail.com> wrote: > > On Thu, Apr 5, 2018 at 1:30 AM, Teodor Sigaev <teo...@sigaev.ru> wrote: > >> Thanks for everyone, pushed with minor editorization > >> > > > > Thank you for committing! > > I found a typo in nbtpage.c and attached a patch fixes it. > > > > I also found an incorrect documentation in create_index.sgml as follows. > > <term><literal>vacuum_cleanup_index_scale_factor</literal></term> > <listitem> > <para> > Per-table value for <xref > linkend="guc-vacuum-cleanup-index-scale-factor"/>. > </para> > </listitem> > </varlistentry> > > I think it should be "Per-index". Attached a patch for fixing it. And > sorry for missing it at review. > > Regards, -- Kyotaro Horiguchi NTT Open Source Software Center
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 505a67e6ed..b920d66731 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -85,7 +85,7 @@ void _bt_upgrademetapage(Page page) { BTMetaPageData *metad; - BTPageOpaque metaopaque; + BTPageOpaque metaopaque PG_USED_FOR_ASSERTS_ONLY; metad = BTPageGetMeta(page); metaopaque = (BTPageOpaque) PageGetSpecialPointer(page); @@ -118,7 +118,6 @@ _bt_update_meta_cleanup_info(Relation rel, TransactionId oldestBtpoXact, { Buffer metabuf; Page metapg; - BTPageOpaque metaopaque; BTMetaPageData *metad; bool needsRewrite = false; XLogRecPtr recptr; @@ -126,7 +125,6 @@ _bt_update_meta_cleanup_info(Relation rel, TransactionId oldestBtpoXact, /* read the metapage and check if it needs rewrite */ metabuf = _bt_getbuf(rel, BTREE_METAPAGE, BT_READ); metapg = BufferGetPage(metabuf); - metaopaque = (BTPageOpaque) PageGetSpecialPointer(metapg); metad = BTPageGetMeta(metapg); /* outdated version of metapage always needs rewrite */ diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 06badc90ba..66a66f2dad 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -786,13 +786,11 @@ _bt_vacuum_needs_cleanup(IndexVacuumInfo *info) { Buffer metabuf; Page metapg; - BTPageOpaque metaopaque; BTMetaPageData *metad; bool result = false; metabuf = _bt_getbuf(info->index, BTREE_METAPAGE, BT_READ); metapg = BufferGetPage(metabuf); - metaopaque = (BTPageOpaque) PageGetSpecialPointer(metapg); metad = BTPageGetMeta(metapg); if (metad->btm_version < BTREE_VERSION)
diff --git a/src/backend/executor/nodeMerge.c b/src/backend/executor/nodeMerge.c index 0e0d0795d4..b21e69903d 100644 --- a/src/backend/executor/nodeMerge.c +++ b/src/backend/executor/nodeMerge.c @@ -485,7 +485,7 @@ ExecMerge(ModifyTableState *mtstate, EState *estate, TupleTableSlot *slot, ItemPointer tupleid; ItemPointerData tuple_ctid; bool matched = false; - char relkind; + char relkind PG_USED_FOR_ASSERTS_ONLY; Datum datum; bool isNull;