Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
8d4671f
fix BenchmarkModule: support spaces in filepath to dialects file
lmwnshn Jan 23, 2018
c973a9c
create files and add default ddl
mpardesh Jan 12, 2018
1697580
add constants
mpardesh Jan 13, 2018
c0343c9
add function to parse data file
mpardesh Jan 14, 2018
b10f6f5
finish loadCallCenters
mpardesh Jan 14, 2018
c292ad9
add some loader functions
mpardesh Jan 15, 2018
d784a91
add load function
mpardesh Jan 15, 2018
acc9313
add createLoaderThreads
mpardesh Jan 16, 2018
5e556f5
discovered parsing issues
mpardesh Jan 20, 2018
79614c5
correctly loads 8 tables
mpardesh Jan 20, 2018
bcf15cd
fix values in constants file
mpardesh Jan 20, 2018
6f12b2c
fix AuctionMark: allow spaces in path to data dir
lmwnshn Jan 13, 2018
4b954d9
implement AuctionMark: createLoaderThreads
lmwnshn Jan 15, 2018
26ffd60
limited style fix: AuctionMarkLoader
lmwnshn Jan 15, 2018
71ec52a
Add Support for Cassandra
Jan 28, 2018
ac1171f
Fixed 'NoOp' to just execute a semi-colon instead of 'SELECT 1'. This…
apavlo Jan 31, 2018
0179cd7
config: remove traces directory, no longer used
at15 Jan 23, 2018
adc122f
docker: Add MySQL and PostgreSQL
at15 Jan 23, 2018
90fb426
doc: Add supported benchmark and databases
at15 Jan 24, 2018
031d42f
docker: Add MySQL tpcc using docker
at15 Jan 24, 2018
d8db97b
travis: Test matrix and docker
at15 Jan 24, 2018
a5bb13f
travis: Use multiple variables per item
at15 Jan 24, 2018
2ebc411
travis: fix broken shell script for docker-compose
at15 Jan 24, 2018
4921f9d
travis: bash branch is still broken ...
at15 Jan 24, 2018
4ad93b4
travis: stop mysql and postgres and check port use
at15 Jan 24, 2018
c3796c9
config: Add YAML file as catalog of bench & dbs
at15 Jan 25, 2018
4d0388f
config: Finish catalog for benchmarks
at15 Jan 27, 2018
d4b6337
config: Add subcommand for config util script
at15 Feb 2, 2018
626bfc7
config: Add command to print bench & db in catalog
at15 Feb 2, 2018
014db8c
config: Implemented config file generation logic
at15 Feb 2, 2018
409d7d6
travis: pip install pyyaml
at15 Feb 2, 2018
acad9c8
travis: pip3 install pyyaml
at15 Feb 2, 2018
932b330
travis: sudo apt-get install python3.6
at15 Feb 2, 2018
f617f6f
travis: sudo apt-get install python3.6
at15 Feb 2, 2018
42d12e0
travis: addon python3-pip
at15 Feb 2, 2018
1e28e1d
travis: sudo pip3 install pyyaml
at15 Feb 2, 2018
9e8adc0
docker: Add scripts to run benchmark on docker
at15 Feb 3, 2018
f48142c
config: Allow specify dburl in databases.yml
at15 Feb 3, 2018
cdd734f
docker: Init create_db.py to create database
at15 Feb 3, 2018
9407b06
docker: Implement create database logic
at15 Feb 3, 2018
1dc3dd6
config: move sample into benchmarks folder
at15 Feb 3, 2018
704953f
config: remove sample that mix db and benchmark
at15 Feb 3, 2018
c23f71d
config: config/plugin.xml is required ....
at15 Feb 3, 2018
9f56ae3
config: bring plugin.xml back
at15 Feb 3, 2018
c6fae5d
config: Replace
at15 Feb 3, 2018
3f451f4
docker: Add Cassandra but failed default config
at15 Feb 3, 2018
4d41c04
config: Support using alias in config and docker
at15 Feb 7, 2018
4b50a6e
docker: Add TiDB and support using native shell
at15 Feb 7, 2018
0d8a850
docker: Add MemSQL but tppc DDL is incorrect
at15 Feb 7, 2018
e898a68
db: TiDB TPC-C is working
at15 Feb 7, 2018
6a17c66
config: Support scalefactor in config.py
at15 Feb 7, 2018
42e8609
config: Fix typo fo epionions in benchmarks.yml
at15 Feb 7, 2018
35e514b
travis: forgot to remove ; fi after remove if
at15 Feb 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@ results
*~

# maven output
target
target

# IDE
.idea
*.iml
.vscode
168 changes: 168 additions & 0 deletions .travis.old.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
dist: trusty
sudo: required
group: deprecated-2017Q2

# lib contains jar files to support running tests
cache:
directories:
- lib

language: java
jdk:
- oraclejdk8
- openjdk8

# oraclejdk9 failures - https://github.com/oltpbenchmark/oltpbench/issues/137
#matrix:
# allow_failures:
# - jdk: oraclejdk9

