aboutsummaryrefslogtreecommitdiff
path: root/src/include/executor
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2017-06-21 14:39:04 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2017-06-21 14:39:04 -0400
commite3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 (patch)
tree8dc7df95c340803546152724fbc17aee4b8527f9 /src/include/executor
parent8ff6d4ec7840b0af56f1207073f44b7f2afae96d (diff)
downloadpostgresql-e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89.tar.gz
postgresql-e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89.zip
Initial pgindent run with pg_bsd_indent version 2.0.
The new indent version includes numerous fixes thanks to Piotr Stefaniak. The main changes visible in this commit are: * Nicer formatting of function-pointer declarations. * No longer unexpectedly removes spaces in expressions using casts, sizeof, or offsetof. * No longer wants to add a space in "struct structname *varname", as well as some similar cases for const- or volatile-qualified pointers. * Declarations using PG_USED_FOR_ASSERTS_ONLY are formatted more nicely. * Fixes bug where comments following declarations were sometimes placed with no space separating them from the code. * Fixes some odd decisions for comments following case labels. * Fixes some cases where comments following code were indented to less than the expected column 33. On the less good side, it now tends to put more whitespace around typedef names that are not listed in typedefs.list. This might encourage us to put more effort into typedef name collection; it's not really a bug in indent itself. There are more changes coming after this round, having to do with comment indentation and alignment of lines appearing within parentheses. I wanted to limit the size of the diffs to something that could be reviewed without one's eyes completely glazing over, so it seemed better to split up the changes as much as practical. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
Diffstat (limited to 'src/include/executor')
-rw-r--r--src/include/executor/executor.h6
-rw-r--r--src/include/executor/hashjoin.h6
-rw-r--r--src/include/executor/tablefunc.h6
3 files changed, 9 insertions, 9 deletions
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 8cc5f3a413f..6544be96028 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -71,9 +71,9 @@ extern PGDLLIMPORT ExecutorStart_hook_type ExecutorStart_hook;
/* Hook for plugins to get control in ExecutorRun() */
typedef void (*ExecutorRun_hook_type) (QueryDesc *queryDesc,
- ScanDirection direction,
- uint64 count,
- bool execute_once);
+ ScanDirection direction,
+ uint64 count,
+ bool execute_once);
extern PGDLLIMPORT ExecutorRun_hook_type ExecutorRun_hook;
/* Hook for plugins to get control in ExecutorFinish() */
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index ac840533ee1..addcd09049d 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -66,7 +66,7 @@ typedef struct HashJoinTupleData
struct HashJoinTupleData *next; /* link to next tuple in same bucket */
uint32 hashvalue; /* tuple's hash code */
/* Tuple data, in MinimalTuple format, follows on a MAXALIGN boundary */
-} HashJoinTupleData;
+} HashJoinTupleData;
#define HJTUPLE_OVERHEAD MAXALIGN(sizeof(HashJoinTupleData))
#define HJTUPLE_MINTUPLE(hjtup) \
@@ -116,7 +116,7 @@ typedef struct HashMemoryChunkData
* list) */
char data[FLEXIBLE_ARRAY_MEMBER]; /* buffer allocated at the end */
-} HashMemoryChunkData;
+} HashMemoryChunkData;
typedef struct HashMemoryChunkData *HashMemoryChunk;
@@ -186,6 +186,6 @@ typedef struct HashJoinTableData
/* used for dense allocation of tuples (into linked chunks) */
HashMemoryChunk chunks; /* one list for the whole batch */
-} HashJoinTableData;
+} HashJoinTableData;
#endif /* HASHJOIN_H */
diff --git a/src/include/executor/tablefunc.h b/src/include/executor/tablefunc.h
index 22ca916eb28..9c7b4808a8e 100644
--- a/src/include/executor/tablefunc.h
+++ b/src/include/executor/tablefunc.h
@@ -54,13 +54,13 @@ typedef struct TableFuncRoutine
void (*InitOpaque) (struct TableFuncScanState *state, int natts);
void (*SetDocument) (struct TableFuncScanState *state, Datum value);
void (*SetNamespace) (struct TableFuncScanState *state, char *name,
- char *uri);
+ char *uri);
void (*SetRowFilter) (struct TableFuncScanState *state, char *path);
void (*SetColumnFilter) (struct TableFuncScanState *state,
- char *path, int colnum);
+ char *path, int colnum);
bool (*FetchRow) (struct TableFuncScanState *state);
Datum (*GetValue) (struct TableFuncScanState *state, int colnum,
- Oid typid, int32 typmod, bool *isnull);
+ Oid typid, int32 typmod, bool *isnull);
void (*DestroyOpaque) (struct TableFuncScanState *state);
} TableFuncRoutine;