Skip to content

chore: remove unnecessary test helpers #13317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alamb merged 2 commits into from
Nov 17, 2024
Merged

chore: remove unnecessary test helpers #13317

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2be78c3
chore: remove unnecessary test helpers
findepi Nov 8, 2024
9e40e7d
cargo fmt
findepi Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 59 additions & 99 deletions datafusion/optimizer/src/simplify_expressions/expr_simplifier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2865,15 +2865,12 @@ mod tests {
);

// single character
assert_change(
regex_match(col("c1"), lit("x")),
like(col("c1"), lit("%x%")),
);
assert_change(regex_match(col("c1"), lit("x")), col("c1").like(lit("%x%")));

// single word
assert_change(
regex_match(col("c1"), lit("foo")),
like(col("c1"), lit("%foo%")),
col("c1").like(lit("%foo%")),
);

// regular expressions that match an exact literal
Expand Down Expand Up @@ -2963,48 +2960,53 @@ mod tests {
// regular expressions that match a partial literal
assert_change(
regex_match(col("c1"), lit("^foo")),
like(col("c1"), lit("foo%")),
col("c1").like(lit("foo%")),
);
assert_change(
regex_match(col("c1"), lit("foo$")),
like(col("c1"), lit("%foo")),
col("c1").like(lit("%foo")),
);
assert_change(
regex_match(col("c1"), lit("^foo|bar$")),
like(col("c1"), lit("foo%")).or(like(col("c1"), lit("%bar"))),
col("c1").like(lit("foo%")).or(col("c1").like(lit("%bar"))),
);

// OR-chain
assert_change(
regex_match(col("c1"), lit("foo|bar|baz")),
like(col("c1"), lit("%foo%"))
.or(like(col("c1"), lit("%bar%")))
.or(like(col("c1"), lit("%baz%"))),
col("c1")
.like(lit("%foo%"))
.or(col("c1").like(lit("%bar%")))
.or(col("c1").like(lit("%baz%"))),
);
assert_change(
regex_match(col("c1"), lit("foo|x|baz")),
like(col("c1"), lit("%foo%"))
.or(like(col("c1"), lit("%x%")))
.or(like(col("c1"), lit("%baz%"))),
col("c1")
.like(lit("%foo%"))
.or(col("c1").like(lit("%x%")))
.or(col("c1").like(lit("%baz%"))),
);
assert_change(
regex_not_match(col("c1"), lit("foo|bar|baz")),
not_like(col("c1"), lit("%foo%"))
.and(not_like(col("c1"), lit("%bar%")))
.and(not_like(col("c1"), lit("%baz%"))),
col("c1")
.not_like(lit("%foo%"))
.and(col("c1").not_like(lit("%bar%")))
.and(col("c1").not_like(lit("%baz%"))),
);
// both anchored expressions (translated to equality) and unanchored
assert_change(
regex_match(col("c1"), lit("foo|^x$|baz")),
like(col("c1"), lit("%foo%"))
col("c1")
.like(lit("%foo%"))
.or(col("c1").eq(lit("x")))
.or(like(col("c1"), lit("%baz%"))),
.or(col("c1").like(lit("%baz%"))),
);
assert_change(
regex_not_match(col("c1"), lit("foo|^bar$|baz")),
not_like(col("c1"), lit("%foo%"))
col("c1")
.not_like(lit("%foo%"))
.and(col("c1").not_eq(lit("bar")))
.and(not_like(col("c1"), lit("%baz%"))),
.and(col("c1").not_like(lit("%baz%"))),
);
// Too many patterns (MAX_REGEX_ALTERNATIONS_EXPANSION)
assert_no_change(regex_match(col("c1"), lit("foo|bar|baz|blarg|bozo|etc")));
Expand Down Expand Up @@ -3054,46 +3056,6 @@ mod tests {
})
}

