remove unused DoubleValues (#292)

Author: zhejiangxiaomai

velox/substrait/SubstraitToVeloxPlan.cpp

@@ -1810,22 +1810,6 @@ void SubstraitVeloxPlanConverter::setInFilter(
     const std::string& inputName,
     connector::hive::SubfieldFilters& filters) {}
 
-template <>
-void SubstraitVeloxPlanConverter::setInFilter<TypeKind::DOUBLE>(
-    const std::vector<variant>& variants,
-    bool nullAllowed,
-    const std::string& inputName,
-    connector::hive::SubfieldFilters& filters) {
-  std::vector<double> values;
-  values.reserve(variants.size());
-  for (const auto& variant : variants) {
-    double value = variant.value<double>();
-    values.emplace_back(value);
-  }
-  filters[common::Subfield(inputName, true)] =
-      common::createDoubleValues(values, nullAllowed);
-}
-
 template <>
 void SubstraitVeloxPlanConverter::setInFilter<TypeKind::BIGINT>(
     const std::vector<variant>& variants,

velox/type/Filter.cpp

@@ -64,9 +64,6 @@ std::string Filter::toString() const {
     case FilterKind::kDoubleRange:
       strKind = "DoubleRange";
       break;
-    case FilterKind::kDoubleValues:
-      strKind = "DoubleValues";
-      break;
     case FilterKind::kFloatRange:
       strKind = "FloatRange";
       break;
@@ -1015,31 +1012,6 @@ std::unique_ptr<Filter> notNullOrTrue(bool nullAllowed) {
 
 } // namespace
 
-std::unique_ptr<Filter> createDoubleValues(
-    const std::vector<double>& values,
-    bool nullAllowed) {
-  if (values.empty()) {
-    return nullOrFalse(nullAllowed);
-  }
-  if (values.size() == 1) {
-    return std::make_unique<DoubleRange>(
-        values.front(),
-        false,
-        false,
-        values.front(),
-        false,
-        false,
-        nullAllowed);
-  }
-  double min = values.front();
-  double max = values.front();
-  for (const auto& value : values) {
-    min = (value < min) ? value : min;
-    max = (value > max) ? value : max;
-  }
-  return std::make_unique<DoubleValues>(min, max, values, nullAllowed);
-}
-
 std::unique_ptr<Filter> createBigintValuesFilter(
     const std::vector<int64_t>& values,
     bool nullAllowed,

velox/type/Filter.h

@@ -47,7 +47,6 @@ enum class FilterKind {
   kNegatedBigintValuesUsingHashTable,
   kNegatedBigintValuesUsingBitmask,
   kDoubleRange,
-  kDoubleValues,
   kFloatRange,
   kBytesRange,
   kNegatedBytesRange,
@@ -623,7 +622,7 @@ class BigintRange final : public Filter {
   folly::dynamic serialize() const override;
 
   static FilterPtr create(const folly::dynamic& obj);
-  
+
   BigintRange(
       int64_t lower,
       bool lowerUnbounded,
@@ -1146,60 +1145,6 @@ class NegatedBigintValuesUsingBitmask final : public Filter {
   std::unique_ptr<BigintValuesUsingBitmask> nonNegated_;
 };
 
-class DoubleValues final : public Filter {
- public:
-  /// @param min Minimum value.
-  /// @param max Maximum value.
-  /// @param values A list of unique values that pass the filter. Must contain
-  /// at least two entries.
-  /// @param nullAllowed Null values are passing the filter if true.
-  DoubleValues(
-      double min,
-      double max,
-      const std::vector<double>& values,
-      bool nullAllowed);
-
-  DoubleValues(const DoubleValues& other, bool nullAllowed)
-      : Filter(true, nullAllowed, FilterKind::kDoubleValues),
-        bitmask_(other.bitmask_),
-        min_(other.min_),
-        max_(other.max_) {}
-
-  folly::dynamic serialize() const override;
-
-  std::unique_ptr<Filter> clone(
-      std::optional<bool> nullAllowed = std::nullopt) const final {
-    if (nullAllowed) {
-      return std::make_unique<DoubleValues>(*this, nullAllowed.value());
-    } else {
-      return std::make_unique<DoubleValues>(*this);
-    }
-  }
-
-  std::vector<double> values() const;
-
-  bool testDouble(double value) const final;
-
-  bool testDoubleRange(double min, double max, bool hasNull) const final;
-
-  std::unique_ptr<Filter> mergeWith(const Filter* other) const final;
-
-  bool testingEquals(const Filter& other) const final;
-
- private:
-  std::unique_ptr<Filter> mergeWith(double min, double max, const Filter* other)
-      const;
-
-  int64_t toInt64(double value) const {
-    int64_t converted = (int64_t)(value + 0.5);
-    return converted;
-  }
-
-  std::vector<bool> bitmask_;
-  const double min_;
-  const double max_;
-};
-
 /// Base class for range filters on floating point and string data types.
 class AbstractRange : public Filter {
  public:
@@ -1938,7 +1883,7 @@ class MultiRange final : public Filter {
       : Filter(true, nullAllowed, FilterKind::kMultiRange),
         filters_(std::move(filters)),
         nanAllowed_(true) {}
-		
+
   folly::dynamic serialize() const override;
 
   static FilterPtr create(const folly::dynamic& obj);
@@ -2019,9 +1964,4 @@ std::unique_ptr<Filter> createBigintValues(
 std::unique_ptr<Filter> createNegatedBigintValues(
     const std::vector<int64_t>& values,
     bool nullAllowed);
-
-std::unique_ptr<Filter> createDoubleValues(
-    const std::vector<double>& values,
-    bool nullAllowed);
-
 } // namespace facebook::velox::common