From 3df2f51881707d4a9eb047c64e7da41ff7f52a42 Mon Sep 17 00:00:00 2001 From: Jason Petersen Date: Tue, 26 Feb 2019 22:26:52 -0700 Subject: [PATCH] Turn on style-checking, fix lingering violations We'd been ignoring updating uncrustify for some time now because I'd thought these were misclassifications that would require an update in our rules to address. Turns out they're legit, so I'm checking them in. --- .circleci/config.yml | 7 ++++ .../distributed/utils/citus_copyfuncs.c | 4 +- src/backend/distributed/utils/resource_lock.c | 42 +++++++++---------- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 60274718a..0b81c3896 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,12 @@ jobs: - checkout - {run: {name: 'Configure, Build, and Install', command: build-ext}} - {persist_to_workspace: {root: ., paths: [.]}} + check-style: + docker: + - {image: 'citusdata/stylechecker:latest'} + steps: + - checkout + - {run: {name: 'Check Style', command: citus_indent --check}} test-10_check-multi: docker: - {image: 'citusdata/exttester-10:latest'} @@ -77,6 +83,7 @@ workflows: build_and_test: jobs: - build + - check-style - {test-10_check-multi: {requires: [build]}} - {test-10_check-tt-van-mx: {requires: [build]}} diff --git a/src/backend/distributed/utils/citus_copyfuncs.c b/src/backend/distributed/utils/citus_copyfuncs.c index 9d02a2b5e..757317851 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) */ diff --git a/src/backend/distributed/utils/resource_lock.c b/src/backend/distributed/utils/resource_lock.c index 36989d0f6..57a4d7ccc 100644 --- a/src/backend/distributed/utils/resource_lock.c +++ b/src/backend/distributed/utils/resource_lock.c @@ -107,7 +107,7 @@ lock_shard_metadata(PG_FUNCTION_ARGS) ereport(ERROR, (errmsg("no locks specified"))); } - /* we don't want random users to block writes */ + /* we don't want random users to block writes */ EnsureSuperUser(); shardIdCount = ArrayObjectCount(shardIdArrayObject); @@ -147,7 +147,7 @@ lock_shard_resources(PG_FUNCTION_ARGS) ereport(ERROR, (errmsg("no locks specified"))); } - /* we don't want random users to block writes */ + /* we don't want random users to block writes */ EnsureSuperUser(); shardIdCount = ArrayObjectCount(shardIdArrayObject); @@ -475,7 +475,7 @@ LockShardListMetadata(List *shardIntervalList, LOCKMODE lockMode) { ListCell *shardIntervalCell = NULL; - /* lock shards in order of shard id to prevent deadlock */ + /* lock shards in order of shard id to prevent deadlock */ shardIntervalList = SortList(shardIntervalList, CompareShardIntervalsById); foreach(shardIntervalCell, shardIntervalList) @@ -497,7 +497,7 @@ LockShardsInPlacementListMetadata(List *shardPlacementList, LOCKMODE lockMode) { ListCell *shardPlacementCell = NULL; - /* lock shards in order of shard id to prevent deadlock */ + /* lock shards in order of shard id to prevent deadlock */ shardPlacementList = SortList(shardPlacementList, CompareShardPlacementsByShardId); @@ -553,7 +553,7 @@ LockShardListResources(List *shardIntervalList, LOCKMODE lockMode) { ListCell *shardIntervalCell = NULL; - /* lock shards in order of shard id to prevent deadlock */ + /* lock shards in order of shard id to prevent deadlock */ shardIntervalList = SortList(shardIntervalList, CompareShardIntervalsById); foreach(shardIntervalCell, shardIntervalList) @@ -575,7 +575,7 @@ LockRelationShardResources(List *relationShardList, LOCKMODE lockMode) { ListCell *relationShardCell = NULL; - /* lock shards in a consistent order to prevent deadlock */ + /* lock shards in a consistent order to prevent deadlock */ relationShardList = SortList(relationShardList, CompareRelationShards); foreach(relationShardCell, relationShardList) @@ -641,11 +641,11 @@ LockPartitionsInRelationList(List *relationIdList, LOCKMODE lockmode) void LockPartitionRelations(Oid relationId, LOCKMODE lockMode) { - /* - * PartitionList function generates partition list in the same order - * as PostgreSQL. Therefore we do not need to sort it before acquiring - * locks. - */ + /* + * PartitionList function generates partition list in the same order + * as PostgreSQL. Therefore we do not need to sort it before acquiring + * locks. + */ List *partitionList = PartitionList(relationId); ListCell *partitionCell = NULL; @@ -678,7 +678,7 @@ LockModeTextToLockMode(const char *lockModeName) } } - /* we could not find the lock mode we are looking for */ + /* we could not find the lock mode we are looking for */ if (lockMode == -1) { ereport(ERROR, @@ -712,7 +712,7 @@ LockModeToLockModeText(LOCKMODE lockMode) } } - /* we could not find the lock mode we are looking for */ + /* we could not find the lock mode we are looking for */ if (lockModeText == NULL) { ereport(ERROR, @@ -747,17 +747,17 @@ lock_relation_if_exists(PG_FUNCTION_ARGS) LOCKMODE lockMode = NoLock; bool relationExists = false; - /* ensure that we're in a transaction block */ + /* ensure that we're in a transaction block */ RequireTransactionBlock(true, "lock_relation_if_exists"); - /* get the lock mode */ + /* get the lock mode */ lockMode = LockModeTextToLockMode(lockModeCString); - /* resolve relationId from passed in schema and relation name */ + /* resolve relationId from passed in schema and relation name */ relationNameList = textToQualifiedNameList(relationName); relation = makeRangeVarFromNameList(relationNameList); - /* lock the relation with the lock mode */ + /* lock the relation with the lock mode */ relationId = RangeVarGetRelidInternal(relation, lockMode, RVR_MISSING_OK, CitusRangeVarCallbackForLockTable, (void *) &lockMode); @@ -783,18 +783,18 @@ CitusRangeVarCallbackForLockTable(const RangeVar *rangeVar, Oid relationId, if (!OidIsValid(relationId)) { - /* table doesn't exist, so no permissions check */ + /* table doesn't exist, so no permissions check */ return; } - /* we only allow tables and views to be locked */ + /* we only allow tables and views to be locked */ if (!RegularTable(relationId)) { ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), errmsg("\"%s\" is not a table", rangeVar->relname))); } - /* check permissions */ + /* check permissions */ aclResult = CitusLockTableAclCheck(relationId, lockmode, GetUserId()); if (aclResult != ACLCHECK_OK) { @@ -822,7 +822,7 @@ CitusLockTableAclCheck(Oid relationId, LOCKMODE lockmode, Oid userId) AclResult aclResult; AclMode aclMask; - /* verify adequate privilege */ + /* verify adequate privilege */ if (lockmode == AccessShareLock) { aclMask = ACL_SELECT;