Skip to content

chore(query): improve error of project_column_ref #18531

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
merged 12 commits into from
Aug 18, 2025
Merged

chore(query): improve error of project_column_ref #18531

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
402c948
chore(query): improve error of project_column_ref
sundy-li Aug 14, 2025
dab4964
chore(query): improve error of project_column_ref
sundy-li Aug 14, 2025
8cb9745
chore(query): improve error of project_column_ref
sundy-li Aug 14, 2025
6150877
chore(query): improve error of project_column_ref
sundy-li Aug 14, 2025
f288988
fix recursive stackoverflow
sundy-li Aug 15, 2025
37c4344
Merge branch 'main' into project_column_ref-improve
sundy-li Aug 18, 2025
6c241e2
update
sundy-li Aug 18, 2025
9b105d7
update
sundy-li Aug 18, 2025
5eb18ef
update
sundy-li Aug 18, 2025
f0d2f33
update
sundy-li Aug 18, 2025
156ae86
update
sundy-li Aug 18, 2025
00427f7
update
sundy-li Aug 18, 2025
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
112 changes: 5 additions & 107 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions src/binaries/query/cmd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,4 @@ impl Cmd {
pub enum Commands {
#[command(about = "Print version and quit")]
Ver,
Local {
#[clap(long, short = 'q', default_value_t)]
query: String,
#[clap(long, default_value_t)]
output_format: String,
#[clap(long, short = 'c')]
config: String,
},
}
20 changes: 0 additions & 20 deletions src/binaries/query/entry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ use databend_common_version::DATABEND_GIT_SHA;
use databend_common_version::DATABEND_SEMVER;
use databend_query::clusters::ClusterDiscovery;
use databend_query::history_tables::GlobalHistoryLog;
use databend_query::local;
use databend_query::servers::admin::AdminService;
use databend_query::servers::flight::FlightService;
use databend_query::servers::metrics::MetricService;
Expand All @@ -53,31 +52,12 @@ use super::cmd::Commands;
pub struct MainError;

pub async fn run_cmd(cmd: &Cmd) -> Result<bool, MainError> {
let make_error = || "failed to run cmd";

match &cmd.subcommand {
None => return Ok(false),
Some(Commands::Ver) => {
println!("version: {}", *DATABEND_SEMVER);
println!("min-compatible-metasrv-version: {}", MIN_METASRV_SEMVER);
}
Some(Commands::Local {
query,
output_format,
config,
}) => {
let mut cmd = cmd.clone();
if !config.is_empty() {
cmd.config_file = config.to_string();
}
let conf = cmd
.init_inner_config(false)
.await
.with_context(make_error)?;
local::query_local(conf, query, output_format)
.await
.with_context(make_error)?
}
}

Ok(true)
Expand Down
8 changes: 4 additions & 4 deletions src/query/expression/src/evaluator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,7 +2127,7 @@ impl<'a, Index: ColumnIndex> ConstantFolder<'a, Index> {
let block = DataBlock::empty_with_rows(1);
let evaluator = Evaluator::new(&block, self.func_ctx, self.fn_registry);
// Since we know the expression is constant, it'll be safe to change its column index type.
let cast_expr = cast_expr.project_column_ref(|_| unreachable!());
let cast_expr = cast_expr.project_column_ref(|_| unreachable!()).unwrap();
if let Ok(Value::Scalar(scalar)) = evaluator.run(&cast_expr) {
return (
Expr::Constant(Constant {
Expand Down Expand Up @@ -2260,7 +2260,7 @@ impl<'a, Index: ColumnIndex> ConstantFolder<'a, Index> {
let block = DataBlock::empty_with_rows(1);
let evaluator = Evaluator::new(&block, self.func_ctx, self.fn_registry);
// Since we know the expression is constant, it'll be safe to change its column index type.
let func_expr = func_expr.project_column_ref(|_| unreachable!());
let func_expr = func_expr.project_column_ref(|_| unreachable!()).unwrap();
if let Ok(Value::Scalar(scalar)) = evaluator.run(&func_expr) {
return (
Expr::Constant(Constant {
Expand Down Expand Up @@ -2411,7 +2411,7 @@ impl<'a, Index: ColumnIndex> ConstantFolder<'a, Index> {
let block = DataBlock::empty_with_rows(1);
let evaluator = Evaluator::new(&block, self.func_ctx, self.fn_registry);
// Since we know the expression is constant, it'll be safe to change its column index type.
let func_expr = func_expr.project_column_ref(|_| unreachable!());
let func_expr = func_expr.project_column_ref(|_| unreachable!()).unwrap();
if let Ok(Value::Scalar(scalar)) = evaluator.run(&func_expr) {
return (
Expr::Constant(Constant {
Expand Down Expand Up @@ -2458,7 +2458,7 @@ impl<'a, Index: ColumnIndex> ConstantFolder<'a, Index> {
let block = DataBlock::empty_with_rows(1);
let evaluator = Evaluator::new(&block, self.func_ctx, self.fn_registry);
// Since we know the expression is constant, it'll be safe to change its column index type.
let func_expr = func_expr.project_column_ref(|_| unreachable!());
let func_expr = func_expr.project_column_ref(|_| unreachable!()).unwrap();
if let Ok(Value::Scalar(scalar)) = evaluator.run(&func_expr) {
return (
Expr::Constant(Constant {
Expand Down
Loading