Skip to content

[bot] Merge 24.11 to develop #270

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

Merged
github-actions merged 2 commits into from
Feb 26, 2025
Merged

[bot] Merge 24.11 to develop #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aaa75f
Updated mergeRows in EventDataTable and AttributeDataTable. (#268)
spamhurts Feb 24, 2025
16001c0
Merge 24.11 to develop
labkey-teamcity Feb 25, 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
12 changes: 10 additions & 2 deletions src/org/labkey/snd/query/AttributeDataTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,19 @@ public int mergeRows(User user, Container container, DataIteratorBuilder rows, B
Logger log = SNDManager.getLogger(configParameters, AttributeDataTable.class);

List<Map<String, Object>> data = getMutableData(rows, getDataIteratorContext(errors, InsertOption.MERGE, configParameters));

// Large merge triggers importRows path
if (data.size() > SNDManager.MAX_MERGE_ROWS)
Set<Object> distinctEventIds = new HashSet<>();
for (Map<String, Object> map : data) {
distinctEventIds.add(map.get("eventId"));
}

int max_merge_rows = SNDManager.MAX_MERGE_ROWS * 10; //ensure this code path is only triggered by the initial data load

if (distinctEventIds.size() >= max_merge_rows)
{
data.clear();
log.info("More than " + SNDManager.MAX_MERGE_ROWS + " rows. using importRows method.");
log.info("More than " + max_merge_rows + " rows. using importRows method.");
return importRows(user, container, rows, errors, configParameters, extraScriptContext);
}
log.info("Merging rows.");
Expand Down
12 changes: 10 additions & 2 deletions src/org/labkey/snd/query/EventDataTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,18 @@ public int mergeRows(User user, Container container, DataIteratorBuilder rows, B
{
return 0;
}

// Large merge triggers importRows path
if (data.size() >= SNDManager.MAX_MERGE_ROWS)
Set<Object> distinctEventIds = new HashSet<>();
for (Map<String, Object> map : data) {
distinctEventIds.add(map.get("eventId"));
}

int max_merge_rows = SNDManager.MAX_MERGE_ROWS * 10; //ensure this code path is only triggered by the initial data load

if (distinctEventIds.size() >= max_merge_rows)
{
log.info("More than " + SNDManager.MAX_MERGE_ROWS + " rows. using importRows method.");
log.info("More than " + max_merge_rows + " rows. using importRows method.");
return importRows(user, container, rows, errors, configParameters, extraScriptContext);
}

Expand Down