database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-21 16:02:15 +03:00
Code Activity

D'Arcy's cleanups

Browse Source
This commit is contained in:
Marc G. Fournier
1996-10-26 04:15:05 +00:00
parent 716d506a81
commit 87b48ff032
6 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/executor/execMain.c
View File

@ -26,7 +26,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.5 1996/10/23 07:40:26 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.6 1996/10/26 04:13:05 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -37,6 +37,7 @@
#include "utils/acl.h" #include "utils/acl.h"
#include "parser/parsetree.h" /* rt_fetch() */ #include "parser/parsetree.h" /* rt_fetch() */
#include "storage/bufmgr.h" #include "storage/bufmgr.h"
#include "storage/lmgr.h"
#include "commands/async.h" #include "commands/async.h"
/* #include "access/localam.h" */ /* #include "access/localam.h" */
#include "optimizer/var.h" #include "optimizer/var.h"

8
src/backend/executor/execQual.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.6 1996/10/10 00:18:52 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.7 1996/10/26 04:13:11 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -918,7 +918,7 @@ ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull)
List *clause; List *clause;
bool isDone; bool isDone;
bool IsNull; bool IsNull;
Datum const_value; Datum const_value = 0;
IsNull = false; IsNull = false;
clauses = orExpr->args; clauses = orExpr->args;
@ -979,7 +979,7 @@ ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull)
{ {
List *clauses; List *clauses;
List *clause; List *clause;
Datum const_value; Datum const_value = 0;
bool isDone; bool isDone;
bool IsNull; bool IsNull;
@ -1056,7 +1056,7 @@ ExecEvalExpr(Node *expression,
bool *isNull, bool *isNull,
bool *isDone) bool *isDone)
{ {
Datum retDatum; Datum retDatum = 0;
*isNull = false; *isNull = false;

5
src/backend/executor/functions.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.2 1996/09/16 05:36:15 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.3 1996/10/26 04:13:20 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -23,6 +23,7 @@
#include "parser/parse_query.h" #include "parser/parse_query.h"
#include "tcop/pquery.h" #include "tcop/pquery.h"
#include "tcop/tcopprot.h" #include "tcop/tcopprot.h"
#include "tcop/utility.h"
#include "nodes/params.h" #include "nodes/params.h"
#include "fmgr.h" #include "fmgr.h"
#include "utils/fcache.h" #include "utils/fcache.h"
@ -352,7 +353,7 @@ Datum
postquel_function(Func *funcNode, char **args, bool *isNull, bool *isDone) postquel_function(Func *funcNode, char **args, bool *isNull, bool *isDone)
{ {
execution_state *es; execution_state *es;
Datum result; Datum result = 0;
FunctionCachePtr fcache = funcNode->func_fcache; FunctionCachePtr fcache = funcNode->func_fcache;
es = (execution_state *) fcache->func_state; es = (execution_state *) fcache->func_state;

4
src/backend/executor/nodeAppend.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.1.1.1 1996/07/09 06:21:26 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.2 1996/10/26 04:13:26 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -171,7 +171,7 @@ ExecInitAppend(Append *node, EState *estate, Plan *parent)
{ {
AppendState *unionstate; AppendState *unionstate;
int nplans; int nplans;
List *resultList; List *resultList = NULL;
List *rtentries; List *rtentries;
List *unionplans; List *unionplans;
bool *initialized; bool *initialized;

6
src/backend/executor/nodeHash.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.4 1996/08/19 01:52:36 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.5 1996/10/26 04:13:31 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -22,6 +22,7 @@
#include <stdio.h> /* for sprintf() */ #include <stdio.h> /* for sprintf() */
#include <math.h> #include <math.h>
#include <sys/file.h> #include <sys/file.h>
#include "storage/fd.h" /* for SEEK_ */ #include "storage/fd.h" /* for SEEK_ */
#include "storage/ipc.h" #include "storage/ipc.h"
#include "storage/bufmgr.h" /* for BLCKSZ */ #include "storage/bufmgr.h" /* for BLCKSZ */
@ -29,6 +30,7 @@
#include "executor/nodeHash.h" #include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h" #include "executor/nodeHashjoin.h"
#include "utils/palloc.h" #include "utils/palloc.h"
#include "utils/hsearch.h"
extern int NBuffers; extern int NBuffers;
static int HashTBSize; static int HashTBSize;
@ -55,7 +57,7 @@ ExecHash(Hash *node)
ExprContext *econtext; ExprContext *econtext;
int nbatch; int nbatch;
File *batches; File *batches = NULL;
RelativeAddr *batchPos; RelativeAddr *batchPos;
int *batchSizes; int *batchSizes;
int i; int i;

5
src/include/storage/bufmgr.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: bufmgr.h,v 1.3 1996/10/20 06:35:20 scrappy Exp $ * $Id: bufmgr.h,v 1.4 1996/10/26 04:15:05 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -14,7 +14,10 @@
#define BUFMGR_H #define BUFMGR_H
#include <stdio.h> #include <stdio.h>
#include "storage/ipc.h" #include "storage/ipc.h"
#include "storage/buf.h"
#include "utils/rel.h"
/* /*
* the maximum size of a disk block for any possible installation. * the maximum size of a disk block for any possible installation.