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

feat: support UNNEST (#5580)

Browse Source 
* feat: support UNNEST

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* fix clippy and sqlness

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

---------

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
This commit is contained in:
Ruihang Xia
2025-02-20 20:53:56 -08:00
committed by GitHub
parent 7981c06989
commit 76083892cd
6 changed files with 198 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,8 +77,13 @@ impl DistPlannerAnalyzer {
.map(|e| e.transform(&Self::transform_subquery).map(|x| x.data))
.collect::<DfResult<Vec<_>>>()?;
let inputs = plan.inputs().into_iter().cloned().collect::<Vec<_>>();
Ok(Transformed::yes(plan.with_new_exprs(exprs, inputs)?))
// Some plans that are special treated (should not call `with_new_exprs` on them)
if !matches!(plan, LogicalPlan::Unnest(_)) {
let inputs = plan.inputs().into_iter().cloned().collect::<Vec<_>>();
Ok(Transformed::yes(plan.with_new_exprs(exprs, inputs)?))
} else {
Ok(Transformed::no(plan))
}
}
fn transform_subquery(expr: Expr) -> DfResult<Transformed<Expr>> {

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

@@ -49,7 +49,6 @@ impl AnalyzerRule for StringNormalizationRule {
| LogicalPlan::Distinct(_)
| LogicalPlan::Dml(_)
| LogicalPlan::Copy(_)
| LogicalPlan::Unnest(_)
| LogicalPlan::RecursiveQuery(_) => {
let mut converter = StringNormalizationConverter;
let inputs = plan.inputs().into_iter().cloned().collect::<Vec<_>>();
@@ -58,10 +57,15 @@ impl AnalyzerRule for StringNormalizationRule {
.into_iter()
.map(|e| e.rewrite(&mut converter).map(|x| x.data))
.collect::<Result<Vec<_>>>()?;
plan.with_new_exprs(expr, inputs).map(Transformed::yes)
if expr != plan.expressions_consider_join() {
plan.with_new_exprs(expr, inputs).map(Transformed::yes)
} else {
Ok(Transformed::no(plan))
}
}
LogicalPlan::Limit(_)
| LogicalPlan::Explain(_)
| LogicalPlan::Unnest(_)
| LogicalPlan::Ddl(_)
| LogicalPlan::DescribeTable(_) => Ok(Transformed::no(plan)),
})

24
tests/cases/standalone/common/function/geo.result
View File

@@ -157,6 +157,30 @@ FROM
| 9 | [604189371209351167, 604189371075133439, 604189375235883007, 604189375101665279, 604189638034194431, 604189638571065343, 604189638436847615, 604189642597597183, 604189642463379455, 604189641255419903] | 55.05017 | 0.54939243697098 |
+----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-----------------+--------------------+
SELECT
unnest(h3_grid_path_cells(cell1, cell2)) AS path_cells,
FROM
(
SELECT
h3_string_to_cell('86283082fffffff') AS cell1,
h3_string_to_cell('86283470fffffff') AS cell2
);
+--------------------+
| path_cells |
+--------------------+
| 604189371209351167 |
| 604189371075133439 |
| 604189375235883007 |
| 604189375101665279 |
| 604189638034194431 |
| 604189638571065343 |
| 604189638436847615 |
| 604189642597597183 |
| 604189642463379455 |
| 604189641255419903 |
+--------------------+
SELECT
h3_cells_contains('86283470fffffff,862834777ffffff, 862834757ffffff, 86283471fffffff, 862834707ffffff', '8b283470d112fff') AS R00,
h3_cells_contains('86283470fffffff,862834777ffffff, 862834757ffffff, 86283471fffffff, 862834707ffffff', 604189641792290815) AS R01,

9
tests/cases/standalone/common/function/geo.sql
View File

@@ -57,6 +57,15 @@ FROM
h3_string_to_cell('86283470fffffff') AS cell2
);
SELECT
unnest(h3_grid_path_cells(cell1, cell2)) AS path_cells,
FROM
(
SELECT
h3_string_to_cell('86283082fffffff') AS cell1,
h3_string_to_cell('86283470fffffff') AS cell2
);
SELECT
h3_cells_contains('86283470fffffff,862834777ffffff, 862834757ffffff, 86283471fffffff, 862834707ffffff', '8b283470d112fff') AS R00,
h3_cells_contains('86283470fffffff,862834777ffffff, 862834757ffffff, 86283471fffffff, 862834707ffffff', 604189641792290815) AS R01,

85
tests/cases/standalone/common/select/unnest.result Normal file
View File

@@ -0,0 +1,85 @@
-- Licensed to the Apache Software Foundation (ASF) under one
-- or more contributor license agreements. See the NOTICE file
-- distributed with this work for additional information
-- regarding copyright ownership. The ASF licenses this file
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-- KIND, either express or implied. See the License for the
-- specific language governing permissions and limitations
-- under the License.
--
-- Unnest tests from Apache DataFusion
-- Basic unnest tests
SELECT unnest([1,2,3]);
+------------------------------------------------+
| UNNEST(make_array(Int64(1),Int64(2),Int64(3))) |
+------------------------------------------------+
| 1 |
| 2 |
| 3 |
+------------------------------------------------+
SELECT unnest(struct(1,2,3));
+-----------------------------------------------------------+-----------------------------------------------------------+-----------------------------------------------------------+
| unnest_placeholder(struct(Int64(1),Int64(2),Int64(3))).c0 | unnest_placeholder(struct(Int64(1),Int64(2),Int64(3))).c1 | unnest_placeholder(struct(Int64(1),Int64(2),Int64(3))).c2 |
+-----------------------------------------------------------+-----------------------------------------------------------+-----------------------------------------------------------+
| 1 | 2 | 3 |
+-----------------------------------------------------------+-----------------------------------------------------------+-----------------------------------------------------------+
-- Table function is not supported for now
-- SELECT * FROM unnest([1,2,3]);
-- SELECT * FROM unnest(struct(1,2,3));
-- SELECT * FROM unnest(struct(1,2,3)), unnest([4,5,6]);
-- Multiple unnest levels
SELECT unnest([1,2,3]), unnest(unnest([[1,2,3]]));
+------------------------------------------------+--------------------------------------------------------------------+
| UNNEST(make_array(Int64(1),Int64(2),Int64(3))) | UNNEST(UNNEST(make_array(make_array(Int64(1),Int64(2),Int64(3))))) |
+------------------------------------------------+--------------------------------------------------------------------+
| 1 | 1 |
| 2 | 2 |
| 3 | 3 |
+------------------------------------------------+--------------------------------------------------------------------+
SELECT unnest([1,2,3]) + unnest([1,2,3]), unnest([1,2,3]) + unnest([4,5]);
+-------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------+
| UNNEST(make_array(Int64(1),Int64(2),Int64(3))) + UNNEST(make_array(Int64(1),Int64(2),Int64(3))) | UNNEST(make_array(Int64(1),Int64(2),Int64(3))) + UNNEST(make_array(Int64(4),Int64(5))) |
+-------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------+
| 2 | 5 |
| 4 | 7 |
| 6 | |
+-------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------+
SELECT unnest(unnest([[1,2,3]])) + unnest(unnest([[1,2,3]])),
unnest(unnest([[1,2,3]])) + unnest([4,5]),
unnest([4,5]);
+-----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------+---------------------------------------+
| UNNEST(UNNEST(make_array(make_array(Int64(1),Int64(2),Int64(3))))) + UNNEST(UNNEST(make_array(make_array(Int64(1),Int64(2),Int64(3))))) | UNNEST(UNNEST(make_array(make_array(Int64(1),Int64(2),Int64(3))))) + UNNEST(make_array(Int64(4),Int64(5))) | UNNEST(make_array(Int64(4),Int64(5))) |
+-----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------+---------------------------------------+
| 2 | 5 | 4 |
| 4 | 7 | 5 |
| 6 | | |
+-----------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------+---------------------------------------+
-- Unnest with expressions
SELECT unnest([1,2,3]) + 1, unnest(unnest([[1,2,3]]))* 2;
+-----------------------------------------------------------+-------------------------------------------------------------------------------+
| UNNEST(make_array(Int64(1),Int64(2),Int64(3))) + Int64(1) | UNNEST(UNNEST(make_array(make_array(Int64(1),Int64(2),Int64(3))))) * Int64(2) |
+-----------------------------------------------------------+-------------------------------------------------------------------------------+
| 2 | 2 |
| 3 | 4 |
| 4 | 6 |
+-----------------------------------------------------------+-------------------------------------------------------------------------------+

67
tests/cases/standalone/common/select/unnest.sql Normal file
View File

@@ -0,0 +1,67 @@
-- Licensed to the Apache Software Foundation (ASF) under one
-- or more contributor license agreements. See the NOTICE file
-- distributed with this work for additional information
-- regarding copyright ownership. The ASF licenses this file
-- to you under the Apache License, Version 2.0 (the
-- "License"); you may not use this file except in compliance
-- with the License. You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing,
-- software distributed under the License is distributed on an
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-- KIND, either express or implied. See the License for the
-- specific language governing permissions and limitations
-- under the License.
--
-- Unnest tests from Apache DataFusion
-- Basic unnest tests
SELECT unnest([1,2,3]);
SELECT unnest(struct(1,2,3));
-- Table function is not supported for now
-- SELECT * FROM unnest([1,2,3]);
-- SELECT * FROM unnest(struct(1,2,3));
-- SELECT * FROM unnest(struct(1,2,3)), unnest([4,5,6]);
-- Multiple unnest levels
SELECT unnest([1,2,3]), unnest(unnest([[1,2,3]]));
SELECT unnest([1,2,3]) + unnest([1,2,3]), unnest([1,2,3]) + unnest([4,5]);
SELECT unnest(unnest([[1,2,3]])) + unnest(unnest([[1,2,3]])),
unnest(unnest([[1,2,3]])) + unnest([4,5]),
unnest([4,5]);
-- Unnest with expressions
SELECT unnest([1,2,3]) + 1, unnest(unnest([[1,2,3]]))* 2;
-- Complex subquery with unnest
-- table function is not supported for now
-- WITH t AS (
-- SELECT
-- left1,
-- width1,
-- min(column3) as min_height
-- FROM
-- unnest(ARRAY[1,2,3,4,5,6,7,8,9,10]) AS t(left1)
-- CROSS JOIN unnest(ARRAY[1,2,3,4,5,6,7,8,9,10]) AS t1(width1)
-- WHERE
-- left1 + width1 - 1 <= 10
-- AND column3 BETWEEN left1 AND left1 + width1 - 1
-- GROUP BY
-- left1, width1
-- )
-- SELECT
-- left1, width1, min_height, min_height * width1 as area
-- FROM t
-- WHERE min_height * width1 = (
-- SELECT max(min_height * width1) FROM t
-- );