external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Indentation cleanup 

Uncrustify 0.65 appears to have changed some defaults, resulting in
breakages for those of us who have already upgraded; Travis still uses
Uncrustify 0.64, but these changes work with both versions (assuming
appropriately updated config), so this should permit use of either
version for the time being.
pull/1462/head
Jason Petersen 2017-07-11 15:47:56 -06:00
parent d896fe7995
commit 9018e698ec
No known key found for this signature in database
GPG Key ID: 9F1D3510D110ABA9
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/distributed/planner/multi_explain.c
View File

@ -540,27 +540,27 @@ BuildRemoteExplainQuery(char *queryString, ExplainState *es)
case EXPLAIN_FORMAT_XML: case EXPLAIN_FORMAT_XML:
{ {
formatStr = "XML"; formatStr = "XML";
}
break; break;
}
case EXPLAIN_FORMAT_JSON: case EXPLAIN_FORMAT_JSON:
{ {
formatStr = "JSON"; formatStr = "JSON";
}
break; break;
}
case EXPLAIN_FORMAT_YAML: case EXPLAIN_FORMAT_YAML:
{ {
formatStr = "YAML"; formatStr = "YAML";
}
break; break;
}
default: default:
{ {
formatStr = "TEXT"; formatStr = "TEXT";
}
break; break;
} }
}
appendStringInfo(explainQuery, appendStringInfo(explainQuery,
"EXPLAIN (ANALYZE %s, VERBOSE %s, " "EXPLAIN (ANALYZE %s, VERBOSE %s, "

12
src/backend/distributed/planner/shard_pruning.c
View File

@ -632,8 +632,8 @@ AddPartitionKeyRestrictionToInstance(ClauseWalkerContext *context, OpExpr *opCla
prune->lessConsts = constantClause; prune->lessConsts = constantClause;
} }
matchedOp = true; matchedOp = true;
}
break; break;
}
case BTLessEqualStrategyNumber: case BTLessEqualStrategyNumber:
{ {
@ -645,8 +645,8 @@ AddPartitionKeyRestrictionToInstance(ClauseWalkerContext *context, OpExpr *opCla
prune->lessEqualConsts = constantClause; prune->lessEqualConsts = constantClause;
} }
matchedOp = true; matchedOp = true;
}
break; break;
}
case BTEqualStrategyNumber: case BTEqualStrategyNumber:
{ {
@ -662,8 +662,8 @@ AddPartitionKeyRestrictionToInstance(ClauseWalkerContext *context, OpExpr *opCla
prune->evaluatesToFalse = true; prune->evaluatesToFalse = true;
} }
matchedOp = true; matchedOp = true;
}
break; break;
}
case BTGreaterEqualStrategyNumber: case BTGreaterEqualStrategyNumber:
{ {
@ -676,8 +676,8 @@ AddPartitionKeyRestrictionToInstance(ClauseWalkerContext *context, OpExpr *opCla
prune->greaterEqualConsts = constantClause; prune->greaterEqualConsts = constantClause;
} }
matchedOp = true; matchedOp = true;
}
break; break;
}
case BTGreaterStrategyNumber: case BTGreaterStrategyNumber:
{ {
@ -689,15 +689,15 @@ AddPartitionKeyRestrictionToInstance(ClauseWalkerContext *context, OpExpr *opCla
prune->greaterConsts = constantClause; prune->greaterConsts = constantClause;
} }
matchedOp = true; matchedOp = true;
}
break; break;
}
case ROWCOMPARE_NE: case ROWCOMPARE_NE:
{ {
/* TODO: could add support for this, if we feel like it */ /* TODO: could add support for this, if we feel like it */
matchedOp = false; matchedOp = false;
}
break; break;
}
default: default:
Assert(false); Assert(false);

11
src/backend/distributed/transaction/transaction_management.c
View File

@ -168,8 +168,8 @@ CoordinatedTransactionCallback(XactEvent event, void *arg)
XactModificationLevel = XACT_MODIFICATION_NONE; XactModificationLevel = XACT_MODIFICATION_NONE;
dlist_init(&InProgressTransactions); dlist_init(&InProgressTransactions);
CoordinatedTransactionUses2PC = false; CoordinatedTransactionUses2PC = false;
}
break; break;
}
case XACT_EVENT_ABORT: case XACT_EVENT_ABORT:
{ {
@ -204,14 +204,15 @@ CoordinatedTransactionCallback(XactEvent event, void *arg)
dlist_init(&InProgressTransactions); dlist_init(&InProgressTransactions);
CoordinatedTransactionUses2PC = false; CoordinatedTransactionUses2PC = false;
subXactAbortAttempted = false; subXactAbortAttempted = false;
}
break; break;
}
case XACT_EVENT_PARALLEL_COMMIT: case XACT_EVENT_PARALLEL_COMMIT:
case XACT_EVENT_PARALLEL_ABORT: case XACT_EVENT_PARALLEL_ABORT:
case XACT_EVENT_PREPARE: case XACT_EVENT_PREPARE:
{ } {
break; break;
}
case XACT_EVENT_PRE_COMMIT: case XACT_EVENT_PRE_COMMIT:
{ {
@ -270,8 +271,8 @@ CoordinatedTransactionCallback(XactEvent event, void *arg)
* committed. This handles failure at COMMIT/PREPARE time. * committed. This handles failure at COMMIT/PREPARE time.
*/ */
PostCommitMarkFailedShardPlacements(CoordinatedTransactionUses2PC); PostCommitMarkFailedShardPlacements(CoordinatedTransactionUses2PC);
}
break; break;
}
case XACT_EVENT_PARALLEL_PRE_COMMIT: case XACT_EVENT_PARALLEL_PRE_COMMIT:
case XACT_EVENT_PRE_PREPARE: case XACT_EVENT_PRE_PREPARE:
@ -282,10 +283,10 @@ CoordinatedTransactionCallback(XactEvent event, void *arg)
errmsg("cannot use 2PC in transactions involving " errmsg("cannot use 2PC in transactions involving "
"multiple servers"))); "multiple servers")));
} }
}
break; break;
} }
} }
}
/* /*