diff --git a/dbcon/joblist/batchprimitiveprocessor-jl.cpp b/dbcon/joblist/batchprimitiveprocessor-jl.cpp index 6596eb8c5..4d5635379 100644 --- a/dbcon/joblist/batchprimitiveprocessor-jl.cpp +++ b/dbcon/joblist/batchprimitiveprocessor-jl.cpp @@ -1362,7 +1362,7 @@ void BatchPrimitiveProcessorJL::destroyBPP(ByteStream& bs) const bs << uniqueID; } -void BatchPrimitiveProcessorJL::useJoiners(const vector >& j) +void BatchPrimitiveProcessorJL::useJoiners(const vector >& j) { pos = 0; joinerNum = 0; diff --git a/dbcon/joblist/batchprimitiveprocessor-jl.h b/dbcon/joblist/batchprimitiveprocessor-jl.h index 8c3dfd6d3..4a48bb3be 100644 --- a/dbcon/joblist/batchprimitiveprocessor-jl.h +++ b/dbcon/joblist/batchprimitiveprocessor-jl.h @@ -209,7 +209,7 @@ class BatchPrimitiveProcessorJL void setJoinedRowGroup(const rowgroup::RowGroup& rg); /* Tuple hashjoin */ - void useJoiners(const std::vector >&); + void useJoiners(const std::vector >&); bool nextTupleJoinerMsg(messageqcpp::ByteStream&); // void setSmallSideKeyColumn(uint32_t col); @@ -348,7 +348,7 @@ class BatchPrimitiveProcessorJL rowgroup::RowGroup aggregateRGPM; /* UM portion of the PM join alg */ - std::vector > tJoiners; + std::vector > tJoiners; std::vector smallSideRGs; rowgroup::RowGroup largeSideRG; std::vector > smallSideKeys; diff --git a/dbcon/joblist/diskjoinstep.cpp b/dbcon/joblist/diskjoinstep.cpp index 2f69f9627..7d472409c 100644 --- a/dbcon/joblist/diskjoinstep.cpp +++ b/dbcon/joblist/diskjoinstep.cpp @@ -360,7 +360,7 @@ void DiskJoinStep::joinFcn() Row l_joinFERow, l_outputRow, baseRow; vector > joinMatches; boost::shared_array smallRowTemplates(new Row[1]); - vector > joiners; + vector> joiners; boost::shared_array > colMappings, fergMappings; boost::scoped_array > smallNullMem; boost::scoped_array joinFEMem; diff --git a/dbcon/joblist/diskjoinstep.h b/dbcon/joblist/diskjoinstep.h index 1acadfb27..b95d411ea 100644 --- a/dbcon/joblist/diskjoinstep.h +++ b/dbcon/joblist/diskjoinstep.h @@ -55,7 +55,7 @@ class DiskJoinStep : public JobStep boost::shared_ptr fe; bool typeless; JoinType joinType; - boost::shared_ptr joiner; // the same instance THJS uses + std::shared_ptr joiner; // the same instance THJS uses /* main thread, started by JobStep::run() */ void mainRunner(); @@ -106,7 +106,7 @@ class DiskJoinStep : public JobStep /* Builder structs */ struct BuilderOutput { - boost::shared_ptr tupleJoiner; + std::shared_ptr tupleJoiner; std::vector smallData; uint64_t partitionID; joiner::JoinPartition* jp; diff --git a/dbcon/joblist/primitivestep.h b/dbcon/joblist/primitivestep.h index 3a19b5b83..570a93b3a 100644 --- a/dbcon/joblist/primitivestep.h +++ b/dbcon/joblist/primitivestep.h @@ -1101,8 +1101,8 @@ class TupleBPS : public BatchPrimitive, public TupleDeliveryStep { return uniqueID; } - void useJoiner(boost::shared_ptr); - void useJoiners(const std::vector>&); + void useJoiner(std::shared_ptr); + void useJoiners(const std::vector>&); bool wasStepRun() const { return fRunExecuted; @@ -1298,7 +1298,7 @@ class TupleBPS : public BatchPrimitive, public TupleDeliveryStep void serializeJoiner(); void serializeJoiner(uint32_t connectionNumber); - std::vector> tjoiners; + std::vector> tjoiners; bool doJoin, hasPMJoin, hasUMJoin; std::vector joinerMatchesRGs; // parses the small-side matches from joiner @@ -1361,7 +1361,7 @@ class TupleBPS : public BatchPrimitive, public TupleDeliveryStep JoinLocalData(TupleBPS* pTupleBPS, rowgroup::RowGroup& primRowGroup, rowgroup::RowGroup& outputRowGroup, boost::shared_ptr& fe2, rowgroup::RowGroup& fe2Output, std::vector& joinerMatchesRGs, rowgroup::RowGroup& joinFERG, - std::vector>& tjoiners, uint32_t smallSideCount, + std::vector>& tjoiners, uint32_t smallSideCount, bool doJoin); friend class TupleBPS; @@ -1385,7 +1385,7 @@ class TupleBPS : public BatchPrimitive, public TupleDeliveryStep rowgroup::RowGroup fe2Output; std::vector joinerMatchesRGs; rowgroup::RowGroup joinFERG; - std::vector> tjoiners; + std::vector> tjoiners; uint32_t smallSideCount; bool doJoin; diff --git a/dbcon/joblist/tuple-bps.cpp b/dbcon/joblist/tuple-bps.cpp index a0035f677..ab96a2cdc 100644 --- a/dbcon/joblist/tuple-bps.cpp +++ b/dbcon/joblist/tuple-bps.cpp @@ -161,7 +161,7 @@ TupleBPS::JoinLocalData::JoinLocalData(TupleBPS* pTupleBPS, RowGroup& primRowGro rowgroup::RowGroup& fe2Output, std::vector& joinerMatchesRGs, rowgroup::RowGroup& joinFERG, - std::vector>& tjoiners, + std::vector>& tjoiners, uint32_t smallSideCount, bool doJoin) : tbps(pTupleBPS) , local_primRG(primRowGroup) @@ -2915,14 +2915,14 @@ uint64_t TupleBPS::getFBO(uint64_t lbid) throw logic_error("TupleBPS: didn't find the FBO?"); } -void TupleBPS::useJoiner(boost::shared_ptr tj) +void TupleBPS::useJoiner(std::shared_ptr tj) { - vector> v; + vector> v; v.push_back(tj); useJoiners(v); } -void TupleBPS::useJoiners(const vector>& joiners) +void TupleBPS::useJoiners(const vector>& joiners) { uint32_t i; diff --git a/dbcon/joblist/tuplehashjoin.cpp b/dbcon/joblist/tuplehashjoin.cpp index df716524b..758aaaa00 100644 --- a/dbcon/joblist/tuplehashjoin.cpp +++ b/dbcon/joblist/tuplehashjoin.cpp @@ -214,7 +214,7 @@ void TupleHashJoinStep::join() // the threads inserting into Joiner. void TupleHashJoinStep::trackMem(uint index) { - boost::shared_ptr joiner = joiners[index]; + auto joiner = joiners[index]; ssize_t memBefore = 0, memAfter = 0; bool gotMem; @@ -268,7 +268,7 @@ void TupleHashJoinStep::startSmallRunners(uint index) utils::setThreadName("HJSStartSmall"); string extendedInfo; JoinType jt; - boost::shared_ptr joiner; + std::shared_ptr joiner; jt = joinTypes[index]; extendedInfo += toString(); @@ -391,7 +391,7 @@ void TupleHashJoinStep::smallRunnerFcn(uint32_t index, uint threadID, uint64_t* RowGroupDL* smallDL; uint32_t smallIt; RowGroup smallRG; - boost::shared_ptr joiner = joiners[index]; + auto joiner = joiners[index]; smallDL = smallDLs[index]; smallIt = smallIts[index]; @@ -1708,7 +1708,7 @@ void TupleHashJoinStep::joinOneRG( Row& joinFERow, Row& joinedRow, Row& baseRow, vector >& joinMatches, shared_array& smallRowTemplates, RowGroupDL* outputDL, // disk-join support vars. This param list is insane; refactor attempt would be nice at some point. - vector >* tjoiners, + vector >* tjoiners, boost::shared_array >* rgMappings, boost::shared_array >* feMappings, boost::scoped_array >* smallNullMem) diff --git a/dbcon/joblist/tuplehashjoin.h b/dbcon/joblist/tuplehashjoin.h index b5149a6ee..81925726b 100644 --- a/dbcon/joblist/tuplehashjoin.h +++ b/dbcon/joblist/tuplehashjoin.h @@ -442,13 +442,13 @@ class TupleHashJoinStep : public JobStep, public TupleDeliveryStep struct JoinerSorter { - inline bool operator()(const boost::shared_ptr& j1, - const boost::shared_ptr& j2) const + inline bool operator()(const std::shared_ptr& j1, + const std::shared_ptr& j2) const { return *j1 < *j2; } }; - std::vector > joiners; + std::vector > joiners; boost::scoped_array > rgData; TupleBPS* largeBPS; rowgroup::RowGroup largeRG, outputRG; @@ -551,7 +551,7 @@ class TupleHashJoinStep : public JobStep, public TupleDeliveryStep rowgroup::Row& joinedRow, rowgroup::Row& baseRow, std::vector >& joinMatches, boost::shared_array& smallRowTemplates, RowGroupDL* outputDL, - std::vector >* joiners = NULL, + std::vector >* joiners = NULL, boost::shared_array >* rgMappings = NULL, boost::shared_array >* feMappings = NULL, boost::scoped_array >* smallNullMem = NULL); @@ -631,8 +631,8 @@ class TupleHashJoinStep : public JobStep, public TupleDeliveryStep bool ownsOutputDL; void segregateJoiners(); - std::vector > tbpsJoiners; - std::vector > djsJoiners; + std::vector > tbpsJoiners; + std::vector > djsJoiners; std::vector djsJoinerMap; boost::scoped_array memUsedByEachJoin; boost::mutex djsLock; diff --git a/utils/joiner/tuplejoiner.cpp b/utils/joiner/tuplejoiner.cpp index ac925e6ea..f3c059460 100644 --- a/utils/joiner/tuplejoiner.cpp +++ b/utils/joiner/tuplejoiner.cpp @@ -1819,9 +1819,9 @@ void TupleJoiner::clearData() finished = false; } -boost::shared_ptr TupleJoiner::copyForDiskJoin() +std::shared_ptr TupleJoiner::copyForDiskJoin() { - boost::shared_ptr ret(new TupleJoiner()); + std::shared_ptr ret(new TupleJoiner()); ret->smallRG = smallRG; ret->largeRG = largeRG; diff --git a/utils/joiner/tuplejoiner.h b/utils/joiner/tuplejoiner.h index 233e724fe..61567dd38 100644 --- a/utils/joiner/tuplejoiner.h +++ b/utils/joiner/tuplejoiner.h @@ -460,7 +460,7 @@ class TupleJoiner } // Disk-based join support void clearData(); - boost::shared_ptr copyForDiskJoin(); + std::shared_ptr copyForDiskJoin(); bool isFinished() { return finished;