rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-08 22:32:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: skip replacing exprs of the DistinctOn node (#5823)

Browse Source 
* fix: handle distinct on specially

* chore: update comment
This commit is contained in:
Yingwen
2025-04-07 16:59:40 +08:00
committed by GitHub
parent 917510ffd0
commit 21a209f7ba
6 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/query/src/dist_plan/analyzer.rs
View File

@@ -66,9 +66,9 @@ impl AnalyzerRule for DistPlannerAnalyzer {
impl DistPlannerAnalyzer {
fn inspect_plan_with_subquery(plan: LogicalPlan) -> DfResult<Transformed<LogicalPlan>> {
// Workaround for https://github.com/GreptimeTeam/greptimedb/issues/5469
// FIXME(yingwen): Remove this once we update DataFusion.
if let LogicalPlan::Limit(_) = &plan {
// Workaround for https://github.com/GreptimeTeam/greptimedb/issues/5469 and https://github.com/GreptimeTeam/greptimedb/issues/5799
// FIXME(yingwen): Remove the `Limit` plan once we update DataFusion.
if let LogicalPlan::Limit(_) | LogicalPlan::Distinct(_) = &plan {
return Ok(Transformed::no(plan));
}

4
src/query/src/optimizer/string_normalization.rs
View File

@@ -46,7 +46,6 @@ impl AnalyzerRule for StringNormalizationRule {
| LogicalPlan::Values(_)
| LogicalPlan::Analyze(_)
| LogicalPlan::Extension(_)
| LogicalPlan::Distinct(_)
| LogicalPlan::Dml(_)
| LogicalPlan::Copy(_)
| LogicalPlan::RecursiveQuery(_) => {
@@ -63,7 +62,8 @@ impl AnalyzerRule for StringNormalizationRule {
Ok(Transformed::no(plan))
}
}
LogicalPlan::Limit(_)
LogicalPlan::Distinct(_)
| LogicalPlan::Limit(_)
| LogicalPlan::Explain(_)
| LogicalPlan::Unnest(_)
| LogicalPlan::Ddl(_)

4
src/query/src/optimizer/type_conversion.rs
View File

@@ -88,7 +88,6 @@ impl ExtensionAnalyzerRule for TypeConversionRule {
| LogicalPlan::Sort { .. }
| LogicalPlan::Union { .. }
| LogicalPlan::Join { .. }
| LogicalPlan::Distinct { .. }
| LogicalPlan::Values { .. }
| LogicalPlan::Analyze { .. } => {
let mut converter = TypeConverter {
@@ -105,7 +104,8 @@ impl ExtensionAnalyzerRule for TypeConversionRule {
plan.with_new_exprs(expr, inputs).map(Transformed::yes)
}
LogicalPlan::Limit { .. }
LogicalPlan::Distinct { .. }
| LogicalPlan::Limit { .. }
| LogicalPlan::Subquery { .. }
| LogicalPlan::Explain { .. }
| LogicalPlan::SubqueryAlias { .. }

26
src/query/src/range_select/plan_rewrite.rs
View File

@@ -32,8 +32,8 @@ use datafusion_expr::execution_props::ExecutionProps;
use datafusion_expr::expr::WildcardOptions;
use datafusion_expr::simplify::SimplifyContext;
use datafusion_expr::{
Aggregate, Analyze, Cast, Explain, Expr, ExprSchemable, Extension, LogicalPlan,
LogicalPlanBuilder, Projection,
Aggregate, Analyze, Cast, Distinct, DistinctOn, Explain, Expr, ExprSchemable, Extension,
LogicalPlan, LogicalPlanBuilder, Projection,
};
use datafusion_optimizer::simplify_expressions::ExprSimplifier;
use datatypes::prelude::ConcreteDataType;
@@ -453,6 +453,28 @@ impl RangePlanRewriter {
.context(DataFusionSnafu)?
.build()
}
LogicalPlan::Distinct(Distinct::On(DistinctOn {
on_expr,
select_expr,
sort_expr,
..
})) => {
ensure!(
inputs.len() == 1,
RangeQuerySnafu {
msg:
"Illegal subplan nums when rewrite DistinctOn logical plan",
}
);
LogicalPlanBuilder::from(inputs[0].clone())
.distinct_on(
on_expr.clone(),
select_expr.clone(),
sort_expr.clone(),
)
.context(DataFusionSnafu)?
.build()
}
_ => plan.with_new_exprs(plan.expressions_consider_join(), inputs),
}
.context(DataFusionSnafu)?;

9
tests/cases/standalone/common/aggregate/distinct.result
View File

@@ -69,6 +69,15 @@ SELECT DISTINCT CASE WHEN a > 11 THEN 11 ELSE a END FROM test;
| 11 |
+-------------------------------------------------------------+
SELECT DISTINCT ON (a) * FROM test ORDER BY a, t DESC;
+----+----+-------------------------+
| a | b | t |
+----+----+-------------------------+
| 11 | 22 | 1970-01-01T00:00:00.004 |
| 13 | 22 | 1970-01-01T00:00:00.002 |
+----+----+-------------------------+
DROP TABLE test;
Affected Rows: 0

2
tests/cases/standalone/common/aggregate/distinct.sql
View File

@@ -16,4 +16,6 @@ SELECT DISTINCT MAX(b) FROM test GROUP BY a;
SELECT DISTINCT CASE WHEN a > 11 THEN 11 ELSE a END FROM test;
SELECT DISTINCT ON (a) * FROM test ORDER BY a, t DESC;
DROP TABLE test;