Skip to content

Commit

Permalink
Revert range filter changes (#423)
Browse files Browse the repository at this point in the history
* Revert "Expand BigintRange constructor (oap 377)"

This reverts commit 17b83ee.

* Revert "Expand multi range constructor (oap 378)"

This reverts commit 4075a75.
  • Loading branch information
rui-mo authored Oct 25, 2023
1 parent 39b561a commit ead8890
Showing 1 changed file with 0 additions and 28 deletions.
28 changes: 0 additions & 28 deletions velox/type/Filter.h
Original file line number Diff line number Diff line change
Expand Up @@ -665,27 +665,6 @@ class BigintRange final : public Filter {
upper16_(std::min<int64_t>(upper, std::numeric_limits<int16_t>::max())),
isSingleValue_(upper_ == lower_) {}

BigintRange(
int64_t lower,
bool lowerUnbounded,
bool lowerExclusive,
int64_t upper,
bool upperUnbounded,
bool upperExclusive,
bool nullAllowed)
: Filter(true, nullAllowed, FilterKind::kBigintRange),
lower_(lowerExclusive ? lower + 1 : lower),
upper_(upperExclusive ? upper - 1 : upper),
lower32_(
std::max<int64_t>(lower_, std::numeric_limits<int32_t>::min())),
upper32_(
std::min<int64_t>(upper_, std::numeric_limits<int32_t>::max())),
lower16_(
std::max<int64_t>(lower_, std::numeric_limits<int16_t>::min())),
upper16_(
std::min<int64_t>(upper_, std::numeric_limits<int16_t>::max())),
isSingleValue_(upper_ == lower_) {}

folly::dynamic serialize() const override;

static FilterPtr create(const folly::dynamic& obj);
Expand Down Expand Up @@ -2049,13 +2028,6 @@ class MultiRange final : public Filter {
filters_(std::move(filters)),
nanAllowed_(nanAllowed) {}

MultiRange(
std::vector<std::unique_ptr<Filter>> filters,
bool nullAllowed)
: Filter(true, nullAllowed, FilterKind::kMultiRange),
filters_(std::move(filters)),
nanAllowed_(true) {}

folly::dynamic serialize() const override;

static FilterPtr create(const folly::dynamic& obj);
Expand Down

0 comments on commit ead8890

Please sign in to comment.