Skip to content

Remove/increase the record size limit #7332

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
merged 4 commits into from
Oct 4, 2025
Merged

Remove/increase the record size limit #7332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e20c309
Raised the record size limit
dyemanov Oct 6, 2022
f8a6c97
Represent the limit as 2^20
dyemanov Oct 4, 2025
8d06dd9
Protect against extremely high InlineSortThreshold settings
dyemanov Oct 4, 2025
f12badb
Merge branch 'master' into record-size-limit
dyemanov Oct 4, 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
2 changes: 1 addition & 1 deletion src/jrd/optimizer/Optimizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,7 +1508,7 @@ SortedStream* Optimizer::generateSort(const StreamList& streams,
const auto* dbb = tdbb->getDatabase();
const auto threshold = dbb->dbb_config->getInlineSortThreshold();

refetchFlag = (totalLength > threshold);
refetchFlag = (totalLength > MIN(threshold, MAX_SORT_RECORD / 2));
}

// Check for persistent fields to be excluded from the sort.
Expand Down
2 changes: 1 addition & 1 deletion src/jrd/val.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class VaryingString : public pool_alloc_rpt<SCHAR, type_str>
UCHAR str_data[2]; // one byte for ALLOC and one for the NULL
};

inline constexpr ULONG MAX_RECORD_SIZE = 65535;
inline constexpr ULONG MAX_RECORD_SIZE = 1048576; // 1 MB -- just to protect from possible misuse

namespace Jrd {

Expand Down
Loading