Skip to content

Commit 2d54d55

Browse files
Revert "Pass Bloom filter from TupleHashJoinStep to BatchPrimitiveProcessorJL"
This reverts commit 3383a46.
1 parent 3eecc51 commit 2d54d55

File tree

5 files changed

+0
-27
lines changed

5 files changed

+0
-27
lines changed

dbcon/joblist/batchprimitiveprocessor-jl.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,9 +1778,4 @@ void BatchPrimitiveProcessorJL::deliverStringTableRowGroup(bool b)
17781778
projectionRG.setUseStringTable(b);
17791779
}
17801780

1781-
void BatchPrimitiveProcessorJL::setBloomFilters(std::vector<std::shared_ptr<std::array<std::optional<BlockedBloomFilter>, 2>>>&& bloomFilters)
1782-
{
1783-
this->bloomFilters = std::move(bloomFilters);
1784-
}
1785-
17861781
} // namespace joblist

dbcon/joblist/batchprimitiveprocessor-jl.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -389,13 +389,6 @@ class BatchPrimitiveProcessorJL
389389
friend class CommandJL;
390390
friend class ColumnCommandJL;
391391
friend class PassThruCommandJL;
392-
393-
// Blocked Bloom filter
394-
public:
395-
std::vector<std::shared_ptr<std::array<std::optional<BlockedBloomFilter>, 2>>> bloomFilters;
396-
void setBloomFilters(std::vector<std::shared_ptr<std::array<std::optional<BlockedBloomFilter>, 2>>>&& bloomFilters);
397-
void serializeBloomFilters(messageqcpp::ByteStream& bs) const;
398-
399392
};
400393

401394
} // namespace joblist

dbcon/joblist/primitivestep.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,11 +1472,6 @@ class TupleBPS : public BatchPrimitive, public TupleDeliveryStep
14721472
bool compareRange(uint8_t COP, int64_t min, int64_t max, int64_t val) const;
14731473
bool hasPCFilter, hasPMFilter, hasRIDFilter, hasSegmentFilter, hasDBRootFilter, hasSegmentDirFilter,
14741474
hasPartitionFilter, hasMaxFilter, hasMinFilter, hasLBIDFilter, hasExtentIDFilter;
1475-
1476-
// Blocked Bloom filter
1477-
public:
1478-
void setBloomFilters(std::vector<std::shared_ptr<std::array<std::optional<BlockedBloomFilter>, 2>>>&& bloomFilters);
1479-
14801475
};
14811476

14821477
/** @brief class FilterStep

dbcon/joblist/tuple-bps.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3407,9 +3407,4 @@ template bool TupleBPS::processSingleFilterString<int128_t>(int8_t BOP, int8_t c
34073407
template bool TupleBPS::compareSingleValue<int64_t>(uint8_t COP, int64_t val1, int64_t val2) const;
34083408
template bool TupleBPS::compareSingleValue<int128_t>(uint8_t COP, int128_t val1, int128_t val2) const;
34093409

3410-
void TupleBPS::setBloomFilters(std::vector<std::shared_ptr<std::array<std::optional<BlockedBloomFilter>, 2>>>&& bloomFilters)
3411-
{
3412-
fBPP->setBloomFilters(std::move(bloomFilters));
3413-
}
3414-
34153410
} // namespace joblist

dbcon/joblist/tuplehashjoin.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -897,11 +897,6 @@ void TupleHashJoinStep::hjRunner()
897897
{
898898
largeBPS->useJoiners(tbpsJoiners);
899899

900-
if (!bloomFilters.empty())
901-
{
902-
largeBPS->setBloomFilters(std::move(bloomFilters));
903-
}
904-
905900
if (djs.size())
906901
largeBPS->setJoinedResultRG(largeRG + outputRG);
907902
else

0 commit comments

Comments
 (0)