database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

MCOL-1822 Change scanFlags back to bool (had changed to int for debugging)

Browse Source
This commit is contained in:
David Hall
2019-03-05 10:00:15 -06:00
parent 0ea4ccfe06
commit 38d077d72f
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/joblist/primitivestep.h
View File

@@ -392,7 +392,7 @@ private:
boost::condition condvar; boost::condition condvar;
boost::condition flushed; boost::condition flushed;
SP_LBIDList lbidList; SP_LBIDList lbidList;
std::vector<int> scanFlags; // use to keep track of which extents to eliminate from this step std::vector<bool> scanFlags; // use to keep track of which extents to eliminate from this step
uint32_t uniqueID; uint32_t uniqueID;
//@bug 2634 //@bug 2634
@@ -1411,7 +1411,7 @@ private:
boost::mutex serializeJoinerMutex; boost::mutex serializeJoinerMutex;
boost::condition condvarWakeupProducer, condvar; boost::condition condvarWakeupProducer, condvar;
std::vector<int> scanFlags; // use to keep track of which extents to eliminate from this step std::vector<bool> scanFlags; // use to keep track of which extents to eliminate from this step
bool BPPIsAllocated; bool BPPIsAllocated;
uint32_t uniqueID; uint32_t uniqueID;
ResourceManager* fRm; ResourceManager* fRm;
@@ -1477,7 +1477,7 @@ private:
* component and this new array as the runtime component. The final CP decision * component and this new array as the runtime component. The final CP decision
* is scanFlags & runtimeCP. * is scanFlags & runtimeCP.
*/ */
std::vector<int> runtimeCPFlags; std::vector<bool> runtimeCPFlags;
/* semijoin vars */ /* semijoin vars */
rowgroup::RowGroup joinFERG; rowgroup::RowGroup joinFERG;

3
dbcon/joblist/rowestimator.cpp
View File

@@ -1,5 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc. /* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License 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 // This function returns the estimated row count for the entire TupleBPS. It samples the last 20 (configurable) extents to
// calculate the estimate. // calculate the estimate.
uint64_t RowEstimator::estimateRows(const vector<ColumnCommandJL*>& cpColVec, uint64_t RowEstimator::estimateRows(const vector<ColumnCommandJL*>& cpColVec,
const std::vector<int>& scanFlags, const std::vector<bool>& scanFlags,
BRM::DBRM& dbrm, BRM::DBRM& dbrm,
const execplan::CalpontSystemCatalog::OID oid) const execplan::CalpontSystemCatalog::OID oid)

3
dbcon/joblist/rowestimator.h
View File

@@ -1,5 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc. /* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@@ -63,7 +62,7 @@ public:
* *
*/ */
uint64_t estimateRows(const std::vector<ColumnCommandJL*>& cpColVec, uint64_t estimateRows(const std::vector<ColumnCommandJL*>& cpColVec,
const std::vector <int>& scanFlags, const std::vector <bool>& scanFlags,
BRM::DBRM& dbrm, BRM::DBRM& dbrm,
const execplan::CalpontSystemCatalog::OID oid); const execplan::CalpontSystemCatalog::OID oid);