Skip to content

[AMORO-3810] Fix tableRuntime initialize failed when not have optimizer info for table #3811

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[AMORO-3810] Fix tableRuntime initialize failed when not have optimizer info for table #3811

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fdca94
[AMORO-3810] Fix TableRuntime initialize failed when not have optimiz…
czy006 Oct 9, 2025
fd6d417
hot fixed
czy006 Oct 10, 2025
ceddb92
Merge branch 'master' into issues/AMORO-3819
czy006 Oct 22, 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
65 changes: 34 additions & 31 deletions amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableRuntimeStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ public DefaultTableRuntimeStore(
Preconditions.checkNotNull(tableIdentifier, "ServerTableIdentifier must not be null.");
Preconditions.checkNotNull(meta, "TableRuntimeMeta must not be null.");
Preconditions.checkNotNull(requiredStates, "requiredStates must not be null.");
Preconditions.checkNotNull(restoredStates, "restoredStates must not be null.");
this.tableIdentifier = tableIdentifier;
this.meta = meta;
restoreStates(requiredStates, restoredStates);
Expand Down Expand Up @@ -136,37 +135,41 @@ public TableRuntimeOperation begin() {

protected void restoreStates(
List<StateKey<?>> requiredStates, List<TableRuntimeState> restoredStates) {
Map<String, TableRuntimeState> stateMap =
restoredStates.stream()
.collect(Collectors.toMap(TableRuntimeState::getStateKey, Function.identity()));

requiredStates.forEach(
key -> {
if (stateMap.containsKey(key.getKey())) {
states.put(key.getKey(), stateMap.get(key.getKey()));
stateMap.remove(key.getKey());
} else {
doAs(
TableRuntimeMapper.class,
mapper ->
mapper.saveState(
tableIdentifier.getId(), key.getKey(), key.serializeDefault()));
TableRuntimeState state =
getAs(
TableRuntimeMapper.class,
m -> m.getState(tableIdentifier.getId(), key.getKey()));
Preconditions.checkNotNull(state, "State %s initialize failed", key.getKey());
states.put(key.getKey(), state);
}
});

if (!stateMap.isEmpty()) {
LOG.warn("Found {} useless runtime states for {}", stateMap.size(), tableIdentifier);
stateMap.forEach(
(k, s) -> {
LOG.warn("Remove useless runtime state {} for {}", k, tableIdentifier);
doAs(TableRuntimeMapper.class, m -> m.removeState(s.getStateId()));
if (restoredStates == null) {
doAs(TableRuntimeMapper.class, m -> m.saveState(meta.getTableId(), null, null));
} else {
Map<String, TableRuntimeState> stateMap =
restoredStates.stream()
.collect(Collectors.toMap(TableRuntimeState::getStateKey, Function.identity()));

requiredStates.forEach(
key -> {
if (stateMap.containsKey(key.getKey())) {
states.put(key.getKey(), stateMap.get(key.getKey()));
stateMap.remove(key.getKey());
} else {
doAs(
TableRuntimeMapper.class,
mapper ->
mapper.saveState(
tableIdentifier.getId(), key.getKey(), key.serializeDefault()));
TableRuntimeState state =
getAs(
TableRuntimeMapper.class,
m -> m.getState(tableIdentifier.getId(), key.getKey()));
Preconditions.checkNotNull(state, "State %s initialize failed", key.getKey());
states.put(key.getKey(), state);
}
});

if (!stateMap.isEmpty()) {
LOG.warn("Found {} useless runtime states for {}", stateMap.size(), tableIdentifier);
stateMap.forEach(
(k, s) -> {
LOG.warn("Remove useless runtime state {} for {}", k, tableIdentifier);
doAs(TableRuntimeMapper.class, m -> m.removeState(s.getStateId()));
});
}
}
}

Expand Down
Loading