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

more changes for names

This commit is contained in:
david hill
2016-05-12 14:14:24 -05:00
parent b78043dc8a
commit 0dbd823c00
185 changed files with 15440 additions and 16894 deletions

View File

@ -43,10 +43,10 @@ the entire Calpont directory tree there.
After untaring the sofware or installing the RPM's, setup the software
to run (this script needs to run with root privileges). Check the Installation
Guide for addition details on using postConfigure:
/usr/local/Calpont/bin/postConfigure
/usr/local/MariaDB/Columnstore/bin/postConfigure
Setup some aliases:
. /usr/local/Calpont/bin/calpontAlias
. /usr/local/MariaDB/Columnstore/bin/calpontAlias
Connect to MySQL:
idbmysql
@ -70,7 +70,7 @@ To use bulk load:
200|2002|
2. Save/place this file in a directory.
3. From that same directory, import the rows:
/usr/local/Calpont/bin/cpimport calpont caltest caltest.tbl
/usr/local/MariaDB/Columnstore/bin/cpimport calpont caltest caltest.tbl
And check the import:
calpontmysql calpont

306
utils/autoconf/INSTALL~ Normal file
View File

@ -0,0 +1,306 @@
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
Software Foundation, Inc.
Copyright (C) 2014 InfiniDB, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
InfiniDB, Inc. also gives unlimited permission to copy, distribute and
modify it.
Basic Installation from source
==============================
**** InfiniDB source build instructions ****
Consult the generic installation instructions
that follow for detailed information. The short version is:
cd $HOME
git clone http://github.com/infinidb/mysql
git clone http://github.com/infinidb/infinidb
-- or --
tar -zxf <srcfile>
cd mysql
./configure --prefix=$HOME
make
make install
cd ../infinidb
./configure --prefix=$HOME
make
make install
This will create a directory called Calpont in $HOME which conatins
all the software you need.
Install the InfiniDB software into /usr/local (for example) by copying
the entire Calpont directory tree there.
After untaring the sofware or installing the RPM's, setup the software
to run (this script needs to run with root privileges). Check the Installation
Guide for addition details on using postConfigure:
/usr/local/Calpont/bin/postConfigure
Setup some aliases:
. /usr/local/Calpont/bin/calpontAlias
Connect to MySQL:
idbmysql
A suggested test scenario:
create database calpont;
use calpont;
create table caltest (col1 int, col2 int) engine=infinidb;
show create table caltest;
set autocommit=0;
insert into caltest values (1, 2);
insert into caltest values (3, 4);
commit;
select * from caltest;
To use bulk load:
1. A delimited import file should be created to match the table that
you want to import data to similar to the following. In this
example, the file will be saved as idbtest.tbl:
100|1001|
200|2002|
2. Save/place this file in a directory.
3. From that same directory, import the rows:
/usr/local/Calpont/bin/cpimport calpont caltest caltest.tbl
And check the import:
calpontmysql calpont
select * from caltest;
That's it. Enjoy.
These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
cache files.)
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
If you have to use a `make' that does not support the `VPATH'
variable, you have to compile the package for one architecture at a
time in the source code directory. After you have installed the
package for one architecture, use `make distclean' before reconfiguring
for another architecture.
Installation Names
==================
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script). Here is a another example:
/bin/bash ./configure CONFIG_SHELL=/bin/bash
Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
configuration-related scripts to be executed by `/bin/bash'.
`configure' Invocation
======================
`configure' recognizes the following options to control how it operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

View File

