diff --git a/utils/joiner/tuplejoiner.cpp b/utils/joiner/tuplejoiner.cpp index 8125d5d18..58883244e 100644 --- a/utils/joiner/tuplejoiner.cpp +++ b/utils/joiner/tuplejoiner.cpp @@ -67,9 +67,9 @@ TupleJoiner::TupleJoiner(const rowgroup::RowGroup& smallInput, const rowgroup::R // _pool.reset(new boost::shared_ptr[bucketCount]); for (i = 0; i < bucketCount; i++) { - // STLPoolAllocator> alloc(resourceManager_); + STLPoolAllocator> alloc(resourceManager_); // _pool[i] = alloc.getPoolAllocator(); - auto alloc = resourceManager_->getAllocator>(); + // auto alloc = resourceManager_->getAllocator>(); ld[i].reset(new ldhash_t(10, hasher(), ldhash_t::key_equal(), alloc)); } } @@ -79,9 +79,9 @@ TupleJoiner::TupleJoiner(const rowgroup::RowGroup& smallInput, const rowgroup::R _pool.reset(new boost::shared_ptr[bucketCount]); for (i = 0; i < bucketCount; i++) { - // STLPoolAllocator> alloc(resourceManager_); + STLPoolAllocator> alloc(resourceManager_); // _pool[i] = alloc.getPoolAllocator(); - auto alloc = resourceManager_->getAllocator>(); + // auto alloc = resourceManager_->getAllocator>(); sth[i].reset(new sthash_t(10, hasher(), sthash_t::key_equal(), alloc)); } } @@ -91,9 +91,9 @@ TupleJoiner::TupleJoiner(const rowgroup::RowGroup& smallInput, const rowgroup::R _pool.reset(new boost::shared_ptr[bucketCount]); for (i = 0; i < bucketCount; i++) { - // STLPoolAllocator> alloc(resourceManager_); + STLPoolAllocator> alloc(resourceManager_); // _pool[i] = alloc.getPoolAllocator(); - auto alloc = resourceManager_->getAllocator>(); + // auto alloc = resourceManager_->getAllocator>(); h[i].reset(new hash_t(10, hasher(), hash_t::key_equal(), alloc)); } } @@ -184,9 +184,9 @@ TupleJoiner::TupleJoiner(const rowgroup::RowGroup& smallInput, const rowgroup::R ht.reset(new boost::scoped_ptr[bucketCount]); for (i = 0; i < bucketCount; i++) { - // STLPoolAllocator> alloc(resourceManager_); + STLPoolAllocator> alloc(resourceManager_); // _pool[i] = alloc.getPoolAllocator(); - auto alloc = resourceManager_->getAllocator>(); + // auto alloc = resourceManager_->getAllocator>(); ht[i].reset(new typelesshash_t(10, hasher(), typelesshash_t::key_equal(), alloc)); } m_bucketLocks.reset(new boost::mutex[bucketCount]); @@ -1833,9 +1833,9 @@ void TupleJoiner::clearData() for (uint i = 0; i < bucketCount; i++) { - // STLPoolAllocator> alloc; + STLPoolAllocator> alloc(resourceManager_); // _pool[i] = alloc.getPoolAllocator(); - auto alloc = resourceManager_->getAllocator>(); + // auto alloc = resourceManager_->getAllocator>(); if (typelessJoin) ht[i].reset(new typelesshash_t(10, hasher(), typelesshash_t::key_equal(), alloc)); else if (smallRG.getColTypes()[smallKeyColumns[0]] == CalpontSystemCatalog::LONGDOUBLE) diff --git a/utils/joiner/tuplejoiner.h b/utils/joiner/tuplejoiner.h index afb580cb6..282642b1f 100644 --- a/utils/joiner/tuplejoiner.h +++ b/utils/joiner/tuplejoiner.h @@ -478,22 +478,38 @@ class TupleJoiner } private: - typedef std::unordered_multimap, - allocators::CountingAllocator > > + typedef std::unordered_multimap, + utils::STLPoolAllocator > > hash_t; typedef std::unordered_multimap, - allocators::CountingAllocator > > + utils::STLPoolAllocator > > sthash_t; typedef std::unordered_multimap< TypelessData, rowgroup::Row::Pointer, hasher, std::equal_to, - allocators::CountingAllocator > > + utils::STLPoolAllocator > > typelesshash_t; // MCOL-1822 Add support for Long Double AVG/SUM small side typedef std::unordered_multimap< long double, rowgroup::Row::Pointer, hasher, LongDoubleEq, - allocators::CountingAllocator > > + utils::STLPoolAllocator > > ldhash_t; + // typedef std::unordered_multimap, + // allocators::CountingAllocator > > + // hash_t; + // typedef std::unordered_multimap, + // allocators::CountingAllocator > > + // sthash_t; + // typedef std::unordered_multimap< + // TypelessData, rowgroup::Row::Pointer, hasher, std::equal_to, + // allocators::CountingAllocator > > + // typelesshash_t; + // // MCOL-1822 Add support for Long Double AVG/SUM small side + // typedef std::unordered_multimap< + // long double, rowgroup::Row::Pointer, hasher, LongDoubleEq, + // allocators::CountingAllocator > > + // ldhash_t; + typedef hash_t::iterator iterator; typedef typelesshash_t::iterator thIterator; typedef ldhash_t::iterator ldIterator;