[PGPRO-5691]

* fix tap test (remove checking of ptrack.map.mmap file)
* cosmetic change (minimize diff with master)

Author: kulaginm

engine.h

@@ -98,8 +98,7 @@ extern PtrackMap ptrack_map;
  * Size of ptrack map in bytes
  * TODO: to be protected by PtrackResizeLock?
  */
-extern uint64	ptrack_map_size;
-extern uint64  *ptrack_map_size_requested_at_startup;
+extern uint64 ptrack_map_size;
 extern int	ptrack_map_size_tmp;
 
 extern void ptrackCheckpoint(void);

ptrack.c

@@ -58,9 +58,9 @@
 
 PG_MODULE_MAGIC;
 
-PtrackMap		ptrack_map = NULL;
-uint64			ptrack_map_size = 0;
-int				ptrack_map_size_tmp;
+PtrackMap	ptrack_map = NULL;
+uint64		ptrack_map_size = 0;
+int			ptrack_map_size_tmp;
 
 static shmem_startup_hook_type prev_shmem_startup_hook = NULL;
 static copydir_hook_type prev_copydir_hook = NULL;

t/001_basic.pl

@@ -155,7 +155,6 @@
 # Check that we have lost everything
 ok(! -f $node->data_dir . "/global/ptrack.map", "ptrack.map should be cleaned up");
 ok(! -f $node->data_dir . "/global/ptrack.map.tmp", "ptrack.map.tmp should be cleaned up");
-ok(! -f $node->data_dir . "/global/ptrack.map.mmap", "ptrack.map.mmap should be cleaned up");
 
 ($res, $res_stdout, $res_stderr) = $node->psql("postgres", "SELECT ptrack_get_pagemapset('0/0')");
 is($res, 3, 'errors out if ptrack is disabled');