@ -3,8 +3,8 @@ To build the software from source, consult the file INSTALL.
Brief Install Instructions:
1. Install the 3 Calpont InfiniDB RPMs.
2. Install and start the software, run: /usr/local/Calpont/bin/postConfigure
3. Setup some aliases: . /usr/local/Calpont/bin/calpontAlias
2. Install and start the software, run: /usr/local/MariaDB/Columnstore/bin/postConfigure
3. Setup some aliases: . /usr/local/MariaDB/Columnstore/bin/calpontAlias
4. Connect to MySQL: idbmysql
5. Try the test in step 12 below
@ -21,7 +21,7 @@ Detailed Installation Instructions:
tar xvf calpont-2.2.0-2.x86_64.rpm.tar.gz
4. Install the 3 RPMs in this order, the Calpont InfiniDB software will be installed in
/usr/local/Calpont.
/usr/local/MariaDB/Columnstore.
rpm -ivh infinidb-libs-2.2.0-2.x86_64.rpm
rpm -ivh infinidb-platform-2.2.0-2.x86_64.rpm
@ -31,19 +31,19 @@ Detailed Installation Instructions:
5a.To configure and run on a single server system utilizing local disk storage,
run install script:
/usr/local/Calpont/bin/postConfigure
/usr/local/MariaDB/Columnstore/bin/postConfigure
5b.To configure and run on a multi-server system and/or to utilize a SAN storage
system, follow the instructions in the Calpont InfiniDB Installation Guide.
/usr/local/Calpont/bin/postConfigure
/usr/local/MariaDB/Columnstore/bin/postConfigure
6. Ports utilized by the Calpont InfiniDB Software
The Calpont MySQL daemon utilizes port 3306. To use a different port, update
the 2 locations in the following file:
/usr/local/Calpont/mysql/my.cnf
/usr/local/MariaDB/Columnstore/mysql/my.cnf
port = 3306
port = 3306
@ -53,7 +53,7 @@ Detailed Installation Instructions:
8600 - 8622, 8700, and 8800
7. Setup some aliases:
. /usr/local/Calpont/bin/calpontAlias
. /usr/local/MariaDB/Columnstore/bin/calpontAlias
8. To manually start and stop the Calpont InfiniDB Software as the root user run:
@ -127,7 +127,7 @@ Detailed Installation Instructions:
mysql>
12. Run the following upgrade script to create calponsys schema and upgrade the syscolumn table: /usr/local/Calpont/bin/upgrade-infinidb.sh
12. Run the following upgrade script to create calponsys schema and upgrade the syscolumn table: /usr/local/MariaDB/Columnstore/bin/upgrade-infinidb.sh
13. As an example to get you started, try this:

145
utils/autoconf/README~ Normal file
View File

