rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-05 21:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't transform Limit in TypeConversionRule, StringNormalizationRule and DistPlannerAnalyzer (#5472)

Browse Source 
* fix: do not transform exprs in the limit plan

* chore: keep some logs for debug

* feat: workaround for limit in other rules

* test: add sqlness tests for offset 0

* chore: add fixme
This commit is contained in:
Yingwen
2025-02-05 19:30:24 +08:00
committed by GitHub
parent 5d1761f3e5
commit 0e249f69cd
11 changed files with 129 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/query/src/datafusion.rs
View File

@@ -267,6 +267,8 @@ impl DatafusionQueryEngine {
let _timer = metrics::CREATE_PHYSICAL_ELAPSED.start_timer();
let state = ctx.state();
common_telemetry::debug!("Create physical plan, input plan: {logical_plan}");
// special handle EXPLAIN plan
if matches!(logical_plan, DfLogicalPlan::Explain(_)) {
return state
@@ -285,6 +287,8 @@ impl DatafusionQueryEngine {
.map_err(BoxedError::new)
.context(QueryExecutionSnafu)?;
common_telemetry::debug!("Create physical plan, analyzed plan: {analyzed_plan}");
// skip optimize for MergeScan
let optimized_plan = if let DfLogicalPlan::Extension(ext) = &analyzed_plan
&& ext.node.name() == MergeScanLogicalPlan::name()
@@ -299,6 +303,8 @@ impl DatafusionQueryEngine {
.context(QueryExecutionSnafu)?
};
common_telemetry::debug!("Create physical plan, optimized plan: {optimized_plan}");
let physical_plan = state
.query_planner()
.create_physical_plan(&optimized_plan, state)

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

@@ -65,6 +65,12 @@ 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 {
return Ok(Transformed::no(plan));
}
let exprs = plan
.expressions_consider_join()
.into_iter()

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

@@ -29,15 +29,41 @@ pub struct StringNormalizationRule;
impl AnalyzerRule for StringNormalizationRule {
fn analyze(&self, plan: LogicalPlan, _config: &ConfigOptions) -> Result<LogicalPlan> {
plan.transform(|plan| {
let mut converter = StringNormalizationConverter;
let inputs = plan.inputs().into_iter().cloned().collect::<Vec<_>>();
let expr = plan
.expressions_consider_join()
.into_iter()
.map(|e| e.rewrite(&mut converter).map(|x| x.data))
.collect::<Result<Vec<_>>>()?;
plan.with_new_exprs(expr, inputs).map(Transformed::yes)
plan.transform(|plan| match plan {
LogicalPlan::Projection(_)
| LogicalPlan::Filter(_)
| LogicalPlan::Window(_)
| LogicalPlan::Aggregate(_)
| LogicalPlan::Sort(_)
| LogicalPlan::Join(_)
| LogicalPlan::Repartition(_)
| LogicalPlan::Union(_)
| LogicalPlan::TableScan(_)
| LogicalPlan::EmptyRelation(_)
| LogicalPlan::Subquery(_)
| LogicalPlan::SubqueryAlias(_)
| LogicalPlan::Statement(_)
| LogicalPlan::Values(_)
| LogicalPlan::Analyze(_)
| LogicalPlan::Extension(_)
| LogicalPlan::Distinct(_)
| LogicalPlan::Dml(_)
| LogicalPlan::Copy(_)
| LogicalPlan::Unnest(_)
| LogicalPlan::RecursiveQuery(_) => {
let mut converter = StringNormalizationConverter;
let inputs = plan.inputs().into_iter().cloned().collect::<Vec<_>>();
let expr = plan
.expressions_consider_join()
.into_iter()
.map(|e| e.rewrite(&mut converter).map(|x| x.data))
.collect::<Result<Vec<_>>>()?;
plan.with_new_exprs(expr, inputs).map(Transformed::yes)
}
LogicalPlan::Limit(_)
| LogicalPlan::Explain(_)
| LogicalPlan::Ddl(_)
| LogicalPlan::DescribeTable(_) => Ok(Transformed::no(plan)),
})
.map(|x| x.data)
}

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

@@ -86,7 +86,6 @@ impl ExtensionAnalyzerRule for TypeConversionRule {
| LogicalPlan::Repartition { .. }
| LogicalPlan::Extension { .. }
| LogicalPlan::Sort { .. }
| LogicalPlan::Limit { .. }
| LogicalPlan::Union { .. }
| LogicalPlan::Join { .. }
| LogicalPlan::Distinct { .. }
@@ -106,7 +105,8 @@ impl ExtensionAnalyzerRule for TypeConversionRule {
plan.with_new_exprs(expr, inputs).map(Transformed::yes)
}
LogicalPlan::Subquery { .. }
LogicalPlan::Limit { .. }
| LogicalPlan::Subquery { .. }
| LogicalPlan::Explain { .. }
| LogicalPlan::SubqueryAlias { .. }
| LogicalPlan::EmptyRelation(_)

2
src/query/src/planner.rs
View File

@@ -109,6 +109,7 @@ impl DfLogicalPlanner {
let result = sql_to_rel
.statement_to_plan(df_stmt)
.context(PlanSqlSnafu)?;
common_telemetry::debug!("Logical planner, statement to plan result: {result}");
let plan = RangePlanRewriter::new(table_provider, query_ctx.clone())
.rewrite(result)
.await?;
@@ -119,6 +120,7 @@ impl DfLogicalPlanner {
.engine_state
.optimize_by_extension_rules(plan, &context)
.context(DataFusionSnafu)?;
common_telemetry::debug!("Logical planner, optimize result: {plan}");
Ok(plan)
}

9
tests/cases/standalone/common/order/limit.result
View File

@@ -14,6 +14,15 @@ SELECT a FROM test LIMIT 1;
| 1970-01-01T00:00:00.011 |
+-------------------------+
SELECT b FROM test ORDER BY b LIMIT 2 OFFSET 0;
+----+
| b |
+----+
| 21 |
| 22 |
+----+
SELECT a FROM test LIMIT 1.25;
Error: 3001(EngineExecuteQuery), DataFusion error: Error during planning: Expected LIMIT to be an integer or null, but got Float64

2
tests/cases/standalone/common/order/limit.sql
View File

@@ -4,6 +4,8 @@ INSERT INTO test VALUES (11, 22), (12, 21), (13, 22);
SELECT a FROM test LIMIT 1;
SELECT b FROM test ORDER BY b LIMIT 2 OFFSET 0;
SELECT a FROM test LIMIT 1.25;
SELECT a FROM test LIMIT 2-1;

24
tests/cases/standalone/common/system/information_schema.result
View File

@@ -433,6 +433,30 @@ select * from information_schema.columns order by table_schema, table_name, colu
| greptime | public | numbers | number | 1 | | | 10 | 0 | | | | PRI | | select,insert | | UInt32 | int unsigned | TAG | | No | int unsigned | | |
+---------------+--------------------+---------------------------------------+-----------------------------------+------------------+--------------------------+------------------------+-------------------+---------------+--------------------+--------------------+----------------+------------+-------+---------------+-----------------------+----------------------+-----------------+---------------+----------------+-------------+-----------------+----------------+--------+
select table_schema, table_name from information_schema.tables order by table_name limit 5;
+--------------------+---------------------------------------+
| table_schema | table_name |
+--------------------+---------------------------------------+
| information_schema | build_info |
| information_schema | character_sets |
| information_schema | check_constraints |
| information_schema | cluster_info |
| information_schema | collation_character_set_applicability |
+--------------------+---------------------------------------+
select table_schema, table_name from information_schema.tables order by table_name limit 5 offset 0;
+--------------------+---------------------------------------+
| table_schema | table_name |
+--------------------+---------------------------------------+
| information_schema | build_info |
| information_schema | character_sets |
| information_schema | check_constraints |
| information_schema | cluster_info |
| information_schema | collation_character_set_applicability |
+--------------------+---------------------------------------+
create
database my_db;

4
tests/cases/standalone/common/system/information_schema.sql
View File

@@ -11,6 +11,10 @@ order by table_schema, table_name;
select * from information_schema.columns order by table_schema, table_name, column_name;
select table_schema, table_name from information_schema.tables order by table_name limit 5;
select table_schema, table_name from information_schema.tables order by table_name limit 5 offset 0;
create
database my_db;

29
tests/cases/standalone/limit/limit.result
View File

@@ -23,3 +23,32 @@ EXPLAIN SELECT * FROM (SELECT SUM(number) FROM numbers LIMIT 100000000000) WHERE
| | |
+---------------+----------------------------------+
CREATE TABLE test (a TIMESTAMP TIME INDEX, b INTEGER);
Affected Rows: 0
INSERT INTO test VALUES (11, 23), (12, 21), (13, 22);
Affected Rows: 3
SELECT a FROM test LIMIT 1;
+-------------------------+
| a |
+-------------------------+
| 1970-01-01T00:00:00.011 |
+-------------------------+
SELECT b FROM test ORDER BY b LIMIT 2 OFFSET 0;
+----+
| b |
+----+
| 21 |
| 22 |
+----+
DROP TABLE test;
Affected Rows: 0

10
tests/cases/standalone/limit/limit.sql
View File

@@ -3,3 +3,13 @@ SELECT * FROM (SELECT SUM(number) FROM numbers LIMIT 100000000000) LIMIT 0;
EXPLAIN SELECT * FROM (SELECT SUM(number) FROM numbers LIMIT 100000000000) LIMIT 0;
EXPLAIN SELECT * FROM (SELECT SUM(number) FROM numbers LIMIT 100000000000) WHERE 1=0;
CREATE TABLE test (a TIMESTAMP TIME INDEX, b INTEGER);
INSERT INTO test VALUES (11, 23), (12, 21), (13, 22);
SELECT a FROM test LIMIT 1;
SELECT b FROM test ORDER BY b LIMIT 2 OFFSET 0;
DROP TABLE test;