Handle partitions with different order of columns.

Author: Antonin Houska

concurrent.c

@@ -576,15 +576,33 @@ find_tuple_in_partition(HeapTuple tup, Relation partition,
 						ScanKey key, int nkeys, ItemPointer ctid)
 {
 	Oid			part_oid = RelationGetRelid(partition);
+	HeapTuple	tup_mapped = NULL;
 	PartitionEntry *entry;
 
 	entry = partitions_lookup(partitions, part_oid);
 	if (entry == NULL)
 		elog(ERROR, "identity index not found for partition %u", part_oid);
 	Assert(entry->part_oid == part_oid);
 
+	/*
+	 * Make sure the tuple so it matches the partition.
+	 */
+	if (entry->conv_map)
+	{
+		/*
+		 * convert_tuple_for_dest_table() is not suitable here because we need
+		 * to keep the original tuple. XXX Should we add a boolean argument to
+		 * the function that indicates whether it should free the original
+		 * tuple?
+		 */
+		tup_mapped = pg_rewrite_execute_attr_map_tuple(tup,
+													   entry->conv_map);
+		tup = tup_mapped;
+	}
 	find_tuple(tup, partition, entry->ident_index, key, nkeys, ctid,
 			   entry->ind_slot);
+	if (tup_mapped)
+		pfree(tup_mapped);
 }
 
 /*

pg_rewrite.c

@@ -1371,7 +1371,6 @@ get_identity_index(Relation rel_dst, Relation rel_src)
 	index_src = index_open(index_src_oid, AccessShareLock);
 	tupdesc_src = RelationGetDescr(index_src);
 
-
 	/*
 	 * The tuple descriptors might not be equal, since some attributes of
 	 * rel_dst can have different types. What should match though is attribute

specs/pg_rewrite_concurrent.spec

@@ -4,11 +4,15 @@ setup
     CREATE EXTENSION pg_rewrite;
 
     CREATE TABLE tbl_src(i int primary key, j int);
-    INSERT INTO tbl_src(i, j) VALUES (1, 1), (4, 4);
+    INSERT INTO tbl_src(i, j) VALUES (1, 10), (4, 40);
 
     CREATE TABLE tbl_dst(i int primary key, j int) PARTITION BY RANGE(i);
     CREATE TABLE tbl_dst_part_1 PARTITION OF tbl_dst FOR VALUES FROM (1) TO (4);
-    CREATE TABLE tbl_dst_part_2 PARTITION OF tbl_dst FOR VALUES FROM (4) TO (8);
+
+    -- Create a partition with different order of columns, to test that
+    -- partition maps work.
+    CREATE TABLE tbl_dst_part_2(j int, i int primary key);
+    ALTER TABLE tbl_dst ATTACH PARTITION tbl_dst_part_2 FOR VALUES FROM (4) TO (8);
 }
 
 teardown
@@ -66,12 +70,12 @@ BEGIN
 		PERFORM pg_sleep(.1);
 	END LOOP;
 END;
-$$
+$$;
 }
 step do_changes
 {
 	-- Insert one row into each partition.
-	INSERT INTO tbl_src VALUES (2, 2), (3, 3), (5, 5);
+	INSERT INTO tbl_src VALUES (2, 20), (3, 30), (5, 50);
 
 	-- Update with no identity change.
 	UPDATE tbl_src SET j=0 WHERE i=1;