8000 Split index xlog headers from other private index headers. · postgrespro/postgres_cluster@8da9a22 · GitHub
[go: up one dir, main page]

Skip to content

Commit 8da9a22

Browse files
committed
Split index xlog headers from other private index headers.
The xlog-specific headers need to be included in both frontend code - specifically, pg_waldump - and the backend, but the remainder of the private headers for each index are only needed by the backend. By splitting the xlog stuff out into separate headers, pg_waldump pulls in fewer backend headers, which is a good thing. Patch by me, reviewed by Michael Paquier and Andres Freund, per a complaint from Dilip Kumar. Discussion: http://postgr.es/m/CA+TgmoZ=F=GkxV0YEv-A8tb+AEGy_Qa7GSiJ8deBKFATnzfEug@mail.gmail.com
1 parent fb47544 commit 8da9a22

File tree

35 files changed

+1159
-1055
lines changed
  • src
    • backend/access
      • gin
        • < 8000 div class="PRIVATE_TreeView-item-level-line prc-TreeView-TreeViewItemLevelLine-KPSSL">
  • gist
  • nbtree
  • rmgrdesc
  • spgist
  • transam
  • bin/pg_waldump
  • include/access
  • 35 files changed

    +1159
    -1055
    lines changed

    src/backend/access/gin/ginbtree.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,6 +15,7 @@
    1515
    #include "postgres.h"
    1616

    1717
    #include "access/gin_private.h"
    18+
    #include "access/ginxlog.h"
    1819
    #include "access/xloginsert.h"
    1920
    #include "miscadmin.h"
    2021
    #include "utils/memutils.h"

    src/backend/access/gin/gindatapage.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,6 +15,7 @@
    1515
    #include "postgres.h"
    1616

    1717
    #include "access/gin_private.h"
    18+
    #include "access/ginxlog.h"
    1819
    #include "access/xloginsert.h"
    1920
    #include "lib/ilist.h"
    2021
    #include "miscadmin.h"

    src/backend/access/gin/ginentrypage.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,6 +15,7 @@
    1515
    #include "postgres.h"
    1616

    1717
    #include "access/gin_private.h"
    18+
    #include "access/ginxlog.h"
    1819
    #include "access/xloginsert.h"
    1920
    #include "miscadmin.h"
    2021
    #include "utils/rel.h"

    src/backend/access/gin/ginfast.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -19,6 +19,7 @@
    1919
    #include "postgres.h"
    2020

    2121
    #include "access/gin_private.h"
    22+
    #include "access/ginxlog.h"
    2223
    #include "access/xloginsert.h"
    2324
    #include "access/xlog.h"
    2425
    #include "commands/vacuum.h"

    src/backend/access/gin/gininsert.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,6 +15,7 @@
    1515
    #include "postgres.h"
    1616

    1717
    #include "access/gin_private.h"
    18+
    #include "access/ginxlog.h"
    1819
    #include "access/xloginsert.h"
    1920
    #include "catalog/index.h"
    2021
    #include "miscadmin.h"

    src/backend/access/gin/ginutil.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,6 +15,7 @@
    1515
    #include "postgres.h"
    1616

    1717
    #include "access/gin_private.h"
    18+
    #include "access/ginxlog.h"
    1819
    #include "access/reloptions.h"
    1920
    #include "access/xloginsert.h"
    2021
    #include "catalog/pg_collation.h"

    src/backend/access/gin/ginvacuum.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,6 +15,7 @@
    1515
    #include "postgres.h"
    1616

    1717
    #include "access/gin_private.h"
    18+
    #include "access/ginxlog.h"
    1819
    #include "access/xloginsert.h"
    1920
    #include "commands/vacuum.h"
    2021
    #include "miscadmin.h"

    src/backend/access/gin/ginxlog.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,6 +15,7 @@
    1515

    1616
    #include "access/bufmask.h"
    1717
    #include "access/gin_private.h"
    18+
    #include "access/ginxlog.h"
    1819
    #include "access/xlogutils.h"
    1920
    #include "utils/memutils.h"
    2021

    src/backend/access/gist/gistbuild.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -18,6 +18,7 @@
    1818

    1919
    #include "access/genam.h"
    2020
    #include "access/gist_private.h"
    21+
    #include "access/gistxlog.h"
    2122
    #include "access/xloginsert.h"
    2223
    #include "catalog/index.h"
    2324
    #include "miscadmin.h"

    src/backend/access/gist/gistxlog.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,6 +15,7 @@
    1515

    1616
    #include "access/bufmask.h"
    1717
    #include "access/gist_private.h"
    18+
    #include "access/gistxlog.h"
    1819
    #include "access/xloginsert.h"
    1920
    #include "access/xlogutils.h"
    2021
    #include "utils/memutils.h"

    src/backend/access/nbtree/nbtinsert.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,6 +17,7 @@
    1717

    1818
    #include "access/heapam.h"
    1919
    #include "access/nbtree.h"
    20+
    #include "access/nbtxlog.h"
    2021
    #include "access/transam.h"
    2122
    #include "access/xloginsert.h"
    2223
    #include "miscadmin.h"

    src/backend/access/nbtree/nbtpage.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -23,6 +23,7 @@
    2323
    #include "postgres.h"
    2424

    2525
    #include "access/nbtree.h"
    26+
    #include "access/nbtxlog.h"
    2627
    #include "access/transam.h"
    2728
    #include "access/xlog.h"
    2829
    #include "access/xloginsert.h"

    src/backend/access/nbtree/nbtxlog.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,6 +17,7 @@
    1717
    #include "access/bufmask.h"
    1818
    #include "access/heapam_xlog.h"
    1919
    #include "access/nbtree.h"
    20+
    #include "access/nbtxlog.h"
    2021
    #include "access/transam.h"
    2122
    #include "access/xlog.h"
    2223
    #include "access/xlogutils.h"

    src/backend/access/rmgrdesc/gindesc.c

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -14,7 +14,7 @@
    1414
    */
    1515
    #include "postgres.h"
    1616

    17-
    #include "access/gin_private.h"
    17+
    #include "access/ginxlog.h"
    1818
    #include "access/xlogutils.h"
    1919
    #include "lib/stringinfo.h"
    2020
    #include "storage/relfilenode.h"

    src/backend/access/rmgrdesc/gistdesc.c

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -14,7 +14,7 @@
    1414
    */
    1515
    #include "postgres.h"
    1616

    17-
    #include "access/gist_private.h"
    17+
    #include "access/gistxlog.h"
    1818
    #include "lib/stringinfo.h"
    1919
    #include "storage/relfilenode.h"
    2020

    src/backend/access/rmgrdesc/nbtdesc.c

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -14,7 +14,7 @@
    1414
    */
    1515
    #include "postgres.h"
    1616

    17-
    #include "access/nbtree.h"
    17+
    #include "access/nbtxlog.h"
    1818

    1919
    void
    2020
    btree_desc(StringInfo buf, XLogReaderState *record)

    src/backend/access/rmgrdesc/spgdesc.c

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -14,7 +14,7 @@
    1414
    */
    1515
    #include "postgres.h"
    1616

    17-
    #include "access/spgist_private.h"
    17+
    #include "access/spgxlog.h"
    1818

    1919
    void
    2020
    spg_desc(StringInfo buf, XLogReaderState *record)

    src/backend/access/spgist/spgdoinsert.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,6 +17,7 @@
    1717

    1818
    #include "access/genam.h"
    1919
    #include "access/spgist_private.h"
    20+
    #include "access/spgxlog.h"
    2021
    #include "access/xloginsert.h"
    2122
    #include "miscadmin.h"
    2223
    #include "storage/bufmgr.h"

    src/backend/access/spgist/spginsert.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -18,6 +18,7 @@
    1818

    1919
    #include "access/genam.h"
    2020
    #include "access/spgist_private.h"
    21+
    #include "access/spgxlog.h"
    2122
    #include "access/xlog.h"
    2223
    #include "access/xloginsert.h"
    2324
    #include "catalog/index.h"

    src/backend/access/spgist/spgvacuum.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,6 +17,7 @@
    1717

    1818
    #include "access/genam.h"
    1919
    #include "access/spgist_private.h"
    20+
    #include "access/spgxlog.h"
    2021
    #include "access/transam.h"
    2122
    #include "access/xloginsert.h"
    2223
    #include "catalog/storage_xlog.h"

    src/backend/access/spgist/spgxlog.c

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -16,6 +16,7 @@
    1616

    1717
    #include "access/bufmask.h"
    1818
    #include "access/spgist_private.h"
    19+
    #include "access/spgxlog.h"
    1920
    #include "access/transam.h"
    2021
    #include "access/xlog.h"
    2122
    #include "access/xlogutils.h"

    src/backend/access/transam/rmgr.c

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -9,15 +9,15 @@
    99

    1010
    #include "access/clog.h"
    1111
    #include "access/commit_ts.h"
    12-
    #include "access/gin.h"
    13-
    #include "access/gist_private.h"
    12+
    #include "access/ginxlog.h"
    13+
    #include "access/gistxlog.h"
    1414
    #include "access/generic_xlog.h"
    1515
    #include "access/hash_xlog.h"
    1616
    #include "access/heapam_xlog.h"
    1717
    #include "access/brin_xlog.h"
    1818
    #include "access/multixact.h"
    19-
    #include "access/nbtree.h"
    20-
    #include "access/spgist.h"
    19+
    #include "access/nbtxlog.h"
    20+
    #include "access/spgxlog.h"
    2121
    #include "access/xact.h"
    2222
    #include "access/xlog_internal.h"
    2323
    #include "catalog/storage_xlog.h"

    src/bin/pg_waldump/rmgrdesc.c

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -12,14 +12,14 @@
    1212
    #include "access/clog.h"
    1313
    #include "access/commit_ts.h"
    1414
    #include "access/generic_xlog.h"
    15-
    #include "access/gin.h"
    16-
    #include "access/gist_private.h"
    15+
    #include "access/ginxlog.h"
    16+
    #include "access/gistxlog.h"
    1717
    #include "access/hash_xlog.h"
    1818
    #include "access/heapam_xlog.h"
    1919
    #include "access/multixact.h"
    20-
    #include "access/nbtree.h"
    20+
    #include "access/nbtxlog.h"
    2121
    #include "access/rmgr.h"
    22-
    #include "access/spgist.h"
    22+
    #include "access/spgxlog.h"
    2323
    #include "access/xact.h"
    2424
    #include "access/xlog_internal.h"
    2525
    #include "catalog/storage_xlog.h"

    src/include/access/gin.h

    Lines changed: 0 additions & 8 deletions
    Original file line numberDiff line numberDiff line change
    @@ -73,12 +73,4 @@ extern int gin_pending_list_limit;
    7373
    extern void ginGetStats(Relation index, GinStatsData *stats);
    7474
    extern void ginUpdateStats(Relation index, const GinStatsData *stats);
    7575

    76-
    /* ginxlog.c */
    77-
    extern void gin_redo(XLogReaderState *record);
    78-
    extern void gin_desc(StringInfo buf, XLogReaderState *record);
    79-
    extern const char *gin_identify(uint8 info);
    80-
    extern void gin_xlog_startup(void);
    81-
    extern void gin_xlog_cleanup(void);
    82-
    extern void gin_mask(char *pagedata, BlockNumber blkno);
    83-
    8476
    #endif /* GIN_H */

    0 commit comments

    Comments
     (0)
    0