Toward the ptrack 2.1

Author: ololobus

.travis.yml

@@ -21,10 +21,6 @@ notifications:
         on_success: change
         on_failure: always
 
-# Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
 env:
     - PG_VERSION=12 PG_BRANCH=REL_12_STABLE
-
-jobs:
-    allow_failures:
-        - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
+    # - PG_VERSION=13 PG_BRANCH=master

Makefile

@@ -1,12 +1,12 @@
 # contrib/ptrack/Makefile
 
 MODULE_big = ptrack
-OBJS = ptrack.o $(WIN32RES)
+OBJS = ptrack.o datapagemap.o engine.o $(WIN32RES)
 EXTENSION = ptrack
-EXTVERSION = 2.0
-DATA = ptrack.sql
+EXTVERSION = 2.1
+DATA = ptrack.sql ptrack--2.0--2.1.sql
 DATA_built = $(EXTENSION)--$(EXTVERSION).sql
-PGFILEDESC = "ptrack - public API for internal ptrack engine"
+PGFILEDESC = "ptrack - block-level incremental backup engine"
 
 EXTRA_CLEAN = $(EXTENSION)--$(EXTVERSION).sql
 
@@ -24,4 +24,26 @@ endif
 $(EXTENSION)--$(EXTVERSION).sql: ptrack.sql
 	cat $^ > $@
 
+# check: isolationcheck
+
+# ISOLATIONCHECKS=corner_cases
+
+# submake-isolation:
+# 	$(MAKE) -C $(top_builddir)/src/test/isolation all
+
+# isolationcheck: | submake-isolation temp-install
+# 	$(MKDIR_P) isolation_output
+# 	$(pg_isolation_regress_check) \
+# 	  --temp-config $(top_srcdir)/contrib/pg_query_state/test.conf \
+#       --outputdir=isolation_output \
+# 	  $(ISOLATIONCHECKS)
+
+# isolationcheck-install-force: all | submake-isolation temp-install
+# 	$(MKDIR_P) isolation_output
+# 	$(pg_isolation_regress_installcheck) \
+#       --outputdir=isolation_output \
+# 	  $(ISOLATIONCHECKS)
+
+# .PHONY: isolationcheck isolationcheck-install-force check
+
 temp-install: EXTRA_INSTALL=contrib/ptrack

datapagemap.c

@@ -0,0 +1,126 @@
+/*-------------------------------------------------------------------------
+ *
+ * datapagemap.c
+ *	  A data structure for keeping track of data pages that have changed.
+ *
+ * This is a fairly simple bitmap.
+ *
+ * Copyright (c) 2013-2020, PostgreSQL Global Development Group
+ * Copyright (c) 2019-2020, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "datapagemap.h"
+
+struct datapagemap_iterator
+{
+	datapagemap_t *map;
+	BlockNumber nextblkno;
+};
+
+/*
+ * Add a block to the bitmap.
+ */
+void
+datapagemap_add(datapagemap_t *map, BlockNumber blkno)
+{
+	int			offset;
+	int			bitno;
+
+	offset = blkno / 8;
+	bitno = blkno % 8;
+
+	/* enlarge or create bitmap if needed */
+	if (map->bitmapsize <= offset)
+	{
+		int			oldsize = map->bitmapsize;
+		int			newsize;
+
+		/*
+		 * The minimum to hold the new bit is offset + 1. But add some
+		 * headroom, so that we don't need to repeatedly enlarge the bitmap in
+		 * the common case that blocks are modified in order, from beginning
+		 * of a relation to the end.
+		 */
+		newsize = offset + 1;
+		newsize += 10;
+
+		if (map->bitmap != NULL)
+			map->bitmap = repalloc(map->bitmap, newsize);
+		else
+			map->bitmap = palloc(newsize);
+
+		/* zero out the newly allocated region */
+		memset(&map->bitmap[oldsize], 0, newsize - oldsize);
+
+		map->bitmapsize = newsize;
+	}
+
+	/* Set the bit */
+	map->bitmap[offset] |= (1 << bitno);
+}
+
+/*
+ * Start iterating through all entries in the page map.
+ *
+ * After datapagemap_iterate, call datapagemap_next to return the entries,
+ * until it returns false. After you're done, use pg_free() to destroy the
+ * iterator.
+ */
+datapagemap_iterator_t *
+datapagemap_iterate(datapagemap_t *map)
+{
+	datapagemap_iterator_t *iter;
+
+	iter = palloc(sizeof(datapagemap_iterator_t));
+	iter->map = map;
+	iter->nextblkno = 0;
+
+	return iter;
+}
+
+bool
+datapagemap_next(datapagemap_iterator_t *iter, BlockNumber *blkno)
+{
+	datapagemap_t *map = iter->map;
+
+	for (;;)
+	{
+		BlockNumber blk = iter->nextblkno;
+		int			nextoff = blk / 8;
+		int			bitno = blk % 8;
+
+		if (nextoff >= map->bitmapsize)
+			break;
+
+		iter->nextblkno++;
+
+		if (map->bitmap[nextoff] & (1 << bitno))
+		{
+			*blkno = blk;
+			return true;
+		}
+	}
+
+	/* no more set bits in this bitmap. */
+	return false;
+}
+
+/*
+ * A debugging aid. Prints out the contents of the page map.
+ */
+void
+datapagemap_print(datapagemap_t *map)
+{
+	datapagemap_iterator_t *iter;
+	BlockNumber blocknum;
+
+	iter = datapagemap_iterate(map);
+	while (datapagemap_next(iter, &blocknum))
+		elog(DEBUG3, "block %u", blocknum);
+
+	pfree(iter);
+}

datapagemap.h

@@ -0,0 +1,29 @@
+/*-------------------------------------------------------------------------
+ *
+ * datapagemap.h
+ *
+ * Copyright (c) 2013-2019, PostgreSQL Global Development Group
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef DATAPAGEMAP_H
+#define DATAPAGEMAP_H
+
+#include "storage/relfilenode.h"
+#include "storage/block.h"
+
+struct datapagemap
+{
+	char	   *bitmap;
+	int			bitmapsize;
+};
+
+typedef struct datapagemap datapagemap_t;
+typedef struct datapagemap_iterator datapagemap_iterator_t;
+
+extern void datapagemap_add(datapagemap_t *map, BlockNumber blkno);
+extern datapagemap_iterator_t *datapagemap_iterate(datapagemap_t *map);
+extern bool datapagemap_next(datapagemap_iterator_t *iter, BlockNumber *blkno);
+extern void datapagemap_print(datapagemap_t *map);
+
+#endif							/* DATAPAGEMAP_H */