aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/access/gist.h6
-rw-r--r--src/include/access/iqual.h3
-rw-r--r--src/include/access/nbtree.h6
-rw-r--r--src/include/access/relscan.h6
-rw-r--r--src/include/access/transam.h6
-rw-r--r--src/include/executor/nodeIndexscan.h3
-rw-r--r--src/include/executor/tuptable.h5
-rw-r--r--src/include/libpq/libpq.h6
-rw-r--r--src/include/libpq/pqcomm.h4
-rw-r--r--src/include/nodes/execnodes.h3
-rw-r--r--src/include/nodes/primnodes.h6
-rw-r--r--src/include/storage/bufpage.h4
-rw-r--r--src/include/utils/tqual.h3
13 files changed, 44 insertions, 17 deletions
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index e77918a21aa..4befdd8ae93 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -12,8 +12,11 @@
#ifndef GIST_H
#define GIST_H
+#include "utils/rel.h"
+#include "storage/off.h"
+#include "storage/block.h"
#include "storage/bufpage.h"
-
+#include "access/skey.h"
/*
** You can have as many strategies as you please in GiSTs, as
@@ -146,4 +149,5 @@ extern void gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
Relation r, Page pg, OffsetNumber o, int b, bool l) ;
extern void gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
Relation r, Page pg, OffsetNumber o, int b, bool l) ;
+extern StrategyNumber RelationGetGISTStrategy(Relation, AttrNumber, RegProcedure);
#endif /* GIST_H */
diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h
index 0cb0cc3329b..6a495851305 100644
--- a/src/include/access/iqual.h
+++ b/src/include/access/iqual.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: iqual.h,v 1.1 1996/08/27 21:50:16 scrappy Exp $
+ * $Id: iqual.h,v 1.2 1996/10/23 07:41:27 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,6 +18,7 @@
#include "storage/itemid.h"
#include "utils/rel.h"
#include "access/skey.h"
+#include "access/itup.h"
/* ----------------
* index tuple qualification support
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 730b04e4d4c..58ac0b5b134 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nbtree.h,v 1.1 1996/08/27 21:50:19 scrappy Exp $
+ * $Id: nbtree.h,v 1.2 1996/10/23 07:41:29 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,6 +23,10 @@
#include "access/relscan.h"
#include "access/sdir.h"
#include "nodes/pg_list.h"
+#include "storage/page.h"
+#include "storage/bufpage.h"
+#include "storage/item.h"
+#include "utils/memutils.h"
/*
* BTPageOpaqueData -- At the end of every page, we store a pointer
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 43ee60acbc1..860d9c31fbc 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: relscan.h,v 1.2 1996/10/19 06:27:08 scrappy Exp $
+ * $Id: relscan.h,v 1.3 1996/10/23 07:41:30 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -14,11 +14,9 @@
#define RELSCAN_H
#include "utils/tqual.h"
+#include "utils/rel.h"
#include "storage/buf.h"
-
-
-
typedef ItemPointerData MarkData;
typedef struct HeapScanDescData {
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 86658c9936d..8cc0b4c4260 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: transam.h,v 1.1 1996/08/27 21:50:26 scrappy Exp $
+ * $Id: transam.h,v 1.2 1996/10/23 07:41:31 scrappy Exp $
*
* NOTES
* Transaction System Version 101 now support proper oid
@@ -17,6 +17,10 @@
#ifndef TRANSAM_H
#define TRANSAM_H
+#include "utils/nabstime.h"
+#include "utils/rel.h"
+#include "storage/bufmgr.h"
+
/* ----------------
* transaction system version id
*
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index dcb361dc1ac..5e55948ad91 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: nodeIndexscan.h,v 1.1 1996/08/28 07:22:20 scrappy Exp $
+ * $Id: nodeIndexscan.h,v 1.2 1996/10/23 07:41:34 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,4 +29,5 @@ extern bool ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent);
extern int ExecCountSlotsIndexScan(IndexScan *node);
+extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan* parent);
#endif /* NODEINDEXSCAN_H */
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index cb60093565e..01346456891 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tuptable.h,v 1.1 1996/08/28 07:22:28 scrappy Exp $
+ * $Id: tuptable.h,v 1.2 1996/10/23 07:41:36 scrappy Exp $
*
* NOTES
* The tuple table interface is getting pretty ugly.
@@ -17,6 +17,9 @@
#ifndef TUPTABLE_H
#define TUPTABLE_H
+#include "access/htup.h"
+#include "access/relscan.h"
+
/* ----------------
* Note: the executor tuple table is managed and manipulated by special
* code and macros in executor/execTuples.c and tupTable.h
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index 8e6d6907ac3..d49c644e590 100644
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: libpq.h,v 1.2 1996/10/20 21:51:45 scrappy Exp $
+ * $Id: libpq.h,v 1.3 1996/10/23 07:41:41 scrappy Exp $
*
* NOTES
* This file contains definitions for structures and
@@ -19,6 +19,10 @@
#ifndef LIBPQ_H
#define LIBPQ_H
+#include <netinet/in.h>
+
+#include "libpq/pqcomm.h"
+
/* ----------------
* PQArgBlock --
* Information (pointer to array of this structure) required
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index e9049aec002..cba61f06af9 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqcomm.h,v 1.2 1996/10/11 09:12:18 bryanh Exp $
+ * $Id: pqcomm.h,v 1.3 1996/10/23 07:41:47 scrappy Exp $
*
* NOTES
* Some of this should move to libpq.h
@@ -16,7 +16,9 @@
#ifndef PQCOMM_H
#define PQCOMM_H
+#include <stdio.h>
#include <sys/types.h>
+
#ifdef WIN32
#include <winsock.h>
#else
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index e8c08f60fdd..63cbe32b466 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: execnodes.h,v 1.3 1996/10/20 06:35:07 scrappy Exp $
+ * $Id: execnodes.h,v 1.4 1996/10/23 07:41:56 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,6 +15,7 @@
#include "nodes/params.h"
#include "access/sdir.h"
+#include "access/funcindex.h"
#include "executor/hashjoin.h"
#include "nodes/primnodes.h"
#include "nodes/memnodes.h"
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index a96d5570dc3..cbdb723d06f 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -6,13 +6,17 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: primnodes.h,v 1.3 1996/10/19 04:48:30 scrappy Exp $
+ * $Id: primnodes.h,v 1.4 1996/10/23 07:42:02 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef PRIMNODES_H
#define PRIMNODES_H
+#include "nodes/pg_list.h"
+#include "nodes/nodes.h"
+#include "access/attnum.h"
+
#include "utils/fcache.h"
/* ----------------------------------------------------------------
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index 9209fdbe8c2..de27959aa06 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: bufpage.h,v 1.4 1996/10/20 06:35:16 scrappy Exp $
+ * $Id: bufpage.h,v 1.5 1996/10/23 07:42:07 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,6 +16,7 @@
#include "storage/itemid.h"
#include "storage/item.h"
#include "storage/buf.h"
+#include "storage/page.h"
#include "storage/off.h"
/*
@@ -72,7 +73,6 @@
* initialize its pages with PageInit and then set its own opaque
* fields.
*/
-typedef Pointer Page;
/*
* PageIsValid --
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index 6e4fb850e85..f02df8114ca 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tqual.h,v 1.2 1996/10/20 06:35:27 scrappy Exp $
+ * $Id: tqual.h,v 1.3 1996/10/23 07:42:13 scrappy Exp $
*
* NOTE
* It may be desirable to allow time qualifications to indicate
@@ -18,6 +18,7 @@
#define TQUAL_H
#include "utils/nabstime.h"
+#include "access/htup.h"
typedef struct TimeQualSpace {
char data[12];