summaryrefslogtreecommitdiff
path: root/src/include/access
diff options
context:
space:
mode:
authorBruce Momjian1999-05-25 16:15:34 +0000
committerBruce Momjian1999-05-25 16:15:34 +0000
commit07842084fe3e11041f83563c851236395f481470 (patch)
treeab9960e67325bec5a97b8b4dd4b2075ce60cc420 /src/include/access
parent4b04b01aaa460f1e52980f24173dc7a4535efd2d (diff)
pgindent run over code.
Diffstat (limited to 'src/include/access')
-rw-r--r--src/include/access/attnum.h10
-rw-r--r--src/include/access/hash.h4
-rw-r--r--src/include/access/heapam.h8
-rw-r--r--src/include/access/hio.h6
-rw-r--r--src/include/access/htup.h30
-rw-r--r--src/include/access/istrat.h10
-rw-r--r--src/include/access/nbtree.h4
-rw-r--r--src/include/access/printtup.h12
-rw-r--r--src/include/access/relscan.h54
-rw-r--r--src/include/access/sdir.h10
-rw-r--r--src/include/access/strat.h5
-rw-r--r--src/include/access/transam.h4
-rw-r--r--src/include/access/tupmacs.h6
13 files changed, 83 insertions, 80 deletions
diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h
index 25e20f4909e..ef09c3706d0 100644
--- a/src/include/access/attnum.h
+++ b/src/include/access/attnum.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: attnum.h,v 1.9 1999/02/13 23:20:49 momjian Exp $
+ * $Id: attnum.h,v 1.10 1999/05/25 16:13:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,21 +26,21 @@ typedef int16 AttrNumber;
* ----------------
*/
/*
- * AttributeNumberIsValid
+ * AttributeNumberIsValid
* True iff the attribute number is valid.
*/
#define AttributeNumberIsValid(attributeNumber) \
((bool) ((attributeNumber) != InvalidAttrNumber))
/*
- * AttrNumberIsForUserDefinedAttr
+ * AttrNumberIsForUserDefinedAttr
* True iff the attribute number corresponds to an user defined attribute.
*/
#define AttrNumberIsForUserDefinedAttr(attributeNumber) \
((bool) ((attributeNumber) > 0))
/*
- * AttrNumberGetAttrOffset
+ * AttrNumberGetAttrOffset
* Returns the attribute offset for an attribute number.
*
* Note:
@@ -53,7 +53,7 @@ typedef int16 AttrNumber;
)
/*
- * AttributeOffsetGetAttributeNumber
+ * AttributeOffsetGetAttributeNumber
* Returns the attribute number for an attribute offset.
*/
#define AttrOffsetGetAttrNumber(attributeOffset) \
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index f3227f59447..6250ead85a2 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: hash.h,v 1.22 1999/04/15 02:23:37 thomas Exp $
+ * $Id: hash.h,v 1.23 1999/05/25 16:13:27 momjian Exp $
*
* NOTES
* modeled after Margo Seltzer's hash implementation for unix.
@@ -265,7 +265,7 @@ extern void hashdelete(Relation rel, ItemPointer tid);
/* hashfunc.c */
extern uint32 hashint2(int16 key);
extern uint32 hashint4(uint32 key);
-extern uint32 hashint8(int64 *key);
+extern uint32 hashint8(int64 * key);
extern uint32 hashfloat4(float32 keyp);
extern uint32 hashfloat8(float64 keyp);
extern uint32 hashoid(Oid key);
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index c205cab52dc..9681bc759d4 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: heapam.h,v 1.41 1999/02/13 23:20:52 momjian Exp $
+ * $Id: heapam.h,v 1.42 1999/05/25 16:13:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -149,7 +149,7 @@ fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc,
(attnum) == 1) ?
(
(Datum) fetchatt(&((tupleDesc)->attrs[(attnum) - 1]),
- (char *) (tup)->t_data + (tup)->t_data->t_hoff +
+ (char *) (tup)->t_data + (tup)->t_data->t_hoff +
(
((attnum) != 1) ?
(tupleDesc)->attrs[(attnum) - 1]->attcacheoff
@@ -256,8 +256,8 @@ extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw);
extern void heap_fetch(Relation relation, Snapshot snapshot, HeapTuple tup, Buffer *userbuf);
extern Oid heap_insert(Relation relation, HeapTuple tup);
extern int heap_delete(Relation relation, ItemPointer tid, ItemPointer ctid);
-extern int heap_replace(Relation relation, ItemPointer otid, HeapTuple tup,
- ItemPointer ctid);
+extern int heap_replace(Relation relation, ItemPointer otid, HeapTuple tup,
+ ItemPointer ctid);
extern int heap_mark4update(Relation relation, HeapTuple tup, Buffer *userbuf);
extern void heap_markpos(HeapScanDesc scan);
extern void heap_restrpos(HeapScanDesc scan);
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index 0d84d50e264..bf5164b5e89 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: hio.h,v 1.10 1999/02/13 23:20:53 momjian Exp $
+ * $Id: hio.h,v 1.11 1999/05/25 16:13:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,8 +17,8 @@
#include <utils/rel.h>
-extern void RelationPutHeapTuple(Relation relation, Buffer buffer,
- HeapTuple tuple);
+extern void RelationPutHeapTuple(Relation relation, Buffer buffer,
+ HeapTuple tuple);
extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple);
#endif /* HIO_H */
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 5e748f4fcf9..4586f6118a4 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: htup.h,v 1.14 1999/03/28 20:32:30 vadim Exp $
+ * $Id: htup.h,v 1.15 1999/05/25 16:13:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,7 +48,7 @@ typedef struct HeapTupleHeaderData
/* bit map of domains */
/* MORE DATA FOLLOWS AT END OF STRUCT */
-} HeapTupleHeaderData;
+} HeapTupleHeaderData;
typedef HeapTupleHeaderData *HeapTupleHeader;
@@ -68,22 +68,22 @@ extern long heap_sysoffset[];
*
* 1. t_len moved off on-disk tuple data - ItemIdData is used to get len;
* 2. t_ctid above is not self tuple TID now - it may point to
- * updated version of tuple (required by MVCC);
- * 3. someday someone let tuple to cross block boundaries -
- * he have to add something below...
+ * updated version of tuple (required by MVCC);
+ * 3. someday someone let tuple to cross block boundaries -
+ * he have to add something below...
*/
typedef struct HeapTupleData
{
- uint32 t_len; /* length of *t_data */
- ItemPointerData t_self; /* SelfItemPointer */
- HeapTupleHeader t_data; /* */
+ uint32 t_len; /* length of *t_data */
+ ItemPointerData t_self; /* SelfItemPointer */
+ HeapTupleHeader t_data; /* */
} HeapTupleData;
-
+
typedef HeapTupleData *HeapTuple;
-#define HEAPTUPLESIZE DOUBLEALIGN(sizeof(HeapTupleData))
-
-
+#define HEAPTUPLESIZE DOUBLEALIGN(sizeof(HeapTupleData))
+
+
/* ----------------
* support macros
* ----------------
@@ -118,8 +118,10 @@ typedef HeapTupleData *HeapTuple;
#define HEAP_XMAX_INVALID 0x0800 /* t_xmax invalid/aborted */
#define HEAP_MARKED_FOR_UPDATE 0x1000 /* marked for UPDATE */
#define HEAP_UPDATED 0x2000 /* this is UPDATEd version of row */
-#define HEAP_MOVED_OFF 0x4000 /* removed or moved to another place by vacuum */
-#define HEAP_MOVED_IN 0x8000 /* moved from another place by vacuum */
+#define HEAP_MOVED_OFF 0x4000 /* removed or moved to another
+ * place by vacuum */
+#define HEAP_MOVED_IN 0x8000 /* moved from another place by
+ * vacuum */
#define HEAP_XACT_MASK 0xFF00 /* */
diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index 8d3dd069eac..6f451291587 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: istrat.h,v 1.12 1999/02/13 23:20:55 momjian Exp $
+ * $Id: istrat.h,v 1.13 1999/05/25 16:13:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,14 +17,14 @@
#include <access/strat.h>
/*
- * StrategyNumberIsValid
+ * StrategyNumberIsValid
* True iff the strategy number is valid.
*/
#define StrategyNumberIsValid(strategyNumber) \
((bool) ((strategyNumber) != InvalidStrategy))
/*
- * StrategyNumberIsInBounds
+ * StrategyNumberIsInBounds
* True iff strategy number is within given bounds.
*
* Note:
@@ -36,13 +36,13 @@
(strategyNumber) <= (maxStrategyNumber)))
/*
- * StrategyMapIsValid
+ * StrategyMapIsValid
* True iff the index strategy mapping is valid.
*/
#define StrategyMapIsValid(map) PointerIsValid(map)
/*
- * IndexStrategyIsValid
+ * IndexStrategyIsValid
* True iff the index strategy is valid.
*/
#define IndexStrategyIsValid(s) PointerIsValid(s)
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index b1c54366d88..a25e0c2c43f 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.24 1999/03/28 20:32:34 vadim Exp $
+ * $Id: nbtree.h,v 1.25 1999/05/25 16:13:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -42,7 +42,7 @@ typedef struct BTPageOpaqueData
{
BlockNumber btpo_prev;
BlockNumber btpo_next;
- BlockNumber btpo_parent;
+ BlockNumber btpo_parent;
uint16 btpo_flags;
#define BTP_LEAF (1 << 0)
diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h
index f5de892d93c..6b5a538b5e6 100644
--- a/src/include/access/printtup.h
+++ b/src/include/access/printtup.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: printtup.h,v 1.8 1999/02/13 23:20:56 momjian Exp $
+ * $Id: printtup.h,v 1.9 1999/05/25 16:13:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,17 +15,17 @@
#include <tcop/dest.h>
-extern DestReceiver* printtup_create_DR(void);
+extern DestReceiver *printtup_create_DR(void);
extern void showatts(char *name, TupleDesc attinfo);
extern void debugtup(HeapTuple tuple, TupleDesc typeinfo,
- DestReceiver* self);
+ DestReceiver * self);
extern void printtup_internal(HeapTuple tuple, TupleDesc typeinfo,
- DestReceiver* self);
+ DestReceiver * self);
/* XXX this one is really in executor/spi.c */
extern void spi_printtup(HeapTuple tuple, TupleDesc tupdesc,
- DestReceiver* self);
+ DestReceiver * self);
-extern int getTypeOutAndElem(Oid type, Oid* typOutput, Oid* typElem);
+extern int getTypeOutAndElem(Oid type, Oid *typOutput, Oid *typElem);
#endif /* PRINTTUP_H */
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 5b33e7ca12d..4481c575e61 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.14 1999/02/13 23:20:56 momjian Exp $
+ * $Id: relscan.h,v 1.15 1999/05/25 16:13:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,40 +22,40 @@ typedef ItemPointerData MarkData;
typedef struct HeapScanDescData
{
- Relation rs_rd; /* pointer to relation descriptor */
- HeapTupleData rs_ptup; /* previous tuple in scan */
- HeapTupleData rs_ctup; /* current tuple in scan */
- HeapTupleData rs_ntup; /* next tuple in scan */
- Buffer rs_pbuf; /* previous buffer in scan */
- Buffer rs_cbuf; /* current buffer in scan */
- Buffer rs_nbuf; /* next buffer in scan */
- ItemPointerData rs_mptid; /* marked previous tid */
- ItemPointerData rs_mctid; /* marked current tid */
- ItemPointerData rs_mntid; /* marked next tid */
- ItemPointerData rs_mcd; /* marked current delta XXX ??? */
- Snapshot rs_snapshot; /* snapshot to see */
- bool rs_atend; /* restart scan at end? */
- uint16 rs_cdelta; /* current delta in chain */
- uint16 rs_nkeys; /* number of attributes in keys */
- ScanKey rs_key; /* key descriptors */
+ Relation rs_rd; /* pointer to relation descriptor */
+ HeapTupleData rs_ptup; /* previous tuple in scan */
+ HeapTupleData rs_ctup; /* current tuple in scan */
+ HeapTupleData rs_ntup; /* next tuple in scan */
+ Buffer rs_pbuf; /* previous buffer in scan */
+ Buffer rs_cbuf; /* current buffer in scan */
+ Buffer rs_nbuf; /* next buffer in scan */
+ ItemPointerData rs_mptid; /* marked previous tid */
+ ItemPointerData rs_mctid; /* marked current tid */
+ ItemPointerData rs_mntid; /* marked next tid */
+ ItemPointerData rs_mcd; /* marked current delta XXX ??? */
+ Snapshot rs_snapshot; /* snapshot to see */
+ bool rs_atend; /* restart scan at end? */
+ uint16 rs_cdelta; /* current delta in chain */
+ uint16 rs_nkeys; /* number of attributes in keys */
+ ScanKey rs_key; /* key descriptors */
} HeapScanDescData;
typedef HeapScanDescData *HeapScanDesc;
typedef struct IndexScanDescData
{
- Relation relation; /* relation descriptor */
- void *opaque; /* am-specific slot */
+ Relation relation; /* relation descriptor */
+ void *opaque; /* am-specific slot */
ItemPointerData previousItemData; /* previous index pointer */
ItemPointerData currentItemData; /* current index pointer */
ItemPointerData nextItemData; /* next index pointer */
MarkData previousMarkData; /* marked previous pointer */
- MarkData currentMarkData; /* marked current pointer */
- MarkData nextMarkData; /* marked next pointer */
- uint8 flags; /* scan position flags */
- bool scanFromEnd; /* restart scan at end? */
- uint16 numberOfKeys; /* number of key attributes */
- ScanKey keyData; /* key descriptor */
+ MarkData currentMarkData;/* marked current pointer */
+ MarkData nextMarkData; /* marked next pointer */
+ uint8 flags; /* scan position flags */
+ bool scanFromEnd; /* restart scan at end? */
+ uint16 numberOfKeys; /* number of key attributes */
+ ScanKey keyData; /* key descriptor */
} IndexScanDescData;
typedef IndexScanDescData *IndexScanDesc;
@@ -69,13 +69,13 @@ typedef IndexScanDescData *IndexScanDesc;
typedef IndexScanDesc *IndexScanDescPtr;
/*
- * HeapScanIsValid
+ * HeapScanIsValid
* True iff the heap scan is valid.
*/
#define HeapScanIsValid(scan) PointerIsValid(scan)
/*
- * IndexScanIsValid
+ * IndexScanIsValid
* True iff the index scan is valid.
*/
#define IndexScanIsValid(scan) PointerIsValid(scan)
diff --git a/src/include/access/sdir.h b/src/include/access/sdir.h
index 42654765bf7..4f317f5eb03 100644
--- a/src/include/access/sdir.h
+++ b/src/include/access/sdir.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: sdir.h,v 1.5 1999/02/13 23:20:58 momjian Exp $
+ * $Id: sdir.h,v 1.6 1999/05/25 16:13:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,7 @@ typedef enum ScanDirection
} ScanDirection;
/*
- * ScanDirectionIsValid
+ * ScanDirectionIsValid
* True iff scan direction is valid.
*/
#define ScanDirectionIsValid(direction) \
@@ -34,21 +34,21 @@ typedef enum ScanDirection
direction <= ForwardScanDirection))
/*
- * ScanDirectionIsBackward
+ * ScanDirectionIsBackward
* True iff scan direction is backward.
*/
#define ScanDirectionIsBackward(direction) \
((bool) (direction == BackwardScanDirection))
/*
- * ScanDirectionIsNoMovement
+ * ScanDirectionIsNoMovement
* True iff scan direction indicates no movement.
*/
#define ScanDirectionIsNoMovement(direction) \
((bool) (direction == NoMovementScanDirection))
/*
- * ScanDirectionIsForward
+ * ScanDirectionIsForward
* True iff scan direction is forward.
*/
#define ScanDirectionIsForward(direction) \
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index 4f47c0e224e..0fa3cf62fd8 100644
--- a/src/include/access/strat.h
+++ b/src/include/access/strat.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: strat.h,v 1.12 1999/02/13 23:20:58 momjian Exp $
+ * $Id: strat.h,v 1.13 1999/05/25 16:13:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,6 +31,7 @@ typedef struct StrategyTransformMapData
*
*
*
+ *
* STRUCTURE */
typedef StrategyTransformMapData *StrategyTransformMap;
@@ -70,7 +71,7 @@ typedef struct StrategyEvaluationData
typedef StrategyEvaluationData *StrategyEvaluation;
/*
- * StrategyTransformMapIsValid
+ * StrategyTransformMapIsValid
* Returns true iff strategy transformation map is valid.
*/
#define StrategyTransformMapIsValid(transform) PointerIsValid(transform)
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index a7f911e50a3..221a7456f92 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.19 1999/02/13 23:20:59 momjian Exp $
+ * $Id: transam.h,v 1.20 1999/05/25 16:13:35 momjian Exp $
*
* NOTES
* Transaction System Version 101 now support proper oid
@@ -145,7 +145,7 @@ extern bool TransactionIdDidCommit(TransactionId transactionId);
extern bool TransactionIdDidAbort(TransactionId transactionId);
extern void TransactionIdCommit(TransactionId transactionId);
extern void TransactionIdAbort(TransactionId transactionId);
-extern void TransactionIdFlushCache(void);
+extern void TransactionIdFlushCache(void);
/* in transam/transsup.c */
extern void AmiTransactionOverride(bool flag);
diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index 6dd499c60b9..3f2d6e8d962 100644
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tupmacs.h,v 1.9 1999/03/25 03:49:26 tgl Exp $
+ * $Id: tupmacs.h,v 1.10 1999/05/25 16:13:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -63,7 +63,7 @@
)
/* att_align aligns the given offset as needed for a datum of length attlen
- * and alignment requirement attalign. In practice we don't need the length.
+ * and alignment requirement attalign. In practice we don't need the length.
* The attalign cases are tested in what is hopefully something like their
* frequency of occurrence.
*/
@@ -89,5 +89,5 @@
(cur_offset) + VARSIZE(DatumGetPointer(attval)) \
) \
)
-
+
#endif