From 08eb0ade31e04d178ec0ebd74dc701d7068f04e6 Mon Sep 17 00:00:00 2001 From: Hadi Moshayedi Date: Thu, 19 Dec 2019 23:07:10 -0800 Subject: [PATCH 1/2] Fix reindent version inconsistencies. Different versions of reindent tool reformatted citus_custom_scan.c and citus_copyfuncs.c differently. So some developers spent some extra attention not to commit these two files after reindent. This PR tries to address this. --- src/backend/distributed/executor/citus_custom_scan.c | 4 ++-- src/backend/distributed/utils/citus_copyfuncs.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/distributed/executor/citus_custom_scan.c b/src/backend/distributed/executor/citus_custom_scan.c index e2742c7d9..968b22102 100644 --- a/src/backend/distributed/executor/citus_custom_scan.c +++ b/src/backend/distributed/executor/citus_custom_scan.c @@ -183,8 +183,8 @@ CitusModifyBeginScan(CustomScanState *node, EState *estate, int eflags) * executions of a prepared statement. Instead we create a deep copy that we only * use for the current execution. */ - DistributedPlan *distributedPlan = scanState->distributedPlan = copyObject( - scanState->distributedPlan); + DistributedPlan *distributedPlan = copyObject(scanState->distributedPlan); + scanState->distributedPlan = distributedPlan; Job *workerJob = distributedPlan->workerJob; Query *jobQuery = workerJob->jobQuery; diff --git a/src/backend/distributed/utils/citus_copyfuncs.c b/src/backend/distributed/utils/citus_copyfuncs.c index 1a2083989..22e9901cc 100644 --- a/src/backend/distributed/utils/citus_copyfuncs.c +++ b/src/backend/distributed/utils/citus_copyfuncs.c @@ -33,8 +33,8 @@ CitusSetTag(Node *node, int tag) #define DECLARE_FROM_AND_NEW_NODE(nodeTypeName) \ - nodeTypeName *newnode = (nodeTypeName *) \ - CitusSetTag((Node *) target_node, T_ ## nodeTypeName); \ + nodeTypeName *newnode = \ + (nodeTypeName *) CitusSetTag((Node *) target_node, T_ ## nodeTypeName); \ nodeTypeName *from = (nodeTypeName *) source_node /* Copy a simple scalar field (int, float, bool, enum, etc) */ From f007b7f91d5128f095f4401a5e258a751c8bb0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Fri, 20 Dec 2019 08:27:47 +0000 Subject: [PATCH 2/2] Also fix reindent inconsistencies with fake_fdw.c --- src/backend/distributed/test/fake_fdw.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/backend/distributed/test/fake_fdw.c b/src/backend/distributed/test/fake_fdw.c index 22a4960e1..e8c011820 100644 --- a/src/backend/distributed/test/fake_fdw.c +++ b/src/backend/distributed/test/fake_fdw.c @@ -118,7 +118,10 @@ FakeGetForeignPlan(PlannerInfo *root, RelOptInfo *baserel, Oid foreigntableid, * FakeBeginForeignScan begins the fake plan (i.e. does nothing). */ static void -FakeBeginForeignScan(ForeignScanState *node, int eflags) { } +FakeBeginForeignScan(ForeignScanState *node, int eflags) +{ + /* this comment is for indentation consistency */ +} /* @@ -138,11 +141,17 @@ FakeIterateForeignScan(ForeignScanState *node) * FakeReScanForeignScan restarts the fake plan (i.e. does nothing). */ static void -FakeReScanForeignScan(ForeignScanState *node) { } +FakeReScanForeignScan(ForeignScanState *node) +{ + /* this comment is for indentation consistency */ +} /* * FakeEndForeignScan ends the fake plan (i.e. does nothing). */ static void -FakeEndForeignScan(ForeignScanState *node) { } +FakeEndForeignScan(ForeignScanState *node) +{ + /* this comment is for indentation consistency */ +}