database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge pull request #851 from mariadb-corporation/fix-packaging

Browse Source 
Fix my.cnf clash
This commit is contained in:
benthompson15
2019-09-05 18:27:45 -05:00
committed by GitHub
parent 64ceb8686f 7da5b21fe2
commit 016523ef47
434 changed files with 102 additions and 7866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/mysql/CMakeLists.txt
View File

@ -87,11 +87,13 @@ install(FILES syscatalog_mysql.sql
calremoveuserpriority.sql
calshowprocesslist.sql
columnstore_info.sql
my.cnf
DESTINATION ${ENGINE_MYSQLDIR} COMPONENT storage-engine)
install(PROGRAMS install_calpont_mysql.sh mysql-Columnstore
DESTINATION ${ENGINE_MYSQLDIR} COMPONENT storage-engine)
install(FILES columnstore.cnf
DESTINATION /etc/my.cnf.d COMPONENT storage-engine)
#AM_CPPFLAGS = $(idb_common_includes) $(idb_cppflags)
#AM_CFLAGS = $(idb_cflags)

53
dbcon/mysql/columnstore.cnf Normal file
View File

@ -0,0 +1,53 @@
# The following options will be passed to all MySQL clients
[client]
#password = your_password
socket = /usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock
# Here follows entries for some specific programs
# The MySQL server
[mysqld]
socket = /usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock
datadir = /usr/local/mariadb/columnstore/mysql/db
sql_mode="ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
#columnstore_processing_handlers_fallback = OFF;
# Enable compression by default on create, set to 0 to turn off
#columnstore_compression_type=2
# Default for string table threshhold
#columnstore_stringtable_threshold=20
# infinidb local query flag
#columnstore_local_query=0
#columnstore_diskjoin_smallsidelimit=0
#columnstore_diskjoin_largesidelimit=0
#columnstore_diskjoin_bucketsize=100
#columnstore_um_mem_limit=0
#columnstore_use_import_for_batchinsert=1
#columnstore_import_for_batchinsert_delimiter=7
basedir = /usr/local/mariadb/columnstore/mysql/
character-sets-dir = /usr/local/mariadb/columnstore/mysql/share/charsets/
lc-messages-dir = /usr/local/mariadb/columnstore/mysql/share/
plugin_dir = /usr/local/mariadb/columnstore/mysql/lib/plugin
# Replication Master Server (default)
# binary logging is required for replication
# log-bin=mysql-bin
binlog_format=ROW
# required unique id between 1 and 2^32 - 1
# defaults to 1 if master-host
# uses to 2+ if slave-host
server-id = 1
# binary logging - not required for slaves, but recommended
log-bin=/usr/local/mariadb/columnstore/mysql/db/mysql-bin
relay-log=/usr/local/mariadb/columnstore/mysql/db/relay-bin
relay-log-index = /usr/local/mariadb/columnstore/mysql/db/relay-bin.index
relay-log-info-file = /usr/local/mariadb/columnstore/mysql/db/relay-bin.info
lower_case_table_names=1

14
dbcon/mysql/install_calpont_mysql.sh
View File

