@@ -190,6 +190,7 @@ typedef struct autovac_table
190190int at_vacuum_cost_delay ;
191191int at_vacuum_cost_limit ;
192192bool at_dobalance ;
193+ bool at_sharedrel ;
193194char * at_relname ;
194195char * at_nspname ;
195196char * at_datname ;
@@ -203,6 +204,7 @@ typedef struct autovac_table
203204 * wi_linksentry into free list or running list
204205 * wi_dboidOID of the database this worker is supposed to work on
205206 * wi_tableoidOID of the table currently being vacuumed, if any
207+ * wi_sharedrelflag indicating whether table is marked relisshared
206208 * wi_procpointer to PGPROC of the running worker, NULL if not started
207209 * wi_launchtime Time at which this worker was launched
208210 * wi_cost_*Vacuum cost-based delay parameters current in this worker
@@ -220,6 +222,7 @@ typedef struct WorkerInfoData
220222PGPROC * wi_proc ;
221223TimestampTz wi_launchtime ;
222224bool wi_dobalance ;
225+ bool wi_sharedrel ;
223226int wi_cost_delay ;
224227int wi_cost_limit ;
225228int wi_cost_limit_base ;
@@ -717,6 +720,7 @@ AutoVacLauncherMain(int argc, char *argv[])
717720worker = AutoVacuumShmem -> av_startingWorker ;
718721worker -> wi_dboid = InvalidOid ;
719722worker -> wi_tableoid = InvalidOid ;
723+ worker -> wi_sharedrel = false;
720724worker -> wi_proc = NULL ;
721725worker -> wi_launchtime = 0 ;
722726dlist_push_head (& AutoVacuumShmem -> av_freeWorkers ,
@@ -1683,6 +1687,7 @@ FreeWorkerInfo(int code, Datum arg)
16831687dlist_delete (& MyWorkerInfo -> wi_links );
16841688MyWorkerInfo -> wi_dboid = InvalidOid ;
16851689MyWorkerInfo -> wi_tableoid = InvalidOid ;
1690+ MyWorkerInfo -> wi_sharedrel = false;
16861691MyWorkerInfo -> wi_proc = NULL ;
16871692MyWorkerInfo -> wi_launchtime = 0 ;
16881693MyWorkerInfo -> wi_dobalance = false;
@@ -2229,8 +2234,8 @@ do_autovacuum(void)
22292234if (worker == MyWorkerInfo )
22302235continue ;
22312236
2232- /* ignore workers in other databases */
2233- if (worker -> wi_dboid != MyDatabaseId )
2237+ /* ignore workers in other databases(unless table is shared) */
2238+ if (! worker -> wi_sharedrel && worker -> wi_dboid != MyDatabaseId )
22342239continue ;
22352240
22362241if (worker -> wi_tableoid == relid )
@@ -2271,6 +2276,7 @@ do_autovacuum(void)
22712276 * the lock so that other workers don't vacuum it concurrently.
22722277 */
22732278MyWorkerInfo -> wi_tableoid = relid ;
2279+ MyWorkerInfo -> wi_sharedrel = tab -> at_sharedrel ;
22742280LWLockRelease (AutovacuumScheduleLock );
22752281
22762282/*
@@ -2382,6 +2388,7 @@ do_autovacuum(void)
23822388 */
23832389LWLockAcquire (AutovacuumLock ,LW_EXCLUSIVE );
23842390MyWorkerInfo -> wi_tableoid = InvalidOid ;
2391+ MyWorkerInfo -> wi_sharedrel = false;
23852392LWLockRelease (AutovacuumLock );
23862393
23872394/* restore vacuum cost GUCs for the next iteration */
@@ -2577,6 +2584,7 @@ table_recheck_autovac(Oid relid, HTAB *table_toast_map,
25772584
25782585tab = palloc (sizeof (autovac_table ));
25792586tab -> at_relid = relid ;
2587+ tab -> at_sharedrel = classForm -> relisshared ;
25802588tab -> at_vacoptions = VACOPT_SKIPTOAST |
25812589(dovacuum ?VACOPT_VACUUM :0 ) |
25822590(doanalyze ?VACOPT_ANALYZE :0 ) |