Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 40f456c

Browse files
committed
Remove double-rename used by Win32 on busy files. Not needed anymore.
1 parent e2d8c1b commit 40f456c

File tree

2 files changed

+2
-46
lines changed

2 files changed

+2
-46
lines changed

src/backend/commands/user.c

+1-33
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.138 2004/02/25 19:41:22 momjian Exp $
9+
* $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.139 2004/03/16 05:05:57 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -140,10 +140,6 @@ write_group_file(Relation grel)
140140
bufsize = strlen(filename) + 12;
141141
tempname = (char *) palloc(bufsize);
142142
snprintf(tempname, bufsize, "%s.%d", filename, MyProcPid);
143-
#if defined(WIN32) || defined(__CYGWIN__)
144-
filename = repalloc(filename, strlen(filename) + 1 + strlen(".new"));
145-
strcat(filename, ".new");
146-
#endif
147143

148144
oumask = umask((mode_t) 077);
149145
fp = AllocateFile(tempname, "w");
@@ -291,10 +287,6 @@ write_user_file(Relation urel)
291287
bufsize = strlen(filename) + 12;
292288
tempname = (char *) palloc(bufsize);
293289
snprintf(tempname, bufsize, "%s.%d", filename, MyProcPid);
294-
#if defined(WIN32) || defined(__CYGWIN__)
295-
filename = repalloc(filename, strlen(filename) + 1 + strlen(".new"));
296-
strcat(filename, ".new");
297-
#endif
298290

299291
oumask = umask((mode_t) 077);
300292
fp = AllocateFile(tempname, "w");
@@ -466,37 +458,13 @@ AtEOXact_UpdatePasswordFile(bool isCommit)
466458
user_file_update_needed = false;
467459
write_user_file(urel);
468460
heap_close(urel, NoLock);
469-
#if defined(WIN32) || defined(__CYGWIN__)
470-
{
471-
/* Rename active file while not holding an exclusive lock */
472-
char *filename = user_getfilename(), *filename_new;
473-
474-
filename_new = palloc(strlen(filename) + 1 + strlen(".new"));
475-
sprintf(filename_new, "%s.new", filename);
476-
rename(filename_new, filename);
477-
pfree(filename);
478-
pfree(filename_new);
479-
}
480-
#endif
481461
}
482462

483463
if (group_file_update_needed)
484464
{
485465
group_file_update_needed = false;
486466
write_group_file(grel);
487467
heap_close(grel, NoLock);
488-
#if defined(WIN32) || defined(__CYGWIN__)
489-
{
490-
/* Rename active file while not holding an exclusive lock */
491-
char *filename = group_getfilename(), *filename_new;
492-
493-
filename_new = palloc(strlen(filename) + 1 + strlen(".new"));
494-
sprintf(filename_new, "%s.new", filename);
495-
rename(filename_new, filename);
496-
pfree(filename);
497-
pfree(filename_new);
498-
}
499-
#endif
500468
}
501469

502470
/*

src/backend/utils/cache/relcache.c

+1-13
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.199 2004/03/14 23:41:27 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.200 2004/03/16 05:05:58 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -3278,20 +3278,8 @@ write_relcache_init_file(void)
32783278
* OK, rename the temp file to its final name, deleting any
32793279
* previously-existing init file.
32803280
*/
3281-
#if defined(WIN32) || defined(__CYGWIN__)
32823281
rename(tempfilename, finalfilename);
32833282
LWLockRelease(RelCacheInitLock);
3284-
#else
3285-
{
3286-
char finalfilename_new[MAXPGPATH];
3287-
3288-
snprintf(finalfilename_new, sizeof(finalfilename_new), "%s.new", finalfilename);
3289-
rename(tempfilename, finalfilename_new);
3290-
LWLockRelease(RelCacheInitLock);
3291-
/* Rename to active file after lock is released */
3292-
rename(finalfilename_new, finalfilename);
3293-
}
3294-
#endif
32953283
}
32963284
else
32973285
{

0 commit comments

Comments
 (0)