@ -24,9 +24,7 @@ for arg in "$@"; do
fi
done
df=$installdir/mysql/my.cnf
$installdir/mysql/bin/mysql --defaults-extra-file=$df --force --user=root mysql 2> ${tmpdir}/mysql_install.log <<EOD
$installdir/mysql/bin/mysql --force --user=root mysql 2> ${tmpdir}/mysql_install.log <<EOD
INSTALL PLUGIN columnstore SONAME 'libcalmysql.so';
INSTALL PLUGIN columnstore_tables SONAME 'is_columnstore_tables.so';
INSTALL PLUGIN columnstore_columns SONAME 'is_columnstore_columns.so';
@ -78,9 +76,9 @@ CREATE TABLE IF NOT EXISTS infinidb_querystats.priority
insert ignore into infinidb_querystats.priority values ('High', 100),('Medium', 66), ('Low', 33);
EOD
$installdir/mysql/bin/mysql --defaults-extra-file=$df --user=root mysql 2>/dev/null <$installdir/mysql/syscatalog_mysql.sql
$installdir/mysql/bin/mysql --defaults-extra-file=$df --user=root mysql 2>/dev/null <$installdir/mysql/calsetuserpriority.sql
$installdir/mysql/bin/mysql --defaults-extra-file=$df --user=root mysql 2>/dev/null <$installdir/mysql/calremoveuserpriority.sql
$installdir/mysql/bin/mysql --defaults-extra-file=$df --user=root mysql 2>/dev/null <$installdir/mysql/calshowprocesslist.sql
$installdir/mysql/bin/mysql --defaults-extra-file=$df --user=root mysql 2>/dev/null <$installdir/mysql/columnstore_info.sql
$installdir/mysql/bin/mysql --user=root mysql 2>/dev/null <$installdir/mysql/syscatalog_mysql.sql
$installdir/mysql/bin/mysql --user=root mysql 2>/dev/null <$installdir/mysql/calsetuserpriority.sql
$installdir/mysql/bin/mysql --user=root mysql 2>/dev/null <$installdir/mysql/calremoveuserpriority.sql
$installdir/mysql/bin/mysql --user=root mysql 2>/dev/null <$installdir/mysql/calshowprocesslist.sql
$installdir/mysql/bin/mysql --user=root mysql 2>/dev/null <$installdir/mysql/columnstore_info.sql

184
dbcon/mysql/my.cnf
View File

