Remove QUERY_LIMIT and documenation on same. Change _ALIGN to TYPEALIGN
for Irix.
This commit is contained in:
parent
0c1ec67447
commit
4c65382596
|
@ -182,12 +182,6 @@
|
||||||
sets the default cost for indexed searches for the optimizer.
|
sets the default cost for indexed searches for the optimizer.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
<envar>PGQUERY_LIMIT</envar>
|
|
||||||
sets the maximum number of rows returned by a query.
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
|
|
@ -1521,12 +1521,6 @@ sets the default cost for heap searches for the optimizer.
|
||||||
sets the default cost for indexed searches for the optimizer.
|
sets the default cost for indexed searches for the optimizer.
|
||||||
</Para>
|
</Para>
|
||||||
</ListItem>
|
</ListItem>
|
||||||
<ListItem>
|
|
||||||
<Para>
|
|
||||||
<Acronym>PGQUERY_LIMIT</Acronym>
|
|
||||||
sets the maximum number of rows returned by a query.
|
|
||||||
</Para>
|
|
||||||
</ListItem>
|
|
||||||
</ItemizedList>
|
</ItemizedList>
|
||||||
</Para>
|
</Para>
|
||||||
|
|
||||||
|
|
|
@ -601,43 +601,6 @@ SET TRANSACTION ISOLATION LEVEL { READ COMMITTED | SERIALIZED }
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term>
|
|
||||||
QUERY_LIMIT
|
|
||||||
</term>
|
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
Sets the maximum number of rows returned by a query.
|
|
||||||
By default, there is no limit to the number of rows
|
|
||||||
returned by a query.
|
|
||||||
|
|
||||||
<variablelist>
|
|
||||||
<varlistentry>
|
|
||||||
<term>
|
|
||||||
<replaceable class="parameter">#</replaceable>
|
|
||||||
</term>
|
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
Sets the maximum number of rows returned by a
|
|
||||||
query to <replaceable class="parameter">#</replaceable>.
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
<varlistentry>
|
|
||||||
<term>
|
|
||||||
DEFAULT
|
|
||||||
</term>
|
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
Sets the maximum number of rows returned by a query to be unlimited.
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
</variablelist>
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
</variablelist>
|
</variablelist>
|
||||||
</para>
|
</para>
|
||||||
</refsect2>
|
</refsect2>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Routines for handling of 'SET var TO',
|
* Routines for handling of 'SET var TO',
|
||||||
* 'SHOW var' and 'RESET var' statements.
|
* 'SHOW var' and 'RESET var' statements.
|
||||||
*
|
*
|
||||||
* $Id: variable.c,v 1.20 1999/05/25 16:08:28 momjian Exp $
|
* $Id: variable.c,v 1.21 1999/06/17 15:15:48 momjian Exp $
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -16,14 +16,10 @@
|
||||||
#include "utils/builtins.h"
|
#include "utils/builtins.h"
|
||||||
#include "optimizer/internal.h"
|
#include "optimizer/internal.h"
|
||||||
#include "access/xact.h"
|
#include "access/xact.h"
|
||||||
|
#include "utils/tqual.h"
|
||||||
#ifdef MULTIBYTE
|
#ifdef MULTIBYTE
|
||||||
#include "mb/pg_wchar.h"
|
#include "mb/pg_wchar.h"
|
||||||
#endif
|
#endif
|
||||||
#ifdef QUERY_LIMIT
|
|
||||||
#include "executor/executor.h"
|
|
||||||
#include "executor/execdefs.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static bool show_date(void);
|
static bool show_date(void);
|
||||||
static bool reset_date(void);
|
static bool reset_date(void);
|
||||||
static bool parse_date(const char *);
|
static bool parse_date(const char *);
|
||||||
|
@ -46,13 +42,6 @@ static bool show_XactIsoLevel(void);
|
||||||
static bool reset_XactIsoLevel(void);
|
static bool reset_XactIsoLevel(void);
|
||||||
static bool parse_XactIsoLevel(const char *);
|
static bool parse_XactIsoLevel(const char *);
|
||||||
|
|
||||||
#ifdef QUERY_LIMIT
|
|
||||||
static bool show_query_limit(void);
|
|
||||||
static bool reset_query_limit(void);
|
|
||||||
static bool parse_query_limit(const char *);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern Cost _cpu_page_wight_;
|
extern Cost _cpu_page_wight_;
|
||||||
extern Cost _cpu_index_page_wight_;
|
extern Cost _cpu_index_page_wight_;
|
||||||
extern bool _use_geqo_;
|
extern bool _use_geqo_;
|
||||||
|
@ -538,52 +527,6 @@ reset_timezone()
|
||||||
return TRUE;
|
return TRUE;
|
||||||
} /* reset_timezone() */
|
} /* reset_timezone() */
|
||||||
|
|
||||||
/*
|
|
||||||
*
|
|
||||||
* Query_limit
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
#ifdef QUERY_LIMIT
|
|
||||||
static bool
|
|
||||||
parse_query_limit(const char *value)
|
|
||||||
{
|
|
||||||
int32 limit;
|
|
||||||
|
|
||||||
if (value == NULL)
|
|
||||||
{
|
|
||||||
reset_query_limit();
|
|
||||||
return (TRUE);
|
|
||||||
}
|
|
||||||
/* why is pg_atoi's arg not declared "const char *" ? */
|
|
||||||
limit = pg_atoi((char *) value, sizeof(int32), '\0');
|
|
||||||
if (limit <= -1)
|
|
||||||
elog(ERROR, "Bad value for # of query limit (%s)", value);
|
|
||||||
ExecutorLimit(limit);
|
|
||||||
return (TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool
|
|
||||||
show_query_limit(void)
|
|
||||||
{
|
|
||||||
int limit;
|
|
||||||
|
|
||||||
limit = ExecutorGetLimit();
|
|
||||||
if (limit == ALL_TUPLES)
|
|
||||||
elog(NOTICE, "No query limit is set");
|
|
||||||
else
|
|
||||||
elog(NOTICE, "query limit is %d", limit);
|
|
||||||
return (TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool
|
|
||||||
reset_query_limit(void)
|
|
||||||
{
|
|
||||||
ExecutorLimit(ALL_TUPLES);
|
|
||||||
return (TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------*/
|
||||||
|
|
||||||
struct VariableParsers
|
struct VariableParsers
|
||||||
|
@ -624,11 +567,6 @@ struct VariableParsers
|
||||||
{
|
{
|
||||||
"XactIsoLevel", parse_XactIsoLevel, show_XactIsoLevel, reset_XactIsoLevel
|
"XactIsoLevel", parse_XactIsoLevel, show_XactIsoLevel, reset_XactIsoLevel
|
||||||
},
|
},
|
||||||
#ifdef QUERY_LIMIT
|
|
||||||
{
|
|
||||||
"query_limit", parse_query_limit, show_query_limit, reset_query_limit
|
|
||||||
},
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
NULL, NULL, NULL, NULL
|
NULL, NULL, NULL, NULL
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.87 1999/06/09 12:23:42 vadim Exp $
|
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.88 1999/06/17 15:15:49 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -88,26 +88,6 @@ static TupleTableSlot *EvalPlanQualNext(EState *estate);
|
||||||
|
|
||||||
/* end of local decls */
|
/* end of local decls */
|
||||||
|
|
||||||
#ifdef QUERY_LIMIT
|
|
||||||
static int queryLimit = ALL_TUPLES;
|
|
||||||
|
|
||||||
#undef ALL_TUPLES
|
|
||||||
#define ALL_TUPLES queryLimit
|
|
||||||
|
|
||||||
int
|
|
||||||
ExecutorLimit(int limit)
|
|
||||||
{
|
|
||||||
return queryLimit = limit;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
ExecutorGetLimit()
|
|
||||||
{
|
|
||||||
return queryLimit;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------
|
/* ----------------------------------------------------------------
|
||||||
* ExecutorStart
|
* ExecutorStart
|
||||||
*
|
*
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (c) 1994, Regents of the University of California
|
* Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $Id: psqlHelp.h,v 1.70 1999/06/04 04:28:53 momjian Exp $
|
* $Id: psqlHelp.h,v 1.71 1999/06/17 15:15:51 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -296,7 +296,7 @@ static struct _helpStruct QL_HELP[] = {
|
||||||
{"reset",
|
{"reset",
|
||||||
"set run-time environment back to default",
|
"set run-time environment back to default",
|
||||||
"\
|
"\
|
||||||
\tRESET DATESTYLE|COST_HEAP|COST_INDEX|GEQO|KSQO|QUERY_LIMIT|\n\
|
\tRESET DATESTYLE|COST_HEAP|COST_INDEX|GEQO|KSQO|\n\
|
||||||
TIMEZONE|XACTISOLEVEL|CLIENT_ENCODING|SERVER_ENCODING"},
|
TIMEZONE|XACTISOLEVEL|CLIENT_ENCODING|SERVER_ENCODING"},
|
||||||
{"revoke",
|
{"revoke",
|
||||||
"revoke access control from a user or group",
|
"revoke access control from a user or group",
|
||||||
|
@ -329,7 +329,6 @@ TIMEZONE|XACTISOLEVEL|CLIENT_ENCODING|SERVER_ENCODING"},
|
||||||
\tSET COST_INDEX TO #\n\
|
\tSET COST_INDEX TO #\n\
|
||||||
\tSET GEQO TO 'ON[=#]'|'OFF'\n\
|
\tSET GEQO TO 'ON[=#]'|'OFF'\n\
|
||||||
\tSET KSQO TO 'ON'|'OFF'\n\
|
\tSET KSQO TO 'ON'|'OFF'\n\
|
||||||
\tSET QUERY_LIMIT TO #\n\
|
|
||||||
\tSET TIMEZONE TO 'value'\n\
|
\tSET TIMEZONE TO 'value'\n\
|
||||||
\tSET TRANSACTION ISOLATION LEVEL 'SERIALIZABLE'|'READ COMMITTED'\n\
|
\tSET TRANSACTION ISOLATION LEVEL 'SERIALIZABLE'|'READ COMMITTED'\n\
|
||||||
\tSET CLIENT_ENCODING|NAMES TO 'EUC_JP'|'SJIS'|'EUC_CN'|'EUC_KR'|'EUC_TW'|\n\
|
\tSET CLIENT_ENCODING|NAMES TO 'EUC_JP'|'SJIS'|'EUC_CN'|'EUC_KR'|'EUC_TW'|\n\
|
||||||
|
@ -341,7 +340,7 @@ TIMEZONE|XACTISOLEVEL|CLIENT_ENCODING|SERVER_ENCODING"},
|
||||||
{"show",
|
{"show",
|
||||||
"show current run-time environment",
|
"show current run-time environment",
|
||||||
"\
|
"\
|
||||||
\tSHOW DATESTYLE|COST_HEAP|COST_INDEX|GEQO|KSQO|QUERY_LIMIT|\n\
|
\tSHOW DATESTYLE|COST_HEAP|COST_INDEX|GEQO|KSQO|\n\
|
||||||
TIMEZONE|XACTISOLEVEL|CLIENT_ENCODING|SERVER_ENCODING"},
|
TIMEZONE|XACTISOLEVEL|CLIENT_ENCODING|SERVER_ENCODING"},
|
||||||
{"unlisten",
|
{"unlisten",
|
||||||
"stop listening for notification on a condition name",
|
"stop listening for notification on a condition name",
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (c) 1994, Regents of the University of California
|
* Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $Id: executor.h,v 1.33 1999/05/25 16:13:53 momjian Exp $
|
* $Id: executor.h,v 1.34 1999/06/17 15:15:53 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -89,12 +89,6 @@ extern void ExecutorEnd(QueryDesc *queryDesc, EState *estate);
|
||||||
extern void ExecConstraints(char *caller, Relation rel, HeapTuple tuple,
|
extern void ExecConstraints(char *caller, Relation rel, HeapTuple tuple,
|
||||||
EState *estate);
|
EState *estate);
|
||||||
|
|
||||||
#ifdef QUERY_LIMIT
|
|
||||||
extern int ExecutorLimit(int limit);
|
|
||||||
extern int ExecutorGetLimit(void);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* prototypes from functions in execProcnode.c
|
* prototypes from functions in execProcnode.c
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (c) 1994, Regents of the University of California
|
* Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $Id: memutils.h,v 1.27 1999/05/26 12:57:07 momjian Exp $
|
* $Id: memutils.h,v 1.28 1999/06/17 15:15:59 momjian Exp $
|
||||||
*
|
*
|
||||||
* NOTES
|
* NOTES
|
||||||
* some of the information in this file will be moved to
|
* some of the information in this file will be moved to
|
||||||
|
@ -33,18 +33,18 @@
|
||||||
* There used to be some incredibly crufty platform-dependent hackery here,
|
* There used to be some incredibly crufty platform-dependent hackery here,
|
||||||
* but now we rely on the configure script to get the info for us. Much nicer.
|
* but now we rely on the configure script to get the info for us. Much nicer.
|
||||||
*
|
*
|
||||||
* NOTE: _ALIGN will not work if ALIGNVAL is not a power of 2.
|
* NOTE: TYPEALIGN will not work if ALIGNVAL is not a power of 2.
|
||||||
* That case seems extremely unlikely to occur in practice, however.
|
* That case seems extremely unlikely to occur in practice, however.
|
||||||
* ----------------
|
* ----------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define _ALIGN(ALIGNVAL,LEN) (((long)(LEN) + (ALIGNVAL-1)) & ~(ALIGNVAL-1))
|
#define TYPEALIGN(ALIGNVAL,LEN) (((long)(LEN) + (ALIGNVAL-1)) & ~(ALIGNVAL-1))
|
||||||
|
|
||||||
#define SHORTALIGN(LEN) _ALIGN(ALIGNOF_SHORT, (LEN))
|
#define SHORTALIGN(LEN) TYPEALIGN(ALIGNOF_SHORT, (LEN))
|
||||||
#define INTALIGN(LEN) _ALIGN(ALIGNOF_INT, (LEN))
|
#define INTALIGN(LEN) TYPEALIGN(ALIGNOF_INT, (LEN))
|
||||||
#define LONGALIGN(LEN) _ALIGN(ALIGNOF_LONG, (LEN))
|
#define LONGALIGN(LEN) TYPEALIGN(ALIGNOF_LONG, (LEN))
|
||||||
#define DOUBLEALIGN(LEN) _ALIGN(ALIGNOF_DOUBLE, (LEN))
|
#define DOUBLEALIGN(LEN) TYPEALIGN(ALIGNOF_DOUBLE, (LEN))
|
||||||
#define MAXALIGN(LEN) _ALIGN(MAXIMUM_ALIGNOF, (LEN))
|
#define MAXALIGN(LEN) TYPEALIGN(MAXIMUM_ALIGNOF, (LEN))
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* oset.h -- Fixed format ordered set definitions. *
|
* oset.h -- Fixed format ordered set definitions. *
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.97 1999/05/25 16:15:11 momjian Exp $
|
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.98 1999/06/17 15:16:04 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -139,9 +139,6 @@ static struct EnvironmentOptions
|
||||||
{
|
{
|
||||||
"PGGEQO", "geqo"
|
"PGGEQO", "geqo"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"PGQUERY_LIMIT", "query_limit"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
NULL
|
NULL
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
.\" This is -*-nroff-*-
|
.\" This is -*-nroff-*-
|
||||||
.\" XXX standard disclaimer belongs here....
|
.\" XXX standard disclaimer belongs here....
|
||||||
.\" $Header: /cvsroot/pgsql/src/man/Attic/set.l,v 1.22 1999/06/09 03:51:40 vadim Exp $
|
.\" $Header: /cvsroot/pgsql/src/man/Attic/set.l,v 1.23 1999/06/17 15:16:06 momjian Exp $
|
||||||
.TH SET SQL 05/14/97 PostgreSQL PostgreSQL
|
.TH SET SQL 05/14/97 PostgreSQL PostgreSQL
|
||||||
.SH NAME
|
.SH NAME
|
||||||
set - set run-time parameters for session
|
set - set run-time parameters for session
|
||||||
|
@ -74,10 +74,6 @@ enables or disables a workaround for memory exhaustion in queries with many
|
||||||
clauses.
|
clauses.
|
||||||
The default is disabled.
|
The default is disabled.
|
||||||
.PP
|
.PP
|
||||||
.IR QUERY_LIMIT
|
|
||||||
restricts the number of rows returned by a query.
|
|
||||||
The default is unlimited.
|
|
||||||
.PP
|
|
||||||
.IR TIMEZONE
|
.IR TIMEZONE
|
||||||
sets your timezone.
|
sets your timezone.
|
||||||
.PP
|
.PP
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
AROPT:crs
|
AROPT:crs
|
||||||
CFLAGS:-O -mieee # optimization -O2 removed because of egcs problem
|
CFLAGS:-O2 -mieee
|
||||||
SHARED_LIB:-fpic
|
SHARED_LIB:-fpic
|
||||||
ALL:
|
ALL:
|
||||||
SRCH_INC:
|
SRCH_INC:
|
||||||
|
|
Loading…
Reference in New Issue