Skip to content

Make clickbench query IDs 1-based #16455

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

Closed
wants to merge 1 commit into from
Closed

Make clickbench query IDs 1-based #16455

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
23 changes: 11 additions & 12 deletions benchmarks/src/clickbench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,24 +86,23 @@ impl AllQueries {

/// Returns the text of query `query_id`
fn get_query(&self, query_id: usize) -> Result<&str> {
self.queries
.get(query_id)
.ok_or_else(|| {
let min_id = self.min_query_id();
let max_id = self.max_query_id();
exec_datafusion_err!(
"Invalid query id {query_id}. Must be between {min_id} and {max_id}"
)
})
.map(|s| s.as_str())
let min_id = self.min_query_id();
let max_id = self.max_query_id();
if query_id < min_id || query_id > max_id {
return Err(exec_datafusion_err!(
"Invalid query id {query_id}. Must be in the range [{min_id}, {max_id}]"
));
}

Ok(self.queries[query_id - 1].as_str())
}

fn min_query_id(&self) -> usize {
0
1
}

fn max_query_id(&self) -> usize {
self.queries.len() - 1
self.queries.len()
}
}
impl RunOpt {
Expand Down