branch-4.0: [Enhance](Iceberg) Enhance branch/tag operations with validation and comprehensive test coverage #59917 #60023
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
…comprehensive test coverage (apache#59917) - Related Pr: apache#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>
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
run external |
Contributor
Author
|
run buildall |
Contributor
|
LGTM |
yiguolei
approved these changes
Jan 21, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Uh oh!
There was an error while loading. Please reload this page.