Skip to content
Open
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
2 changes: 1 addition & 1 deletion src/common/CvtFormat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ namespace
break;
}
if (strOffset >= strLength)
cb->err(Arg::Gds(isc_data_for_format_is_exhausted) << string(it->patternStr.data()));
cb->err(Arg::Gds(isc_data_for_format_is_exhausted) << string(it->patternStr.data(), it->patternStr.length()));
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We already have StringBase::assign(std::string_view s), why not add StringBase::StringBase(std::string_view s) ?


std::string_view patternStr = it->patternStr;

Expand Down
6 changes: 3 additions & 3 deletions src/jrd/btr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5807,7 +5807,7 @@ static ULONG insert_node(thread_db* tdbb,
// For checking on duplicate nodes we should find the first matching key.
UCHAR* pointer = find_node_start_point(bucket, key, 0, &prefix,
idx->idx_flags & idx_descending,
false, true, validateDuplicates ? NO_VALUE : newRecordNumber);
0, true, validateDuplicates ? NO_VALUE : newRecordNumber);
if (!pointer)
return NO_VALUE_PAGE;

Expand Down Expand Up @@ -6620,8 +6620,8 @@ static contents remove_leaf_node(thread_db* tdbb, index_insertion* insertion, WI
UCHAR* pointer;
USHORT prefix;
while (!(pointer = find_node_start_point(page, key, 0, &prefix,
(idx->idx_flags & idx_descending),
false, false,
idx->idx_flags & idx_descending,
0, false,
(validateDuplicates ? NO_VALUE : insertion->iib_number))))
{
page = (btree_page*) CCH_HANDOFF(tdbb, window, page->btr_sibling, LCK_write, pag_index);
Expand Down