Skip to content

Fix for #8359 #8825

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

Open
aafemt wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −2
Open

Fix for #8359 #8825

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/jrd/optimizer/Optimizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3397,9 +3397,12 @@ ValueExprNode* Optimizer::optimizeLikeSimilar(ComparativeBoolNode* cmpNode)

// allocate a literal node to store the starting with string;
// assume it will be shorter than the pattern string
// This literal will be in text charset to prevent conversion on every comparison

const auto literal = FB_NEW_POOL(getPool()) LiteralNode(getPool());
literal->litDesc = *patternDesc;
literal->litDesc.setTextType(matchDesc.getTextType());
literal->litDesc.dsc_length = p_count;
UCHAR* q = literal->litDesc.dsc_address = FB_NEW_POOL(getPool()) UCHAR[literal->litDesc.dsc_length];

// Set the string length to point till the first wildcard character.
Expand Down Expand Up @@ -3431,8 +3434,8 @@ ValueExprNode* Optimizer::optimizeLikeSimilar(ComparativeBoolNode* cmpNode)
break;
}

q += patternCharset->substring(patternDesc->dsc_length,
patternDesc->dsc_address,
q += matchCharset->substring(p_count,
p,
literal->litDesc.dsc_length - (q - literal->litDesc.dsc_address), q,
(patternPtrStart - patternCanonical.begin()) / canWidth, 1);
}
Expand Down
Loading