Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd301241

Browse files
michaelpqpull[bot]
authored andcommitted
Move any remaining files generated by pg_upgrade into an internal subdir
This change concerns a couple of .txt files (for internal state checks)that were still written in the path where the binary is executed, andnot in the subdirectory located in the target cluster. Like the other.txt files doing already so (like loadable_libraries.txt), these aresaved in the base output directory. Note that on failure, the logsreport the full path to the .txt file generated, so these are easy tofind.Oversight in38bfae3.Author: Daniel GustafssonReviewed-by: Michael Paquier, Justin PrysbyDiscussion:https://postgr.es/m/181A6DA8-3B7F-4B71-82D5-363FF0146820@yesql.seBackpatch-through: 15
1 parentb238b66 commitd301241

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

‎src/bin/pg_upgrade/check.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,9 @@ check_for_composite_data_type_usage(ClusterInfo *cluster)
12181218

12191219
prep_status("Checking for system-defined composite types in user tables");
12201220

1221-
snprintf(output_path,sizeof(output_path),"tables_using_composite.txt");
1221+
snprintf(output_path,sizeof(output_path),"%s/%s",
1222+
log_opts.basedir,
1223+
"tables_using_composite.txt");
12221224

12231225
/*
12241226
* Look for composite types that were made during initdb *or* belong to
@@ -1275,7 +1277,9 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
12751277

12761278
prep_status("Checking for reg* data types in user tables");
12771279

1278-
snprintf(output_path,sizeof(output_path),"tables_using_reg.txt");
1280+
snprintf(output_path,sizeof(output_path),"%s/%s",
1281+
log_opts.basedir,
1282+
"tables_using_reg.txt");
12791283

12801284
/*
12811285
* Note: older servers will not have all of these reg* types, so we have
@@ -1328,7 +1332,9 @@ check_for_jsonb_9_4_usage(ClusterInfo *cluster)
13281332

13291333
prep_status("Checking for incompatible \"jsonb\" data type");
13301334

1331-
snprintf(output_path,sizeof(output_path),"tables_using_jsonb.txt");
1335+
snprintf(output_path,sizeof(output_path),"%s/%s",
1336+
log_opts.basedir,
1337+
"tables_using_jsonb.txt");
13321338

13331339
if (check_for_data_type_usage(cluster,"pg_catalog.jsonb",output_path))
13341340
{

‎src/bin/pg_upgrade/version.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@ old_9_3_check_for_line_data_type_usage(ClusterInfo *cluster)
183183

184184
prep_status("Checking for incompatible \"line\" data type");
185185

186-
snprintf(output_path,sizeof(output_path),"tables_using_line.txt");
186+
snprintf(output_path,sizeof(output_path),"%s/%s",
187+
log_opts.basedir,
188+
"tables_using_line.txt");
187189

188190
if (check_for_data_type_usage(cluster,"pg_catalog.line",output_path))
189191
{
@@ -221,7 +223,9 @@ old_9_6_check_for_unknown_data_type_usage(ClusterInfo *cluster)
221223

222224
prep_status("Checking for invalid \"unknown\" user columns");
223225

224-
snprintf(output_path,sizeof(output_path),"tables_using_unknown.txt");
226+
snprintf(output_path,sizeof(output_path),"%s/%s",
227+
log_opts.basedir,
228+
"tables_using_unknown.txt");
225229

226230
if (check_for_data_type_usage(cluster,"pg_catalog.unknown",output_path))
227231
{
@@ -364,7 +368,9 @@ old_11_check_for_sql_identifier_data_type_usage(ClusterInfo *cluster)
364368

365369
prep_status("Checking for invalid \"sql_identifier\" user columns");
366370

367-
snprintf(output_path,sizeof(output_path),"tables_using_sql_identifier.txt");
371+
snprintf(output_path,sizeof(output_path),"%s/%s",
372+
log_opts.basedir,
373+
"tables_using_sql_identifier.txt");
368374

369375
if (check_for_data_type_usage(cluster,"information_schema.sql_identifier",
370376
output_path))

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp