database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

MCOL-4736 Fix cross-engine tests to run without --extern

Browse Source
This commit is contained in:
Alexander Barkov
2021-05-27 14:33:36 +04:00
parent 7a30103925
commit aaef69040a
11 changed files with 128 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mysql-test/columnstore/basic/suite.pm Normal file
View File

@ -0,0 +1,19 @@
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";
}
elsif (-d $mcs_ins_dir_installed)
{
$ENV{MCS_MCSSETCONFIG}=$mcs_ins_dir_installed . "/mcsSetConfig";
}
sub is_default { 0 }
bless { };

12
mysql-test/columnstore/basic/t/mcs44_select_crossengine_join.test
View File

@ -2,8 +2,15 @@
# Cross engine join # Cross engine join
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source include/have_innodb.inc
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
if (!$MASTER_MYPORT)
{
# Running with --extern
let $MASTER_MYPORT=`SELECT @@port`;
}
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs44_db; DROP DATABASE IF EXISTS mcs44_db;
--enable_warnings --enable_warnings
@ -15,8 +22,9 @@ USE mcs44_db;
# Enable cross engine join # Enable cross engine join
# Configure user and password in Columnstore.xml file # Configure user and password in Columnstore.xml file
# #
--exec /usr/bin/mcsSetConfig CrossEngineSupport User 'cejuser' --exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
--exec /usr/bin/mcsSetConfig CrossEngineSupport Password 'Vagrant1|0000001' --exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT
# #
# Create corresponding in the server # Create corresponding in the server
# #

13
mysql-test/columnstore/basic/t/mcs45_write_crossengine_join.test
View File

@ -2,8 +2,15 @@
# Update and Delete using Cross engine join # Update and Delete using Cross engine join
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source include/have_innodb.inc
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
if (!$MASTER_MYPORT)
{
# Running with --extern
let $MASTER_MYPORT=`SELECT @@port`;
}
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs45_db; DROP DATABASE IF EXISTS mcs45_db;
--enable_warnings --enable_warnings
@ -15,8 +22,10 @@ USE mcs45_db;
# Enable cross engine join # Enable cross engine join
# Configure user and password in Columnstore.xml file # Configure user and password in Columnstore.xml file
# #
--exec /usr/bin/mcsSetConfig CrossEngineSupport User 'cejuser' --exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
--exec /usr/bin/mcsSetConfig CrossEngineSupport Password 'Vagrant1|0000001' --exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT
# #
# Create corresponding in the server # Create corresponding in the server
# #

13
mysql-test/columnstore/basic/t/mcs63_crossengine_views.test
View File

@ -2,8 +2,15 @@
# Cross Engine View # Cross Engine View
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source include/have_innodb.inc
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
if (!$MASTER_MYPORT)
{
# Running with --extern
let $MASTER_MYPORT=`SELECT @@port`;
}
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs63_db; DROP DATABASE IF EXISTS mcs63_db;
--enable_warnings --enable_warnings
@ -15,8 +22,10 @@ USE mcs63_db;
# Enable cross engine join # Enable cross engine join
# Configure user and password in Columnstore.xml file # Configure user and password in Columnstore.xml file
# #
--exec /usr/bin/mcsSetConfig CrossEngineSupport User 'cejuser' --exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
--exec /usr/bin/mcsSetConfig CrossEngineSupport Password 'Vagrant1|0000001' --exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT
# #
# Create corresponding in the server # Create corresponding in the server
# #

13
mysql-test/columnstore/basic/t/mcs64_crossengine_group_by.test
View File

@ -2,8 +2,15 @@
# Cross Engine GROUP BY statements # Cross Engine GROUP BY statements
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source include/have_innodb.inc
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
if (!$MASTER_MYPORT)
{
# Running with --extern
let $MASTER_MYPORT=`SELECT @@port`;
}
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs64_db; DROP DATABASE IF EXISTS mcs64_db;
--enable_warnings --enable_warnings
@ -15,8 +22,10 @@ USE mcs64_db;
# Enable cross engine join # Enable cross engine join
# Configure user and password in Columnstore.xml file # Configure user and password in Columnstore.xml file
# #
--exec /usr/bin/mcsSetConfig CrossEngineSupport User 'cejuser' --exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
--exec /usr/bin/mcsSetConfig CrossEngineSupport Password 'Vagrant1|0000001' --exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT
# #
# Create corresponding in the server # Create corresponding in the server
# #

13
mysql-test/columnstore/basic/t/mcs65_crossengine_order_by.test
View File

@ -2,8 +2,15 @@
# Cross Engine ORDER BY statements # Cross Engine ORDER BY statements
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source include/have_innodb.inc
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
if (!$MASTER_MYPORT)
{
# Running with --extern
let $MASTER_MYPORT=`SELECT @@port`;
}
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs65_db; DROP DATABASE IF EXISTS mcs65_db;
--enable_warnings --enable_warnings
@ -15,8 +22,10 @@ USE mcs65_db;
# Enable cross engine join # Enable cross engine join
# Configure user and password in Columnstore.xml file # Configure user and password in Columnstore.xml file
# #
--exec /usr/bin/mcsSetConfig CrossEngineSupport User 'cejuser' --exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
--exec /usr/bin/mcsSetConfig CrossEngineSupport Password 'Vagrant1|0000001' --exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT
# #
# Create corresponding in the server # Create corresponding in the server
# #