@ -1,184 +0,0 @@
#
# $Id: my.cnf 9502 2013-05-09 15:37:30Z pleblanc $
#
# Example MySQL config file for very large systems.
#
# This is for a large system with memory of 1G-2G where the system runs mainly
# MySQL.
#
# You can copy this file to
# /etc/my.cnf to set global options,
# mysql-data-dir/my.cnf to set server-specific options (in this
# installation this directory is /var/lib/mysql) or
# ~/.my.cnf to set user-specific options.
#
# In this file, you can use all long options that a program supports.
# If you want to know which options a program supports, run the program
# with the "--help" option.
# The following options will be passed to all MySQL clients
[client]
#password = your_password
port = 3306
socket = /usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock
# Here follows entries for some specific programs
# The MySQL server
[mysqld]
port = 3306
socket = /usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock
datadir = /usr/local/mariadb/columnstore/mysql/db
skip-external-locking
key_buffer_size = 512M
max_allowed_packet = 1M
table_cache = 512
sort_buffer_size = 4M
read_buffer_size = 4M
read_rnd_buffer_size = 16M
myisam_sort_buffer_size = 64M
thread_cache_size = 8
query_cache_size = 0
# Try number of CPU's*2 for thread_concurrency
#thread_concurrency = 8
thread_stack = 512K
lower_case_table_names=1
group_concat_max_len=512
sql_mode="ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
#columnstore_processing_handlers_fallback = OFF;
# Enable compression by default on create, set to 0 to turn off
#columnstore_compression_type=2
# Default for string table threshhold
#columnstore_stringtable_threshold=20
# infinidb local query flag
#columnstore_local_query=0
#columnstore_diskjoin_smallsidelimit=0
#columnstore_diskjoin_largesidelimit=0
#columnstore_diskjoin_bucketsize=100
#columnstore_um_mem_limit=0
#columnstore_use_import_for_batchinsert=1
#columnstore_import_for_batchinsert_delimiter=7
basedir = /usr/local/mariadb/columnstore/mysql/
character-sets-dir = /usr/local/mariadb/columnstore/mysql/share/charsets/
lc-messages-dir = /usr/local/mariadb/columnstore/mysql/share/
plugin_dir = /usr/local/mariadb/columnstore/mysql/lib/plugin
# Don't listen on a TCP/IP port at all. This can be a security enhancement,
# if all processes that need to connect to mysqld run on the same host.
# All interaction with mysqld must be made via Unix sockets or named pipes.
# Note that using this option without enabling named pipes on Windows
# (via the "enable-named-pipe" option) will render mysqld useless!
#
#skip-networking
# Replication Master Server (default)
# binary logging is required for replication
# log-bin=mysql-bin
binlog_format=ROW
# required unique id between 1 and 2^32 - 1
# defaults to 1 if master-host
# uses to 2+ if slave-host
server-id = 1
# Replication Slave (comment out master section to use this)
#
# To configure this host as a replication slave, you can choose between
# two methods :
#
# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
# the syntax is:
#
# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
# MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
#
# where you replace <host>, <user>, <password> by quoted strings and
# <port> by the master's port number (3306 by default).
#
# Example:
#
# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
# MASTER_USER='joe', MASTER_PASSWORD='secret';
#
# OR
#
# 2) Set the variables below. However, in case you choose this method, then
# start replication for the first time (even unsuccessfully, for example
# if you mistyped the password in master-password and the slave fails to
# connect), the slave will create a master.info file, and any later
# change in this file to the variables' values below will be ignored and
# overridden by the content of the master.info file, unless you shutdown
# the slave server, delete master.info and restart the slaver server.
# For that reason, you may want to leave the lines below untouched
# (commented) and instead use CHANGE MASTER TO (see above)
#
#
# The replication master for this slave - required
#master-host = <hostname>
#
# The username the slave will use for authentication when connecting
# to the master - required
#master-user = <username>
#
# The password the slave will authenticate with when connecting to
# the master - required
#master-password = <password>
#
# The port the master is listening on.
# optional - defaults to 3306
#master-port = <port>
#
# binary logging - not required for slaves, but recommended
log-bin=/usr/local/mariadb/columnstore/mysql/db/mysql-bin
relay-log=/usr/local/mariadb/columnstore/mysql/db/relay-bin
relay-log-index = /usr/local/mariadb/columnstore/mysql/db/relay-bin.index
relay-log-info-file = /usr/local/mariadb/columnstore/mysql/db/relay-bin.info
# Point the following paths to different dedicated disks
#tmpdir = /tmp/
#log-update = /path-to-dedicated-directory/hostname
# Uncomment the following if you are using InnoDB tables
#innodb_data_home_dir = /usr/local/mariadb/columnstore/mysql/lib/mysql/
#innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
#innodb_log_group_home_dir = /usr/local/mariadb/columnstore/mysql/lib/mysql/
#innodb_log_arch_dir = /usr/local/mariadb/columnstore/mysql/lib/mysql/
# You can set .._buffer_pool_size up to 50 - 80 %
# of RAM but beware of setting memory usage too high
#innodb_buffer_pool_size = 384M
#innodb_additional_mem_pool_size = 20M
# Set .._log_file_size to 25 % of buffer pool size
#innodb_log_file_size = 100M
#innodb_log_buffer_size = 8M
#innodb_flush_log_at_trx_commit = 1
#innodb_lock_wait_timeout = 50
[mysqldump]
quick
max_allowed_packet = 16M
[mysql]
no-auto-rehash
# Remove the next comment character if you are not familiar with SQL
#safe-updates
[isamchk]
key_buffer_size = 256M
sort_buffer_size = 256M
read_buffer = 2M
write_buffer = 2M
[myisamchk]
key_buffer_size = 256M
sort_buffer_size = 256M
read_buffer = 2M
write_buffer = 2M
[mysqlhotcopy]
interactive-timeout

237
dbcon/mysql/schemaSync.pl
View File

