Skip to content

Commit 46ef41d

Browse files
angocaangoca
committed
Merge
1 parent 9ac8bbe commit 46ef41d

10 files changed

+134
-102
lines changed

‎.pydevproject

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<?eclipse-pydev version="1.0"?><pydev_project>
3+
4+
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
5+
6+
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
7+
8+
</pydev_project>

‎Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM centos:8
55
RUN dnf -y update
66

77
RUN dnf -y install epel-release
8-
RUN dnf -y install java-1.8.0-openjdk-headless
8+
RUN dnf -y install java-11-openjdk-headless
99
RUN dnf -y install R-core
1010
RUN dnf -y install bc
1111
RUN dnf -y install python3
@@ -17,14 +17,15 @@ ENV FLASK_ENV=development
1717
RUN pip3 install pip --upgrade
1818
RUN pip3 install Flask
1919

20-
RUN mkdir -p /benchmarksql
21-
COPY ./src/main/FlaskService/ /benchmarksql/FlaskService/
22-
COPY ./target/lib/ /benchmarksql/lib/
23-
COPY ./target/ /benchmarksql/run/
20+
COPY ./target/ /benchmarksql
2421

2522
RUN mkdir -p /service_data
23+
RUN rm -f /benchmarksql/run/.jTPCC_run_seq.dat
24+
RUN rm -f /benchmarksql/run/benchmarksql-error.log
25+
RUN rm -f /benchmarksql/run/benchmarksql-trace.log
2626
RUN ln -s /service_data/run_seq.dat /benchmarksql/run/.jTPCC_run_seq.dat
27-
RUN ln -s /service_data/benchmarksql-error.log /benchmarksql/run/
27+
RUN ln -s /service_data/benchmarksql-error.log /benchmarksql/run/benchmarksql-error.log
28+
RUN ln -s /service_data/benchmarksql-trace.log /benchmarksql/run/benchmarksql-trace.log
2829

29-
CMD ["python3", "/benchmarksql/FlaskService/main.py"]
30+
CMD ["python3", "/benchmarksql/run/FlaskService/main.py"]
3031

‎podman-build.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
3+
mvn || exit 1
4+
podman build -t benchmarksql-v6.0 .

‎podman-run.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
3+
mkdir -p ./service_data || exit 1
4+
5+
podman run --rm \
6+
--network="host" \
7+
--user=`id -u`:`id -g` \
8+
--userns=keep-id \
9+
--volume="${HOME}:${HOME}" \
10+
--volume="./service_data:/service_data" \
11+
-w "$PWD" \
12+
localhost/benchmarksql-v6.0
13+

‎src/main/resources/sample.firebird.properties

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1+
// General Driver and connection parameters
2+
//
3+
// db={ postgres | oracle | firebird | mariadb | transact-sql }
4+
// driver=<JDBC_DRIVER_CLASS>
5+
// application={ Generic | PostgreSQLStoredProc | OracleStoredProc }
6+
// conn=<JDBC_URI>
7+
// user=<USERNAME>
8+
// password=<PASSWORD>
19
db=firebird
210
driver=org.firebirdsql.jdbc.FBDriver
311
application=Generic
4-
conn=jdbc:firebirdsql://localhost:3050//var/lib/firebird/data/benchmarksql1.fdb
12+
conn=jdbc:firebirdsql://localhost:3050//var/lib/firebird/data/benchmarksql1.fdb?charSet=UTF-8
513
user=benchmarksql
614
password=PWbmsql
715

8-
warehouses=100
9-
loadWorkers=32
10-
monkeys=10
11-
sutThreads=32
12-
maxDeliveryBGThreads=16
16+
// Scaling and timing configuration
17+
warehouses=50
18+
loadWorkers=8
19+
monkeys=2
20+
sutThreads=16
21+
maxDeliveryBGThreads=2
1322
maxDeliveryBGPerWarehouse=1
1423
rampupMins=10
1524
rampupSUTMins=5
1625
rampupTerminalMins=5
1726
runMins=30
18-
reportIntervalSecs=10
27+
reportIntervalSecs=30
1928
restartSUTThreadProbability=0.0
2029
keyingTimeMultiplier=1.0
2130
thinkTimeMultiplier=1.0
@@ -36,8 +45,3 @@ stockLevelWeight=4.2
3645
// Directory name to create for collecting detailed result data.
3746
// Comment this out to suppress.
3847
//resultDirectory=my_result_%tY-%tm-%td_%tH%tM%tS
39-
//osCollectorScript=./misc/os_collector_linux.py
40-
//osCollectorInterval=1
41-
//osCollectorSSHAddr=user@host
42-
//osCollectorDevices=net_eth0 blk_vda
43-

