Skip to content

[fix](mtmv) Add null-safety to getBaseViewsOneLevel for backward compatibility #64412

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
yujun777 wants to merge 5 commits into
base: master
Choose a base branch
from
+12 −1
Open

[fix](mtmv) Add null-safety to getBaseViewsOneLevel for backward compatibility #64412

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85d7f56
[fix](mtmv) Add null-safety to getBaseViewsOneLevel for backward comp…
yujun777 Jun 11, 2026
ce73be8
Merge branch 'master' of https://github.com/apache/doris into fix-vie…
yujun777 Jun 11, 2026
f7ad3c6
Use gsonPostProcess for baseViewsOneLevel backward compat
yujun777 Jun 11, 2026
93e14b1
Use copy for baseViewsOneLevel fallback in gsonPostProcess
yujun777 Jun 11, 2026
4103dd3
Ensure baseViewsOneLevel is never null after gsonPostProcess
yujun777 Jun 11, 2026
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
13 changes: 12 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/mtmv/MTMVRelation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,16 @@
package org.apache.doris.mtmv;

import org.apache.doris.datasource.CatalogMgr;
import org.apache.doris.persist.gson.GsonPostProcessable;

import com.google.gson.annotations.SerializedName;
import org.apache.commons.collections4.CollectionUtils;

import java.io.IOException;
import java.util.HashSet;
import java.util.Set;

public class MTMVRelation {
public class MTMVRelation implements GsonPostProcessable {
// t1 => v1 => v2
// t2 => mv1
// mv1 join v2 => mv2
Expand Down Expand Up @@ -80,6 +83,14 @@ public Set<BaseTableInfo> getBaseViews() {
return baseViews;
}

@Override

@github-actions github-actions Bot Jun 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a test for this exact compatibility path. The existing MTMVRelationTest creates a fresh MTMV, so baseViewsOneLevel is already populated and that test would have passed before this PR. The reported failure only happens after Gson deserializes old MTMV metadata where the bvol field is absent; a focused test should deserialize such JSON through GsonUtils.GSON and assert getBaseViewsOneLevel() is non-null before MetadataGenerator streams it.

public void gsonPostProcess() throws IOException {
// For backward compatibility: previously created MTMV may not have baseViewsOneLevel
if (baseViewsOneLevel == null) {
baseViewsOneLevel = baseViews == null ? new HashSet<>() : new HashSet<>(baseViews);
}
}

// toString() is not easy to find where to call the method
public String toInfoString() {
return "MTMVRelation{"
Expand Down
Loading