Update incremental logic for ao tables

In GPDB 7+, the pg_class.relstorage column no longer exists to tell us if a table is heap or append-only. Instead, we now have the upstream Postgres implementation of pluggable storage which introduces table (and other relation type) access methods exposed in catalog table pg_am which is referenced in the new pg_class.relam column. Authored-by: Kevin Yeap <kyeap@vmware.com>
silvertl · Nov 22, 2022 · 1e2559c · 1e2559c
1 parent 52f1ffe
commit 1e2559c
Showing 1 changed file with 79 additions and 34 deletions.
diff --git a/backup/queries_incremental.go b/backup/queries_incremental.go
@@ -34,22 +34,44 @@ func getAllModCounts(connectionPool *dbconn.DBConn) map[string]int64 {
 }
 
 func getAOSegTableFQNs(connectionPool *dbconn.DBConn) map[string]string {
-	query := fmt.Sprintf(`
-	SELECT seg.aotablefqn,
-		'pg_aoseg.' || quote_ident(aoseg_c.relname) AS aosegtablefqn
-	FROM pg_class aoseg_c
-		JOIN (SELECT pg_ao.relid AS aooid,
-				pg_ao.segrelid,
-				aotables.aotablefqn
-			FROM pg_appendonly pg_ao
-				JOIN (SELECT c.oid,
-						quote_ident(n.nspname)|| '.' || quote_ident(c.relname) AS aotablefqn
-					FROM pg_class c
-						JOIN pg_namespace n ON c.relnamespace = n.oid
-					WHERE relstorage IN ( 'ao', 'co' )
-						AND %s
-				) aotables ON pg_ao.relid = aotables.oid
-		) seg ON aoseg_c.oid = seg.segrelid`, relationAndSchemaFilterClause())
+	var query string
+	if connectionPool.Version.AtLeast("7") {
+		query = fmt.Sprintf(`
+		SELECT seg.aotablefqn,
+			'pg_aoseg.' || quote_ident(aoseg_c.relname) AS aosegtablefqn
+		FROM pg_class aoseg_c
+			JOIN (SELECT pg_ao.relid AS aooid,
+					pg_ao.segrelid,
+					aotables.aotablefqn
+				FROM pg_appendonly pg_ao
+					JOIN (SELECT c.oid,
+							quote_ident(n.nspname) || '.' || quote_ident(c.relname) AS aotablefqn
+						FROM pg_class c
+							JOIN pg_namespace n ON c.relnamespace = n.oid
+							JOIN pg_am a ON c.relam = a.oid
+						WHERE a.amname in ('ao_row', 'ao_col')
+							AND %s
+					) aotables ON pg_ao.relid = aotables.oid
+			) seg ON aoseg_c.oid = seg.segrelid`, relationAndSchemaFilterClause())
+	} else {
+		query = fmt.Sprintf(`
+		SELECT seg.aotablefqn,
+			'pg_aoseg.' || quote_ident(aoseg_c.relname) AS aosegtablefqn
+		FROM pg_class aoseg_c
+			JOIN (SELECT pg_ao.relid AS aooid,
+					pg_ao.segrelid,
+					aotables.aotablefqn
+				FROM pg_appendonly pg_ao
+					JOIN (SELECT c.oid,
+							quote_ident(n.nspname)|| '.' || quote_ident(c.relname) AS aotablefqn
+						FROM pg_class c
+							JOIN pg_namespace n ON c.relnamespace = n.oid
+						WHERE relstorage IN ( 'ao', 'co' )
+							AND %s
+					) aotables ON pg_ao.relid = aotables.oid
+			) seg ON aoseg_c.oid = seg.segrelid`, relationAndSchemaFilterClause())
+	}
+
 	results := make([]struct {
 		AOTableFQN    string
 		AOSegTableFQN string
@@ -86,24 +108,47 @@ func getModCount(connectionPool *dbconn.DBConn, aosegtablefqn string) int64 {
 }
 
 func getLastDDLTimestamps(connectionPool *dbconn.DBConn) map[string]string {
-	query := fmt.Sprintf(`
-	SELECT quote_ident(aoschema) || '.' || quote_ident(aorelname) as aotablefqn,
-		lastddltimestamp
-	FROM ( SELECT c.oid AS aooid,
-				n.nspname AS aoschema,
-				c.relname AS aorelname
-			FROM pg_class c
-			JOIN pg_namespace n ON c.relnamespace = n.oid
-			WHERE c.relstorage IN ('ao', 'co')
-			AND %s
-		) aotables
-	JOIN ( SELECT lo.objid,
-				MAX(lo.statime) AS lastddltimestamp
-			FROM pg_stat_last_operation lo
-			WHERE lo.staactionname IN ('CREATE', 'ALTER', 'TRUNCATE')
-			GROUP BY lo.objid
-		) lastop
-	ON aotables.aooid = lastop.objid`, relationAndSchemaFilterClause())
+	var query string
+	if connectionPool.Version.AtLeast("7") {
+		query = fmt.Sprintf(`
+		SELECT quote_ident(aoschema) || '.' || quote_ident(aorelname) as aotablefqn,
+			lastddltimestamp
+		FROM ( SELECT c.oid AS aooid,
+					n.nspname AS aoschema,
+					c.relname AS aorelname
+				FROM pg_class c
+					JOIN pg_namespace n ON c.relnamespace = n.oid
+					JOIN pg_am a ON c.relam = a.oid
+				WHERE a.amname in ('ao_row', 'ao_col');
+					AND %s
+			) aotables
+		JOIN ( SELECT lo.objid,
+					MAX(lo.statime) AS lastddltimestamp
+				FROM pg_stat_last_operation lo
+				WHERE lo.staactionname IN ('CREATE', 'ALTER', 'TRUNCATE')
+				GROUP BY lo.objid
+			) lastop
+		ON aotables.aooid = lastop.objid`, relationAndSchemaFilterClause())
+	} else {
+		query = fmt.Sprintf(`
+		SELECT quote_ident(aoschema) || '.' || quote_ident(aorelname) as aotablefqn,
+			lastddltimestamp
+		FROM ( SELECT c.oid AS aooid,
+					n.nspname AS aoschema,
+					c.relname AS aorelname
+				FROM pg_class c
+				JOIN pg_namespace n ON c.relnamespace = n.oid
+				WHERE c.relstorage IN ('ao', 'co')
+				AND %s
+			) aotables
+		JOIN ( SELECT lo.objid,
+					MAX(lo.statime) AS lastddltimestamp
+				FROM pg_stat_last_operation lo
+				WHERE lo.staactionname IN ('CREATE', 'ALTER', 'TRUNCATE')
+				GROUP BY lo.objid
+			) lastop
+		ON aotables.aooid = lastop.objid`, relationAndSchemaFilterClause())
+	}
 
 	var results []struct {
 		AOTableFQN       string