chore(): rebasing

Author: drrtuy

dbcon/joblist/disk-based-topnorderby.cpp

@@ -45,11 +45,11 @@ void DiskBasedTopNOrderBy::flushCurrentToDisk(RowGroupDL& dl, rowgroup::RowGroup
 
   incrementGenerationCounter();
 }
-void DiskBasedTopNOrderBy::diskBasedMergePhaseIfNeeded(std::vector<RowGroupDLSPtr>& dataLists)
+void DiskBasedTopNOrderBy::diskBasedMergePhaseIfNeeded(std::vector<RowGroupDLSPtr>& /*dataLists*/)
 {
 }
 
-std::vector<std::string> DiskBasedTopNOrderBy::getGenerationFileNamesNextBatch(const size_t batchSize)
+std::vector<std::string> DiskBasedTopNOrderBy::getGenerationFileNamesNextBatch(const size_t /*batchSize*/)
 {
   return {};
 }

dbcon/joblist/disk-based-topnorderby.h

@@ -34,7 +34,7 @@ class DiskBasedTopNOrderBy : public rowgroup::RGDumper
   // std::string fCompStr = config::Config::makeConfig()->getConfig("RowAggregation", "Compression");
  public:
   // TODO Parametrize compression, tmpdir and memory manager (can be temp)
-  DiskBasedTopNOrderBy(ResourceManager* rm)
+  DiskBasedTopNOrderBy(ResourceManager* /*rm*/)
    : RGDumper(compress::getCompressInterfaceByName("LZ4"), std::make_unique<rowgroup::MemManager>(),
               config::Config::makeConfig()->getTempFileDir(config::Config::TempDirPurpose::Sorting),
               "Sorting", reinterpret_cast<std::uintptr_t>(this))

dbcon/joblist/tupleannexstep.cpp

@@ -82,8 +82,8 @@ struct TAEq
   bool operator()(const rowgroup::Row::Pointer&, const rowgroup::Row::Pointer&) const;
 };
 // TODO:  Generalize these and put them back in utils/common/hasher.h
-using TNSDistinctMap_t = std::unordered_set<rowgroup::Row::Pointer, TAHasher, TAEq,
-                                            allocators::CountingAllocator<rowgroup::Row::Pointer> >;
+using TNSDistinctMap_t =
+    std::unordered_set<rowgroup::Row::Pointer, TAHasher, TAEq, STLPoolAllocator<rowgroup::Row::Pointer> >;
 };  // namespace
 
 inline uint64_t TAHasher::operator()(const Row::Pointer& p) const
@@ -821,9 +821,8 @@ void TupleAnnexStep::finalizeParallelOrderByDistinct()
 
   auto allocSorting = fRm->getAllocator<ordering::OrderByRow>();
   ordering::SortingPQ finalPQ(rowgroup::rgCommonSize, allocSorting);
-  auto allocDistinct = fRm->getAllocator<rowgroup::Row::Pointer>();
   std::unique_ptr<TNSDistinctMap_t> distinctMap(
-      new TNSDistinctMap_t(10, TAHasher(this), TAEq(this), allocDistinct));
+    new TNSDistinctMap_t(10, TAHasher(this), TAEq(this), STLPoolAllocator<rowgroup::Row::Pointer>(fRm)));
   fRowGroupIn.initRow(&row1);
   fRowGroupIn.initRow(&row2);
 

utils/rowgroup/CMakeLists.txt

@@ -2,7 +2,7 @@ include_directories(${ENGINE_COMMON_INCLUDES})
 
 # ########## next target ###############
 
-set(rowgroup_LIB_SRCS rowaggregation.cpp rowgroup.cpp rowstorage.cpp)
+set(rowgroup_LIB_SRCS rowaggregation.cpp rowgroup.cpp rowstorage.cpp dumper.cpp)
 
 columnstore_library(rowgroup ${rowgroup_LIB_SRCS})
 columnstore_link(rowgroup PRIVATE ${NETSNMP_LIBRARIES} funcexp loggingcpp)

utils/rowgroup/dumper.h

@@ -56,7 +56,7 @@ class RGDumper : protected Dumper
 {
  public:
   RGDumper(const compress::CompressInterface* comp, std::unique_ptr<MemManager> mm, const std::string& tmpDir,
-           const std::string& operationName, const uint64_t uniqId)
+           const std::string& operationName, const uint64_t /*uniqId*/)
    : Dumper(comp, mm), fTmpDir(tmpDir), fOperationName(operationName)
   {
   }