Commit cea3d558 authored by Alvaro Herrera's avatar Alvaro Herrera

Remove PROC_IN_ANALYZE and derived flags

These flags are unused and always have been.

Discussion: https://postgr.es/m/20200805235549.GA8118@alvherre.pgsql
parent 6f0b632f
...@@ -247,11 +247,8 @@ analyze_rel(Oid relid, RangeVar *relation, ...@@ -247,11 +247,8 @@ analyze_rel(Oid relid, RangeVar *relation,
} }
/* /*
* OK, let's do it. First let other backends know I'm in ANALYZE. * OK, let's do it. First, initialize progress reporting.
*/ */
LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
MyPgXact->vacuumFlags |= PROC_IN_ANALYZE;
LWLockRelease(ProcArrayLock);
pgstat_progress_start_command(PROGRESS_COMMAND_ANALYZE, pgstat_progress_start_command(PROGRESS_COMMAND_ANALYZE,
RelationGetRelid(onerel)); RelationGetRelid(onerel));
...@@ -279,14 +276,6 @@ analyze_rel(Oid relid, RangeVar *relation, ...@@ -279,14 +276,6 @@ analyze_rel(Oid relid, RangeVar *relation,
relation_close(onerel, NoLock); relation_close(onerel, NoLock);
pgstat_progress_end_command(); pgstat_progress_end_command();
/*
* Reset my PGXACT flag. Note: we need this here, and not in vacuum_rel,
* because the vacuum flag is cleared by the end-of-xact code.
*/
LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE);
MyPgXact->vacuumFlags &= ~PROC_IN_ANALYZE;
LWLockRelease(ProcArrayLock);
} }
/* /*
......
...@@ -52,7 +52,6 @@ struct XidCache ...@@ -52,7 +52,6 @@ struct XidCache
*/ */
#define PROC_IS_AUTOVACUUM 0x01 /* is it an autovac worker? */ #define PROC_IS_AUTOVACUUM 0x01 /* is it an autovac worker? */
#define PROC_IN_VACUUM 0x02 /* currently running lazy vacuum */ #define PROC_IN_VACUUM 0x02 /* currently running lazy vacuum */
#define PROC_IN_ANALYZE 0x04 /* currently running analyze */
#define PROC_VACUUM_FOR_WRAPAROUND 0x08 /* set by autovac only */ #define PROC_VACUUM_FOR_WRAPAROUND 0x08 /* set by autovac only */
#define PROC_IN_LOGICAL_DECODING 0x10 /* currently doing logical #define PROC_IN_LOGICAL_DECODING 0x10 /* currently doing logical
* decoding outside xact */ * decoding outside xact */
...@@ -60,7 +59,7 @@ struct XidCache ...@@ -60,7 +59,7 @@ struct XidCache
/* flags reset at EOXact */ /* flags reset at EOXact */
#define PROC_VACUUM_STATE_MASK \ #define PROC_VACUUM_STATE_MASK \
(PROC_IN_VACUUM | PROC_IN_ANALYZE | PROC_VACUUM_FOR_WRAPAROUND) (PROC_IN_VACUUM | PROC_VACUUM_FOR_WRAPAROUND)
/* /*
* We allow a small number of "weak" relation locks (AccessShareLock, * We allow a small number of "weak" relation locks (AccessShareLock,
......
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
*/ */
#define PROCARRAY_VACUUM_FLAG 0x02 /* currently running lazy #define PROCARRAY_VACUUM_FLAG 0x02 /* currently running lazy
* vacuum */ * vacuum */
#define PROCARRAY_ANALYZE_FLAG 0x04 /* currently running
* analyze */
#define PROCARRAY_LOGICAL_DECODING_FLAG 0x10 /* currently doing logical #define PROCARRAY_LOGICAL_DECODING_FLAG 0x10 /* currently doing logical
* decoding outside xact */ * decoding outside xact */
...@@ -42,7 +40,6 @@ ...@@ -42,7 +40,6 @@
* have no corresponding PROC flag equivalent. * have no corresponding PROC flag equivalent.
*/ */
#define PROCARRAY_PROC_FLAGS_MASK (PROCARRAY_VACUUM_FLAG | \ #define PROCARRAY_PROC_FLAGS_MASK (PROCARRAY_VACUUM_FLAG | \
PROCARRAY_ANALYZE_FLAG | \
PROCARRAY_LOGICAL_DECODING_FLAG) PROCARRAY_LOGICAL_DECODING_FLAG)
/* Use the following flags as an input "flags" to GetOldestXmin function */ /* Use the following flags as an input "flags" to GetOldestXmin function */
...@@ -50,10 +47,6 @@ ...@@ -50,10 +47,6 @@
#define PROCARRAY_FLAGS_DEFAULT PROCARRAY_LOGICAL_DECODING_FLAG #define PROCARRAY_FLAGS_DEFAULT PROCARRAY_LOGICAL_DECODING_FLAG
/* Ignore vacuum backends */ /* Ignore vacuum backends */
#define PROCARRAY_FLAGS_VACUUM PROCARRAY_FLAGS_DEFAULT | PROCARRAY_VACUUM_FLAG #define PROCARRAY_FLAGS_VACUUM PROCARRAY_FLAGS_DEFAULT | PROCARRAY_VACUUM_FLAG
/* Ignore analyze backends */
#define PROCARRAY_FLAGS_ANALYZE PROCARRAY_FLAGS_DEFAULT | PROCARRAY_ANALYZE_FLAG
/* Ignore both vacuum and analyze backends */
#define PROCARRAY_FLAGS_VACUUM_ANALYZE PROCARRAY_FLAGS_DEFAULT | PROCARRAY_VACUUM_FLAG | PROCARRAY_ANALYZE_FLAG
extern Size ProcArrayShmemSize(void); extern Size ProcArrayShmemSize(void);
extern void CreateSharedProcArray(void); extern void CreateSharedProcArray(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment