database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +03:00
Code Activity

Merge branch 'stable-23.10' into feat/MCOL-6072-parallel-scan-4-CES-4

Browse Source
This commit is contained in:
Leonid Fedorov
2025-09-09 20:36:06 +04:00
committed by GitHub
parent 0bf8241e3c 4f3ed2a6bd
commit 00c81ab758
17 changed files with 346 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/columnstore/devregression/suite.opt Normal file
View File

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

29
mysql-test/columnstore/devregression/suite.pm Normal file
View File

@@ -0,0 +1,29 @@
package My::Suite::ColumnStore;
@ISA = qw(My::Suite);
my $mcs_bin_dir_compiled=$::bindir . '/storage/columnstore/columnstore/bin';
my $mcs_ins_dir_installed=$::bindir . '/bin';
if (-d $mcs_bin_dir_compiled)
{
$ENV{MCS_MCSSETCONFIG}=$mcs_bin_dir_compiled . "/mcsSetConfig";
$ENV{MCS_CPIMPORT}=$mcs_bin_dir_compiled . "/cpimport";
$ENV{MCS_SYSCATALOG_MYSQL_SQL}=$::mysqld_variables{'basedir'} . "/storage/columnstore/columnstore/dbcon/mysql/syscatalog_mysql.sql";
}
elsif (-d $mcs_ins_dir_installed)
{
$ENV{MCS_MCSSETCONFIG}=$mcs_ins_dir_installed . "/mcsSetConfig";
$ENV{MCS_CPIMPORT}=$mcs_ins_dir_installed . "/cpimport";
$ENV{MCS_SYSCATALOG_MYSQL_SQL}=$::mysqld_variables{'basedir'} . "/share/columnstore/syscatalog_mysql.sql";
}
sub is_default { 0 }
sub start_test {
# we should guard this for --force-restart flag condition.
my ($self, $tinfo)= @_;
My::Suite::start_test(@_);
}
bless { };

6
mysql-test/columnstore/devregression/t/mcs7238_regression_MCOL-830.test
View File

@@ -5,6 +5,9 @@
# -------------------------------------------------------------- #
#
--source ../include/have_columnstore.inc
--source ../include/cross_engine.inc
#
USE tpch1;
#
@@ -32,3 +35,6 @@ DROP TABLE test.mcol830b;
--enable_warnings
#
--source ../include/drop_cross_engine.inc

14
mysql-test/columnstore/include/cross_engine.inc
View File

@@ -2,8 +2,16 @@
# Enable cross engine join
# Configure user and password in Columnstore.xml file
# -------------------------------------------------------------- #
--exec /usr/bin/mcsSetConfig CrossEngineSupport User 'cejuser'
--exec /usr/bin/mcsSetConfig CrossEngineSupport Password 'Vagrant1|0000001'
--disable_query_log
if (!$MASTER_MYPORT)
{
# Running with --extern
let $MASTER_MYPORT=`SELECT @@port`;
}
--exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT
# -------------------------------------------------------------- #
@@ -16,4 +24,4 @@ CREATE USER IF NOT EXISTS'cejuser'@'localhost' IDENTIFIED BY 'Vagrant1|0000001';
GRANT ALL PRIVILEGES ON *.* TO 'cejuser'@'localhost';
FLUSH PRIVILEGES;
--enable_query_log

3
mysql-test/columnstore/include/drop_cross_engine.inc
View File

@@ -1,2 +1,5 @@
--disable_query_log
REVOKE ALL PRIVILEGES ON *.* FROM 'cejuser'@'localhost';
DROP USER 'cejuser'@'localhost';
--enable_query_log