‎src/main/resources/sample.mariadb.properties

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1+
// General Driver and connection parameters
2+
//
3+
// db={ postgres | oracle | firebird | mariadb | transact-sql }
4+
// driver=<JDBC_DRIVER_CLASS>
5+
// application={ Generic | PostgreSQLStoredProc | OracleStoredProc }
6+
// conn=<JDBC_URI>
7+
// user=<USERNAME>
8+
// password=<PASSWORD>
19
db=mariadb
210
driver=org.mariadb.jdbc.Driver
311
application=Generic
412
conn=jdbc:mariadb://localhost:3306/benchmarksql1
513
user=benchmarksql
614
password=PWbmsql
715

8-
warehouses=100
9-
loadWorkers=32
10-
monkeys=10
11-
sutThreads=32
12-
maxDeliveryBGThreads=16
16+
// Scaling and timing configuration
17+
warehouses=50
18+
loadWorkers=8
19+
monkeys=2
20+
sutThreads=16
21+
maxDeliveryBGThreads=2
1322
maxDeliveryBGPerWarehouse=1
1423
rampupMins=10
1524
rampupSUTMins=5
1625
rampupTerminalMins=5
1726
runMins=30
18-
reportIntervalSecs=10
27+
reportIntervalSecs=30
1928
restartSUTThreadProbability=0.0
2029
keyingTimeMultiplier=1.0
2130
thinkTimeMultiplier=1.0
@@ -36,8 +45,3 @@ stockLevelWeight=4.2
3645
// Directory name to create for collecting detailed result data.
3746
// Comment this out to suppress.
3847
//resultDirectory=my_result_%tY-%tm-%td_%tH%tM%tS
39-
//osCollectorScript=./misc/os_collector_linux.py
40-
//osCollectorInterval=1
41-
//osCollectorSSHAddr=user@host
42-
//osCollectorDevices=net_eth0 blk_vda
43-

‎src/main/resources/sample.oracle.properties

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1+
// General Driver and connection parameters
2+
//
3+
// db={ postgres | oracle | firebird | mariadb | transact-sql }
4+
// driver=<JDBC_DRIVER_CLASS>
5+
// application={ Generic | PostgreSQLStoredProc | OracleStoredProc }
6+
// conn=<JDBC_URI>
7+
// user=<USERNAME>
8+
// password=<PASSWORD>
19
db=oracle
210
driver=oracle.jdbc.driver.OracleDriver
311
application=Generic
412
conn=jdbc:oracle:thin:@localhost:1521:XE
5-
user=scott
6-
password=tiger
13+
user=benchmarksql
14+
password=PWbmsql
715

8-
warehouses=100
9-
loadWorkers=32
10-
monkeys=10
11-
sutThreads=32
12-
maxDeliveryBGThreads=16
16+
// Scaling and timing configuration
17+
warehouses=50
18+
loadWorkers=8
19+
monkeys=2
20+
sutThreads=16
21+
maxDeliveryBGThreads=2
1322
maxDeliveryBGPerWarehouse=1
1423
rampupMins=10
1524
rampupSUTMins=5
1625
rampupTerminalMins=5
1726
runMins=30
18-
reportIntervalSecs=10
27+
reportIntervalSecs=30
1928
restartSUTThreadProbability=0.0
2029
keyingTimeMultiplier=1.0
2130
thinkTimeMultiplier=1.0
@@ -36,8 +45,3 @@ stockLevelWeight=4.2
3645
// Directory name to create for collecting detailed result data.
3746
// Comment this out to suppress.
3847
//resultDirectory=my_result_%tY-%tm-%td_%tH%tM%tS
39-
//osCollectorScript=./misc/os_collector_linux.py
40-
//osCollectorInterval=1
41-
//osCollectorSSHAddr=user@host
42-
//osCollectorDevices=net_eth0 blk_vda
43-

‎src/main/resources/sample.postgresql.properties

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1+
// General Driver and connection parameters
2+
//
3+
// db={ postgres | oracle | firebird | mariadb | transact-sql }
4+
// driver=<JDBC_DRIVER_CLASS>
5+
// application={ Generic | PostgreSQLStoredProc | OracleStoredProc }
6+
// conn=<JDBC_URI>
7+
// user=<USERNAME>
8+
// password=<PASSWORD>
19
db=postgres
210
driver=org.postgresql.Driver
311
application=Generic
412
conn=jdbc:postgresql://localhost:5432/postgres
513
user=benchmarksql
614
password=PWbmsql
715

