indent

kelvich · kelvich · commit 398e7bce5021 · 2016-02-10T19:53:06.000+03:00
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
@@ -22,6 +22,7 @@
 #include "utils/hsearch.h"
 #include "utils/memutils.h"
 
+
 /*
  * Connection cache hash table entry
  *
@@ -809,6 +810,7 @@ pgfdw_xact_callback(XactEvent event, void *arg)
 					break;
 			}
 		}
+
 		/* Reset state to show we're out of a transaction */
 		entry->xact_depth = 0;
 
diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
@@ -133,9 +133,9 @@ postgres_fdw_validator(PG_FUNCTION_ARGS)
 		}
 		else if (strcmp(def->defname, "fetch_size") == 0)
 		{
-			int			fetch_size;
+			int		fetch_size;
 
-			fetch_size = strtol(defGetString(def), NULL, 10);
+			fetch_size = strtol(defGetString(def), NULL,10);
 			if (fetch_size <= 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
diff --git a/contrib/postgres_fdw/postgres_fdw.h b/contrib/postgres_fdw/postgres_fdw.h
@@ -54,7 +54,7 @@ typedef struct PgFdwRelationInfo
 	ForeignServer *server;
 	UserMapping *user;			/* only set in use_remote_estimate mode */
 
-	int			fetch_size;		/* fetch size for this remote table */
+	int			fetch_size;      /* fetch size for this remote table */
 } PgFdwRelationInfo;
 
 /* in postgres_fdw.c */
@@ -110,6 +110,4 @@ extern void deparseSelectStmtForRel(StringInfo buf, PlannerInfo *root,
 extern bool is_builtin(Oid objectId);
 extern bool is_shippable(Oid objectId, Oid classId, PgFdwRelationInfo *fpinfo);
 
-extern bool UseTsDtmTransactions;
-
 #endif   /* POSTGRES_FDW_H */
diff --git a/contrib/postgres_fdw/shippable.c b/contrib/postgres_fdw/shippable.c
@@ -46,13 +46,13 @@ typedef struct
 	Oid			objid;			/* function/operator/type OID */
 	Oid			classid;		/* OID of its catalog (pg_proc, etc) */
 	Oid			serverid;		/* FDW server we are concerned with */
-}	ShippableCacheKey;
+} ShippableCacheKey;
 
 typedef struct
 {
 	ShippableCacheKey key;		/* hash key - must be first */
 	bool		shippable;
-}	ShippableCacheEntry;
+} ShippableCacheEntry;
 
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include "utils/hsearch.h"`
`23`	`23`	`#include "utils/memutils.h"`
`24`	`24`
	`25`	`+`
`25`	`26`	`/*`
`26`	`27`	`* Connection cache hash table entry`
`27`	`28`	`*`
`@@ -809,6 +810,7 @@ pgfdw_xact_callback(XactEvent event, void *arg)`
`809`	`810`	`break;`
`810`	`811`	`}`
`811`	`812`	`}`
	`813`	`+`
`812`	`814`	`/* Reset state to show we're out of a transaction */`
`813`	`815`	`entry->xact_depth = 0;`
`814`	`816`
Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,9 @@ postgres_fdw_validator(PG_FUNCTION_ARGS)`
`133`	`133`	`}`
`134`	`134`	`else if (strcmp(def->defname, "fetch_size") == 0)`
`135`	`135`	`{`
`136`		`- int fetch_size;`
	`136`	`+ int fetch_size;`
`137`	`137`
`138`		`- fetch_size = strtol(defGetString(def), NULL, 10);`
	`138`	`+ fetch_size = strtol(defGetString(def), NULL,10);`
`139`	`139`	`if (fetch_size <= 0)`
`140`	`140`	`ereport(ERROR,`
`141`	`141`	`(errcode(ERRCODE_SYNTAX_ERROR),`