Add more gc activity statistic functions

knizhnik · knizhnik · commit 1f964fc288c9 · 2016-11-10T22:26:07.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -839,7 +839,10 @@ PG_FUNCTION_INFO_V1(cfs_enable_gc);
 PG_FUNCTION_INFO_V1(cfs_version);
 PG_FUNCTION_INFO_V1(cfs_estimate);
 PG_FUNCTION_INFO_V1(cfs_compression_ratio);
-PG_FUNCTION_INFO_V1(cfs_gc_activity);
+PG_FUNCTION_INFO_V1(cfs_gc_activity_processed_bytes);
+PG_FUNCTION_INFO_V1(cfs_gc_activity_processed_pages);
+PG_FUNCTION_INFO_V1(cfs_gc_activity_processed_files);
+PG_FUNCTION_INFO_V1(cfs_gc_activity_scanned_files);
 
 Datum cfs_start_gc(PG_FUNCTION_ARGS)
 {
@@ -982,7 +985,22 @@ Datum cfs_compression_ratio(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8((double)virtSize/physSize);
 }
 
-Datum cfs_gc_activity(PG_FUNCTION_ARGS)
+Datum cfs_gc_activity_processed_bytes(PG_FUNCTION_ARGS)
 {
 	PG_RETURN_INT64(cfs_state->gc_stat.processedBytes);
 }
+
+Datum cfs_gc_activity_processed_pages(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_INT64(cfs_state->gc_stat.processedPages);
+}
+
+Datum cfs_gc_activity_processed_files(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_INT64(cfs_state->gc_stat.processedFiles);
+}
+
+Datum cfs_gc_activity_scanned_files(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_INT64(cfs_state->gc_stat.scannedFiles);
+}
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
@@ -5348,10 +5348,16 @@ DATA(insert OID = 6102 (  cfs_enable_gc		   PGNSP PGUID 12 1 0 0 0 f f f f t f v
 DESCR("Enable or disable CFS garbage collection");
 DATA(insert OID = 6103 (  cfs_estimate		   PGNSP PGUID 12 1 0 0 0 f f f f t f v s 1 0 701 "2205" _null_ _null_ _null_ _null_ _null_ cfs_estimate _null_ _null_ _null_ ));
 DESCR("Estimate relation compression ratio");
-DATA(insert OID = 6019 (  cfs_compression_ratio  PGNSP PGUID 12 1 0 0 0 f f f f t f v s 1 0 701 "2205" _null_ _null_ _null_ _null_ _null_ cfs_compression_ratio _null_ _null_ _null_ ));
+DATA(insert OID = 6104 (  cfs_compression_ratio  PGNSP PGUID 12 1 0 0 0 f f f f t f v s 1 0 701 "2205" _null_ _null_ _null_ _null_ _null_ cfs_compression_ratio _null_ _null_ _null_ ));
 DESCR("Compression ration of relation");
-DATA(insert OID = 6020 (  cfs_gc_activity		   PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 20 "" _null_ _null_ _null_ _null_ _null_ cfs_gc_activity _null_ _null_ _null_ ));
+DATA(insert OID = 6105 (  cfs_gc_activity_processed_bytes		   PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 20 "" _null_ _null_ _null_ _null_ _null_ cfs_gc_activity_processed_bytes _null_ _null_ _null_ ));
 DESCR("Number of bytes proceeded by CFS garbage collectors since system start");
+DATA(insert OID = 6106 (  cfs_gc_activity_processed_files		   PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 20 "" _null_ _null_ _null_ _null_ _null_ cfs_gc_activity_processed_files _null_ _null_ _null_ ));
+DESCR("Number of files compacted by CFS garbage collectors since system start");
+DATA(insert OID = 6107 (  cfs_gc_activity_processed_pages		   PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 20 "" _null_ _null_ _null_ _null_ _null_ cfs_gc_activity_processed_pages _null_ _null_ _null_ ));
+DESCR("Number of transferred  pages by CFS garbage collectors since system start");
+DATA(insert OID = 6108 (  cfs_gc_activity_scanned_files		   PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 20 "" _null_ _null_ _null_ _null_ _null_ cfs_gc_activity_scanned_files _null_ _null_ _null_ ));
+DESCR("Number of files scanned by CFS garbage collectors since system start");
 
 /* distance functions */
 DATA(insert OID = 3343 ( int2_dist		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0   21 "21 21"		_null_ _null_ _null_ _null_ _null_	int2_dist	_null_ _null_ _null_ ));
