Skip to content

branch-4.0: [fix](backup) Fix UnsupportedOperationException in RestoreCommand by copying properties before modification #61890 #62071

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

Open
github-actions wants to merge 1 commit into
base: branch-4.0
Choose a base branch
from
+22 −6
Open

branch-4.0: [fix](backup) Fix UnsupportedOperationException in RestoreCommand by copying properties before modification #61890 #62071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/RestoreCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,27 +212,27 @@ private void updateTableRefInfos() throws AnalysisException {
* analyzeProperties
*/
public 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) {
ErrorReport.reportAnalysisException(ErrorCode.ERR_COMMON_ERROR, "timeout must be at least 10 min");
}

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);

// allow load
allowLoad = eatBooleanProperty(copiedProperties, PROP_ALLOW_LOAD, allowLoad);

Expand Down
16 changes: 16 additions & 0 deletions ...-core/src/test/java/org/apache/doris/nereids/trees/plans/commands/RestoreCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.doris.nereids.trees.plans.commands.info.TableRefInfo;
import org.apache.doris.qe.ConnectContext;

import com.google.common.collect.ImmutableMap;
import mockit.Expectations;
import mockit.Mocked;
import org.apache.commons.collections4.map.HashedMap;
Expand Down Expand Up @@ -136,4 +137,19 @@ public void testValidateNormal() {
RestoreCommand command5 = new RestoreCommand(labelNameInfo, repoName2, tableRefInfos, properties2, isExclude);
Assertions.assertThrows(DdlException.class, () -> command5.validate(connectContext));
}

@Test
public void testAnalyzePropertiesWithImmutableMap() {
LabelNameInfo labelNameInfo = new LabelNameInfo(dbName, "label0");
Map<String, String> properties = ImmutableMap.of(
"timeout", "86400",
"backup_timestamp", "2025-06-12-11-15-20");

RestoreCommand command = new RestoreCommand(labelNameInfo, "testRepo",
new ArrayList<>(), properties, false);

Assertions.assertDoesNotThrow(command::analyzeProperties);
Assertions.assertEquals(86400L * 1000, command.getTimeoutMs());
Assertions.assertEquals("2025-06-12-11-15-20", command.getBackupTimestamp());
}
}
Loading