database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

> Marko Kreen <marko@l-t.ee> writes:

Browse Source 
> > secure_ctx changes too.  it will be PGC_BACKEND after '-p'.
>
> Oh, okay, I missed that part.  Could we see the total state of the
> patch --- ie, a diff against current CVS, not a bunch of deltas?
> I've gotten confused about what's in and what's out.

Ok, here it is.  Cleared the ctx comment too - after -p
it will be PGC_BACKEND in any case.

Marko Kreen
This commit is contained in:
Bruce Momjian
2001-06-23 22:23:49 +00:00
parent 2e2d17ed51
commit 6a7f23c213
6 changed files with 70 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.224 2001/06/22 19:16:23 wieck Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.225 2001/06/23 22:23:49 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@ -1110,6 +1110,8 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
const char *DBName = NULL;
bool secure = true;
int errs = 0;
GucContext ctx;
char *tmp;
int firstchar;
StringInfo parser_input;
@ -1119,6 +1121,9 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
char *potential_DataDir = NULL;
/* all options are allowed until '-p' */
ctx = PGC_POSTMASTER;
/*
* Catch standard options before doing much else. This even works on
* systems without getopt_long.
@ -1192,7 +1197,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
{
case 'A':
#ifdef USE_ASSERT_CHECKING
assert_enabled = atoi(optarg);
SetConfigOption("debug_assertions", optarg, ctx, true);
#else
fprintf(stderr, "Assert checking is not compiled in\n");
#endif
@ -1203,8 +1208,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
/*
* specify the size of buffer pool
*/
if (secure)
NBuffers = atoi(optarg);
SetConfigOption("shared_buffers", optarg, ctx, true);
break;
case 'C':
@ -1221,17 +1225,18 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
break;
case 'd': /* debug level */
DebugLvl = atoi(optarg);
if (DebugLvl >= 1);
Log_connections = true;
tmp = "true";
SetConfigOption("debug_level", optarg, ctx, true);
if (DebugLvl >= 1)
SetConfigOption("log_connections", tmp, ctx, true);
if (DebugLvl >= 2)
Debug_print_query = true;
SetConfigOption("debug_print_query", tmp, ctx, true);
if (DebugLvl >= 3)
Debug_print_parse = true;
SetConfigOption("debug_print_parse", tmp, ctx, true);
if (DebugLvl >= 4)
Debug_print_plan = true;
SetConfigOption("debug_print_plan", tmp, ctx, true);
if (DebugLvl >= 5)
Debug_print_rewritten = true;
SetConfigOption("debug_print_rewritten", tmp, ctx, true);
break;
case 'E':
@ -1255,8 +1260,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
/*
* turn off fsync
*/
if (secure)
enableFsync = false;
SetConfigOption("fsync", "false", ctx, true);
break;
case 'f':
@ -1264,29 +1268,32 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
/*
* f - forbid generation of certain plans
*/
tmp = NULL;
switch (optarg[0])
{
case 's': /* seqscan */
enable_seqscan = false;
tmp = "enable_seqscan";
break;
case 'i': /* indexscan */
enable_indexscan = false;
tmp = "enable_indexscan";
break;
case 't': /* tidscan */
enable_tidscan = false;
tmp = "enable_tidscan";
break;
case 'n': /* nestloop */
enable_nestloop = false;
tmp = "enable_nestloop";
break;
case 'm': /* mergejoin */
enable_mergejoin = false;
tmp = "enable_mergejoin";
break;
case 'h': /* hashjoin */
enable_hashjoin = false;
tmp = "enable_hashjoin";
break;
default:
errs++;
}
if (tmp)
SetConfigOption(tmp, "false", ctx, true);
break;
case 'i':
@ -1348,6 +1355,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
DBName = strdup(optarg);
secure = false; /* subsequent switches are NOT
* secure */
ctx = PGC_BACKEND;
}
break;
@ -1356,13 +1364,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
/*
* S - amount of sort memory to use in 1k bytes
*/
{
int S;
S = atoi(optarg);
if (S >= 4 * BLCKSZ / 1024)
SortMem = S;
}
SetConfigOption("sort_mem", optarg, ctx, true);
break;
case 's':
@ -1370,7 +1372,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
/*
* s - report usage statistics (timings) after each query
*/
Show_query_stats = 1;
SetConfigOption("show_query_stats", "true", ctx, true);
break;
case 't':
@ -1384,23 +1386,26 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
* caution: -s can not be used together with -t.
* ----------------
*/
tmp = NULL;
switch (optarg[0])
{
case 'p':
if (optarg[1] == 'a')
Show_parser_stats = 1;
tmp = "show_parser_stats";
else if (optarg[1] == 'l')
Show_planner_stats = 1;
tmp = "show_planner_stats";
else
errs++;
break;
case 'e':
Show_executor_stats = 1;
tmp = "show_parser_stats";
break;
default:
errs++;
break;
}
if (tmp)
SetConfigOption(tmp, "true", ctx, true);
break;
case 'v':
@ -1464,9 +1469,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
elog(ERROR, "-c %s requires argument", optarg);
}
/* all options are allowed if not under postmaster */
SetConfigOption(name, value,
(IsUnderPostmaster) ? PGC_BACKEND : PGC_POSTMASTER, true);
SetConfigOption(name, value, ctx, true);
free(name);
if (value)
free(value);
@ -1711,7 +1714,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.224 $ $Date: 2001/06/22 19:16:23 $\n");
puts("$Revision: 1.225 $ $Date: 2001/06/23 22:23:49 $\n");
}
/*