This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-4.2 by this push:
     new 1380984ddb4 [fix](fe) Handle BACKUP timeout with immutable properties 
(#69424) (#70682)
1380984ddb4 is described below

commit 1380984ddb4a44a1f36031aae65ab679eb301c20
Author: deardeng <[email protected]>
AuthorDate: Thu Nov 19 15:17:25 2026 +0800

    [fix](fe) Handle BACKUP timeout with immutable properties (#69424) (#70682)
    
    pick from https://github.com/apache/doris/pull/69424
    Problem Summary: BACKUP SNAPSHOT with a valid timeout property fails
    during Nereids analysis because BackupCommand removes timeout from the
    immutable properties map returned by the parser. Copy properties before
    analyzing timeout and consume all properties from that mutable copy. Add
    a unit test that parses BACKUP SQL and checks timeout conversion and
    content parsing.
    
    (cherry picked from commit ddba8b280ce6b38a3d890c302896bffb2df07ac8)
    
    ### Background
    
    <!-- How the feature or module this PR touches works today, in two to
    four plain sentences, for a reviewer who doesn't know it. Link the user
    doc if there is one. Leave the problem and the fix to Problem Summary.
    -->
    
    ### What problem does this PR solve?
    
    <!-- Issue Number: "close #N" if this PR resolves the issue, "#N" if it
    only relates to it, "None" if there is none. A Feature needs an issue.
    -->
    <!-- Related PR: "#N (relation)" for each PR a reviewer should know
    about, such as "#123 (introduced the bug)", separated by commas. Write
    "None" if no related PR is known. -->
    <!-- PR Type: Bugfix, Performance, Feature, Enhancement, Refactor, Test,
    Build/CI/Chore, Revert, Release/Dependency, or Other. -->
    
    Issue Number:
    Related PR:
    PR Type:
    
    Problem Summary:
    
    <!-- Two to five sentences: the problem or need and who is affected; the
    approach in one sentence; when the diff is larger than that suggests,
    what else it had to handle, or that most of it is tests; and what
    existing users see after an upgrade. -->
    
    ### Details
    
    <!--
    For a diff of more than about 300 changed lines, start with "- **Change
    map:**": how many lines are production code, tests, generated files, and
    docs, then the code in parts, each with the problem it handles and its
    size.
    Then answer each field of your PR type on its own line, as "- **Field:**
    answer", in this order:
    Bugfix: Frequency, Root cause, Why existing tests missed it, Fix, Other
    paths and branches
    Performance: Why it was slow, Optimization, Results, Applicability and
    cost
      Feature: Scope, Design, Usage, Default behavior, Compatibility
    Enhancement: Before and after, Configs and defaults, Impact on existing
    users
    Refactor: Moves vs. logic changes, Behavior change, Compatibility,
    Performance impact, Rollback
    Test, adding tests: Scenarios, What existing tests miss, Fails when
    broken
      Test, fixing a test: Failure, Cause, Stability evidence
    Build/CI/Chore: Affected, Developer and release impact, License and
    third-party, Rollback
      Revert: Why not fix forward, Original author notified, Follow-up
    Release/Dependency: Versions, Upstream changes, Compatibility, Rollback
      Other: Why Other
    "None" is a valid answer when it is true. Don't restate the diff.
    -->
    
    ### Testing
    
    <!-- The tests, suites, or commands that ran, what each shows, and where
    it ran (locally or in CI). For a fix, the test that fails before it and
    passes after. -->
    
    ### Notes for Reviewers
    
    <!-- Optional; delete this section if there is nothing to say. Why each
    non-obvious edit was made, what you are unsure about, and where to start
    reading if Details has no Change map. -->
    
    ### Release note
    
    <!-- One paragraph on what users will notice, or None. -->
    
    ### Check List (For Author)
    
    <!-- Behavior changed: "No", or "Yes (see Details)" with a Behavior
    change field in Details. -->
    <!-- Does this need documentation: "No", or "Yes" with the
    apache/doris-website PR or the plan. -->
    <!-- Pre-submission status: "Ready"; "Partially verified: " and what is
    not verified; or "Not ready: " and why, for a Draft PR. -->
    
    - Behavior changed:
    - Does this need documentation:
    - Pre-submission status:
    
    ### AI Disclosure
    
    <!-- Tool: the agent and model, or None. Generated: the parts it wrote
    (code, tests, this description), or None. Human review: what you
    reviewed of the generated parts, or "Not applicable" without AI tools.
    You may add "- Prompts:" to summarize how you directed the agent. -->
    
    - Tool:
    - Generated:
    - Human review:
---
 .../doris/nereids/trees/plans/commands/BackupCommand.java | 11 ++++++-----
 .../nereids/trees/plans/commands/BackupCommandTest.java   | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/BackupCommand.java
 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/BackupCommand.java
index a46f645e6d0..745871546d8 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/BackupCommand.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/BackupCommand.java
@@ -173,13 +173,15 @@ public class BackupCommand extends Command implements 
ForwardWithSync {
     }
 
     private void analyzeProperties() throws AnalysisException {
+        Map<String, String> copiedProperties = Maps.newHashMap(properties);
+
         // timeout
-        if (properties.containsKey("timeout")) {
+        if (copiedProperties.containsKey(PROP_TIMEOUT)) {
             try {
-                timeoutMs = Long.valueOf(properties.get(PROP_TIMEOUT));
+                timeoutMs = Long.valueOf(copiedProperties.get(PROP_TIMEOUT));
             } catch (NumberFormatException e) {
                 ErrorReport.reportAnalysisException(ErrorCode.ERR_COMMON_ERROR,
-                        "Invalid timeout format: " + 
properties.get(PROP_TIMEOUT));
+                        "Invalid timeout format: " + 
copiedProperties.get(PROP_TIMEOUT));
             }
 
             if (timeoutMs * 1000 < MIN_TIMEOUT_MS) {
@@ -187,12 +189,11 @@ public class BackupCommand extends Command implements 
ForwardWithSync {
             }
 
             timeoutMs = timeoutMs * 1000;
-            properties.remove(PROP_TIMEOUT);
+            copiedProperties.remove(PROP_TIMEOUT);
         } else {
             timeoutMs = Config.backup_job_default_timeout_ms;
         }
 
-        Map<String, String> copiedProperties = Maps.newHashMap(properties);
         // type
         String typeProp = copiedProperties.get(PROP_TYPE);
         if (typeProp != null) {
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/commands/BackupCommandTest.java
 
b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/commands/BackupCommandTest.java
index 22e48d41d56..6568cf844ea 100644
--- 
a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/commands/BackupCommandTest.java
+++ 
b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/commands/BackupCommandTest.java
@@ -19,12 +19,14 @@ package org.apache.doris.nereids.trees.plans.commands;
 
 import org.apache.doris.catalog.Env;
 import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.jmockit.Deencapsulation;
 import org.apache.doris.datasource.InternalCatalog;
 import org.apache.doris.info.PartitionNamesInfo;
 import org.apache.doris.info.TableNameInfo;
 import org.apache.doris.info.TableRefInfo;
 import org.apache.doris.mysql.privilege.AccessControllerManager;
 import org.apache.doris.mysql.privilege.PrivPredicate;
+import org.apache.doris.nereids.parser.NereidsParser;
 import org.apache.doris.nereids.trees.plans.commands.info.LabelNameInfo;
 import org.apache.doris.qe.ConnectContext;
 
@@ -75,6 +77,19 @@ public class BackupCommandTest {
         };
     }
 
+    @Test
+    public void testAnalyzePropertiesWithTimeout() {
+        BackupCommand command = (BackupCommand) new 
NereidsParser().parseSingle(
+                "BACKUP SNAPSHOT test_db.test_snapshot TO test_repo "
+                        + "PROPERTIES (\"timeout\" = \"3600\", \"type\" = 
\"full\", \"content\" = \"metadata_only\")");
+
+        Deencapsulation.invoke(command, "analyzeProperties");
+
+        Assertions.assertEquals(3600L * 1000, command.getTimeoutMs());
+        Assertions.assertEquals(BackupCommand.BackupType.FULL, 
command.getBackupType());
+        Assertions.assertEquals(BackupCommand.BackupContent.METADATA_ONLY, 
command.getContent());
+    }
+
     @Test
     public void testValidateNormal() {
         runBefore();


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to