Commitcea3d55

committed

Remove PROC_IN_ANALYZE and derived flags

1 parent6f0b632 commitcea3d55Copy full SHA for cea3d55

File tree

-21

lines changed

-21

lines changed

Lines changed: 1 addition & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -247,11 +247,8 @@ analyze_rel(Oid relid, RangeVar *relation,`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`/*`
`250`		`- * OK, let's do it. First let other backends know I'm in ANALYZE.`
	`250`	`+ * OK, let's do it. First, initialize progress reporting.`
`251`	`251`	`*/`
`252`		`-LWLockAcquire(ProcArrayLock,LW_EXCLUSIVE);`
`253`		`-MyPgXact->vacuumFlags \|=PROC_IN_ANALYZE;`
`254`		`-LWLockRelease(ProcArrayLock);`
`255`	`252`	`pgstat_progress_start_command(PROGRESS_COMMAND_ANALYZE,`
`256`	`253`	`RelationGetRelid(onerel));`
`257`	`254`
`@@ -279,14 +276,6 @@ analyze_rel(Oid relid, RangeVar *relation,`
`279`	`276`	`relation_close(onerel,NoLock);`
`280`	`277`
`281`	`278`	`pgstat_progress_end_command();`
`282`		`-`
`283`		`-/*`
`284`		`- * Reset my PGXACT flag. Note: we need this here, and not in vacuum_rel,`
`285`		`- * because the vacuum flag is cleared by the end-of-xact code.`
`286`		`- */`
`287`		`-LWLockAcquire(ProcArrayLock,LW_EXCLUSIVE);`
`288`		`-MyPgXact->vacuumFlags &= ~PROC_IN_ANALYZE;`
`289`		`-LWLockRelease(ProcArrayLock);`
`290`	`279`	`}`
`291`	`280`
`292`	`281`	`/*`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,15 +52,14 @@ struct XidCache`
`52`	`52`	`*/`
`53`	`53`	`#definePROC_IS_AUTOVACUUM0x01/* is it an autovac worker? */`
`54`	`54`	`#definePROC_IN_VACUUM0x02/* currently running lazy vacuum */`
`55`		`-#definePROC_IN_ANALYZE0x04/* currently running analyze */`
`56`	`55`	`#definePROC_VACUUM_FOR_WRAPAROUND0x08/* set by autovac only */`
`57`	`56`	`#definePROC_IN_LOGICAL_DECODING0x10/* currently doing logical`
`58`	`57`	`* decoding outside xact */`
`59`	`58`	`#definePROC_RESERVED0x20/* reserved for procarray */`
`60`	`59`
`61`	`60`	`/* flags reset at EOXact */`
`62`	`61`	`#definePROC_VACUUM_STATE_MASK \`
`63`		`-(PROC_IN_VACUUM \|PROC_IN_ANALYZE \|PROC_VACUUM_FOR_WRAPAROUND)`
	`62`	`+(PROC_IN_VACUUM \| PROC_VACUUM_FOR_WRAPAROUND)`
`64`	`63`
`65`	`64`	`/*`
`66`	`65`	`* We allow a small number of "weak" relation locks (AccessShareLock,`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@`
`29`	`29`	`*/`
`30`	`30`	`#definePROCARRAY_VACUUM_FLAG0x02/* currently running lazy`
`31`	`31`	`* vacuum */`
`32`		`-#definePROCARRAY_ANALYZE_FLAG0x04/* currently running`
`33`		`- * analyze */`
`34`	`32`	`#definePROCARRAY_LOGICAL_DECODING_FLAG 0x10/* currently doing logical`
`35`	`33`	`* decoding outside xact */`
`36`	`34`
`@@ -42,18 +40,13 @@`
`42`	`40`	`* have no corresponding PROC flag equivalent.`
`43`	`41`	`*/`
`44`	`42`	`#definePROCARRAY_PROC_FLAGS_MASK(PROCARRAY_VACUUM_FLAG \| \`
`45`		`- PROCARRAY_ANALYZE_FLAG \| \`
`46`	`43`	`PROCARRAY_LOGICAL_DECODING_FLAG)`
`47`	`44`
`48`	`45`	`/* Use the following flags as an input "flags" to GetOldestXmin function */`
`49`	`46`	`/* Consider all backends except for logical decoding ones which manage xmin separately */`
`50`	`47`	`#definePROCARRAY_FLAGS_DEFAULTPROCARRAY_LOGICAL_DECODING_FLAG`
`51`	`48`	`/* Ignore vacuum backends */`
`52`	`49`	`#definePROCARRAY_FLAGS_VACUUMPROCARRAY_FLAGS_DEFAULT \| PROCARRAY_VACUUM_FLAG`
`53`		`-/* Ignore analyze backends */`
`54`		`-#definePROCARRAY_FLAGS_ANALYZEPROCARRAY_FLAGS_DEFAULT \| PROCARRAY_ANALYZE_FLAG`
`55`		`-/* Ignore both vacuum and analyze backends */`
`56`		`-#definePROCARRAY_FLAGS_VACUUM_ANALYZEPROCARRAY_FLAGS_DEFAULT \| PROCARRAY_VACUUM_FLAG \| PROCARRAY_ANALYZE_FLAG`
`57`	`50`
`58`	`51`	`externSizeProcArrayShmemSize(void);`
`59`	`52`	`externvoidCreateSharedProcArray(void);`

Comments

(0)