Close the file descriptor in ApplyLogicalMappingFile

tvondra · tvondra · commit ef1ac5b2ad08 · 2018-08-16T16:51:00.000+02:00
The function was forgetting to close the file descriptor, resulting in failures like this: ERROR: 53000: exceeded maxAllocatedDescs (492) while trying to open file "pg_logical/mappings/map-4000-4eb-1_60DE1E08-5376b5-537c6b" LOCATION: OpenTransientFile, fd.c:2161 Simply close the file at the end, and backpatch to 9.4 (where logical decoding was introduced). While at it, fix a nearby typo. Discussion: https://www.postgresql.org/message-id/flat/738a590a-2ce5-9394-2bef-7b1caad89b37%402ndquadrant.com
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
@@ -3121,11 +3121,13 @@ ApplyLogicalMappingFile(HTAB *tuplecid_data, Oid relid, const char *fname)
 			new_ent->combocid = ent->combocid;
 		}
 	}
+
+	CloseTransientFile(fd);
 }
 
 
 /*
- * Check whether the TransactionOId 'xid' is in the pre-sorted array 'xip'.
+ * Check whether the TransactionOid 'xid' is in the pre-sorted array 'xip'.
  */
 static bool
 TransactionIdInArray(TransactionId xid, TransactionId *xip, Size num)

Original file line number	Diff line number	Diff line change
`@@ -3121,11 +3121,13 @@ ApplyLogicalMappingFile(HTAB tuplecid_data, Oid relid, const char fname)`
`3121`	`3121`	`new_ent->combocid = ent->combocid;`
`3122`	`3122`	`}`
`3123`	`3123`	`}`
	`3124`	`+`
	`3125`	`+ CloseTransientFile(fd);`
`3124`	`3126`	`}`
`3125`	`3127`
`3126`	`3128`
`3127`	`3129`	`/*`
`3128`		`- * Check whether the TransactionOId 'xid' is in the pre-sorted array 'xip'.`
	`3130`	`+ * Check whether the TransactionOid 'xid' is in the pre-sorted array 'xip'.`
`3129`	`3131`	`*/`
`3130`	`3132`	`static bool`
`3131`	`3133`	`TransactionIdInArray(TransactionId xid, TransactionId *xip, Size num)`