# Currently oraclejdk8 is mapped to DB=mysql and the
# others are DB=postgres.
#
# a test env of: - DB=mysql TEST=tatp
# duplicated for postgres would of been nice however
# attempting to limit non-junit tests to single jdk with
# matrix:
# exclude:
# - jdk: oraclejdk8
# env: DB=mysql
# - jdk: oraclejdk9
# env: DB=mysql
# - jdk: oraclejdk8
# env: DB=postgres
# - jdk: oraclejdk9
# env: DB=postgres
# Failed to exclude any elements.

# Possibilities for future:
# matrix:
# include:
# - addons:
# mariadb: 5.5
# - addons:
# mariadb: 10.0
# - addons:
# mariadb: 10.1
# - addons:
# mariadb: 10.2
# - addons:
# postgresql: 9.4
# - addons:
# postgresql: 9.5
# - addons:
# postgresql: 9.6
## - addons:
## postgresql: 9.7
# https://docs.travis-ci.com/user/database-setup/#Using-a-different-PostgreSQL-Version
# MariaDB wasn't supported on trusty-containers at time of writing
# This syntax may not be correct.

addons:
postgresql: 9.6

env:
- TEST=junit
- TEST=epinions
- TEST=tatp
- TEST=tpcc
- TEST=voter
- TEST=auctionmark
- TEST=wikipedia
- TEST=ycsb
- TEST=seats
- TEST=sibench
- TEST=noop
- TEST=smallbank
- TEST=twitter
- TEST=resourcestresser

# Missing loader com.oltpbenchmark.benchmarks.resourcestresser.ResourceStresserBenchmark.makeLoaderImpl(ResourceStresserBenchmark.java:58)
# -> org.apache.commons.lang.NotImplementedException: Code is not implemented
# - TEST=resourcestresser

# Missing sample config file
# - TEST=chbenchmark
#
# Missing sample config
# - TEST=hyadapt
#
# Not fully implemented
# - TEST=jpab
#
# Works only for MySQL at this time
# - TEST=linkbench
#

# While mariadb addon isn't used. Remove if using a addon: mariadb
services:
- mysql

# Increase the size of ramdisk on sudo enabled infrastructure
# https://github.com/travis-ci/travis-ci/issues/9036#issuecomment-357189213
before_install:
- sudo mount -o remount,size=50% /var/ramfs

install:
- echo $TRAVIS_JDK_VERSION
- if [ $TRAVIS_JDK_VERSION == oraclejdk8 ]; then
DB=mysql ;
else
DB=postgres ;
fi
- if [ $DB == mysql ]; then mysql -e "SELECT VERSION()";
mysql -e "CREATE DATABASE IF NOT EXISTS ${TEST}" ;
mysql -e "CREATE USER 'travis'@'localhost' IDENTIFIED BY 'travis'; GRANT ALL ON *.* TO 'travis'@'localhost'";
elif [ $DB == postgres ]; then psql -c "SELECT VERSION()" -U travis;
psql -c "create database $TEST" -U postgres ;
psql -c "ALTER USER CURRENT_USER WITH PASSWORD 'travis'" -U travis;
fi

# MySQL create user is probably one of the trust-container bugs for MySQL
# Will probably need the following to set a password

# We pass a password here as <password></password> sends no password in the protocol
# rather than the blank one and therefore fails on MySQL.

before_script:
- if [ $DB == mysql ]; then
URLBASE=jdbc:mysql://localhost:3306 ;
DRIVER=com.mysql.jdbc.Driver ;
TYPE=mysql ;
elif [ $DB == postgres ]; then
URLBASE=jdbc:postgresql://localhost:5432 ;
DRIVER=org.postgresql.Driver ;
TYPE=postgres ;
fi

script:
- SCALEFACTOR=0.5
- if [ $TEST == junit ]; then
ant junit;
else
ant build;
config=config/sample_${TEST}_config.xml ;
sed -i
-e "/<dbtype>/c\<dbtype>${TYPE}</dbtype>"
-e "/<driver>/c\<driver>${DRIVER}</driver>"
-e "/<DBUrl>/c\<DBUrl>${URLBASE}/${TEST}</DBUrl>"
-e '/<username>/c\<username>travis</username>'
-e '/<password>/c\<password>travis</password>'
-e "/<scalefactor>/c\\<scalefactor>${SCALEFACTOR}</scalefactor>"
-e '/<terminals>/c\<terminals>3</terminals>'
-e '/<time>/c\<time>60</time>'
-e '/<isolation>/c\<isolation>TRANSACTION_READ_COMMITTED</isolation>'
"${config}";
./oltpbenchmark --bench "${TEST}" --config "${config}" --create true --load true --execute true ;
fi


# With tests, scalefactor and terminals are just to reduce load on travis
# isolation READ_COMMITTED as the TRANSACTIONAL default caused too many failures for now.

after_script:
- if [ $DB == mysql ]; then
mysql -e "DROP DATABASE IF EXISTS ${TEST}" ;
elif [ $DB == postgres ]; then
psql -c "DROP DATABASE IF EXISTS ${TEST}" -U postgres ;
fi
Loading