Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class StructInfoMap {
return structInfo;
}
if (groupExpressionMap.isEmpty() || !groupExpressionMap.containsKey(tableMap)) {
refresh(group, cascadesContext);
refresh(group, cascadesContext, new HashSet<>());
group.getstructInfoMap().setRefreshVersion(cascadesContext.getMemo().getRefreshVersion());
}
if (groupExpressionMap.containsKey(tableMap)) {
Expand Down Expand Up @@ -116,13 +116,13 @@ private Plan constructPlan(GroupExpression groupExpression, List<BitSet> childre
* @param group the root group
*
*/
public void refresh(Group group, CascadesContext cascadesContext) {
public void refresh(Group group, CascadesContext cascadesContext, Set<Integer> refreshedGroup) {
StructInfoMap structInfoMap = group.getstructInfoMap();
refreshedGroup.add(group.getGroupId().asInt());
long memoVersion = cascadesContext.getMemo().getRefreshVersion();
if (!structInfoMap.getTableMaps().isEmpty() && memoVersion == structInfoMap.refreshVersion) {
return;
}
Set<Integer> refreshedGroup = new HashSet<>();
for (GroupExpression groupExpression : group.getLogicalExpressions()) {
List<Set<BitSet>> childrenTableMap = new LinkedList<>();
if (groupExpression.children().isEmpty()) {
Expand All @@ -136,10 +136,9 @@ public void refresh(Group group, CascadesContext cascadesContext) {
for (Group child : groupExpression.children()) {
StructInfoMap childStructInfoMap = child.getstructInfoMap();
if (!refreshedGroup.contains(child.getGroupId().asInt())) {
childStructInfoMap.refresh(child, cascadesContext);
childStructInfoMap.refresh(child, cascadesContext, refreshedGroup);
childStructInfoMap.setRefreshVersion(memoVersion);
}
refreshedGroup.add(child.getGroupId().asInt());
childrenTableMap.add(child.getstructInfoMap().getTableMaps());
}
// if one same groupExpression have refreshed, continue
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public static List<StructInfo> extractStructInfo(Plan plan, Plan originalPlan, C
Group ownerGroup = plan.getGroupExpression().get().getOwnerGroup();
StructInfoMap structInfoMap = ownerGroup.getstructInfoMap();
// Refresh struct info in current level plan from top to bottom
structInfoMap.refresh(ownerGroup, cascadesContext);
structInfoMap.refresh(ownerGroup, cascadesContext, new HashSet<>());
structInfoMap.setRefreshVersion(cascadesContext.getMemo().getRefreshVersion());

Set<BitSet> queryTableSets = structInfoMap.getTableMaps();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.junit.jupiter.api.Test;

import java.util.BitSet;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -60,7 +61,7 @@ public BitSet getDisableNereidsRules() {
Group root = c1.getMemo().getRoot();
Set<BitSet> tableMaps = root.getstructInfoMap().getTableMaps();
Assertions.assertTrue(tableMaps.isEmpty());
root.getstructInfoMap().refresh(root, c1);
root.getstructInfoMap().refresh(root, c1, new HashSet<>());
Assertions.assertEquals(1, tableMaps.size());
new MockUp<MTMVRelationManager>() {
@Mock
Expand Down Expand Up @@ -88,7 +89,7 @@ public boolean isMVPartitionValid(MTMV mtmv, ConnectContext ctx, boolean forceCo
.optimize()
.printlnBestPlanTree();
root = c1.getMemo().getRoot();
root.getstructInfoMap().refresh(root, c1);
root.getstructInfoMap().refresh(root, c1, new HashSet<>());
tableMaps = root.getstructInfoMap().getTableMaps();
Assertions.assertEquals(2, tableMaps.size());
dropMvByNereids("drop materialized view mv1");
Expand Down Expand Up @@ -117,8 +118,8 @@ public BitSet getDisableNereidsRules() {
Group root = c1.getMemo().getRoot();
Set<BitSet> tableMaps = root.getstructInfoMap().getTableMaps();
Assertions.assertTrue(tableMaps.isEmpty());
root.getstructInfoMap().refresh(root, c1);
root.getstructInfoMap().refresh(root, c1);
root.getstructInfoMap().refresh(root, c1, new HashSet<>());
root.getstructInfoMap().refresh(root, c1, new HashSet<>());
Assertions.assertEquals(1, tableMaps.size());
new MockUp<MTMVRelationManager>() {
@Mock
Expand All @@ -145,8 +146,8 @@ public boolean isMVPartitionValid(MTMV mtmv, ConnectContext ctx, boolean isMVPar
.optimize()
.printlnBestPlanTree();
root = c1.getMemo().getRoot();
root.getstructInfoMap().refresh(root, c1);
root.getstructInfoMap().refresh(root, c1);
root.getstructInfoMap().refresh(root, c1, new HashSet<>());
root.getstructInfoMap().refresh(root, c1, new HashSet<>());
tableMaps = root.getstructInfoMap().getTableMaps();
Assertions.assertEquals(2, tableMaps.size());
dropMvByNereids("drop materialized view mv1");
Expand Down Expand Up @@ -192,7 +193,7 @@ public boolean isMVPartitionValid(MTMV mtmv, ConnectContext ctx, boolean isMVPar
.rewrite()
.optimize();
Group root = c1.getMemo().getRoot();
root.getstructInfoMap().refresh(root, c1);
root.getstructInfoMap().refresh(root, c1, new HashSet<>());
StructInfoMap structInfoMap = root.getstructInfoMap();
Assertions.assertEquals(2, structInfoMap.getTableMaps().size());
BitSet mvMap = structInfoMap.getTableMaps().stream()
Expand Down
Loading