Push AO and external table relstorage values into Greenplum-specific code.

contrib/pg_upgrade/greenplum/aotable.c

@@ -11,6 +11,9 @@
 
 #include "pqexpbuffer.h"
 
+/* needs to be kept in sync with pg_class.h */
+#define RELSTORAGE_AOROWS	'a'
+#define RELSTORAGE_AOCOLS	'c'
 
 /*
  * We cannot use executeQueryOrDie for the INSERTs below, because it has a size
@@ -267,8 +270,7 @@ restore_aosegment_tables(void)
 		{
 			RelInfo		*rel = &olddb->rel_arr.rels[relnum];
 
-			if (rel->relstorage == RELSTORAGE_AOROWS ||
-				rel->relstorage == RELSTORAGE_AOCOLS)
+			if (is_appendonly(rel->relstorage))
 				restore_aosegment_table(conn, rel);
 		}
 
@@ -277,3 +279,9 @@ restore_aosegment_tables(void)
 
 	check_ok();
 }
+
+bool
+is_appendonly(char relstorage)
+{
+	return relstorage == RELSTORAGE_AOROWS || relstorage == RELSTORAGE_AOCOLS;
+}

contrib/pg_upgrade/greenplum/check_gp.c

@@ -17,6 +17,8 @@
 #include "pg_upgrade_greenplum.h"
 #include "check_gp.h"
 
+#define RELSTORAGE_EXTERNAL	'x'
+
 static void check_external_partition(void);
 static void check_covering_aoindex(void);
 static void check_partition_indexes(void);

contrib/pg_upgrade/greenplum/pg_upgrade_greenplum.h

@@ -12,6 +12,7 @@
 
 #define PG_OPTIONS_UTILITY_MODE " PGOPTIONS='-c gp_session_role=utility' "
 
+
 /*
  * Enumeration for operations in the progress report
  */
@@ -78,6 +79,8 @@ void validate_greenplum_options(void);
 /* aotable.c */
 
 void		restore_aosegment_tables(void);
+bool        is_appendonly(char relstorage);
+
 
 /* gpdb4_heap_convert.c */
 

contrib/pg_upgrade/info.c

@@ -749,11 +749,11 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
 		relkind = PQgetvalue(res, relnum, i_relkind) [0];
 
 		/*
-		 * RELSTORAGE_AOROWS and RELSTORAGE_AOCOLS. The structure of append
+		 * The structure of append
 		 * optimized tables is similar enough for row and column oriented
 		 * tables so we can handle them both here.
 		 */
-		if (relstorage == RELSTORAGE_AOROWS || relstorage == RELSTORAGE_AOCOLS)
+		if (is_appendonly(relstorage))
 		{
 			char	   *segrel;
 			char	   *visimaprel;

contrib/pg_upgrade/pg_upgrade.h

@@ -45,11 +45,6 @@
 #define DB_OIDS_DUMP_FILE_MASK	"pg_upgrade_dump_%u_oids.sql"
 #define OLD_TABLESPACES_FILE    "old_tablespaces.txt"
 
-/* needs to be kept in sync with pg_class.h */
-#define RELSTORAGE_EXTERNAL	'x'
-#define RELSTORAGE_AOROWS	'a'
-#define RELSTORAGE_AOCOLS	'c'
-
 #define DB_DUMP_LOG_FILE_MASK	"pg_upgrade_dump_%u.log"
 #define SERVER_LOG_FILE		"pg_upgrade_server.log"
 #define UTILITY_LOG_FILE	"pg_upgrade_utility.log"