@ -0,0 +1,145 @@
To build the software from source, consult the file INSTALL.
Brief Install Instructions:
1. Install the 3 Calpont InfiniDB RPMs.
2. Install and start the software, run: /usr/local/Calpont/bin/postConfigure
3. Setup some aliases: . /usr/local/Calpont/bin/calpontAlias
4. Connect to MySQL: idbmysql
5. Try the test in step 12 below
Detailed Installation Instructions:
1. Download the package calpont-2.2.0-2.x86_64.rpm.tar.gz (RHEL5 64-BIT)
to the server where you are installing Calpont.
2. Obtain root user access.
3. Unpack the tarball, which will generate 4 RPMs.
tar xvf calpont-2.2.0-2.x86_64.rpm.tar.gz
4. Install the 3 RPMs in this order, the Calpont InfiniDB software will be installed in
/usr/local/Calpont.
rpm -ivh infinidb-libs-2.2.0-2.x86_64.rpm
rpm -ivh infinidb-platform-2.2.0-2.x86_64.rpm
rpm -ivh infinidb-mysql-2.2.0-2.x86_64.rpm
rpm -ivh infinidb-storage-engine-2.2.0-2.x86_64.rpm
5a.To configure and run on a single server system utilizing local disk storage,
run install script:
/usr/local/Calpont/bin/postConfigure
5b.To configure and run on a multi-server system and/or to utilize a SAN storage
system, follow the instructions in the Calpont InfiniDB Installation Guide.
/usr/local/Calpont/bin/postConfigure
6. Ports utilized by the Calpont InfiniDB Software
The Calpont MySQL daemon utilizes port 3306. To use a different port, update
the 2 locations in the following file:
/usr/local/Calpont/mysql/my.cnf
port = 3306
port = 3306
You must reserve the following ports to run the Calpont InfiniDB Software:
8600 - 8622, 8700, and 8800
7. Setup some aliases:
. /usr/local/Calpont/bin/calpontAlias
8. To manually start and stop the Calpont InfiniDB Software as the root user run:
cc startSystem
To stop the Calpont Software, run:
cc stopSystem
9. To start/stop the Calpont InfiniDB Software during system boot/shutdown use the
chkconfig command
/sbin/chkconfig --add infinidb
/sbin/chkconfig infinidb on
10. After the Calpont InfiniDB Software has been started, use the following command to
connect to the Calpont OAM Console and watch for the System to go to the
ACTIVE status. The follow will repeatedly run the OAM command getsysteminfo
every 5 seconds.
calpontOAMconsole getsysteminfo -r
Here is an example display from a Single Server Install:
System and Module statuses
Component Status Last Status Change
------------ ---------------------- ------------------------
System ACTIVE Mon Apr 6 18:07:14 2009
Module dm1 ACTIVE Mon Apr 6 18:07:12 2009
Calpont Process statuses
Process Module Status Last Status Change Process ID
------------------ ------ ------------ ------------------------ ----------
ProcessMonitor dm1 ACTIVE Mon Apr 6 18:06:41 2009 12753
ProcessManager dm1 ACTIVE Mon Apr 6 18:06:46 2009 12954
SNMPTrapDaemon dm1 ACTIVE Mon Apr 6 18:06:41 2009 12963
SNMPAgent dm1 ACTIVE Mon Apr 6 18:06:50 2009 13565
ServerMonitor dm1 ACTIVE Mon Apr 6 18:06:55 2009 13635
DBRMWorkerNode dm1 ACTIVE Mon Apr 6 18:06:51 2009 13640
DBRMControllerNode dm1 ACTIVE Mon Apr 6 18:06:52 2009 13645
ExeMgr dm1 ACTIVE Mon Apr 6 18:07:05 2009 14578
PrimProc dm1 ACTIVE Mon Apr 6 18:07:03 2009 13842
DDLProc dm1 ACTIVE Mon Apr 6 18:07:10 2009 14936
DMLProc dm1 ACTIVE Mon Apr 6 18:07:13 2009 15114
Active Alarm Counts: Critical = 0, Major = 0, Minor = 0, Warning = 0, Info = 0
Once the System status is ACTIVE, enter the following to exit back to the
UNIX prompt:
CNTR<C>
Or to get back Calpont OAM Console Prompt,enter the following:
CNTR<D>
11. Use the following command to access the Calpont InfiniDB MySQL console:
idbmysql
Example output:
Welcome to the Mysql monitor. Commands end with ; or \g.
Your Mysql connection id is 1
Server version: 5.1.26-Calpont-log Source distribution
Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
mysql>
12. Run the following upgrade script to create calponsys schema and upgrade the syscolumn table: /usr/local/Calpont/bin/upgrade-infinidb.sh
13. As an example to get you started, try this:
create database calpont;
use calpont;
create table caltest (col1 int, col2 int) engine=infinidb;
show create table caltest;
insert into caltest values (1, 2);
insert into caltest values (3, 4);
commit;
select * from caltest;
14. Consult the Admin Guide and Syntax Guide for additional information on how
to get started.

View File

@ -1,6 +1,6 @@
#!/bin/bash
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/Calpont
INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR

View File

@ -1,6 +1,6 @@
#!/bin/bash
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/Calpont
INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR

View File

@ -63,7 +63,7 @@ public class InfiniDBOutputDriver extends Configured implements Tool
InfiniDBConfiguration idbconf = new InfiniDBConfiguration(jobconf);
idbconf.setInputPath("input");
idbconf.setOutputPath("output");
idbconf.setInfiniDBHome("/usr/local/Calpont");
idbconf.setInfiniDBHome("/usr/local/MariaDB/Columnstore");
jobconf.setMapperClass(InfiniDoopMapper.class);
jobconf.setNumMapTasks(1);

View File

