From 38d077d72f47aaee79fae77084e3126fd7d0eebe Mon Sep 17 00:00:00 2001 From: David Hall Date: Tue, 5 Mar 2019 10:00:15 -0600 Subject: [PATCH] MCOL-1822 Change scanFlags back to bool (had changed to int for debugging) --- dbcon/joblist/primitivestep.h | 6 +++--- dbcon/joblist/rowestimator.cpp | 3 +-- dbcon/joblist/rowestimator.h | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dbcon/joblist/primitivestep.h b/dbcon/joblist/primitivestep.h index 2a668ed06..588dd49bb 100644 --- a/dbcon/joblist/primitivestep.h +++ b/dbcon/joblist/primitivestep.h @@ -392,7 +392,7 @@ private: boost::condition condvar; boost::condition flushed; SP_LBIDList lbidList; - std::vector scanFlags; // use to keep track of which extents to eliminate from this step + std::vector scanFlags; // use to keep track of which extents to eliminate from this step uint32_t uniqueID; //@bug 2634 @@ -1411,7 +1411,7 @@ private: boost::mutex serializeJoinerMutex; boost::condition condvarWakeupProducer, condvar; - std::vector scanFlags; // use to keep track of which extents to eliminate from this step + std::vector scanFlags; // use to keep track of which extents to eliminate from this step bool BPPIsAllocated; uint32_t uniqueID; ResourceManager* fRm; @@ -1477,7 +1477,7 @@ private: * component and this new array as the runtime component. The final CP decision * is scanFlags & runtimeCP. */ - std::vector runtimeCPFlags; + std::vector runtimeCPFlags; /* semijoin vars */ rowgroup::RowGroup joinFERG; diff --git a/dbcon/joblist/rowestimator.cpp b/dbcon/joblist/rowestimator.cpp index 0b250e2bb..e69c66d79 100644 --- a/dbcon/joblist/rowestimator.cpp +++ b/dbcon/joblist/rowestimator.cpp @@ -1,5 +1,4 @@ /* Copyright (C) 2014 InfiniDB, Inc. - Copyright (C) 2019 MariaDB Corporaton This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -456,7 +455,7 @@ float RowEstimator::estimateRowReturnFactor(const BRM::EMEntry& emEntry, // This function returns the estimated row count for the entire TupleBPS. It samples the last 20 (configurable) extents to // calculate the estimate. uint64_t RowEstimator::estimateRows(const vector& cpColVec, - const std::vector& scanFlags, + const std::vector& scanFlags, BRM::DBRM& dbrm, const execplan::CalpontSystemCatalog::OID oid) diff --git a/dbcon/joblist/rowestimator.h b/dbcon/joblist/rowestimator.h index 3cbffde1d..477bc2b30 100644 --- a/dbcon/joblist/rowestimator.h +++ b/dbcon/joblist/rowestimator.h @@ -1,5 +1,4 @@ /* Copyright (C) 2014 InfiniDB, Inc. - Copyright (C) 2019 MariaDB Corporaton This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -63,7 +62,7 @@ public: * */ uint64_t estimateRows(const std::vector& cpColVec, - const std::vector & scanFlags, + const std::vector & scanFlags, BRM::DBRM& dbrm, const execplan::CalpontSystemCatalog::OID oid);