Revert recent change of ScanOption values and renumber SO_TYPE_TIDSCAN.

Commit 598b466e80 in v12 renumbered ScanOption enum values to add
the option for Tid scan. But the change of the codes assigned to
the existing values caused an ABI break and may break some extensions
depending on them. This should be avoided in minor version.

This commit reverts the renumbering of ScanOption enum values made by
commit 598b466e80 in v12 and put the ScanOption for Tid scan with new value.
This is applied only to v12.

Per complaint from Tom Lane.

Discussion: https://postgr.es/m/5261.1581103527@sss.pgh.pa.us

diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h
index b5a175dffa6931c57d77cf2e7d0b934586430b7d..9653f80a091eb36f20f6ea0f59d53c44b3ffd4e4 100644 (file)
--- a/src/include/access/tableam.h
+++ b/src/include/access/tableam.h
@@ -47,19 +47,19 @@ typedef enum ScanOptions
    SO_TYPE_SEQSCAN = 1 << 0,
    SO_TYPE_BITMAPSCAN = 1 << 1,
    SO_TYPE_SAMPLESCAN = 1 << 2,
-   SO_TYPE_TIDSCAN = 1 << 3,
-   SO_TYPE_ANALYZE = 1 << 4,
+   SO_TYPE_ANALYZE = 1 << 3,
+   SO_TYPE_TIDSCAN = 1 << 8,
 
    /* several of SO_ALLOW_* may be specified */
    /* allow or disallow use of access strategy */
-   SO_ALLOW_STRAT = 1 << 5,
+   SO_ALLOW_STRAT = 1 << 4,
    /* report location to syncscan logic? */
-   SO_ALLOW_SYNC = 1 << 6,
+   SO_ALLOW_SYNC = 1 << 5,
    /* verify visibility page-at-a-time? */
-   SO_ALLOW_PAGEMODE = 1 << 7,
+   SO_ALLOW_PAGEMODE = 1 << 6,
 
    /* unregister snapshot at scan end? */
-   SO_TEMP_SNAPSHOT = 1 << 8
+   SO_TEMP_SNAPSHOT = 1 << 7
 } ScanOptions;
 
 /*