summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpengbo2016-09-11 12:02:47 +0000
committerpengbo2016-09-11 12:02:47 +0000
commitcfc0998b0d2d28b98789db9df321298668a08f35 (patch)
treebdbb068492007e4d26dd8d62894764a39aeeb78f
parent4166f1c7ffc281242d870e23c8f0bfae7895ba27 (diff)
Fix wrong indentation according to the code styleIMPORT_96_PARSER
-rw-r--r--src/include/parser/explain.h3
-rw-r--r--src/include/parser/extensible.h8
-rw-r--r--src/include/parser/makefuncs.h2
-rw-r--r--src/include/parser/nodes.h6
-rw-r--r--src/include/parser/parsenodes.h16
-rw-r--r--src/include/parser/primnodes.h16
-rw-r--r--src/parser/copyfuncs.c1
-rw-r--r--src/parser/gram.y5
8 files changed, 22 insertions, 35 deletions
diff --git a/src/include/parser/explain.h b/src/include/parser/explain.h
index dc8d8c5e7..e7f63e46e 100644
--- a/src/include/parser/explain.h
+++ b/src/include/parser/explain.h
@@ -13,9 +13,6 @@
#ifndef EXPLAIN_H
#define EXPLAIN_H
-//#include "executor/executor.h"
-//#include "lib/stringinfo.h"
-
typedef enum ExplainFormat
{
EXPLAIN_FORMAT_TEXT,
diff --git a/src/include/parser/extensible.h b/src/include/parser/extensible.h
index eac16de51..33c56099f 100644
--- a/src/include/parser/extensible.h
+++ b/src/include/parser/extensible.h
@@ -14,12 +14,6 @@
#ifndef EXTENSIBLE_H
#define EXTENSIBLE_H
-//#include "parallel.h"
-//#include "explain.h"
-//#include "nodes/execnodes.h"
-//#include "nodes/plannodes.h"
-//#include "nodes/relation.h"
-
/* maximum length of an extensible node identifier */
#define EXTNODENAME_MAX_LEN 64
@@ -81,6 +75,4 @@ extern const ExtensibleNodeMethods *GetExtensibleNodeMethods(const char *name,
#define CUSTOMPATH_SUPPORT_BACKWARD_SCAN 0x0001
#define CUSTOMPATH_SUPPORT_MARK_RESTORE 0x0002
-
-
#endif /* EXTENSIBLE_H */
diff --git a/src/include/parser/makefuncs.h b/src/include/parser/makefuncs.h
index 634351e51..52bd562e6 100644
--- a/src/include/parser/makefuncs.h
+++ b/src/include/parser/makefuncs.h
@@ -74,7 +74,7 @@ extern TypeName *makeTypeNameFromNameList(List *names);
extern TypeName *makeTypeNameFromOid(Oid typeOid, int32 typmod);
extern ColumnDef *makeColumnDef(const char *colname,
- Oid typeOid, int32 typmod, Oid collOid);
+ Oid typeOid, int32 typmod, Oid collOid);
extern FuncExpr *makeFuncExpr(Oid funcid, Oid rettype, List *args,
Oid funccollid, Oid inputcollid, CoercionForm fformat);
diff --git a/src/include/parser/nodes.h b/src/include/parser/nodes.h
index d51c1b411..71aa499b9 100644
--- a/src/include/parser/nodes.h
+++ b/src/include/parser/nodes.h
@@ -481,9 +481,9 @@ typedef enum NodeTag
T_TIDBitmap, /* in nodes/tidbitmap.h */
T_InlineCodeBlock, /* in nodes/parsenodes.h */
T_FdwRoutine, /* in foreign/fdwapi.h */
- T_IndexAmRoutine, /* in access/amapi.h */
- TsmRoutine, /* in access/tsmapi.h */
- T_ForeignKeyCacheInfo, /* in utils/rel.h */
+ T_IndexAmRoutine, /* in access/amapi.h */
+ TsmRoutine, /* in access/tsmapi.h */
+ T_ForeignKeyCacheInfo, /* in utils/rel.h */
/* pgpool Extention */
T_PgpoolVariableSetStmt,
T_PgpoolVariableShowStmt
diff --git a/src/include/parser/parsenodes.h b/src/include/parser/parsenodes.h
index 546581bf6..c49881ecd 100644
--- a/src/include/parser/parsenodes.h
+++ b/src/include/parser/parsenodes.h
@@ -252,7 +252,7 @@ typedef enum A_Expr_Kind
AEXPR_OP_ANY, /* scalar op ANY (array) */
AEXPR_OP_ALL, /* scalar op ALL (array) */
AEXPR_DISTINCT, /* IS DISTINCT FROM - name must be "=" */
- AEXPR_NOT_DISTINCT, /* IS NOT DISTINCT FROM - name must be "=" */
+ AEXPR_NOT_DISTINCT, /* IS NOT DISTINCT FROM - name must be "=" */
AEXPR_NULLIF, /* NULLIF - name must be "=" */
AEXPR_OF, /* IS [NOT] OF - name must be "=" or "<>" */
AEXPR_IN, /* [NOT] IN - name must be "=" or "<>" */
@@ -377,8 +377,8 @@ typedef struct A_Indices
{
NodeTag type;
bool is_slice; /* true if slice (i.e., colon present) */
- Node *lidx; /* slice lower bound, if any */
- Node *uidx; /* subscript, or slice upper bound if any */
+ Node *lidx; /* slice lower bound, if any */
+ Node *uidx; /* subscript, or slice upper bound if any */
} A_Indices;
/*
@@ -1701,15 +1701,15 @@ typedef struct AlterDefaultPrivilegesStmt
typedef struct CopyStmt
{
NodeTag type;
- RangeVar *relation; /* the relation to copy */
- Node *query; /* the query (SELECT or DML statement with
+ RangeVar *relation; /* the relation to copy */
+ Node *query; /* the query (SELECT or DML statement with
* RETURNING) to copy */
- List *attlist; /* List of column names (as Strings), or NIL
+ List *attlist; /* List of column names (as Strings), or NIL
* for all columns */
bool is_from; /* TO or FROM */
bool is_program; /* is 'filename' a program to popen? */
- char *filename; /* filename, or NULL for STDIN/STDOUT */
- List *options; /* List of DefElem nodes */
+ char *filename; /* filename, or NULL for STDIN/STDOUT */
+ List *options; /* List of DefElem nodes */
} CopyStmt;
/* ----------------------
diff --git a/src/include/parser/primnodes.h b/src/include/parser/primnodes.h
index 03400666f..18439df86 100644
--- a/src/include/parser/primnodes.h
+++ b/src/include/parser/primnodes.h
@@ -280,12 +280,12 @@ typedef struct Aggref
Oid aggcollid; /* OID of collation of result */
Oid inputcollid; /* OID of collation that function should use */
Oid aggtranstype; /* type Oid of aggregate's transition value */
- List *aggargtypes; /* type Oids of direct and aggregated args */
- List *aggdirectargs; /* direct arguments, if an ordered-set agg */
- List *args; /* aggregated arguments and sort expressions */
- List *aggorder; /* ORDER BY (list of SortGroupClause) */
- List *aggdistinct; /* DISTINCT (list of SortGroupClause) */
- Expr *aggfilter; /* FILTER expression, if any */
+ List *aggargtypes; /* type Oids of direct and aggregated args */
+ List *aggdirectargs; /* direct arguments, if an ordered-set agg */
+ List *args; /* aggregated arguments and sort expressions */
+ List *aggorder; /* ORDER BY (list of SortGroupClause) */
+ List *aggdistinct; /* DISTINCT (list of SortGroupClause) */
+ Expr *aggfilter; /* FILTER expression, if any */
bool aggstar; /* TRUE if argument list was really '*' */
bool aggvariadic; /* true if variadic arguments have been
* combined into an array last argument */
@@ -1119,9 +1119,9 @@ typedef enum NullTestType
typedef struct NullTest
{
Expr xpr;
- Expr *arg; /* input expression */
+ Expr *arg; /* input expression */
NullTestType nulltesttype; /* IS NULL, IS NOT NULL */
- bool argisrow; /* T to perform field-by-field null checks */
+ bool argisrow; /* T to perform field-by-field null checks */
int location; /* token location, or -1 if unknown */
} NullTest;
diff --git a/src/parser/copyfuncs.c b/src/parser/copyfuncs.c
index 604f9d365..6d50fd394 100644
--- a/src/parser/copyfuncs.c
+++ b/src/parser/copyfuncs.c
@@ -1267,7 +1267,6 @@ _copyGroupingFunc(const GroupingFunc *from)
COPY_NODE_FIELD(refs);
COPY_NODE_FIELD(cols);
COPY_SCALAR_FIELD(agglevelsup);
-// COPY_SCALAR_FIELD(aggsplit);
COPY_LOCATION_FIELD(location);
return newnode;
diff --git a/src/parser/gram.y b/src/parser/gram.y
index ed7c527ae..b4da4ea02 100644
--- a/src/parser/gram.y
+++ b/src/parser/gram.y
@@ -69,7 +69,6 @@
*/
bool operator_precedence_warning = false;
-
/*
* Definition taken from
* postgreSQL source code file: src/include/commands/trigger.h
@@ -650,8 +649,8 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
OBJECT_P OF OFF OFFSET OIDS ON ONLY OPERATOR OPTION OPTIONS OR
ORDER ORDINALITY OUT_P OUTER_P OVER OVERLAPS OVERLAY OWNED OWNER
- PARALLEL PARSER PARTIAL PARTITION PASSING PASSWORD PGPOOL PLACING PLANS POLICY
- POSITION PRECEDING PRECISION PRESERVE PREPARE PREPARED PRIMARY
+ PARALLEL PARSER PARTIAL PARTITION PASSING PASSWORD PGPOOL PLACING PLANS POLICY
+ POSITION PRECEDING PRECISION PRESERVE PREPARE PREPARED PRIMARY
PRIOR PRIVILEGES PROCEDURAL PROCEDURE PROGRAM
QUOTE