Merge branch 'PGPROEE9_6' into PGPROEE9_6_scheduler

Vladimir Ershov · Vladimir Ershov · commit d8b6724b70eb · 2017-07-27T15:26:40.000+03:00
diff --git a/contrib/online_analyze/online_analyze.c b/contrib/online_analyze/online_analyze.c
@@ -847,13 +847,36 @@ onlineAnalyzeHookerUtility(
 		{
 			VacuumStmt	*vac = (VacuumStmt*)parsetree;
 
-			tblnames = list_make1(vac->relation);
-
+			if (vac->relation) 
+				tblnames = list_make1(vac->relation);
 			if (vac->options & (VACOPT_VACUUM | VACOPT_FULL | VACOPT_FREEZE))
+			{
 				/* optionally with analyze */
 				op = CK_VACUUM;
+
+				/* drop all collected stat */
+				if (tblnames == NIL)
+					relstatsInit();
+			}		
 			else if (vac->options & VACOPT_ANALYZE)
+			{
 				op = CK_ANALYZE;
+				
+				/* should reset all counters */
+				if (tblnames == NIL)
+				{
+					HASH_SEQ_STATUS  hs;
+					OnlineAnalyzeTableStat *rstat;
+					TimestampTz	     now = GetCurrentTimestamp();
+
+					hash_seq_init(&hs, relstats);
+					while ((rstat = hash_seq_search(&hs)) != NULL)
+					{
+						rstat->changes_since_analyze = 0;
+						rstat->analyze_timestamp = now;
+					}
+				}
+			}
 			else
 				tblnames = NIL;
 		}
