Skip to content

tests: Make --auto-index-selects try the view only if the normal query succeeded #35908

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
ggevay merged 1 commit into from
Apr 11, 2026
Merged

tests: Make --auto-index-selects try the view only if the normal query succeeded #35908

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 5 additions & 17 deletions src/sqllogictest/src/runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,18 +1819,12 @@ impl<'a> RunnerInner<'a> {
num_attributes,
}) => {
let query_outcome = self.execute_query(sql, output, location.clone()).await?;
if is_select && self.auto_index_selects {
if is_select && self.auto_index_selects && query_outcome.success() {
let view_outcome = self
.execute_view(sql, None, output, location.clone())
.await?;

// We compare here the query-based and view-based outcomes.
// We only produce a test failure if the outcomes are of different
// variant types, thus accepting smaller deviations in the details
// produced for each variant.
if std::mem::discriminant::<Outcome>(&query_outcome)
!= std::mem::discriminant::<Outcome>(&view_outcome)
{
if !view_outcome.success() {
// Before producing a failure outcome, we try to obtain a new
// outcome for view-based execution exploiting analysis of the
// number of attributes. This two-level strategy can avoid errors
Expand All @@ -1842,9 +1836,7 @@ impl<'a> RunnerInner<'a> {
view_outcome
};

if std::mem::discriminant::<Outcome>(&query_outcome)
!= std::mem::discriminant::<Outcome>(&view_outcome)
{
if !view_outcome.success() {
let inconsistent_view_outcome = Outcome::InconsistentViewOutcome {
query_outcome: Box::new(query_outcome),
view_outcome: Box::new(view_outcome),
Expand Down Expand Up @@ -2115,12 +2107,8 @@ const INCONSISTENT_VIEW_OUTCOME_WARNING_REGEXPS: [&str; 9] = [
/// provides enough information as to whether a warning should be emitted or not.
fn should_warn(outcome: &Outcome) -> bool {
match outcome {
Outcome::InconsistentViewOutcome {
query_outcome,
view_outcome,
..
} => match (query_outcome.as_ref(), view_outcome.as_ref()) {
(Outcome::Success, Outcome::PlanFailure { error, .. }) => {
Outcome::InconsistentViewOutcome { view_outcome, .. } => match view_outcome.as_ref() {
Outcome::PlanFailure { error, .. } => {
INCONSISTENT_VIEW_OUTCOME_WARNING_REGEXPS.iter().any(|s| {
Regex::new(s)
.expect("unexpected error in regular expression parsing")
Expand Down
Loading