[opt](iceberg) support create branch/tag for iceberg #51727
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
run buildall |
2 similar comments
Contributor
Author
|
run buildall |
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 35852 ms |
TPC-DS: Total hot run time: 197410 ms |
ClickBench: Total hot run time: 29.14 s |
wuwenchi
force-pushed
the
opt-iceberg-create-branch
branch
2 times, most recently
from
08791a9 to
b113839
Compare
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 33983 ms |
TPC-DS: Total hot run time: 185994 ms |
ClickBench: Total hot run time: 29.45 s |
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 33961 ms |
TPC-DS: Total hot run time: 185428 ms |
ClickBench: Total hot run time: 29.13 s |
morningman
force-pushed
the
opt-iceberg-create-branch
branch
from
edbd112 to
e1eb917
Compare
Contributor
|
run buildall |
TPC-H: Total hot run time: 34614 ms |
TPC-DS: Total hot run time: 186466 ms |
ClickBench: Total hot run time: 29.77 s |
Contributor
FE UT Coverage ReportIncrement line coverage |
morningman
force-pushed
the
opt-iceberg-create-branch
branch
from
a5f1a1a to
02d730c
Compare
Contributor
|
run buildall |
TPC-H: Total hot run time: 34097 ms |
TPC-DS: Total hot run time: 185314 ms |
ClickBench: Total hot run time: 30.01 s |
CalvinKirs
approved these changes
Jun 24, 2025
github-actions
bot
added
the
approved
Contributor
|
PR approved by at least one committer and no changes requested. |
Contributor
|
PR approved by anyone and no changes requested. |
suxiaogang223
approved these changes
Jun 24, 2025
hubgeter
approved these changes
Jun 24, 2025
morningman
pushed a commit
to morningman/doris
that referenced
this pull request
Jul 7, 2025
Related Issue: apache#48285 Problem Summary: You can now create Iceberg branches and tags through Doris. ```sql -- branch alter table tb1 create branch b1; alter table tb1 create branch if not exists b1; alter table tb1 create or replace branch b1; alter table tb1 create or replace branch b1 AS OF VERSION <version>; alter table tb1 create or replace branch b1 AS OF VERSION <version> RETAIN 1 HOURS; -- CREATE b1 at snapshot 1234, retain b1 for 30 days, and retain the latest 30 days. The latest 3 snapshot snapshots, and 2 days worth of snapshots. alter table tb1 CREATE BRANCH b1 AS OF VERSION 1234 RETAIN 30 DAYS WITH SNAPSHOT RETENTION 3 SNAPSHOTS 2 DAYS; -- tag alter table tb1 create tag t1; alter table tb1 create tag if not eists t1; alter table tb1 create or replace tag t1; alter table tb1 create or replace tag t1 AS OF VERSION <version>; -- CREATE t1 at snapshot 1234 and retain it for 1 year. alter table tb1 create tag t1 AS OF VERSION 1234 RETAIN 365 DAYS ``` The supported time units include: DAYS, HOURS, MINUTES
morningman
pushed a commit
to morningman/doris
that referenced
this pull request
Jul 7, 2025
Related Issue: apache#48285 Problem Summary: You can now create Iceberg branches and tags through Doris. ```sql -- branch alter table tb1 create branch b1; alter table tb1 create branch if not exists b1; alter table tb1 create or replace branch b1; alter table tb1 create or replace branch b1 AS OF VERSION <version>; alter table tb1 create or replace branch b1 AS OF VERSION <version> RETAIN 1 HOURS; -- CREATE b1 at snapshot 1234, retain b1 for 30 days, and retain the latest 30 days. The latest 3 snapshot snapshots, and 2 days worth of snapshots. alter table tb1 CREATE BRANCH b1 AS OF VERSION 1234 RETAIN 30 DAYS WITH SNAPSHOT RETENTION 3 SNAPSHOTS 2 DAYS; -- tag alter table tb1 create tag t1; alter table tb1 create tag if not eists t1; alter table tb1 create or replace tag t1; alter table tb1 create or replace tag t1 AS OF VERSION <version>; -- CREATE t1 at snapshot 1234 and retain it for 1 year. alter table tb1 create tag t1 AS OF VERSION 1234 RETAIN 365 DAYS ``` The supported time units include: DAYS, HOURS, MINUTES
morrySnow
pushed a commit
that referenced
this pull request
Jul 8, 2025
16 tasks
morningman
pushed a commit
that referenced
this pull request
Jan 16, 2026
…comprehensive test coverage (#59917) - Related Pr: #51727 ### What problem does this PR solve? ## Overview This PR improves Iceberg table branch/tag functionality by adding input parameter validation, optimizing snapshot loading logic, and significantly expanding test coverage. ## Iceberg Logic Modifications ### 1. Optimize Snapshot Loading **File**: `fe/fe-core/src/main/java/org/apache/doris/nereids/StatementContext.java` - Modified `loadSnapshots` method signature to accept `specificTable` parameter - Supports loading snapshot for a specific table instead of iterating through all tables - Caller (`BindRelation.java:419`) passes the concrete table object, improving performance and precision ### 2. Enhanced Parameter Validation **File**: `fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java` Added parameter validation for branch/tag creation operations: - `RETAIN` time value must be greater than 0 - `SNAPSHOTS` (minimum snapshots to keep) must be greater than 0 - `RETENTION` time must be greater than 0 - Throws clear `IllegalArgumentException` with descriptive error messages ### 3. Branch/Tag Name Validation **File**: `fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergMetadataOps.java` - Validate branch name is not empty when creating a branch - Validate tag name is not empty when creating a tag - Throws `UserException` to notify users ### 4. Syntax Support Limitation **File**: `regression-test/suites/external_table_p0/iceberg/iceberg_branch_tag_operate.groovy` Clarified that `CREATE OR REPLACE BRANCH IF NOT EXISTS` syntax combination is not supported ## New Test Case Coverage This PR adds 10 comprehensive test suites covering the following scenarios: | Test File | Coverage | |-----------|----------| | `iceberg_branch_complex_queries.groovy` | Complex query scenarios with branch operations | | `iceberg_branch_cross_operations.groovy` | Cross operations between branches and tags | | `iceberg_branch_partition_operations.groovy` | Partition-related branch operations | | `iceberg_branch_retention_and_snapshot.groovy` | Snapshot expiration and retention policies | | `iceberg_branch_tag_auth.groovy` | Branch/tag permission and authorization | | `iceberg_branch_tag_edge_cases.groovy` | Edge cases and exception handling | | `iceberg_branch_tag_parallel_op.groovy` | Concurrent/parallel operations testing | | `iceberg_branch_tag_schema_change_extended.groovy` | Schema change scenarios | | `iceberg_branch_tag_system_tables.groovy` | System table query verification | | `iceberg_tag_retention_and_consistency.groovy` | Tag consistency validation | ## Improvements - **More precise snapshot loading**: Avoids unnecessary full table iteration - **Stronger parameter validation**: Catches configuration errors early with clear error messages - **Comprehensive test coverage**: Multi-dimensional validation from edge cases to concurrent operations Co-authored-by: zgxme <u143@qq.com>
github-actions bot
pushed a commit
that referenced
this pull request
Jan 16, 2026
…comprehensive test coverage (#59917) - Related Pr: #51727 ### What problem does this PR solve? ## Overview This PR improves Iceberg table branch/tag functionality by adding input parameter validation, optimizing snapshot loading logic, and significantly expanding test coverage. ## Iceberg Logic Modifications ### 1. Optimize Snapshot Loading **File**: `fe/fe-core/src/main/java/org/apache/doris/nereids/StatementContext.java` - Modified `loadSnapshots` method signature to accept `specificTable` parameter - Supports loading snapshot for a specific table instead of iterating through all tables - Caller (`BindRelation.java:419`) passes the concrete table object, improving performance and precision ### 2. Enhanced Parameter Validation **File**: `fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java` Added parameter validation for branch/tag creation operations: - `RETAIN` time value must be greater than 0 - `SNAPSHOTS` (minimum snapshots to keep) must be greater than 0 - `RETENTION` time must be greater than 0 - Throws clear `IllegalArgumentException` with descriptive error messages ### 3. Branch/Tag Name Validation **File**: `fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergMetadataOps.java` - Validate branch name is not empty when creating a branch - Validate tag name is not empty when creating a tag - Throws `UserException` to notify users ### 4. Syntax Support Limitation **File**: `regression-test/suites/external_table_p0/iceberg/iceberg_branch_tag_operate.groovy` Clarified that `CREATE OR REPLACE BRANCH IF NOT EXISTS` syntax combination is not supported ## New Test Case Coverage This PR adds 10 comprehensive test suites covering the following scenarios: | Test File | Coverage | |-----------|----------| | `iceberg_branch_complex_queries.groovy` | Complex query scenarios with branch operations | | `iceberg_branch_cross_operations.groovy` | Cross operations between branches and tags | | `iceberg_branch_partition_operations.groovy` | Partition-related branch operations | | `iceberg_branch_retention_and_snapshot.groovy` | Snapshot expiration and retention policies | | `iceberg_branch_tag_auth.groovy` | Branch/tag permission and authorization | | `iceberg_branch_tag_edge_cases.groovy` | Edge cases and exception handling | | `iceberg_branch_tag_parallel_op.groovy` | Concurrent/parallel operations testing | | `iceberg_branch_tag_schema_change_extended.groovy` | Schema change scenarios | | `iceberg_branch_tag_system_tables.groovy` | System table query verification | | `iceberg_tag_retention_and_consistency.groovy` | Tag consistency validation | ## Improvements - **More precise snapshot loading**: Avoids unnecessary full table iteration - **Stronger parameter validation**: Catches configuration errors early with clear error messages - **Comprehensive test coverage**: Multi-dimensional validation from edge cases to concurrent operations Co-authored-by: zgxme <u143@qq.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Related Issue: #48285
Problem Summary:
You can now create Iceberg branches and tags through Doris.
The supported time units include: DAYS, HOURS, MINUTES
Release note
None
Check List (For Author)
Test
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)