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

Commit18bbad7

Browse files
committed
Remove OPENLINK define
1 parent0108fdd commit18bbad7

File tree

5 files changed

+6
-37
lines changed

5 files changed

+6
-37
lines changed

‎src/backend/storage/file/fd.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 1994, Regents of the University of California
77
*
88
* IDENTIFICATION
9-
* $Id: fd.c,v 1.6 1996/10/31 10:19:59 scrappy Exp $
9+
* $Id: fd.c,v 1.7 1996/11/04 04:53:24 momjian Exp $
1010
*
1111
* NOTES:
1212
*
@@ -197,14 +197,12 @@ static int FileAccess(File file);
197197
staticFilefileNameOpenFile(FileNamefileName,intfileFlags,intfileMode);
198198
staticchar*filepath(char*filename);
199199

200-
#ifdefOPENLINK_PATCHES
201200
pg_fsync(fd)
202201
{
203202
externintfsyncOff;
204203
returnfsyncOff ?0 :fsync(fd);
205204
}
206205
#definefsync pg_fsync
207-
#endif
208206

209207
#if defined(FDDEBUG)
210208
staticvoid

‎src/backend/storage/smgr/md.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.6 1996/11/03 05:07:55 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.7 1996/11/04 04:53:27 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -470,11 +470,7 @@ mdblindwrt(char *dbstr,
470470
status=SM_SUCCESS;
471471

472472
/* write and sync the block */
473-
#ifdefOPENLINK_PATCHES
474473
if (write(fd,buffer,BLCKSZ)!=BLCKSZ|| (pg_fsync(fd)<0))
475-
#else
476-
if (write(fd,buffer,BLCKSZ)!=BLCKSZ||fsync(fd)<0)
477-
#endif
478474
status=SM_FAIL;
479475

480476
if (close(fd)<0)

‎src/backend/tcop/postgres.c

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.13 1996/11/03 06:52:33 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.14 1996/11/04 04:53:31 momjian Exp $
1111
*
1212
* NOTES
1313
* this is the "main" module of the postgres backend and
@@ -92,9 +92,7 @@ CommandDest whereToSendOutput;
9292
externintlockingOff;
9393
externintNBuffers;
9494

95-
#ifdefOPENLINK_PATCHES
9695
intfsyncOff=0;
97-
#endif
9896

9997
intdontExecute=0;
10098
staticintShowStats;
@@ -742,22 +740,16 @@ her exceeded legal ranges or was a divide by zero");
742740

743741
staticvoidusage(char*progname)
744742
{
745-
#ifdefOPENLINK_PATCHES
746-
fprintf(stderr,"\t[-P portno] [-t tracetype] [-x opttype] [-bCEiLFNopQSs] [dbname]\n");
747-
#else
748743
fprintf(stderr,
749744
"Usage: %s [-B nbufs] [-d lvl] ] [-f plantype] \t[-m portno] [\t -o filename]\n",
750745
progname);
751-
fprintf(stderr,"\t[-P portno] [-t tracetype] [-x opttype] [-bCEiLNopQSs] [dbname]\n");
752-
#endif
746+
fprintf(stderr,"\t[-P portno] [-t tracetype] [-x opttype] [-bCEiLFNopQSs] [dbname]\n");
753747
fprintf(stderr," b: consider bushy plan trees during optimization\n");
754748
fprintf(stderr," B: set number of buffers in buffer pool\n");
755749
fprintf(stderr," C: supress version info\n");
756750
fprintf(stderr," d: set debug level\n");
757751
fprintf(stderr," E: echo query before execution\n");
758-
#ifdefOPENLINK_PATCHES
759752
fprintf(stderr," F: turn off fsync\n");
760-
#endif
761753
fprintf(stderr," f: forbid plantype generation\n");
762754
fprintf(stderr," i: don't execute the query, just show the plan tree\n");
763755
fprintf(stderr," L: turn off locking\n");
@@ -857,11 +849,7 @@ PostgresMain(int argc, char *argv[])
857849
hostName=hostbuf;
858850
}
859851

860-
#ifdefOPENLINK_PATCHES
861852
while ((flag=getopt(argc,argv,"B:bCd:Ef:iLm:MNo:P:pQSst:x:F"))!=EOF)
862-
#else
863-
while ((flag=getopt(argc,argv,"B:bCd:Ef:iLm:MNo:P:pQSst:x:"))!=EOF)
864-
#endif
865853
switch (flag) {
866854

867855
case'b':
@@ -908,15 +896,13 @@ PostgresMain(int argc, char *argv[])
908896
flagE=1;
909897
break;
910898

911-
#ifdefOPENLINK_PATCHES
912899
case'F':
913900
/* --------------------
914901
* turn off fsync
915902
* --------------------
916903
*/
917904
fsyncOff=1;
918905
break;
919-
#endif
920906

921907
case'f':
922908
/* -----------------
@@ -1264,7 +1250,7 @@ PostgresMain(int argc, char *argv[])
12641250
*/
12651251
if (IsUnderPostmaster== false) {
12661252
puts("\nPOSTGRES backend interactive interface");
1267-
puts("$Revision: 1.13 $ $Date: 1996/11/03 06:52:33 $");
1253+
puts("$Revision: 1.14 $ $Date: 1996/11/04 04:53:31 $");
12681254
}
12691255

12701256
/* ----------------

‎src/backend/utils/adt/varchar.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.3 1996/08/26 20:38:52 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.4 1996/11/04 04:53:37 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -68,13 +68,8 @@ bpcharin(char *s, int dummy, int typlen)
6868
typlen=len+4;
6969
}
7070

71-
#ifndefOPENLINK_PATCHES
72-
if (len<1||len>4096)
73-
elog(WARN,"bpcharin: length of char() must be between 1 and 4096");
74-
#else
7571
if (len>4096)
7672
elog(WARN,"bpcharin: length of char() must be less than 4096");
77-
#endif
7873

7974
result= (char*)palloc(typlen);
8075
*(int32*)result=typlen;
@@ -137,13 +132,8 @@ varcharin(char *s, int dummy, int typlen)
137132
typlen=len+4;
138133
}
139134

140-
#ifndefOPENLINK_PATCHES
141-
if (len<1||len>4096)
142-
elog(WARN,"bpcharin: length of char() must be between 1 and 4096");
143-
#else
144135
if (len>4096)
145136
elog(WARN,"varcharin: length of char() must be less than 4096");
146-
#endif
147137

148138
result= (char*)palloc(typlen);
149139
*(int32*)result=typlen;

‎src/include/config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@
180180

181181
/* found in src/backend/utils/adt/arrayfuncs.c */
182182
/* #define LOARRAY */
183-
#defineOPENLINK_PATCHES
184183

185184
/* This is the time, in seconds, at which a given backend server
186185
* will wait on a lock before deciding to abort the transaction

0 commit comments

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