@ -0,0 +1,88 @@
/*
* Copyright (c) 2014 InfiniDB, Inc.
*
* InfiniDB, Inc. licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package infinidb.hadoop.example;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.sql.*;
import java.util.Date;
import java.util.Formatter;
import java.io.IOException;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.*;
import org.apache.hadoop.mapred.lib.db.*;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.input.*;
import org.apache.hadoop.mapreduce.lib.output.*;
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.Mapper;
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.TextInputFormat;
import org.apache.hadoop.mapred.SequenceFileInputFormat;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.util.*;
import org.apache.hadoop.*;
import infinidb.hadoop.db.*;
public class InfiniDBOutputDriver extends Configured implements Tool
{
public int run (String[] args) throws Exception
{
Configuration conf = new Configuration();
JobConf jobconf = new JobConf(conf, InfiniDoopDriver.class);
DBConfiguration.configureDB(jobconf,
"com.mysql.jdbc.Driver",
"jdbc:mysql://srvswint4/tpch1","root", "");
String [] fields = { "n_nationkey", "n_name" };
String [] outFields = {"id", "name"};
jobconf.setInputFormat(IDBFileInputFormat.class);
jobconf.setOutputFormat(InfiniDBOutputFormat.class);
jobconf.setOutputKeyClass(NullWritable.class);
jobconf.setOutputValueClass(Text.class);
InfiniDBOutputFormat.setOutput(jobconf, "db", outFields);
InfiniDBConfiguration idbconf = new InfiniDBConfiguration(jobconf);
idbconf.setInputPath("input");
idbconf.setOutputPath("output");
idbconf.setInfiniDBHome("/usr/local/Calpont");
jobconf.setMapperClass(InfiniDoopMapper.class);
jobconf.setNumMapTasks(1);
jobconf.setNumReduceTasks(2);
JobClient client = new JobClient();
client.setConf(jobconf);
try {
JobClient.runJob(jobconf);
} catch (Exception e) {
e.printStackTrace();
}
return 0;
}
public static void main(String [] args) throws Exception
{
int ret = ToolRunner.run(new InfiniDBOutputDriver(), args);
System.exit(ret);
}
}

275
utils/loggingcpp/Doxyfile Normal file
View File

@ -0,0 +1,275 @@
# Doxyfile 1.4.1-KDevelop
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = loggingcpp.kdevelop
PROJECT_NUMBER = $VERSION$
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
USE_WINDOWS_ENCODING = NO
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
ABBREVIATE_BRIEF = "The $name class" \
"The $name widget" \
"The $name file" \
is \
provides \
specifies \
contains \
represents \
a \
an \
the
ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = NO
FULL_PATH_NAMES = YES
STRIP_FROM_PATH = /home/dhill/InfiniDB_MariaDB/build/
STRIP_FROM_INC_PATH =
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
DETAILS_AT_TOP = NO
INHERIT_DOCS = YES
DISTRIBUTE_GROUP_DOC = NO
TAB_SIZE = 8
ALIASES =
OPTIMIZE_OUTPUT_FOR_C = NO
OPTIMIZE_OUTPUT_JAVA = NO
SUBGROUPING = YES
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
EXTRACT_ALL = NO
EXTRACT_PRIVATE = NO
EXTRACT_STATIC = NO
EXTRACT_LOCAL_CLASSES = YES
EXTRACT_LOCAL_METHODS = NO
HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
HIDE_FRIEND_COMPOUNDS = NO
HIDE_IN_BODY_DOCS = NO
INTERNAL_DOCS = NO
CASE_SENSE_NAMES = YES
HIDE_SCOPE_NAMES = NO
SHOW_INCLUDE_FILES = YES
INLINE_INFO = YES
SORT_MEMBER_DOCS = YES
SORT_BRIEF_DOCS = NO
SORT_BY_SCOPE_NAME = NO
GENERATE_TODOLIST = YES
GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
SHOW_DIRECTORIES = YES
FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
QUIET = NO
WARNINGS = YES
WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
WARN_NO_PARAMDOC = NO
WARN_FORMAT = "$file:$line: $text"
WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
INPUT = /home/dhill/InfiniDB_MariaDB/utils/loggingcpp
FILE_PATTERNS = *.c \
*.cc \
*.cxx \
*.cpp \
*.c++ \
*.java \
*.ii \
*.ixx \
*.ipp \
*.i++ \
*.inl \
*.h \
*.hh \
*.hxx \
*.hpp \
*.h++ \
*.idl \
*.odl \
*.cs \
*.php \
*.php3 \
*.inc \
*.m \
*.mm \
*.dox \
*.C \
*.CC \
*.C++ \
*.II \
*.I++ \
*.H \
*.HH \
*.H++ \
*.CS \
*.PHP \
*.PHP3 \
*.M \
*.MM \
*.C \
*.H \
*.tlh \
*.diff \
*.patch \
*.moc \
*.xpm \
*.dox
RECURSIVE = yes
EXCLUDE =
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS =
EXAMPLE_PATH =
EXAMPLE_PATTERNS = *
EXAMPLE_RECURSIVE = NO
IMAGE_PATH =
INPUT_FILTER =
FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
SOURCE_BROWSER = NO
INLINE_SOURCES = NO
STRIP_CODE_COMMENTS = YES
REFERENCED_BY_RELATION = YES
REFERENCES_RELATION = YES
VERBATIM_HEADERS = YES
#---------------------------------------------------------------------------
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
ALPHABETICAL_INDEX = NO
COLS_IN_ALPHA_INDEX = 5
IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
GENERATE_HTML = YES
HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
HTML_HEADER =
HTML_FOOTER =
HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = NO
CHM_FILE =
HHC_LOCATION =
GENERATE_CHI = NO
BINARY_TOC = NO
TOC_EXPAND = NO
DISABLE_INDEX = NO
ENUM_VALUES_PER_LINE = 4
GENERATE_TREEVIEW = NO
TREEVIEW_WIDTH = 250
#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
GENERATE_LATEX = YES
LATEX_OUTPUT = latex
LATEX_CMD_NAME = latex
MAKEINDEX_CMD_NAME = makeindex
COMPACT_LATEX = NO
PAPER_TYPE = a4wide
EXTRA_PACKAGES =
LATEX_HEADER =
PDF_HYPERLINKS = NO
USE_PDFLATEX = NO
LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
GENERATE_RTF = NO
RTF_OUTPUT = rtf
COMPACT_RTF = NO
RTF_HYPERLINKS = NO
RTF_STYLESHEET_FILE =
RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
GENERATE_MAN = NO
MAN_OUTPUT = man
MAN_EXTENSION = .3
MAN_LINKS = NO
#---------------------------------------------------------------------------
# configuration options related to the XML output
#---------------------------------------------------------------------------
GENERATE_XML = yes
XML_OUTPUT = xml
XML_SCHEMA =
XML_DTD =
XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
GENERATE_AUTOGEN_DEF = NO
#---------------------------------------------------------------------------
# configuration options related to the Perl module output
#---------------------------------------------------------------------------
GENERATE_PERLMOD = NO
PERLMOD_LATEX = NO
PERLMOD_PRETTY = YES
PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = NO
EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
PREDEFINED =
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
# Configuration::additions related to external references
#---------------------------------------------------------------------------
TAGFILES =
GENERATE_TAGFILE = loggingcpp.tag
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = YES
HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = NO
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
GROUP_GRAPHS = YES
UML_LOOK = NO
TEMPLATE_RELATIONS = NO
INCLUDE_GRAPH = YES
INCLUDED_BY_GRAPH = YES
CALL_GRAPH = NO
GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png
DOT_PATH =
DOTFILE_DIRS =
MAX_DOT_GRAPH_WIDTH = 1024
MAX_DOT_GRAPH_HEIGHT = 1024
MAX_DOT_GRAPH_DEPTH = 1000
DOT_TRANSPARENT = NO
DOT_MULTI_TARGETS = NO
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = NO

View File

@ -0,0 +1,101 @@
<?xml version = '1.0'?>
<kdevelop>
<general>
<author/>
<email>dhill@srvhill04.calpont.com</email>
<version>$VERSION$</version>
<projectmanagement>KDevCustomProject</projectmanagement>
<primarylanguage>C++</primarylanguage>
<ignoreparts/>
</general>
<kdevcustomproject>
<run>
<mainprogram>loggingcpp</mainprogram>
<directoryradio>executable</directoryradio>
</run>
</kdevcustomproject>
<kdevdebugger>
<general>
<dbgshell/>
</general>
</kdevdebugger>
<kdevdoctreeview>
<ignoretocs>
<toc>ada</toc>
<toc>ada_bugs_gcc</toc>
<toc>bash</toc>
<toc>bash_bugs</toc>
<toc>clanlib</toc>
<toc>fortran_bugs_gcc</toc>
<toc>gnome1</toc>
<toc>gnustep</toc>
<toc>gtk</toc>
<toc>gtk_bugs</toc>
<toc>haskell</toc>
<toc>haskell_bugs_ghc</toc>
<toc>java_bugs_gcc</toc>
<toc>java_bugs_sun</toc>
<toc>kde2book</toc>
<toc>opengl</toc>
<toc>pascal_bugs_fp</toc>
<toc>php</toc>
<toc>php_bugs</toc>
<toc>perl</toc>
<toc>perl_bugs</toc>
<toc>python</toc>
<toc>python_bugs</toc>
<toc>qt-kdev3</toc>
<toc>ruby</toc>
<toc>ruby_bugs</toc>
<toc>sdl</toc>
<toc>sw</toc>
<toc>w3c-dom-level2-html</toc>
<toc>w3c-svg</toc>
<toc>w3c-uaag10</toc>
<toc>wxwidgets_bugs</toc>
</ignoretocs>
<ignoreqt_xml>
<toc>Guide to the Qt Translation Tools</toc>
<toc>Qt Assistant Manual</toc>
<toc>Qt Designer Manual</toc>
<toc>Qt Reference Documentation</toc>
<toc>qmake User Guide</toc>
</ignoreqt_xml>
<ignoredoxygen>
<toc>KDE Libraries (Doxygen)</toc>
</ignoredoxygen>
</kdevdoctreeview>
<kdevfilecreate>
<filetypes/>
<useglobaltypes>
<type ext="ui" />
<type ext="cpp" />
<type ext="h" />
</useglobaltypes>
</kdevfilecreate>
<kdevcppsupport>
<references/>
<codecompletion>
<includeGlobalFunctions>true</includeGlobalFunctions>
<includeTypes>true</includeTypes>
<includeEnums>true</includeEnums>
<includeTypedefs>false</includeTypedefs>
<automaticCodeCompletion>true</automaticCodeCompletion>
<automaticArgumentsHint>true</automaticArgumentsHint>
<automaticHeaderCompletion>true</automaticHeaderCompletion>
<codeCompletionDelay>250</codeCompletionDelay>
<argumentsHintDelay>400</argumentsHintDelay>
<headerCompletionDelay>250</headerCompletionDelay>
</codecompletion>
</kdevcppsupport>
<kdevfileview>
<groups>
<hidenonprojectfiles>false</hidenonprojectfiles>
<hidenonlocation>false</hidenonlocation>
</groups>
<tree>
<hidepatterns>*.o,*.lo,CVS</hidepatterns>
<hidenonprojectfiles>false</hidenonprojectfiles>
</tree>
</kdevfileview>
</kdevelop>

View File

@ -0,0 +1,23 @@
# KDevelop Custom Project File List
errorcodes.cpp
errorcodes.h
errorids.h
exceptclasses.h
idberrorinfo.cpp
idberrorinfo.h
logger.cpp
logger.h
loggingid.h
Makefile
Makefile.am
Makefile.in
message.cpp
messageids.h
messagelog.cpp
messagelog.h
messageobj.h
sqllogger.cpp
sqllogger.h
stopwatch.cpp
stopwatch.h
tdriver.cpp

Binary file not shown.

View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
<DocsAndViews NumberOfDocuments="2" >
<Doc0 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/utils/loggingcpp/Calpont.xml" >
<View0 line="0" Type="Source" />
</Doc0>
<Doc1 NumberOfViews="1" URL="file:///home/dhill/InfiniDB_MariaDB/oam/etc/Calpont.xml" >
<View0 line="11" Type="Source" />
</Doc1>
</DocsAndViews>
<pluginList>
<kdevdebugger>
<breakpointList/>
</kdevdebugger>
<kdevbookmarks>
<bookmarks/>
</kdevbookmarks>
<kdevvalgrind>
<executable path="" params="" />
<valgrind path="" params="" />
<calltree path="" params="" />
<kcachegrind path="" />
</kdevvalgrind>
</pluginList>
</KDevPrjSession>

View File

@ -195,7 +195,7 @@ void m4()
//------------------------------------------------------------------------------
// This method is intended to test the messages used to profile db performance.
// The method also provides an example on how to use these log messages.
// Test can be verified by viewing /var/log/Calpont/debug.log.
// Test can be verified by viewing /var/log/Columnstore/debug.log.
//
// Message types are:
//

View File

@ -51,9 +51,9 @@ getlogsremote ()
getlogslocal ()
{ mkdir -p $CTOOLS/data/$hostdir/logs
if [ $date = $currentdate ]; then
cp -r /var/log/Calpont/* /usr/local/MariaDB/Columnstore/tools/data/$hostdir/logs
cp -r /var/log/Columnstore/* /usr/local/MariaDB/Columnstore/tools/data/$hostdir/logs
else
find /var/log/Calpont -type f -name "*$date" -exec sh -c 'exec cp -f "$@" '$CTOOLS/data/$hostdir/logs'' find-copy {} +
find /var/log/Columnstore -type f -name "*$date" -exec sh -c 'exec cp -f "$@" '$CTOOLS/data/$hostdir/logs'' find-copy {} +
fi
}
#

View File

@ -4,7 +4,7 @@
* Author: Joseph Williams
* Purpose: Script to load the performance test result from a CSV file.
******************************************************************************/
LOAD DATA INFILE '/usr/local/Calpont/data/bulk/data/import/TestStats.tbl'
LOAD DATA INFILE '/usr/local/MariaDB/Columnstore/data/bulk/data/import/TestStats.tbl'
INTO TABLE TestStats
FIELDS
TERMINATED BY '|'

