mirror of
https://github.com/postgres/postgres.git
synced 2025-11-01 21:31:19 +03:00
Major code cleanups from D'arcy (-Wall -Werror)
This commit is contained in:
@@ -7,11 +7,14 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.2 1996/10/20 09:27:04 scrappy Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.3 1996/10/23 07:39:20 scrappy Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "postgres.h"
|
||||
|
||||
#include "catalog/pg_attribute.h"
|
||||
@@ -32,16 +35,18 @@
|
||||
#include "storage/block.h"
|
||||
#include "storage/off.h"
|
||||
#include "storage/itemptr.h"
|
||||
#include <time.h>
|
||||
#include "utils/nabstime.h"
|
||||
#include "access/htup.h"
|
||||
#include "utils/tqual.h"
|
||||
#include "utils/palloc.h"
|
||||
#include "storage/buf.h"
|
||||
#include "access/relscan.h"
|
||||
#include "access/iqual.h"
|
||||
|
||||
#include "storage/itemid.h"
|
||||
#include "storage/item.h"
|
||||
#include "storage/bufpage.h"
|
||||
#include "storage/bufmgr.h"
|
||||
|
||||
#include "access/itup.h"
|
||||
|
||||
|
||||
@@ -7,15 +7,17 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.2 1996/10/20 09:27:06 scrappy Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.3 1996/10/23 07:39:23 scrappy Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "postgres.h"
|
||||
|
||||
#include "utils/geo-decls.h"
|
||||
|
||||
#include "utils/palloc.h"
|
||||
|
||||
BOX
|
||||
*rt_box_union(BOX *a, BOX *b)
|
||||
|
||||
@@ -7,11 +7,14 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.4 1996/10/20 09:27:07 scrappy Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.5 1996/10/23 07:39:24 scrappy Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "postgres.h"
|
||||
|
||||
#include "catalog/pg_attribute.h"
|
||||
@@ -21,6 +24,7 @@
|
||||
#include "storage/fd.h"
|
||||
#include "catalog/pg_am.h"
|
||||
#include "catalog/pg_class.h"
|
||||
#include "catalog/index.h"
|
||||
#include "nodes/nodes.h"
|
||||
#include "rewrite/prs2lock.h"
|
||||
#include "access/skey.h"
|
||||
@@ -30,22 +34,23 @@
|
||||
#include "storage/block.h"
|
||||
#include "storage/off.h"
|
||||
#include "storage/itemptr.h"
|
||||
#include <time.h>
|
||||
#include "utils/nabstime.h"
|
||||
#include "access/htup.h"
|
||||
|
||||
#include "access/itup.h"
|
||||
|
||||
#include "utils/tqual.h"
|
||||
#include "utils/palloc.h"
|
||||
#include "storage/buf.h"
|
||||
#include "access/relscan.h"
|
||||
#include "access/rtscan.h"
|
||||
|
||||
#include "storage/itemid.h"
|
||||
#include "storage/item.h"
|
||||
#include "storage/bufpage.h"
|
||||
#include "storage/lmgr.h"
|
||||
|
||||
#include "access/rtree.h"
|
||||
|
||||
#include "access/funcindex.h"
|
||||
|
||||
#include "nodes/params.h"
|
||||
@@ -56,7 +61,6 @@
|
||||
#include "executor/tuptable.h"
|
||||
#include "nodes/execnodes.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include "storage/ipc.h"
|
||||
#include "storage/bufmgr.h"
|
||||
|
||||
@@ -126,9 +130,11 @@ rtbuild(Relation heap,
|
||||
Datum *d;
|
||||
bool *nulls;
|
||||
int nb, nh, ni;
|
||||
#ifndef OMIT_PARTIAL_INDEX
|
||||
ExprContext *econtext;
|
||||
TupleTable tupleTable;
|
||||
TupleTableSlot *slot;
|
||||
#endif
|
||||
Oid hrelid, irelid;
|
||||
Node *pred, *oldPred;
|
||||
RTSTATE rtState;
|
||||
@@ -176,6 +182,12 @@ rtbuild(Relation heap,
|
||||
econtext = makeNode(ExprContext);
|
||||
FillDummyExprContext(econtext, slot, hd, buffer);
|
||||
}
|
||||
else
|
||||
{
|
||||
econtext = NULL;
|
||||
tupleTable = NULL;
|
||||
slot = NULL;
|
||||
}
|
||||
#endif /* OMIT_PARTIAL_INDEX */
|
||||
scan = heap_beginscan(heap, 0, NowTimeQual, 0, (ScanKey) NULL);
|
||||
htup = heap_getnext(scan, 0, &buffer);
|
||||
|
||||
@@ -7,11 +7,14 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.4 1996/10/20 09:27:10 scrappy Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.5 1996/10/23 07:39:26 scrappy Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "postgres.h"
|
||||
|
||||
#include "catalog/pg_attribute.h"
|
||||
@@ -30,14 +33,17 @@
|
||||
#include "storage/block.h"
|
||||
#include "storage/off.h"
|
||||
#include "storage/itemptr.h"
|
||||
#include <time.h>
|
||||
#include "utils/nabstime.h"
|
||||
#include "utils/palloc.h"
|
||||
#include "access/htup.h"
|
||||
#include "utils/tqual.h"
|
||||
#include "storage/buf.h"
|
||||
#include "storage/lmgr.h"
|
||||
#include "storage/bufmgr.h"
|
||||
#include "access/relscan.h"
|
||||
|
||||
#include "access/rtree.h"
|
||||
#include "access/rtstrat.h"
|
||||
|
||||
#include "access/itup.h"
|
||||
#include "access/funcindex.h"
|
||||
|
||||
Reference in New Issue
Block a user