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

Browse Source
This commit is contained in:
Justin Swanhart
2016-06-01 17:30:57 -04:00
parent f16c8a63e3 84eeae5a34
commit be45f0a40f
258 changed files with 1875 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/ddlpackageproc/createtableprocessor.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/execplan/calpontsystemcatalog.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/execplan/calpontsystemcatalog.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

6
dbcon/execplan/tdriver-sm.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -148,7 +148,7 @@ public:
void destroySemaphores()
{
key_t semkey;
char* semseed = "/usr/local/MariaDB/Columnstore/etc/Calpont.xml";
char* semseed = "/usr/local/mariadb/columnstore/etc/Calpont.xml";
int sems, err;
// semkey = ftok(semseed, 0x2149bdd2); // these things must match in the SM constructor
@ -166,7 +166,7 @@ public:
void destroyShmseg()
{
key_t shmkey;
char* shmseed = "/usr/local/MariaDB/Columnstore/etc/Calpont.xml";
char* shmseed = "/usr/local/mariadb/columnstore/etc/Calpont.xml";
int shms, err;
// shmkey = ftok(shmseed, 0x2149bdd2); // these things much match in the SM constructor

4
dbcon/execplan/tdriver.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -1082,7 +1082,7 @@ public:
int oid, oidBase;
// fake out the objmgr...
setenv("CALPONT_CONFIG_FILE", "/usr/local/MariaDB/Columnstore/etc/Calpont.xml", 1);
setenv("CALPONT_CONFIG_FILE", "/usr/local/mariadb/columnstore/etc/Calpont.xml", 1);
Config* cf = Config::makeConfig();
cf->setConfig("OIDManager", "OIDBitmapFile", "./oidbitmap");

2
dbcon/joblist/fdtests.pl
View File

@ -6,7 +6,7 @@ use DBI;
use DBD::mysql;
$databasename='calpont';
$cnffile='/usr/local/MariaDB/Columnstore/mysql/my.cnf';
$cnffile='/usr/local/mariadb/columnstore/mysql/my.cnf';
$data_source = 'DBI:mysql:database=' . $databasename . ':mysql_read_default_file=' . $cnffile . '';
$username = 'root';

2
dbcon/joblist/jlf_common.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/joblist/joblist.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/joblist/joblist.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/joblist/joblistfactory.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

6
dbcon/joblist/largehashjoin.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -42,7 +42,7 @@ namespace
void logDiskIoInfo(uint64_t stepId, const AnyDataListSPtr& spdl)
{
boost::mutex::scoped_lock lk(fileLock_g);
ofstream umDiskIoFile("/var/log/Columnstore/trace/umdiskio.log", ios_base::app);
ofstream umDiskIoFile("/var/log/mariadb/columnstore/trace/umdiskio.log", ios_base::app);
CalpontSystemCatalog::OID oid;
uint64_t maxBuckets = 0;
@ -106,7 +106,7 @@ void logDiskIoInfo(uint64_t stepId, const AnyDataListSPtr& spdl)
// move the current file to bak when size above .5 G, so total log is 1 G
if (curPos > 0x20000000)
{
(void)system("/bin/mv /var/log/Columnstore/trace/umdiskio.log /var/log/Columnstore/trace/umdiskio.bak");
(void)system("/bin/mv /var/log/mariadb/columnstore/trace/umdiskio.log /var/log/mariadb/columnstore/trace/umdiskio.bak");
}
}

4
dbcon/joblist/tdriver-agg.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -65,7 +65,7 @@ const uint32_t MAX_SIZE = 0x100000;
const uint32_t MAX_ELEMENTS = 0x20000;
const uint32_t NUM_THREADS = 4;
const string datapath="/home/zzhu/genii/tools/dbbuilder/lineitem.tbl";
//const string datapath="/usr/local/MariaDB/Columnstore/bin/lineitem.tbl";
//const string datapath="/usr/local/mariadb/columnstore/bin/lineitem.tbl";
int numConsumers = 1;
int numRuns = 1;
int printInterval = numRuns * 100000;

2
dbcon/mysql/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2014 InfiniDB, Inc.
# Copyright (C) 2016 MariaDB, Corporation
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License

2
dbcon/mysql/dumpcat.pl
View File

@ -5,7 +5,7 @@
use DBI;
use DBD::mysql;
$data_source = 'DBI:mysql:database=calpontsys:mysql_read_default_file=/usr/local/MariaDB/Columnstore/mysql/my.cnf';
$data_source = 'DBI:mysql:database=calpontsys:mysql_read_default_file=/usr/local/mariadb/columnstore/mysql/my.cnf';
$username = 'root';
$auth = '';
%attr = ();

2
dbcon/mysql/ha_calpont.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_calpont.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_calpont_ddl.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_calpont_dml.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_calpont_execplan.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_calpont_impl.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_calpont_impl_if.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_calpont_partition.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_calpont_udf.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_exists_sub.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_from_sub.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_in_sub.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_scalar_sub.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_select_sub.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_subquery.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_view.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
dbcon/mysql/ha_window_function.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

4
dbcon/mysql/install_calpont_mysql.sh
View File

@ -4,14 +4,14 @@
#
prefix=/usr/local
installdir=$prefix/MariaDB/Columnstore
installdir=$prefix/mariadb/columnstore
rpmmode=install
pwprompt=" "
for arg in "$@"; do
if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then
prefix="`echo $arg | awk -F= '{print $2}'`"
installdir=$prefix/MariaDB/Columnstore
installdir=$prefix/mariadb/columnstore
elif [ `expr -- "$arg" : '--rpmmode='` -eq 10 ]; then
rpmmode="`echo $arg | awk -F= '{print $2}'`"
elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then

28
dbcon/mysql/my.cnf
View File

@ -20,15 +20,15 @@
[client]
#password = your_password
port = 3306
socket = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock
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
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
@ -62,10 +62,10 @@ infinidb_um_mem_limit=0
infinidb_use_import_for_batchinsert=1
infinidb_import_for_batchinsert_delimiter=7
basedir = /usr/local/MariaDB/Columnstore/mysql/
character-sets-dir = /usr/local/MariaDB/Columnstore/mysql/share/mysql/charsets/
language = /usr/local/MariaDB/Columnstore/mysql/share/mysql/english/
plugin_dir = /usr/local/MariaDB/Columnstore/mysql/lib64/mysql/plugin
basedir = /usr/local/mariadb/columnstore/mysql/
character-sets-dir = /usr/local/mariadb/columnstore/mysql/share/mysql/charsets/
language = /usr/local/mariadb/columnstore/mysql/share/mysql/english/
plugin_dir = /usr/local/mariadb/columnstore/mysql/lib64/mysql/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.
@ -134,20 +134,20 @@ slave-skip-errors=all
#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
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_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/
#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

10
dbcon/mysql/mysql-Columnstore
View File

@ -25,7 +25,7 @@
# Description: MySQL is a very fast and reliable SQL database engine.
### END INIT INFO
# If you install MySQL on some other places than /usr/local/MariaDB/Columnstore/mysql, then you
# If you install MySQL on some other places than /usr/local/mariadb/columnstore/mysql, then you
# have to do one of the following things for this script to work:
#
# - Run this script from within the MySQL installation directory
@ -43,8 +43,8 @@
# If you change base dir, you must also change datadir. These may get
# overwritten by settings in the MySQL configuration files.
basedir=/usr/local/MariaDB/Columnstore/mysql
datadir=/usr/local/MariaDB/Columnstore/mysql/db
basedir=/usr/local/mariadb/columnstore/mysql
datadir=/usr/local/mariadb/columnstore/mysql/db
# Default value, in seconds, afterwhich the script should timeout waiting
# for server start.
@ -63,7 +63,7 @@ lock_file_path="$lockdir/mysql-Columnstore"
mysqld_pid_file_path=
if test -z "$basedir"
then
basedir=/usr/local/MariaDB/Columnstore/mysql
basedir=/usr/local/mariadb/columnstore/mysql
bindir=/usr/local/bin
if test -z "$datadir"
then
@ -260,7 +260,7 @@ wait_for_ready () {
i=0
while test $i -ne $service_startup_timeout ; do
if $bindir/mysqladmin ping --socket=/usr/local/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock >/dev/null 2>&1; then
if $bindir/mysqladmin ping --socket=/usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock >/dev/null 2>&1; then
log_success_msg
return 0
elif kill -0 $! 2>/dev/null ; then

2
dbcon/mysql/schemaSync.pl
View File

@ -7,7 +7,7 @@ use DBD::mysql;
$| = 1;
$cfgfile='/usr/local/MariaDB/Columnstore/mysql/my.cnf';
$cfgfile='/usr/local/mariadb/columnstore/mysql/my.cnf';
$username = 'root';
$auth = '';