database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

Revert "fix(MCOL-5386): Bitwise aggregation functions do not work with wide d…"

Browse Source 
This reverts commit e0f3bf8322.
This commit is contained in:
Leonid Fedorov
2025-05-20 19:12:33 +04:00
parent 127dd09a7a
commit d09b7496e4
4 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/columnstore/bugfixes/mcol_5386.result
View File

@@ -2,16 +2,10 @@ DROP DATABASE IF EXISTS mcol_5386;
CREATE DATABASE mcol_5386; CREATE DATABASE mcol_5386;
USE mcol_5386; USE mcol_5386;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
create table t1(c decimal(38)) engine=columnstore; create table t1(c decimal(19)) engine=columnstore;
insert into t1(c) values (11111111111111111111111111111111111111); insert into t1(c) values (-2);
select bit_or(c), bit_xor(c), bit_and(c) from t1; select bit_or(c), bit_xor(c), bit_and(c) from t1;
bit_or(c) bit_xor(c) bit_and(c) bit_or(c) bit_xor(c) bit_and(c)
10324568879994270151 10324568879994270151 10324568879994270151 18446744073709551614 18446744073709551614 18446744073709551614
DROP TABLE IF EXISTS t1;
create table t1(c decimal(18)) engine=columnstore;
insert into t1(c) values (999999999999999999);
select bit_or(c), bit_xor(c), bit_and(c) from t1;
bit_or(c) bit_xor(c) bit_and(c)
999999999999999999 999999999999999999 999999999999999999
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
DROP DATABASE mcol_5386; DROP DATABASE mcol_5386;

11
mysql-test/columnstore/bugfixes/mcol_5386.test
View File

@@ -8,15 +8,8 @@ USE mcol_5386;
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
--enable_warnings --enable_warnings
create table t1(c decimal(38)) engine=columnstore; create table t1(c decimal(19)) engine=columnstore;
insert into t1(c) values (11111111111111111111111111111111111111); insert into t1(c) values (-2);
select bit_or(c), bit_xor(c), bit_and(c) from t1;
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
create table t1(c decimal(18)) engine=columnstore;
insert into t1(c) values (999999999999999999);
select bit_or(c), bit_xor(c), bit_and(c) from t1; select bit_or(c), bit_xor(c), bit_and(c) from t1;
--disable_warnings --disable_warnings

11
utils/rowgroup/rowaggregation.cpp
View File

@@ -1538,24 +1538,21 @@ void RowAggregation::doBitOp(const Row& rowIn, int64_t colIn, int64_t colOut, in
case execplan::CalpontSystemCatalog::MEDINT: case execplan::CalpontSystemCatalog::MEDINT:
case execplan::CalpontSystemCatalog::INT: case execplan::CalpontSystemCatalog::INT:
case execplan::CalpontSystemCatalog::BIGINT: case execplan::CalpontSystemCatalog::BIGINT:
{
valIn = rowIn.getIntField(colIn);
break;
}
// According to SQL specification, the result must fit in int64_t,
// therefore, the upper 8 bytes for data types >= 8 bytes are ignored
case execplan::CalpontSystemCatalog::DECIMAL: case execplan::CalpontSystemCatalog::DECIMAL:
case execplan::CalpontSystemCatalog::UDECIMAL: case execplan::CalpontSystemCatalog::UDECIMAL:
{ {
valIn = rowIn.getIntField<8>(colIn); valIn = rowIn.getIntField(colIn);
if ((fRowGroupIn.getScale())[colIn] != 0) if ((fRowGroupIn.getScale())[colIn] != 0)
{ {
valIn = rowIn.getIntField(colIn);
valIn /= IDB_pow[fRowGroupIn.getScale()[colIn] - 1]; valIn /= IDB_pow[fRowGroupIn.getScale()[colIn] - 1];
if (valIn > 0) if (valIn > 0)
valIn += 5; valIn += 5;
else if (valIn < 0) else if (valIn < 0)
valIn -= 5; valIn -= 5;
valIn /= 10; valIn /= 10;
} }

2
utils/rowgroup/rowgroup.h
View File

@@ -919,6 +919,8 @@ inline int64_t Row::getIntField(uint32_t colIndex) const
case 8: return *((int64_t*)&data[offsets[colIndex]]); case 8: return *((int64_t*)&data[offsets[colIndex]]);
case 16: return *((int128_t*)&data[offsets[colIndex]]);
default: idbassert(0); throw std::logic_error("Row::getIntField(): bad length."); default: idbassert(0); throw std::logic_error("Row::getIntField(): bad length.");
} }
} }