fn like(expr: Expr, pattern: impl Into<Expr>) -> Expr {
Expr::Like(Like {
negated: false,
expr: Box::new(expr),
pattern: Box::new(pattern.into()),
escape_char: None,
case_insensitive: false,
})
}

fn not_like(expr: Expr, pattern: impl Into<Expr>) -> Expr {
Expr::Like(Like {
negated: true,
expr: Box::new(expr),
pattern: Box::new(pattern.into()),
escape_char: None,
case_insensitive: false,
})
}

fn ilike(expr: Expr, pattern: impl Into<Expr>) -> Expr {
Expr::Like(Like {
negated: false,
expr: Box::new(expr),
pattern: Box::new(pattern.into()),
escape_char: None,
case_insensitive: true,
})
}

fn not_ilike(expr: Expr, pattern: impl Into<Expr>) -> Expr {
Expr::Like(Like {
negated: true,
expr: Box::new(expr),
pattern: Box::new(pattern.into()),
escape_char: None,
case_insensitive: true,
})
}

// ------------------------------
// ----- Simplifier tests -------
// ------------------------------
Expand Down Expand Up @@ -3703,119 +3665,117 @@ mod tests {
let null = lit(ScalarValue::Utf8(None));

// expr [NOT] [I]LIKE NULL
let expr = like(col("c1"), null.clone());
let expr = col("c1").like(null.clone());
assert_eq!(simplify(expr), lit_bool_null());

let expr = not_like(col("c1"), null.clone());
let expr = col("c1").not_like(null.clone());
assert_eq!(simplify(expr), lit_bool_null());

let expr = ilike(col("c1"), null.clone());
let expr = col("c1").ilike(null.clone());
assert_eq!(simplify(expr), lit_bool_null());

let expr = not_ilike(col("c1"), null.clone());
let expr = col("c1").not_ilike(null.clone());
assert_eq!(simplify(expr), lit_bool_null());

// expr [NOT] [I]LIKE '%'
let expr = like(col("c1"), lit("%"));
let expr = col("c1").like(lit("%"));
assert_eq!(simplify(expr), if_not_null(col("c1"), true));

let expr = not_like(col("c1"), lit("%"));
let expr = col("c1").not_like(lit("%"));
assert_eq!(simplify(expr), if_not_null(col("c1"), false));

let expr = ilike(col("c1"), lit("%"));
let expr = col("c1").ilike(lit("%"));
assert_eq!(simplify(expr), if_not_null(col("c1"), true));

let expr = not_ilike(col("c1"), lit("%"));
let expr = col("c1").not_ilike(lit("%"));
assert_eq!(simplify(expr), if_not_null(col("c1"), false));

// expr [NOT] [I]LIKE '%%'
let expr = like(col("c1"), lit("%%"));
let expr = col("c1").like(lit("%%"));
assert_eq!(simplify(expr), if_not_null(col("c1"), true));

let expr = not_like(col("c1"), lit("%%"));
let expr = col("c1").not_like(lit("%%"));
assert_eq!(simplify(expr), if_not_null(col("c1"), false));

let expr = ilike(col("c1"), lit("%%"));
let expr = col("c1").ilike(lit("%%"));
assert_eq!(simplify(expr), if_not_null(col("c1"), true));

let expr = not_ilike(col("c1"), lit("%%"));
let expr = col("c1").not_ilike(lit("%%"));
assert_eq!(simplify(expr), if_not_null(col("c1"), false));

// not_null_expr [NOT] [I]LIKE '%'
let expr = like(col("c1_non_null"), lit("%"));
let expr = col("c1_non_null").like(lit("%"));
assert_eq!(simplify(expr), lit(true));

let expr = not_like(col("c1_non_null"), lit("%"));
let expr = col("c1_non_null").not_like(lit("%"));
assert_eq!(simplify(expr), lit(false));

let expr = ilike(col("c1_non_null"), lit("%"));
let expr = col("c1_non_null").ilike(lit("%"));
assert_eq!(simplify(expr), lit(true));

let expr = not_ilike(col("c1_non_null"), lit("%"));
let expr = col("c1_non_null").not_ilike(lit("%"));
assert_eq!(simplify(expr), lit(false));

// not_null_expr [NOT] [I]LIKE '%%'
let expr = like(col("c1_non_null"), lit("%%"));
let expr = col("c1_non_null").like(lit("%%"));
assert_eq!(simplify(expr), lit(true));

let expr = not_like(col("c1_non_null"), lit("%%"));
let expr = col("c1_non_null").not_like(lit("%%"));
assert_eq!(simplify(expr), lit(false));

let expr = ilike(col("c1_non_null"), lit("%%"));
let expr = col("c1_non_null").ilike(lit("%%"));
assert_eq!(simplify(expr), lit(true));

let expr = not_ilike(col("c1_non_null"), lit("%%"));
let expr = col("c1_non_null").not_ilike(lit("%%"));
assert_eq!(simplify(expr), lit(false));

// null_constant [NOT] [I]LIKE '%'
let expr = like(null.clone(), lit("%"));
let expr = null.clone().like(lit("%"));
assert_eq!(simplify(expr), lit_bool_null());

let expr = not_like(null.clone(), lit("%"));
let expr = null.clone().not_like(lit("%"));
assert_eq!(simplify(expr), lit_bool_null());

let expr = ilike(null.clone(), lit("%"));
let expr = null.clone().ilike(lit("%"));
assert_eq!(simplify(expr), lit_bool_null());

let expr = not_ilike(null, lit("%"));
let expr = null.clone().not_ilike(lit("%"));
assert_eq!(simplify(expr), lit_bool_null());

// null_constant [NOT] [I]LIKE '%%'
let null = lit(ScalarValue::Utf8(None));
let expr = like(null.clone(), lit("%%"));
let expr = null.clone().like(lit("%%"));
assert_eq!(simplify(expr), lit_bool_null());

let expr = not_like(null.clone(), lit("%%"));
let expr = null.clone().not_like(lit("%%"));
assert_eq!(simplify(expr), lit_bool_null());

let expr = ilike(null.clone(), lit("%%"));
let expr = null.clone().ilike(lit("%%"));
assert_eq!(simplify(expr), lit_bool_null());

let expr = not_ilike(null, lit("%%"));
let expr = null.clone().not_ilike(lit("%%"));
assert_eq!(simplify(expr), lit_bool_null());

// null_constant [NOT] [I]LIKE 'a%'
let null = lit(ScalarValue::Utf8(None));
let expr = like(null.clone(), lit("a%"));
let expr = null.clone().like(lit("a%"));
assert_eq!(simplify(expr), lit_bool_null());

let expr = not_like(null.clone(), lit("a%"));
let expr = null.clone().not_like(lit("a%"));
assert_eq!(simplify(expr), lit_bool_null());

let expr = ilike(null.clone(), lit("a%"));
let expr = null.clone().ilike(lit("a%"));
assert_eq!(simplify(expr), lit_bool_null());

let expr = not_ilike(null, lit("a%"));
let expr = null.clone().not_ilike(lit("a%"));
assert_eq!(simplify(expr), lit_bool_null());

// expr [NOT] [I]LIKE with pattern without wildcards
let expr = like(col("c1"), lit("a"));
let expr = col("c1").like(lit("a"));
assert_eq!(simplify(expr), col("c1").eq(lit("a")));
let expr = not_like(col("c1"), lit("a"));
let expr = col("c1").not_like(lit("a"));
assert_eq!(simplify(expr), col("c1").not_eq(lit("a")));
let expr = like(col("c1"), lit("a_"));
let expr = col("c1").like(lit("a_"));
assert_eq!(simplify(expr), col("c1").like(lit("a_")));
let expr = not_like(col("c1"), lit("a_"));
let expr = col("c1").not_like(lit("a_"));
assert_eq!(simplify(expr), col("c1").not_like(lit("a_")));
}

Expand Down