Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed a bug in RTRIM implementation, fixed issue #9558 (#9562)

This commit is contained in:
Jan 2019-07-25 13:04:46 +02:00 committed by GitHub
parent 4ea95bc109
commit b62eee034b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arangod/Aql/Functions.cpp
View File

@ -2395,7 +2395,7 @@ AqlValue Functions::Right(ExpressionContext*, transaction::Methods* trx,
} }
namespace { namespace {
void ltrimInternal(uint32_t& startOffset, uint32_t& endOffset, icu::UnicodeString& unicodeStr, void ltrimInternal(int32_t& startOffset, int32_t& endOffset, icu::UnicodeString& unicodeStr,
uint32_t numWhitespaces, UChar32* spaceChars) { uint32_t numWhitespaces, UChar32* spaceChars) {
for (; startOffset < endOffset; startOffset = unicodeStr.moveIndex32(startOffset, 1)) { for (; startOffset < endOffset; startOffset = unicodeStr.moveIndex32(startOffset, 1)) {
bool found = false; bool found = false;
@ -2412,22 +2412,26 @@ void ltrimInternal(uint32_t& startOffset, uint32_t& endOffset, icu::UnicodeStrin
} }
} // for } // for
} }
void rtrimInternal(uint32_t& startOffset, uint32_t& endOffset, icu::UnicodeString& unicodeStr,
void rtrimInternal(int32_t& startOffset, int32_t& endOffset, icu::UnicodeString& unicodeStr,
uint32_t numWhitespaces, UChar32* spaceChars) { uint32_t numWhitespaces, UChar32* spaceChars) {
for (uint32_t codeUnitPos = unicodeStr.moveIndex32(unicodeStr.length(), -1); if (unicodeStr.length() == 0) {
startOffset < codeUnitPos; return;
codeUnitPos = unicodeStr.moveIndex32(codeUnitPos, -1)) { }
for (int32_t codePos = unicodeStr.moveIndex32(endOffset, -1);
startOffset <= codePos;
codePos = unicodeStr.moveIndex32(codePos, -1)) {
bool found = false; bool found = false;
for (uint32_t pos = 0; pos < numWhitespaces; pos++) { for (uint32_t pos = 0; pos < numWhitespaces; pos++) {
if (unicodeStr.char32At(codeUnitPos) == spaceChars[pos]) { if (unicodeStr.char32At(codePos) == spaceChars[pos]) {
found = true; found = true;
--endOffset;
break; break;
} }
} }
endOffset = unicodeStr.moveIndex32(codeUnitPos, 1); if (!found || codePos == 0) {
if (!found) {
break; break;
} }
} // for } // for
@ -2475,7 +2479,7 @@ AqlValue Functions::Trim(ExpressionContext* expressionContext, transaction::Meth
return AqlValue(AqlValueHintNull()); return AqlValue(AqlValueHintNull());
} }
uint32_t startOffset = 0, endOffset = unicodeStr.length(); int32_t startOffset = 0, endOffset = unicodeStr.length();
if (howToTrim <= 1) { if (howToTrim <= 1) {
ltrimInternal(startOffset, endOffset, unicodeStr, numWhitespaces, spaceChars.get()); ltrimInternal(startOffset, endOffset, unicodeStr, numWhitespaces, spaceChars.get());
@ -2521,7 +2525,7 @@ AqlValue Functions::LTrim(ExpressionContext* expressionContext, transaction::Met
return AqlValue(AqlValueHintNull()); return AqlValue(AqlValueHintNull());
} }
uint32_t startOffset = 0, endOffset = unicodeStr.length(); int32_t startOffset = 0, endOffset = unicodeStr.length();
ltrimInternal(startOffset, endOffset, unicodeStr, numWhitespaces, spaceChars.get()); ltrimInternal(startOffset, endOffset, unicodeStr, numWhitespaces, spaceChars.get());
@ -2561,7 +2565,7 @@ AqlValue Functions::RTrim(ExpressionContext* expressionContext, transaction::Met
return AqlValue(AqlValueHintNull()); return AqlValue(AqlValueHintNull());
} }
uint32_t startOffset = 0, endOffset = unicodeStr.length(); int32_t startOffset = 0, endOffset = unicodeStr.length();
rtrimInternal(startOffset, endOffset, unicodeStr, numWhitespaces, spaceChars.get()); rtrimInternal(startOffset, endOffset, unicodeStr, numWhitespaces, spaceChars.get());

48
tests/js/server/aql/aql-functions-string.js
View File

@ -1480,12 +1480,18 @@ function ahuacatlStringFunctionsTestSuite () {
// ////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////
testRtrim: function () { testRtrim: function () {
var expected = [ ' foo', var expected = [ '',
'\t\r\nabc', '',
'\ta\rb\nc', '',
'\r\nThis\nis\r\na\ttest' ' foo',
]; '\t\r\nabc',
'\ta\rb\nc',
'\r\nThis\nis\r\na\ttest'
];
var actual = getQueryResults(`FOR t IN [ var actual = getQueryResults(`FOR t IN [
'',
' ',
' ',
' foo ', ' foo ',
'\t\r\nabc\n\r\t', '\t\r\nabc\n\r\t',
'\ta\rb\nc ', '\ta\rb\nc ',
@ -1499,11 +1505,21 @@ function ahuacatlStringFunctionsTestSuite () {
// ////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////
testRtrimSpecial1: function () { testRtrimSpecial1: function () {
var expected = [ ' foo', var expected = [ '',
'\t\r\nabc\n\r\t', '',
'\ta\rb\nc', '',
'\r\nThis\nis\r\na\ttest' ]; '',
'\t',
' foo',
'\t\r\nabc\n\r\t',
'\ta\rb\nc',
'\r\nThis\nis\r\na\ttest' ];
var actual = getQueryResults(`FOR t IN [ var actual = getQueryResults(`FOR t IN [
'',
'\r',
'\r\n',
' \r\n',
'\t\r\n',
' foo ', ' foo ',
'\t\r\nabc\n\r\t', '\t\r\nabc\n\r\t',
'\ta\rb\nc ', '\ta\rb\nc ',
@ -1529,6 +1545,20 @@ function ahuacatlStringFunctionsTestSuite () {
assertEqual(expected, actual); assertEqual(expected, actual);
}, },
testRtrimChars: function () {
var expected = [ '10000', '1000', '100', '10', '1', '', '' ];
var actual = getQueryResults(`FOR t IN [
'10000x',
'1000x',
'100x',
'10x',
'1x',
'x',
''
] RETURN NOOPT((RTRIM(t, 'x') ))`);
assertEqual(expected, actual);
},
// ////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////
// / @brief test find_first function // / @brief test find_first function
// ////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////