Skip to content

branch-3.1: [opt](show-partitions) remove show partitions support for iceberg (#56985) #57501

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
morningman merged 2 commits into from
Oct 31, 2025
Merged

branch-3.1: [opt](show-partitions) remove show partitions support for iceberg (#56985) #57501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3db7c7b
[opt](show-partitions) remove show partitions support for iceberg (#5…
morningman Oct 29, 2025
1aae3d4
2
morningman Oct 31, 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
14 changes: 7 additions & 7 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@

public class IcebergExternalTable extends ExternalTable implements MTMVRelatedTableIf, MTMVBaseTableIf, MvccTable {

private Table table;
private boolean isValidRelatedTableCached = false;
private boolean isValidRelatedTable = false;
private boolean isView;
Expand All @@ -89,11 +88,6 @@ protected synchronized void makeSureInitialized() {
}
}

@VisibleForTesting
public void setTable(Table table) {
this.table = table;
}

@Override
public Optional<SchemaCacheValue> initSchema(SchemaCacheKey key) {
boolean isView = isView();
Expand Down Expand Up @@ -209,7 +203,7 @@ public boolean isValidRelatedTable() {
}
isValidRelatedTable = false;
Set<String> allFields = Sets.newHashSet();
table = getIcebergTable();
Table table = getIcebergTable();
for (PartitionSpec spec : table.specs().values()) {
if (spec == null) {
isValidRelatedTableCached = true;
Expand Down Expand Up @@ -364,4 +358,10 @@ public Map<String, String> properties() {
}
}

@Override
public boolean isPartitionedTable() {
makeSureInitialized();
Table table = getIcebergTable();
return table.spec().isPartitioned();
}
}
6 changes: 6 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/maxcompute/MaxComputeExternalTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,4 +345,10 @@ public Table getOdpsTable() {
return schemaCacheValue.map(value -> ((MaxComputeSchemaCacheValue) value).getOdpsTable())
.orElse(null);
}

@Override
public boolean isPartitionedTable() {
makeSureInitialized();
return getOdpsTable().isPartitioned();
}
}
6 changes: 6 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,4 +352,10 @@ public Map<String, String> getTableProperties() {
return Collections.emptyMap();
}
}

@Override
public boolean isPartitionedTable() {
makeSureInitialized();
return !paimonTable.partitionKeys().isEmpty();
}
}
65 changes: 47 additions & 18 deletions regression-test/data/mtmv_p0/test_iceberg_mtmv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
\N 8

-- !test_iceberg_table_partition_ts --
ts_day=20022 types: [DATETIMEV2]; keys: [2024-10-26 00:00:00]; types: [DATETIMEV2]; keys: [2024-10-27 00:00:00];
ts_day=20023 types: [DATETIMEV2]; keys: [2024-10-27 00:00:00]; types: [DATETIMEV2]; keys: [2024-10-28 00:00:00];
ts_day=20024 types: [DATETIMEV2]; keys: [2024-10-28 00:00:00]; types: [DATETIMEV2]; keys: [2024-10-29 00:00:00];
ts_day=null types: [DATETIMEV2]; keys: [0000-01-01 00:00:00]; types: [DATETIMEV2]; keys: [0000-01-01 00:00:01];
{"ts_day":null}
{"ts_day":"2024-10-26"}
{"ts_day":"2024-10-27"}
{"ts_day":"2024-10-28"}

-- !unpartition --
2024-10-26T01:02:03 1
Expand Down Expand Up @@ -110,9 +110,9 @@ ts_day=null types: [DATETIMEV2]; keys: [0000-01-01 00:00:00]; types: [DATETIMEV
2024-10-28 7

-- !test_iceberg_table_partition_d --
d_month=655 types: [DATEV2]; keys: [2024-08-01]; types: [DATEV2]; keys: [2024-09-01];
d_month=656 types: [DATEV2]; keys: [2024-09-01]; types: [DATEV2]; keys: [2024-10-01];
d_month=657 types: [DATEV2]; keys: [2024-10-01]; types: [DATEV2]; keys: [2024-11-01];
{"d_month":655}
{"d_month":656}
{"d_month":657}

-- !refresh_one_partition --
2024-01-01T00:00 4
Expand All @@ -130,21 +130,50 @@ d_month=657 types: [DATEV2]; keys: [2024-10-01]; types: [DATEV2]; keys: [2024-1
2024-01-02T00:00 3

-- !evolution2 --
ts_day=20060 types: [DATETIMEV2]; keys: [2024-12-03 00:00:00]; types: [DATETIMEV2]; keys: [2024-12-04 00:00:00];
ts_month=657 types: [DATETIMEV2]; keys: [2024-10-01 00:00:00]; types: [DATETIMEV2]; keys: [2024-11-01 00:00:00];
ts_month=658 types: [DATETIMEV2]; keys: [2024-11-01 00:00:00]; types: [DATETIMEV2]; keys: [2024-12-01 00:00:00];
{"ts_month":null, "ts_day":"2024-12-03"}
{"ts_month":657, "ts_day":null}
{"ts_month":658, "ts_day":null}

-- !evolution3 --
ts_day=20059 types: [DATETIMEV2]; keys: [2024-12-02 00:00:00]; types: [DATETIMEV2]; keys: [2024-12-03 00:00:00];
ts_month=658 types: [DATETIMEV2]; keys: [2024-11-01 00:00:00]; types: [DATETIMEV2]; keys: [2024-12-01 00:00:00];
{"ts_month":null, "ts_day":"2024-12-02"}
{"ts_month":null, "ts_day":"2024-11-02"}
{"ts_month":null, "ts_day":"2024-11-03"}
{"ts_month":658, "ts_day":null}

-- !evolution4 --
ts_month=657 types: [DATETIMEV2]; keys: [2024-10-01 00:00:00]; types: [DATETIMEV2]; keys: [2024-11-01 00:00:00];
ts_month=658 types: [DATETIMEV2]; keys: [2024-11-01 00:00:00]; types: [DATETIMEV2]; keys: [2024-12-01 00:00:00];
{"ts_month":null, "ts_day":"2024-11-02"}
{"ts_month":null, "ts_day":"2024-11-03"}
{"ts_month":657, "ts_day":null}
{"ts_month":658, "ts_day":null}

-- !evolution5 --
ts_day=20078 types: [DATETIMEV2]; keys: [2024-12-21 00:00:00]; types: [DATETIMEV2]; keys: [2024-12-22 00:00:00];
ts_hour=482139 types: [DATETIMEV2]; keys: [2025-01-01 03:00:00]; types: [DATETIMEV2]; keys: [2025-01-01 04:00:00];
ts_month=657 types: [DATETIMEV2]; keys: [2024-10-01 00:00:00]; types: [DATETIMEV2]; keys: [2024-11-01 00:00:00];
ts_month=658 types: [DATETIMEV2]; keys: [2024-11-01 00:00:00]; types: [DATETIMEV2]; keys: [2024-12-01 00:00:00];
{"ts_month":null, "ts_day":"2024-10-12", "ts_hour":null}
{"ts_month":null, "ts_day":null, "ts_hour":482139}
{"ts_month":null, "ts_day":"2024-12-21", "ts_hour":null}
{"ts_month":null, "ts_day":null, "ts_hour":481875}
{"ts_month":657, "ts_day":null, "ts_hour":null}
{"ts_month":658, "ts_day":null, "ts_hour":null}

-- !test1 --
{"create_date1_month":null, "create_date2_year":53}
{"create_date1_month":647, "create_date2_year":null}

-- !test2 --
{"create_date_bucket":2}
{"create_date_bucket":5}

-- !test3 --
{"create_date_month":647}

-- !test4 --
{"create_date1_month":647, "create_date2_year":53}
{"create_date1_month":647, "create_date2_year":null}

-- !test5 --
{"create_date_month":null}
{"create_date_month":647}

-- !test6 --
{"create_date1_month":647, "create_date2_year":53}
{"create_date1_month":647, "create_date2_year":null}

109 changes: 58 additions & 51 deletions regression-test/suites/mtmv_p0/test_iceberg_mtmv.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ suite("test_iceberg_mtmv", "p0,external,iceberg,external_docker,external_docker_
waitingMTMVTaskFinishedByMvName(mvName1, dbName)
qt_test_ts_refresh_null """select * from ${mvName1} order by value"""

qt_test_iceberg_table_partition_ts """show partitions from ${catalog_name}.${icebergDb}.${icebergTable1};"""
qt_test_iceberg_table_partition_ts """select `partition` from ${catalog_name}.${icebergDb}.${icebergTable1}\$partitions order by struct_element(`partition`, 1);"""

def showPartitionsResult = sql """show partitions from ${mvName1}"""
logger.info("showPartitionsResult: " + showPartitionsResult.toString())
Expand Down Expand Up @@ -198,7 +198,7 @@ suite("test_iceberg_mtmv", "p0,external,iceberg,external_docker,external_docker_
waitingMTMVTaskFinishedByMvName(mvName2, dbName)
qt_test_d_refresh5 "select * from ${mvName2} order by value"

qt_test_iceberg_table_partition_d """show partitions from ${catalog_name}.${icebergDb}.${icebergTable2};"""
qt_test_iceberg_table_partition_d """select `partition` from ${catalog_name}.${icebergDb}.${icebergTable2}\$partitions order by struct_element(`partition`, 1);"""

showPartitionsResult = sql """show partitions from ${mvName2}"""
logger.info("showPartitionsResult: " + showPartitionsResult.toString())
Expand Down Expand Up @@ -241,7 +241,7 @@ suite("test_iceberg_mtmv", "p0,external,iceberg,external_docker,external_docker_
assertTrue(showPartitions.toString().contains("p_20240101000000_20240102000000"))
assertTrue(showPartitions.toString().contains("p_20240102000000_20240103000000"))

// refresh one partiton
// refresh one partition
sql """REFRESH MATERIALIZED VIEW ${mvName} partitions(p_20240101000000_20240102000000);"""
waitingMTMVTaskFinishedByMvName(mvName, dbName)
order_qt_refresh_one_partition "SELECT * FROM ${mvName} "
Expand All @@ -265,54 +265,61 @@ suite("test_iceberg_mtmv", "p0,external,iceberg,external_docker,external_docker_
sql """drop table if exists ${catalog_name}.${icebergDb}.${icebergTable3}"""

sql """use ${catalog_name}.test_db"""
qt_evolution2 "show partitions from replace_partition2"
qt_evolution3 "show partitions from replace_partition3"
qt_evolution4 "show partitions from replace_partition4"
qt_evolution5 "show partitions from replace_partition5"

test {
sql "show partitions from replace_partition1"
// check exception message contains
exception "is not a supported partition table"
}

test {
sql "show partitions from no_partition"
// check exception message contains
exception "is not a supported partition table"
}

test {
sql "show partitions from not_support_trans"
// check exception message contains
exception "is not a supported partition table"
}

test {
sql "show partitions from drop_partition1"
// check exception message contains
exception "is not a supported partition table"
}

test {
sql "show partitions from drop_partition2"
// check exception message contains
exception "is not a supported partition table"
}

test {
sql "show partitions from add_partition1"
// check exception message contains
exception "is not a supported partition table"
}

test {
sql "show partitions from add_partition2"
// check exception message contains
exception "is not a supported partition table"
}

sql """ drop catalog if exists ${catalog_name} """
qt_evolution2 "select `partition` from replace_partition2\$partitions order by struct_element(`partition`, 1)"
qt_evolution3 "select `partition` from replace_partition3\$partitions order by struct_element(`partition`, 1)"
qt_evolution4 "select `partition` from replace_partition4\$partitions order by struct_element(`partition`, 1)"
qt_evolution5 "select `partition` from replace_partition5\$partitions order by struct_element(`partition`, 1)"

qt_test1 "select `partition` from replace_partition1\$partitions order by struct_element(`partition`, 1)";
qt_test2 "select `partition` from not_support_trans\$partitions order by struct_element(`partition`, 1)";
qt_test3 "select `partition` from drop_partition1\$partitions order by struct_element(`partition`, 1)";
qt_test4 "select `partition` from drop_partition2\$partitions order by struct_element(`partition`, 1)";
qt_test5 "select `partition` from add_partition1\$partitions order by struct_element(`partition`, 1)";
qt_test6 "select `partition` from add_partition2\$partitions order by struct_element(`partition`, 1)";

// test {
// sql "show partitions from replace_partition1"
// // check exception message contains
// exception "is not a supported partition table"
// }

// test {
// sql "show partitions from no_partition"
// // check exception message contains
// exception "Unknown column 'partition'"
// }

// test {
// sql "show partitions from not_support_trans"
// // check exception message contains
// exception "is not a supported partition table"
// }

// test {
// sql "show partitions from drop_partition1"
// // check exception message contains
// exception "is not a supported partition table"
// }

// test {
// sql "show partitions from drop_partition2"
// // check exception message contains
// exception "is not a supported partition table"
// }

// test {
// sql "show partitions from add_partition1"
// // check exception message contains
// exception "is not a supported partition table"
// }

// test {
// sql "show partitions from add_partition2"
// // check exception message contains
// exception "is not a supported partition table"
// }

// sql """ drop catalog if exists ${catalog_name} """
}
}

Loading