Minor formatting/comment fixes

pull/579/head
Jason Petersen 2016-06-08 10:34:07 -06:00
parent fd1b088208
commit d39508d8b3
No known key found for this signature in database
GPG Key ID: 9F1D3510D110ABA9
1 changed files with 6 additions and 10 deletions

View File

@ -296,15 +296,13 @@ ExecuteDistributedModify(Task *task)
currentAffectedTupleString = PQcmdTuples(result); currentAffectedTupleString = PQcmdTuples(result);
/* May throw out of range errors if the tuple /* could throw error if input > MAX_INT64 */
* count is greater than MAX_INT64.
*/
scanint8(currentAffectedTupleString, false, &currentAffectedTupleCount); scanint8(currentAffectedTupleString, false, &currentAffectedTupleCount);
Assert(currentAffectedTupleCount >= 0); Assert(currentAffectedTupleCount >= 0);
#if (PG_VERSION_NUM < 90600) #if (PG_VERSION_NUM < 90600)
/* make sure that prior version workers don't overflow */ /* before 9.6, PostgreSQL used a uint32 for this field, so check */
Assert(currentAffectedTupleCount <= PG_UINT32_MAX); Assert(currentAffectedTupleCount <= PG_UINT32_MAX);
#endif #endif
@ -315,12 +313,10 @@ ExecuteDistributedModify(Task *task)
} }
else else
{ {
ereport(WARNING, (errmsg( ereport(WARNING,
"modified " INT64_FORMAT (errmsg("modified " INT64_FORMAT " tuples, but expected to modify "
" tuples, but expected to modify " INT64_FORMAT, INT64_FORMAT, currentAffectedTupleCount, affectedTupleCount),
currentAffectedTupleCount, affectedTupleCount), errdetail("modified placement on %s:%d", nodeName, nodePort)));
errdetail("modified placement on %s:%d",
nodeName, nodePort)));
} }
PQclear(result); PQclear(result);