View File

@ -0,0 +1,13 @@
/*****************************************************************************
* Script Name: load_TestQuery.sql
* Date Created: 2008.08.25
* Author: Joseph Williams
* Purpose: Script to load the performance test result from a CSV file.
******************************************************************************/
LOAD DATA INFILE '/usr/local/Calpont/data/bulk/data/import/TestStats.tbl'
INTO TABLE TestStats
FIELDS
TERMINATED BY '|'
ENCLOSED BY '"'
LINES TERMINATED BY '\n'
(IterNum,SessNum,SQLSeqNum,SQLIdxNum,MaxMemPct,NumTempFiles,TempFieSpace,PhyIO,CacheIO,BlocksTouched,CasPartBlks,MsgBytesIn,MsgBytesOut,QuerySetupTime);

View File

@ -4,7 +4,7 @@
* Author: Joseph Williams
* Purpose: Script to load the performance test result from a CSV file.
******************************************************************************/
LOAD DATA INFILE '/usr/local/Calpont/data/bulk/data/import/TestSummary.tbl'
LOAD DATA INFILE '/usr/local/MariaDB/Columnstore/data/bulk/data/import/TestSummary.tbl'
INTO TABLE TestSummary
FIELDS
TERMINATED BY '|'

View File

@ -0,0 +1,14 @@
/*****************************************************************************
* Script Name: load_TestSumamry.sql
* Date Created: 2008.08.25
* Author: Joseph Williams
* Purpose: Script to load the performance test result from a CSV file.
******************************************************************************/
LOAD DATA INFILE '/usr/local/Calpont/data/bulk/data/import/TestSummary.tbl'
INTO TABLE TestSummary
FIELDS
TERMINATED BY '|'
ENCLOSED BY '"'
LINES TERMINATED BY '\n'
(TestID,TestRunID,TestRunDesc,ExecServer,StackName,numDM,numUM,numPM,CalpontDB,ScriptFileName,NumIterations,NumSessions,DataVolume,IOType,NumStmts,NumStmtsProcessed,RunCompleted);