@ -1,237 +0,0 @@
#!/usr/bin/perl -w
#
# $Id: schemaSync.pl 9731 2013-08-01 16:58:35Z rdempsey $
use DBI;
use DBD::mysql;
$| = 1;
$cfgfile='/usr/local/mariadb/columnstore/mysql/my.cnf';
$username = 'root';
$auth = '';
%attr = ();
@calpont_objects = ();
sub gather_calpont_objects
{
$stmt = <<EOD
select
`schema`, tablename, columnname, objectid, dictobjectid, datatype,
scale, prec, columnlength, columnposition, compressiontype
from
syscolumn
order by
`schema`, tablename, columnposition;
EOD
;
my $sth = $dbh->prepare($stmt);
$sth->execute();
my @row_ary = $sth->fetchrow_array();
while ($#row_ary >= 0)
{
push(@calpont_objects, [@row_ary]);
@row_ary = $sth->fetchrow_array();
}
}
sub gather_mysql_objects
{
}
sub diff_calpont_mysql
{
}
sub diff_mysql_calpont
{
}
sub conflicts
{
}
$database='calpontsys';
$data_source = 'DBI:mysql:database=' . $database . ':mysql_read_default_file=' . $cfgfile . '';
$dbh = DBI->connect($data_source, $username, $auth, \%attr);
gather_calpont_objects;
$dbh->disconnect;
sub datatype2name
{
my ($dt) = @_;
if ($dt == 0)
{
$dts = 'bit';
}
elsif ($dt == 1)
{
$dts = 'tinyint';
}
elsif ($dt == 2)
{
$dts = 'char';
}
elsif ($dt == 3)
{
$dts = 'smallint';
}
elsif ($dt == 4)
{
$dts = 'decimal';
}
elsif ($dt == 5)
{
$dts = 'medint';
}
elsif ($dt == 6)
{
$dts = 'int';
}
elsif ($dt == 7)
{
$dts = 'float';
}
elsif ($dt == 8)
{
$dts = 'date';
}
elsif ($dt == 9)
{
$dts = 'bigint';
}
elsif ($dt == 10)
{
$dts = 'double';
}
elsif ($dt == 11)
{
$dts = 'datetime';
}
elsif ($dt == 12)
{
$dts = 'varchar';
}
elsif ($dt == 13)
{
$dts = 'varbinary';
}
elsif ($dt == 14)
{
$dts = 'clob';
}
elsif ($dt == 15)
{
$dts = 'blob';
}
elsif ($dt == 16)
{
$dts = 'tinyint unsigned';
}
elsif ($dt == 17)
{
$dts = 'smallint unsigned';
}
elsif ($dt == 18)
{
$dts = 'decimal unsigned';
}
elsif ($dt == 19)
{
$dts = 'medint unsigned';
}
elsif ($dt == 20)
{
$dts = 'int unsigned';
}
elsif ($dt == 21)
{
$dts = 'float unsigned';
}
elsif ($dt == 22)
{
$dts = 'bigint unsigned';
}
elsif ($dt == 23)
{
$dts = 'double unsigned';
}
else
{
$dts = "$dt";
}
return $dts;
}
%schemas = ();
foreach $co (@calpont_objects)
{
$schema = "$@$co->[0]";
$schemas{$schema} = 1;
}
%schematables = ();
foreach $schema (keys %schemas)
{
foreach $co (@calpont_objects)
{
next if ("$@$co->[0]" ne $schema);
$schematable = $schema . ".$@$co->[1]";
$schematables{$schematable} = 1;
}
}
$curdb='';
foreach $schema (keys %schemas)
{
foreach $schematable (keys %schematables)
{
next if (!($schematable =~ /^$schema\./));
$first = 1;
foreach $co (@calpont_objects)
{
$schtbl = "$@$co->[0].$@$co->[1]";
next if ($schematable ne $schtbl);
$ty = "$@$co->[5]";
$nm = datatype2name($ty);
$sc = "$@$co->[6]";
if (($nm eq 'smallint' || $nm eq 'int' || $nm eq 'bigint') && $sc > 0)
{
$nm = 'decimal';
}
if ($first == 1)
{
if ("$@$co->[0]" ne $curdb)
{
print "create database if not exists $@$co->[0];\nuse $@$co->[0];\n\n";
$curdb = "$@$co->[0]";
}
print "create table if not exists $@$co->[1] (\n";
$first = 0;
}
else
{
print ", ";
}
print "$@$co->[2] $nm";
if ($nm eq 'char' || $nm eq 'varchar' || $nm eq 'varbinary')
{
print "($@$co->[8])";
}
elsif ($nm eq 'decimal')
{
print "($@$co->[7],$@$co->[6])";
}
print " comment 'compression=$@$co->[10]'\n";
}
print ") engine=infinidb comment='schema sync only';\n\n";
}
}
gather_mysql_objects;
diff_calpont_mysql;
diff_mysql_calpont;
conflicts;