Skip to content

Commit f514488

Browse files
committed
[PBCKP-254] fixing build errors after the merge
1. [commit 549d98a] In the PBCKP-181 task, the 'get_log_message' function that was used in the PBCKP-169 task was removed. Corrected it. 2. The order of arguments for 'fio_*' functions has been changed. [commit 5a6bd01] Fixed conflicts that came with the task [PBCKP-153]. [commit 4185570]
1 parent 16c0508 commit f514488

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/dir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,10 +1066,10 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
10661066
waldir_path, to_path);
10671067

10681068
/* create tablespace directory from waldir_path*/
1069-
fio_mkdir(waldir_path, pg_tablespace_mode, location);
1069+
fio_mkdir(location, waldir_path, pg_tablespace_mode, false);
10701070

10711071
/* create link to linked_path */
1072-
if (fio_symlink(waldir_path, to_path, incremental, location) < 0)
1072+
if (fio_symlink(location, waldir_path, to_path, incremental) < 0)
10731073
elog(ERROR, "Could not create symbolic link \"%s\": %s",
10741074
to_path, strerror(errno));
10751075

src/utils/logger.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,12 +506,12 @@ elog_stderr(int elevel, const char *fmt, ...)
506506
json_add_value(buf_json, "pid", str_pid, 0, true);
507507
json_add_key(buf_json, "level", 0);
508508
write_elevel_for_json(buf_json, elevel);
509-
message = get_log_message(fmt, args);
509+
message = ft_vasprintf(fmt, args).ptr;
510510
json_add_value(buf_json, "msg", message, 0, true);
511511
json_add_value(buf_json, "my_thread_num", str_thread_json, 0, true);
512512
json_add_min(buf_json, JT_END_OBJECT);
513513
fputs(buf_json->data, stderr);
514-
pfree(message);
514+
ft_free(message);
515515
termPQExpBuffer(buf_json);
516516
}
517517
else

0 commit comments

Comments
 (0)