Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix OOM in insertDefaultResources migration

Browse Source 
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
This commit is contained in:
Shrikant Sharat Kandula 2021-12-16 22:39:48 +05:30
parent 1247864893
commit 8a336d3caa
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
View File

@ -3913,7 +3913,7 @@ public class DatabaseChangelog {
for (NewPage onlyIdPage : pages) { for (NewPage onlyIdPage : pages) {
// Fetch one page at a time to avoid OOM. // Fetch one action at a time to avoid OOM.
NewPage page = mongockTemplate.findOne( NewPage page = mongockTemplate.findOne(
query(where(fieldName(QNewPage.newPage.id)).is(onlyIdPage.getId())), query(where(fieldName(QNewPage.newPage.id)).is(onlyIdPage.getId())),
NewPage.class NewPage.class
@ -4138,13 +4138,18 @@ public class DatabaseChangelog {
// Update pages for defaultIds (applicationId, pageId) along-with the defaultActionIds for onPageLoadActions // Update pages for defaultIds (applicationId, pageId) along-with the defaultActionIds for onPageLoadActions
final Query pageQuery = query(where(fieldName(QNewPage.newPage.deleted)).ne(true)); final Query pageQuery = query(where(fieldName(QNewPage.newPage.deleted)).ne(true));
pageQuery.fields() pageQuery.fields()
.include(fieldName(QNewPage.newPage.applicationId)) .include(fieldName(QNewPage.newPage.id));
.include(fieldName(QNewPage.newPage.unpublishedPage) + "." + "layouts")
.include(fieldName(QNewPage.newPage.publishedPage) + "." + "layouts");
List<NewPage> pages = mongockTemplate.find(pageQuery, NewPage.class); List<NewPage> pages = mongockTemplate.find(pageQuery, NewPage.class);
for (NewPage page : pages) { for (NewPage onlyIdPage : pages) {
// Fetch one page at a time to avoid OOM.
NewPage page = mongockTemplate.findOne(
query(where(fieldName(QNewPage.newPage.id)).is(onlyIdPage.getId())),
NewPage.class
);
String applicationId = page.getApplicationId(); String applicationId = page.getApplicationId();
final Update defaultResourceUpdates = new Update(); final Update defaultResourceUpdates = new Update();
DefaultResources defaults = new DefaultResources(); DefaultResources defaults = new DefaultResources();
@ -4193,15 +4198,17 @@ public class DatabaseChangelog {
.addCriteria(where(fieldName(QNewAction.newAction.applicationId)).exists(true)); .addCriteria(where(fieldName(QNewAction.newAction.applicationId)).exists(true));
actionQuery.fields() actionQuery.fields()
.include(fieldName(QNewAction.newAction.applicationId)) .include(fieldName(QNewAction.newAction.id));
.include(fieldName(QNewAction.newAction.unpublishedAction) + "." + fieldName(QNewAction.newAction.unpublishedAction.pageId))
.include(fieldName(QNewAction.newAction.unpublishedAction) + "." + fieldName(QNewAction.newAction.unpublishedAction.collectionId))
.include(fieldName(QNewAction.newAction.publishedAction) + "." + fieldName(QNewAction.newAction.publishedAction.pageId))
.include(fieldName(QNewAction.newAction.publishedAction) + "." + fieldName(QNewAction.newAction.publishedAction.collectionId));
List<NewAction> actions = mongockTemplate.find(actionQuery, NewAction.class); List<NewAction> actions = mongockTemplate.find(actionQuery, NewAction.class);
for (NewAction action : actions) { for (NewAction actionIdOnly : actions) {
// Fetch one action at a time to avoid OOM.
final NewAction action = mongockTemplate.findOne(
query(where(fieldName(QNewAction.newAction.id)).is(actionIdOnly.getId())),
NewAction.class
);
String applicationId = action.getApplicationId(); String applicationId = action.getApplicationId();
if (StringUtils.isEmpty(applicationId)) { if (StringUtils.isEmpty(applicationId)) {
continue; continue;