This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new ede68e075d [fix](iceberg-v2) fix fe iceberg split, add regression case
(#15299)
ede68e075d is described below
commit ede68e075ded258ec6dfdf3f2c68c55ff41dff8d
Author: slothever <[email protected]>
AuthorDate: Fri Dec 23 19:33:00 2022 +0800
[fix](iceberg-v2) fix fe iceberg split, add regression case (#15299)
---
.../doris/planner/external/QueryScanProvider.java | 2 +-
.../iceberg/test_external_catalog_icebergv2.out | 18 ++++++++++++------
.../iceberg/test_external_catalog_icebergv2.groovy | 13 +++++++------
3 files changed, 20 insertions(+), 13 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/QueryScanProvider.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/QueryScanProvider.java
index a2ce044bb7..a7453394f6 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/QueryScanProvider.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/QueryScanProvider.java
@@ -106,7 +106,7 @@ public abstract class QueryScanProvider implements
FileScanProviderIf {
TFileRangeDesc rangeDesc = createFileRangeDesc(fileSplit,
partitionValuesFromPath, pathPartitionKeys);
// external data lake table
if (split instanceof IcebergSplit) {
- IcebergScanProvider.setIcebergParams(rangeDesc,
(IcebergSplit) inputSplit);
+ IcebergScanProvider.setIcebergParams(rangeDesc,
(IcebergSplit) split);
}
curLocations.getScanRange().getExtScanRange().getFileScanRange().addToRanges(rangeDesc);
LOG.debug("assign to backend {} with table split: {} ({}, {}),
location: {}",
diff --git
a/regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.out
b/regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.out
index f5cb0464e4..4d3a4b9176 100644
---
a/regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.out
+++
b/regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.out
@@ -1,27 +1,33 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !q01 --
-149990
+149988
-- !q02 --
-45132671
+1
+3
+4
+7
-- !q03 --
-0
+45132671
-- !q04 --
+0
+
+-- !q05 --
1 Customer#000000001 IVhzIApeRb ot,c,E 15
25-989-741-2988 711.56 BUILDING to the even, regular platelets.
regular, ironic epitaphs nag e |
2 Customer#000000002 XSTf4,NCwDVaWNe6tEgvwfmRchLXak 13
23-768-687-3665 121.65 AUTOMOBILE l accounts. blithely ironic
theodolites integrate boldly: caref |
3 Customer#000000003 MG9kdTD2WBHm 1
11-719-748-3364 7498.12 AUTOMOBILE deposits eat slyly ironic, even
instructions. express foxes detect slyly. blithely even accounts abov |
--- !q05 -
+-- !q06 -
366778465
366778561
366778657
--- !q06 --
+-- !q07 --
10539361
130424833
2736865
--- !q07 --
+-- !q08 --
1499999990
\ No newline at end of file
diff --git
a/regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.groovy
b/regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.groovy
index 473bd76fc8..816e75b85e 100644
---
a/regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.groovy
+++
b/regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.groovy
@@ -34,12 +34,13 @@ suite("test_external_catalog_icebergv2", "p2") {
// test parquet format format
def q01 = {
qt_q01 """ select count(1) as c from customer_small;"""
- qt_q02 """ select count(1) from orders """
- qt_q03 """ select count(1) from customer_small where c_name =
'Customer#0063356' order by c_custkey limit 1; """
- qt_q04 """ select * from customer_small order by c_custkey limit 3
"""
- qt_q05 """ select o_orderkey from orders where o_orderkey > 652566
limit 3"""
- qt_q06 """ select o_orderkey from orders where o_custkey < 3357
limit 3"""
- qt_q07 """ select count(1) as c from customer;"""
+ qt_q02 """ select c_custkey from customer_small group by c_custkey
limit 4;"""
+ qt_q03 """ select count(1) from orders """
+ qt_q04 """ select count(1) from customer_small where c_name =
'Customer#0063356' order by c_custkey limit 1; """
+ qt_q05 """ select * from customer_small order by c_custkey limit 3
"""
+ qt_q06 """ select o_orderkey from orders where o_orderkey > 652566
limit 3"""
+ qt_q07 """ select o_orderkey from orders where o_custkey < 3357
limit 3"""
+ qt_q08 """ select count(1) as c from customer;"""
}
sql """ use `tpch_1000_icebergv2`; """
q01()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
