From a18ab529971b27ef3e9adb4f6e0464ad1a357c83 Mon Sep 17 00:00:00 2001 From: David Hall Date: Thu, 12 Sep 2019 10:41:37 -0500 Subject: [PATCH] MCOL-3492 Format cleanup --- dbcon/joblist/joblistfactory.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp index 520e365ef..d8febe971 100644 --- a/dbcon/joblist/joblistfactory.cpp +++ b/dbcon/joblist/joblistfactory.cpp @@ -1131,9 +1131,9 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo // remember the columns to be returned jobInfo.returnedColVec.push_back(make_pair(tupleKey, op)); - // bug 1499 distinct processing, save unique distinct columns that aren't Window columns - if (doDistinct - && (jobInfo.distinctColVec.end() == + // bug 1499 distinct processing, save unique distinct columns + if (doDistinct && + (jobInfo.distinctColVec.end() == find(jobInfo.distinctColVec.begin(), jobInfo.distinctColVec.end(), tupleKey))) { jobInfo.distinctColVec.push_back(tupleKey); @@ -1284,13 +1284,13 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo // remember the columns to be returned jobInfo.returnedColVec.push_back(make_pair(tupleKey, op)); - // bug 1499 distinct processing, save unique distinct columns that aren't Window columns - if (doDistinct - && (jobInfo.distinctColVec.end() == - find(jobInfo.distinctColVec.begin(), jobInfo.distinctColVec.end(), tupleKey))) - { - jobInfo.distinctColVec.push_back(tupleKey); - } + // bug 1499 distinct processing, save unique distinct columns + if (doDistinct && + (jobInfo.distinctColVec.end() == + find(jobInfo.distinctColVec.begin(), jobInfo.distinctColVec.end(), tupleKey))) + { + jobInfo.distinctColVec.push_back(tupleKey); + } } }