mirror of
https://github.com/postgres/postgres.git
synced 2025-12-21 05:21:08 +03:00
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they flow past the right margin. By default, BSD indent lines up statement continuation lines that are within parentheses so that they start just to the right of the preceding left parenthesis. However, traditionally, if that resulted in the continuation line extending to the right of the desired right margin, then indent would push it left just far enough to not overrun the margin, if it could do so without making the continuation line start to the left of the current statement indent. That makes for a weird mix of indentations unless one has been completely rigid about never violating the 80-column limit. This behavior has been pretty universally panned by Postgres developers. Hence, disable it with indent's new -lpl switch, so that parenthesized lines are always lined up with the preceding left paren. This patch is much less interesting than the first round of indent changes, but also bulkier, so I thought it best to separate the effects. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
This commit is contained in:
@@ -522,7 +522,7 @@ pg_flush_data(int fd, off_t offset, off_t nbytes)
|
||||
/* FATAL error because mapping would remain */
|
||||
ereport(FATAL,
|
||||
(errcode_for_file_access(),
|
||||
errmsg("could not munmap() while flushing data: %m")));
|
||||
errmsg("could not munmap() while flushing data: %m")));
|
||||
}
|
||||
|
||||
return;
|
||||
@@ -1757,8 +1757,8 @@ FileWrite(File file, char *buffer, int amount, uint32 wait_event_info)
|
||||
if (newTotal > (uint64) temp_file_limit * (uint64) 1024)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
|
||||
errmsg("temporary file size exceeds temp_file_limit (%dkB)",
|
||||
temp_file_limit)));
|
||||
errmsg("temporary file size exceeds temp_file_limit (%dkB)",
|
||||
temp_file_limit)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2728,7 +2728,7 @@ RemovePgTempFiles(void)
|
||||
continue;
|
||||
|
||||
snprintf(temp_path, sizeof(temp_path), "pg_tblspc/%s/%s/%s",
|
||||
spc_de->d_name, TABLESPACE_VERSION_DIRECTORY, PG_TEMP_FILES_DIR);
|
||||
spc_de->d_name, TABLESPACE_VERSION_DIRECTORY, PG_TEMP_FILES_DIR);
|
||||
RemovePgTempFilesInDir(temp_path);
|
||||
|
||||
snprintf(temp_path, sizeof(temp_path), "pg_tblspc/%s/%s",
|
||||
|
||||
Reference in New Issue
Block a user