database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge pull request #1769 from mariadb-corporation/bar-develop-MCOL-4527

Browse Source 
A join patch for MCOL-4527 (a performance hack) and MCOL-4539 (a bug …
This commit is contained in:
David.Hall
2021-02-17 13:31:35 -06:00
committed by GitHub
parent 8ca688d8d5 5bcc1cd1f0
commit b35e1ee395
7 changed files with 119 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mtr/basic/r/ctype_cmp_char4_latin1_bin.result Normal file
View File

@ -0,0 +1,43 @@
SET NAMES utf8;
#
# MCOL-4539 WHERE short_char_column='literal' ignores the collation on a huge table
#
DROP DATABASE IF EXISTS mcs_ctype_cmp_char4_latin1_bin;
CREATE DATABASE mcs_ctype_cmp_char4_latin1_bin;
USE mcs_ctype_cmp_char4_latin1_bin;
CREATE TABLE t1 (id INT, c CHAR(4) CHARACTER SET latin1 COLLATE latin1_bin);
INSERT INTO t1 VALUES (0,'aaaa');
INSERT INTO t1 VALUES (0,'bbbb');
INSERT INTO t1 VALUES (0,'AAAA');
INSERT INTO t1 VALUES (0,'BBBB');
INSERT INTO t1 VALUES (0,'aaaa');
INSERT INTO t1 VALUES (0,'bbbb');
INSERT INTO t1 VALUES (0,'AAAA');
INSERT INTO t1 VALUES (0,'BBBB');
CREATE TABLE t2 (c CHAR(4) CHARACTER SET latin1 COLLATE latin1_bin);
INSERT INTO t2 SELECT t1_5.c FROM
t1 t1_0
JOIN t1 t1_1 USING (id)
JOIN t1 t1_2 USING (id)
JOIN t1 t1_3 USING (id)
JOIN t1 t1_4 USING (id)
JOIN t1 t1_5 USING (id)
;
SELECT COUNT(*) FROM t2;
COUNT(*)
262144
SELECT DISTINCT c FROM t2 WHERE c='aaaa';
c
aaaa
SELECT DISTINCT c FROM t2 WHERE c='AAAA';
c
AAAA
CREATE TABLE t3 LIKE t2;
INSERT INTO t3 SELECT * FROM t2 WHERE c='aaaa';
SELECT c, MIN(c), MAX(c), COUNT(*) FROM t3 GROUP BY c;
c MIN(c) MAX(c) COUNT(*)
aaaa aaaa aaaa 65536
DROP TABLE t3;
DROP TABLE t2;
DROP TABLE t1;
DROP DATABASE mcs_ctype_cmp_char4_latin1_bin;

1
mtr/basic/suite.opt Normal file
View File

@ -0,0 +1 @@
--plugin-load-add=$HA_COLUMNSTORE_SO

51
mtr/basic/t/ctype_cmp_char4_latin1_bin.test Normal file
View File

@ -0,0 +1,51 @@
--source ../include/have_columnstore.inc
--source ctype_cmp_combinations.inc
--source default_storage_engine_by_combination.inc
SET NAMES utf8;
--echo #
--echo # MCOL-4539 WHERE short_char_column='literal' ignores the collation on a huge table
--echo #
--disable_warnings
DROP DATABASE IF EXISTS mcs_ctype_cmp_char4_latin1_bin;
--enable_warnings
CREATE DATABASE mcs_ctype_cmp_char4_latin1_bin;
USE mcs_ctype_cmp_char4_latin1_bin;
CREATE TABLE t1 (id INT, c CHAR(4) CHARACTER SET latin1 COLLATE latin1_bin);
INSERT INTO t1 VALUES (0,'aaaa');
INSERT INTO t1 VALUES (0,'bbbb');
INSERT INTO t1 VALUES (0,'AAAA');
INSERT INTO t1 VALUES (0,'BBBB');
INSERT INTO t1 VALUES (0,'aaaa');
INSERT INTO t1 VALUES (0,'bbbb');
INSERT INTO t1 VALUES (0,'AAAA');
INSERT INTO t1 VALUES (0,'BBBB');
CREATE TABLE t2 (c CHAR(4) CHARACTER SET latin1 COLLATE latin1_bin);
INSERT INTO t2 SELECT t1_5.c FROM
t1 t1_0
JOIN t1 t1_1 USING (id)
JOIN t1 t1_2 USING (id)
JOIN t1 t1_3 USING (id)
JOIN t1 t1_4 USING (id)
JOIN t1 t1_5 USING (id)
;
SELECT COUNT(*) FROM t2;
SELECT DISTINCT c FROM t2 WHERE c='aaaa';
SELECT DISTINCT c FROM t2 WHERE c='AAAA';
CREATE TABLE t3 LIKE t2;
INSERT INTO t3 SELECT * FROM t2 WHERE c='aaaa';
SELECT c, MIN(c), MAX(c), COUNT(*) FROM t3 GROUP BY c;
DROP TABLE t3;
DROP TABLE t2;
DROP TABLE t1;
DROP DATABASE mcs_ctype_cmp_char4_latin1_bin;

18
mtr/basic/t/ctype_cmp_create.inc
View File

@ -1,20 +1,4 @@
--disable_query_log
SET @combination=NULL;
if ($MTR_COMBINATION_MYISAM)
{
SET @combination="MYISAM";
}
if ($MTR_COMBINATION_COLUMNSTORE)
{
SET @combination="COLUMNSTORE";
}
#
# If we're running without combinations, e.g. with --extern,
# then set default_storage_engine to ColumnStore.
# Otherwise (when running without --extern) it's set by the *.combinations file.
#
SET @@default_storage_engine=COALESCE(@combination,'ColumnStore');
--enable_query_log
--source default_storage_engine_by_combination.inc
--disable_query_log
--eval SET @mysqltest_file='$MYSQLTEST_FILE';

17
mtr/basic/t/default_storage_engine_by_combination.inc Normal file
View File

@ -0,0 +1,17 @@
--disable_query_log
SET @combination=NULL;
if ($MTR_COMBINATION_MYISAM)
{
SET @combination="MYISAM";
}
if ($MTR_COMBINATION_COLUMNSTORE)
{
SET @combination="COLUMNSTORE";
}
#
# If we're running without combinations, e.g. with --extern,
# then set default_storage_engine to ColumnStore.
# Otherwise (when running without --extern) it's set by the *.combinations file.
#
SET @@default_storage_engine=COALESCE(@combination,'ColumnStore');
--enable_query_log

5
primitives/linux-port/column.cpp
View File

@ -707,6 +707,11 @@ inline bool colCompare(int64_t val1, int64_t val2, uint8_t COP, uint8_t rf,
{
if (!regex.used && !rf)
{
// A temporary hack for xxx_nopad_bin collations
// TODO: MCOL-4534 Improve comparison performance in 8bit nopad_bin collations
if ((typeHolder.getCharset().state & (MY_CS_BINSORT|MY_CS_NOPAD)) ==
(MY_CS_BINSORT|MY_CS_NOPAD))
return colCompare_(order_swap(val1), order_swap(val2), COP);
utils::ConstString s1 = {reinterpret_cast<const char*>(&val1), 8};
utils::ConstString s2 = {reinterpret_cast<const char*>(&val2), 8};
return colCompareStr(typeHolder, COP, s1.rtrimZero(), s2.rtrimZero());

1
primitives/primproc/columncommand.cpp
View File

@ -842,6 +842,7 @@ void ColumnCommand::duplicate(ColumnCommand* cc)
cc->colType.colDataType = colType.colDataType;
cc->colType.compressionType = colType.compressionType;
cc->colType.colWidth = colType.colWidth;
cc->colType.charsetNumber = colType.charsetNumber;
cc->BOP = BOP;
cc->filterCount = filterCount;
cc->fFilterFeeder = fFilterFeeder;