Serialize BFs when in UM, type-alias strcuture of BFs

Author: AestheticAkhmad

dbcon/joblist/blockedbloomfilter.h

@@ -58,8 +58,7 @@ class BlockedBloomFilter
 
 };
 
-
-
+using BloomFilters = std::shared_ptr<std::array<std::optional<BlockedBloomFilter>, 2>>;
 
 } // namespace joblist
 

dbcon/joblist/primitivestep.h

@@ -1474,11 +1474,11 @@ class TupleBPS : public BatchPrimitive, public TupleDeliveryStep
       hasPartitionFilter, hasMaxFilter, hasMinFilter, hasLBIDFilter, hasExtentIDFilter;
 
   // Blocked Bloom filter
-  std::vector<std::shared_ptr<std::array<std::optional<BlockedBloomFilter>, 2>>> bloomFilters;
+  std::vector<BloomFilters> bloomFilters;
   void serializeBloomFilters();
 
   public:
-  void setBloomFilters(std::vector<std::shared_ptr<std::array<std::optional<BlockedBloomFilter>, 2>>>&& bloomFilters);
+  void setBloomFilters(std::vector<BloomFilters>&& bloomFilters);
 
 };
 

dbcon/joblist/tuple-bps.cpp

@@ -1479,10 +1479,13 @@ void TupleBPS::run()
     fDec->write(uniqueID, sbs);
     BPPIsAllocated = true;
 
-    if (doJoin && tjoiners[0]->inPM())
+    if (doJoin)
     {
-      serializeBloomFilters();
-      serializeJoiner();
+      if (tjoiners[0]->inPM())
+        serializeJoiner();
+      
+      if (tjoiners[0]->inUM())
+        serializeBloomFilters();
     }
 
     prepCasualPartitioning();
@@ -3397,7 +3400,7 @@ void TupleBPS::abort()
   abort_nolock();
 }
 
-void TupleBPS::setBloomFilters(std::vector<std::shared_ptr<std::array<std::optional<BlockedBloomFilter>, 2>>>&& bloomFilters)
+void TupleBPS::setBloomFilters(std::vector<BloomFilters>&& bloomFilters)
 {
   this->bloomFilters = std::move(bloomFilters);
 }

dbcon/joblist/tuplehashjoin.h

@@ -661,7 +661,7 @@ class TupleHashJoinStep : public JobStep, public TupleDeliveryStep
   friend class DiskJoinStep;
 
   // Blocked Bloom Filter
-  std::vector<std::shared_ptr<std::array<std::optional<BlockedBloomFilter>, 2>>> bloomFilters;
+  std::vector<BloomFilters> bloomFilters;
 
 };
 

primitives/primproc/batchprimitiveprocessor.h

@@ -437,7 +437,7 @@ class BatchPrimitiveProcessor
   uint32_t weight_;
 
   // Blocked Bloom Filter
-  std::vector<std::shared_ptr<std::array<std::optional<joblist::BlockedBloomFilter>, 2>>> bloomFilters;
+  std::vector<BloomFilters> bloomFilters;
   public:
   void addBloomFilters(messageqcpp::ByteStream& bs);
   private:

utils/joiner/tuplejoiner.cpp

@@ -166,7 +166,7 @@ TupleJoiner::TupleJoiner(const rowgroup::RowGroup& smallInput, const rowgroup::R
 TupleJoiner::TupleJoiner(const rowgroup::RowGroup& smallInput, const rowgroup::RowGroup& largeInput,
                          const vector<uint32_t>& smallJoinColumns, const vector<uint32_t>& largeJoinColumns,
                          JoinType jt, threadpool::ThreadPool* jsThreadPool, joblist::ResourceManager* rm,
-                         const uint64_t numCores, std::shared_ptr<std::array<std::optional<joblist::BlockedBloomFilter>, 2>> bloomFilters)
+                         const uint64_t numCores, BloomFilters bloomFilters)
  : smallRG(smallInput)
  , largeRG(largeInput)
  , joinAlg(INSERTING)

utils/joiner/tuplejoiner.h

@@ -280,7 +280,7 @@ class TupleJoiner
   TupleJoiner(const rowgroup::RowGroup& smallInput, const rowgroup::RowGroup& largeInput,
               const std::vector<uint32_t>& smallJoinColumns, const std::vector<uint32_t>& largeJoinColumns,
               joblist::JoinType jt, threadpool::ThreadPool* jsThreadPool, joblist::ResourceManager* rm,
-              const uint64_t numCores, std::shared_ptr<std::array<std::optional<joblist::BlockedBloomFilter>, 2>> bloomFilters);
+              const uint64_t numCores, BloomFilters bloomFilters);
 
   ~TupleJoiner();
 
@@ -570,7 +570,7 @@ class TupleJoiner
   void initRowsVector();
 
   // Blocked Bloom filter
-  std::shared_ptr<std::array<std::optional<joblist::BlockedBloomFilter>, 2>> bloomFilters;
+  BloomFilters bloomFilters;
 
 };