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;
 
 };