Skip to content
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

fix lpad/rpad miss trailing zero #9610

Merged
merged 6 commits into from
Nov 18, 2024
Merged

fix lpad/rpad miss trailing zero #9610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9de2e01
fix lpad/rpad trailing zero miss
guo-shaoge Nov 13, 2024
081dc30
fix
guo-shaoge Nov 13, 2024
2380749
fix
guo-shaoge Nov 13, 2024
8322b96
fix
guo-shaoge Nov 14, 2024
b213371
refine
guo-shaoge Nov 14, 2024
67af62d
Merge branch 'master' into fix_pad_traling_zero
ti-chi-bot[bot] Nov 18, 2024
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
35 changes: 15 additions & 20 deletions dbms/src/Functions/FunctionsString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3147,6 +3147,13 @@ class FunctionTiDBTrim : public IFunction

class TidbPadImpl
{
static void addTrailingZero(ColumnString::Chars_t & res, ColumnString::Offset & res_offset)
{
res.resize(res.size() + 1);
res[res_offset] = '\0';
++res_offset;
}

public:
template <typename IntType, bool IsUTF8, bool IsLeft>
static void tidbExecutePadImpl(
Expand Down Expand Up @@ -3436,9 +3443,7 @@ class TidbPadImpl
}
else
{
result_data.resize(result_data.size() + 1);
result_data[res_prev_offset] = '\0';
res_prev_offset++;
addTrailingZero(result_data, res_prev_offset);
}

string_prev_offset = string_offsets[i];
Expand Down Expand Up @@ -3497,9 +3502,7 @@ class TidbPadImpl
}
else
{
result_data.resize(result_data.size() + 1);
result_data[res_prev_offset] = '\0';
res_prev_offset++;
addTrailingZero(result_data, res_prev_offset);
}

string_prev_offset = string_offsets[i];
Expand Down Expand Up @@ -3556,9 +3559,7 @@ class TidbPadImpl
}
else
{
result_data.resize(result_data.size() + 1);
result_data[res_prev_offset] = '\0';
res_prev_offset++;
addTrailingZero(result_data, res_prev_offset);
}

padding_prev_offset = (*padding_offsets)[i];
Expand Down Expand Up @@ -3614,9 +3615,7 @@ class TidbPadImpl
}
else
{
result_data.resize(result_data.size() + 1);
result_data[res_prev_offset] = '\0';
res_prev_offset++;
addTrailingZero(result_data, res_prev_offset);
}

result_offsets[i] = res_prev_offset;
Expand All @@ -3641,6 +3640,7 @@ class TidbPadImpl

if (target_len < 0 || (data_len < static_cast<ColumnString::Offset>(target_len) && pad_len == 0))
{
addTrailingZero(res, res_offset);
return true;
}

Expand Down Expand Up @@ -3692,10 +3692,7 @@ class TidbPadImpl
++left;
}
}
// Add trailing zero.
res.resize(res.size() + 1);
res[res_offset] = '\0';
res_offset++;
addTrailingZero(res, res_offset);
return false;
}

Expand All @@ -3715,6 +3712,7 @@ class TidbPadImpl

if (target_len < 0 || (data_len < static_cast<ColumnString::Offset>(target_len) && pad_len == 0))
{
addTrailingZero(res, res_offset);
return true;
}

Expand Down Expand Up @@ -3767,10 +3765,7 @@ class TidbPadImpl
copyResult(res, res_offset, data, 0, tmp_target_len);
res_offset += tmp_target_len;
}
// Add trailing zero.
res.resize(res.size() + 1);
res[res_offset] = '\0';
res_offset++;
addTrailingZero(res, res_offset);
return false;
}

Expand Down
24 changes: 24 additions & 0 deletions tests/fullstack-test/expr/pad.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,27 @@ mysql> set tidb_isolation_read_engines='tiflash'; set tidb_enforce_mpp=1; select

mysql> set tidb_isolation_read_engines='tiflash'; set tidb_enforce_mpp=1; SELECT max(lpad('y',0,c1)) FROM test.t2
max(lpad('y',0,c1))


mysql> drop table if exists test.t1
mysql> create table test.t1(c1 varchar(100), c2 int)
mysql> alter table test.t1 set tiflash replica 1
mysql> insert into test.t1 values('a', -1)
func> wait_table test t1

# crc32 will call ColumnString::getDataAt(i), which assume all string rows ends with '\0'.
mysql> select crc32(lpad(c1, c2, 'b')) from test.t1
guo-shaoge marked this conversation as resolved.
Show resolved Hide resolved
+--------------------------+
| crc32(lpad(c1, c2, 'b')) |
+--------------------------+
| NULL |
+--------------------------+

mysql> select crc32(rpad(c1, c2, 'b')) from test.t1
+--------------------------+
| crc32(rpad(c1, c2, 'b')) |
+--------------------------+
| NULL |
+--------------------------+

mysql> drop table if exists test.t1