View File

@ -4,7 +4,7 @@
* Author: Joseph Williams
* Purpose: Script to load the performance test result from a CSV file.
******************************************************************************/
LOAD DATA INFILE '/usr/local/Calpont/data/bulk/data/import/TestTime.tbl'
LOAD DATA INFILE '/usr/local/MariaDB/Columnstore/data/bulk/data/import/TestTime.tbl'
INTO TABLE TestTime
FIELDS
TERMINATED BY '|'

View File

@ -0,0 +1,13 @@
/*****************************************************************************
* Script Name: load_TestTime.sql
* Date Created: 2008.08.25
* Author: Joseph Williams
* Purpose: Script to load the performance test result from a CSV file.
******************************************************************************/
LOAD DATA INFILE '/usr/local/Calpont/data/bulk/data/import/TestTime.tbl'
INTO TABLE TestTime
FIELDS
TERMINATED BY '|'
ENCLOSED BY '"'
LINES TERMINATED BY '\n'
(IterNum,SessNum,SQLSeqNum,SQLIdxNum,StartTime,EndTime);

View File

@ -28,6 +28,6 @@ then
fi
#
mkdir /tmp/$host/logs
cp -r /var/log/Calpont/* /tmp/$host/logs
cp -r /var/log/Columnstore/* /tmp/$host/logs
#
# End of script

View File

@ -41,7 +41,7 @@ cmd="/$startdate/,/$enddate/ {print \$0} "
echo $cmd > /tmp/$host/sql/cmd.$$
#
# execute the command
awk -f /tmp/$host/sql/cmd.$$ /usr/local/Calpont/mysql/db/$host.log > /tmp/$host/sql/temp.log
awk -f /tmp/$host/sql/cmd.$$ /usr/local/MariaDB/Columnstore/mysql/db/$host.log > /tmp/$host/sql/temp.log
#
exit
#

View File

@ -0,0 +1,48 @@
#!/bin/bash
#
#/*******************************************************************************
#* Script Name: getsql.sh
#* Date Created: 2009.02.17
#* Author: Joseph Wiiliams
#* Purpose: extract lines from log file within time block
#*
#* Parameter: date - A day of month in question (dd)
#* starttime - A start time in (HH:mm)
#* endtime - An end time in (HH:mm)
#*
#******************************************************************************/
#
#-----------------------------------------------------------------------------
# command line parameters
#-----------------------------------------------------------------------------
date=$1
starttime=$2
endtime=$3
#
host=$(hostname -s)
#
# change date format to match sql log date format
newdate=`date +%y%m$1`
#
# clean up previous data files
if [ -d /tmp/$host/sql ]
then
rm -rf /tmp/$host/sql
fi
mkdir -p /tmp/$host/sql
#
# create the beginning and ending time search variables
startdate="$newdate $2"
enddate="$newdate $3"
cat $host.log | grep $startdate
#
# create the awk command and write it to a temporary run file
cmd="/$startdate/,/$enddate/ {print \$0} "
echo $cmd > /tmp/$host/sql/cmd.$$
#
# execute the command
awk -f /tmp/$host/sql/cmd.$$ /usr/local/Calpont/mysql/db/$host.log > /tmp/$host/sql/temp.log
#
exit
#
# End of Script

View File

@ -92,7 +92,7 @@ public:
else
outName = name;
ostringstream oss;
oss << "/var/log/Calpont/trace/" << outName << '.' << sessionID;
oss << "/var/log/Columnstore/trace/" << outName << '.' << sessionID;
oFile.reset(new ofstream());
oFile->open(oss.str().c_str(), ios_base::out | ios_base::ate | ios_base::app);
}