13
mysql-test/columnstore/basic/t/mcs71_crossengine_where_groupby_orderby_limit.test
View File

@ -2,8 +2,15 @@
# Cross Engine GROUP BY..ORDER BY..LIMIT statements # Cross Engine GROUP BY..ORDER BY..LIMIT statements
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source include/have_innodb.inc
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
if (!$MASTER_MYPORT)
{
# Running with --extern
let $MASTER_MYPORT=`SELECT @@port`;
}
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs71_db; DROP DATABASE IF EXISTS mcs71_db;
--enable_warnings --enable_warnings
@ -15,8 +22,10 @@ USE mcs71_db;
# Enable cross engine join # Enable cross engine join
# Configure user and password in Columnstore.xml file # Configure user and password in Columnstore.xml file
# #
--exec /usr/bin/mcsSetConfig CrossEngineSupport User 'cejuser' --exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
--exec /usr/bin/mcsSetConfig CrossEngineSupport Password 'Vagrant1|0000001' --exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT
# #
# Create corresponding in the server # Create corresponding in the server
# #

13
mysql-test/columnstore/basic/t/mcs79_exists.test
View File

@ -2,8 +2,15 @@
# Test EXISTS clause # Test EXISTS clause
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source include/have_innodb.inc
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
if (!$MASTER_MYPORT)
{
# Running with --extern
let $MASTER_MYPORT=`SELECT @@port`;
}
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs79_db; DROP DATABASE IF EXISTS mcs79_db;
--enable_warnings --enable_warnings
@ -15,8 +22,10 @@ USE mcs79_db;
# Enable cross engine join # Enable cross engine join
# Configure user and password in Columnstore.xml file # Configure user and password in Columnstore.xml file
# #
--exec /usr/bin/mcsSetConfig CrossEngineSupport User 'cejuser' --exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
--exec /usr/bin/mcsSetConfig CrossEngineSupport Password 'Vagrant1|0000001' --exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT
# #
# Create corresponding in the server # Create corresponding in the server
# #

13
mysql-test/columnstore/basic/t/mcs80_set_operations.test
View File

@ -2,8 +2,15 @@
# Test Set operators like UNION, UNION ALL, EXCEPT, INTERSECT # Test Set operators like UNION, UNION ALL, EXCEPT, INTERSECT
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source include/have_innodb.inc
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
if (!$MASTER_MYPORT)
{
# Running with --extern
let $MASTER_MYPORT=`SELECT @@port`;
}
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs80_db; DROP DATABASE IF EXISTS mcs80_db;
--enable_warnings --enable_warnings
@ -15,8 +22,10 @@ USE mcs80_db;
# Enable cross engine join # Enable cross engine join
# Configure user and password in Columnstore.xml file # Configure user and password in Columnstore.xml file
# #
--exec /usr/bin/mcsSetConfig CrossEngineSupport User 'cejuser' --exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
--exec /usr/bin/mcsSetConfig CrossEngineSupport Password 'Vagrant1|0000001' --exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT
# #
# Create corresponding in the server # Create corresponding in the server
# #

13
mysql-test/columnstore/basic/t/mcs85_derived_table.test
View File

@ -2,8 +2,15 @@
# Test Derived tables # Test Derived tables
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source include/have_innodb.inc
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
if (!$MASTER_MYPORT)
{
# Running with --extern
let $MASTER_MYPORT=`SELECT @@port`;
}
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs85_db; DROP DATABASE IF EXISTS mcs85_db;
--enable_warnings --enable_warnings
@ -15,8 +22,10 @@ USE mcs85_db;
# Enable cross engine join # Enable cross engine join
# Configure user and password in Columnstore.xml file # Configure user and password in Columnstore.xml file
# #
--exec /usr/bin/mcsSetConfig CrossEngineSupport User 'cejuser' --exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
--exec /usr/bin/mcsSetConfig CrossEngineSupport Password 'Vagrant1|0000001' --exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT
# #
# Create corresponding in the server # Create corresponding in the server
# #

13
mysql-test/columnstore/basic/t/mcs90_aggregate_functions.test
View File

@ -2,8 +2,15 @@
# Test Aggregate Functions # Test Aggregate Functions
# Author: Bharath, bharath.bokka@mariadb.com # Author: Bharath, bharath.bokka@mariadb.com
# #
-- source include/have_innodb.inc
-- source ../include/have_columnstore.inc -- source ../include/have_columnstore.inc
if (!$MASTER_MYPORT)
{
# Running with --extern
let $MASTER_MYPORT=`SELECT @@port`;
}
--disable_warnings --disable_warnings
DROP DATABASE IF EXISTS mcs90_db; DROP DATABASE IF EXISTS mcs90_db;
--enable_warnings --enable_warnings
@ -15,8 +22,10 @@ USE mcs90_db;
# Enable cross engine join # Enable cross engine join
# Configure user and password in Columnstore.xml file # Configure user and password in Columnstore.xml file
# #
--exec /usr/bin/mcsSetConfig CrossEngineSupport User 'cejuser' --exec $MCS_MCSSETCONFIG CrossEngineSupport User 'cejuser'
--exec /usr/bin/mcsSetConfig CrossEngineSupport Password 'Vagrant1|0000001' --exec $MCS_MCSSETCONFIG CrossEngineSupport Password 'Vagrant1|0000001'
--exec $MCS_MCSSETCONFIG CrossEngineSupport Port $MASTER_MYPORT
# #
# Create corresponding in the server # Create corresponding in the server
# #