From: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
Date: Fri, 30 May 2014 13:04:34 +0000 (+0200)
Subject: bloom_filter, remove unecessary operators
X-Git-Tag: v0.83~142^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c50f85ea07f572ae62345e21687f93475915e39c;p=ceph.git

bloom_filter, remove unecessary operators

Removes 3 not used operators (intersect, union,
and diff) since after use those methods fpp and is_full are
corrupted.

Fixes: #8476
Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
---

diff --git a/src/common/bloom_filter.hpp b/src/common/bloom_filter.hpp
index 735d6c4f550b..2a04d12016a2 100644
--- a/src/common/bloom_filter.hpp
+++ b/src/common/bloom_filter.hpp
@@ -356,51 +356,6 @@ public:
     return std::pow(1.0 - std::exp(-1.0 * salt_.size() * insert_count_ / size()), 1.0 * salt_.size());
   }
 
-  inline bloom_filter& operator &= (const bloom_filter& filter)
-  {
-    /* intersection */
-    if (
-	(salt_count_  == filter.salt_count_) &&
-	(table_size_  == filter.table_size_) &&
-	(random_seed_ == filter.random_seed_)
-	) {
-      for (std::size_t i = 0; i < table_size_; ++i) {
-	bit_table_[i] &= filter.bit_table_[i];
-      }
-    }
-    return *this;
-  }
-
-  inline bloom_filter& operator |= (const bloom_filter& filter)
-  {
-    /* union */
-    if (
-	(salt_count_  == filter.salt_count_) &&
-	(table_size_  == filter.table_size_) &&
-	(random_seed_ == filter.random_seed_)
-	) {
-      for (std::size_t i = 0; i < table_size_; ++i) {
-        bit_table_[i] |= filter.bit_table_[i];
-      }
-    }
-    return *this;
-  }
-
-  inline bloom_filter& operator ^= (const bloom_filter& filter)
-  {
-    /* difference */
-    if (
-	(salt_count_  == filter.salt_count_) &&
-	(table_size_  == filter.table_size_) &&
-	(random_seed_ == filter.random_seed_)
-	) {
-      for (std::size_t i = 0; i < table_size_; ++i) {
-	bit_table_[i] ^= filter.bit_table_[i];
-      }
-    }
-    return *this;
-  }
-
   inline const cell_type* table() const
   {
     return bit_table_;
@@ -574,27 +529,6 @@ public:
 };
 WRITE_CLASS_ENCODER(bloom_filter)
 
-inline bloom_filter operator & (const bloom_filter& a, const bloom_filter& b)
-{
-  bloom_filter result = a;
-  result &= b;
-  return result;
-}
-
-inline bloom_filter operator | (const bloom_filter& a, const bloom_filter& b)
-{
-  bloom_filter result = a;
-  result |= b;
-  return result;
-}
-
-inline bloom_filter operator ^ (const bloom_filter& a, const bloom_filter& b)
-{
-  bloom_filter result = a;
-  result ^= b;
-  return result;
-}
-
 
 class compressible_bloom_filter : public bloom_filter
 {