8-
warehouses=100
9-
loadWorkers=32
10-
monkeys=10
11-
sutThreads=32
12-
maxDeliveryBGThreads=16
16+
// Scaling and timing configuration
17+
warehouses=50
18+
loadWorkers=8
19+
monkeys=2
20+
sutThreads=16
21+
maxDeliveryBGThreads=2
1322
maxDeliveryBGPerWarehouse=1
1423
rampupMins=10
1524
rampupSUTMins=5
1625
rampupTerminalMins=5
1726
runMins=30
18-
reportIntervalSecs=10
27+
reportIntervalSecs=30
1928
restartSUTThreadProbability=0.0
2029
keyingTimeMultiplier=1.0
2130
thinkTimeMultiplier=1.0
@@ -36,8 +45,3 @@ stockLevelWeight=4.2
3645
// Directory name to create for collecting detailed result data.
3746
// Comment this out to suppress.
3847
//resultDirectory=my_result_%tY-%tm-%td_%tH%tM%tS
39-
//osCollectorScript=./misc/os_collector_linux.py
40-
//osCollectorInterval=1
41-
//osCollectorSSHAddr=user@host
42-
//osCollectorDevices=net_eth0 blk_vda
43-

‎src/main/resources/sample.transact-sql.properties

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,47 @@
1+
// General Driver and connection parameters
2+
//
3+
// db={ postgres | oracle | firebird | mariadb | transact-sql }
4+
// driver=<JDBC_DRIVER_CLASS>
5+
// application={ Generic | PostgreSQLStoredProc | OracleStoredProc }
6+
// conn=<JDBC_URI>
7+
// user=<USERNAME>
8+
// password=<PASSWORD>
19
db=transact-sql
2-
driver=org.postgresql.Driver
3-
conn=jdbc:postgresql://localhost:5432/postgres
10+
driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
11+
application=Generic
12+
conn=jdbc:sqlserver://localhost;database=benchmarksql1
413
user=benchmarksql
514
password=PWbmsql
615

7-
warehouses=10
8-
loadWorkers=4
16+
// Scaling and timing configuration
17+
warehouses=50
18+
loadWorkers=8
19+
monkeys=2
20+
sutThreads=16
21+
maxDeliveryBGThreads=2
22+
maxDeliveryBGPerWarehouse=1
23+
rampupMins=10
24+
rampupSUTMins=5
25+
rampupTerminalMins=5
26+
runMins=30
27+
reportIntervalSecs=30
28+
restartSUTThreadProbability=0.0
29+
keyingTimeMultiplier=1.0
30+
thinkTimeMultiplier=1.0
31+
traceTerminalIO=false
932

10-
terminals=10
11-
// Ramp up gradually adding a new connection every second
12-
rampupDelay=1.0
13-
// To run specified transactions per terminal- runMins must equal zero
14-
runTxnsPerTerminal=0
15-
// To run for specified minutes- runTxnsPerTerminal must equal zero
16-
runMins=2
17-
// Number of total transactions per minute
18-
limitTxnsPerMin=10000000
19-
20-
// Set to true to run in 4.x compatible mode. Set to false to use the
21-
// entire configured database evenly.
22-
terminalWarehouseFixed=false
23-
24-
// Set to true to use the stored procedure/function implementations. Not
25-
// all of them exist for all databases and the use of stored procedures
26-
// is strongly discouraged for comparing different database vendors as
27-
// they may not have been implemented ideally for all of them. This is
28-
// however useful to test how much network IO can be saved by using
29-
// stored procedures.
30-
useStoredProcedures=false
31-
32-
// The following five values must add up to 100
33-
// The internal default percentages mathc the probabilities of a
34-
// 23 Card Deck implementation, as described in the TPC-C Specs.
35-
// The values below match the pre-5.1 defaults.
36-
//newOrderWeight=45
37-
//paymentWeight=43
38-
//orderStatusWeight=4
39-
//deliveryWeight=4
40-
//stockLevelWeight=4
33+
// Below are the definitions for the "attempted" transaction mix.
34+
// The TPC-C specification requires minimum percentages for all but
35+
// the NEW_ORDER transaction. If a test run happens to have any of
36+
// those four types fall below those minimums, the entire test is
37+
// invalid. We don't want that to happen, so we specify values just
38+
// a tiny bit above the required minimum.
39+
// The newOrderWeight is calculated as 100.0 - sum(all_other_types).
40+
paymentWeight=43.2
41+
orderStatusWeight=4.2
42+
deliveryWeight=4.2
43+
stockLevelWeight=4.2
4144
4245
// Directory name to create for collecting detailed result data.
4346
// Comment this out to suppress.
4447
//resultDirectory=my_result_%tY-%tm-%td_%tH%tM%tS
45-
//osCollectorScript=./misc/os_collector_linux.py
46-
//osCollectorInterval=1
47-
//osCollectorSSHAddr=user@dbhost
48-
//osCollectorDevices=net_eth0 blk_sda

‎src/main/resources/service-start.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)