Skip to content
This repository has been archived by the owner on Aug 23, 2021. It is now read-only.

Comdb2 addition #184

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d1ef862
Initial Commit
saatviks Nov 28, 2017
6ce30a4
Setting up TPCC Benchmark
saatviks Dec 2, 2017
8687704
Running TPCC
saatviks Dec 9, 2017
e7b6c84
wMerge remote-tracking branch 'upstream/master' into comdb2_addition
Dec 13, 2017
349b7e6
Merged Remote mater
Dec 13, 2017
edfbc6b
ready to change UpdatePage.java in wikipedia
Dec 14, 2017
06c3509
wikipedia modified & passed 4/5
Dec 14, 2017
1316596
Minor modifications
Dec 14, 2017
db9dba8
Add TPCH
Dec 14, 2017
47ed811
Update TPCHLoader.java
QinyuHu Dec 14, 2017
5e7eaea
Update TPCHLoader.java
QinyuHu Dec 14, 2017
57ede77
minor changes
Dec 15, 2017
bfae054
minor changes+
Dec 15, 2017
7265393
Merge branch 'comdb2_addition' of https://github.com/saatviks/oltpben…
Dec 15, 2017
0bce533
Update Loader.java
QinyuHu Dec 21, 2017
e31ea2a
Update TPCHLoader.java
QinyuHu Dec 21, 2017
b113d62
Update log4j.properties
QinyuHu Dec 21, 2017
15c0be7
Update pom.xml
QinyuHu Dec 21, 2017
b4c29b2
Update pom.xml
QinyuHu Dec 21, 2017
3a0c2bb
Update TPCHLoader.java
QinyuHu Dec 21, 2017
1cdb6fe
Update TPCHLoader.java
QinyuHu Dec 21, 2017
5b1e39b
Update pom.xml
QinyuHu Dec 21, 2017
9d9fff9
Update pom.xml
QinyuHu Dec 21, 2017
834b59b
Update pom.xml
QinyuHu Dec 21, 2017
e0b36d7
Update pom.xml
QinyuHu Dec 21, 2017
62cfe4e
Revert Loader.java, TPCHLoader.java, pom.xml and modify log4j from DE…
QinyuHu Dec 21, 2017
fa38c5f
Remove useless folder
QinyuHu Dec 22, 2017
c836aa5
Merge branch 'comdb2_addition' of https://github.com/saatviks/oltpben…
QinyuHu Dec 22, 2017
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
Binary file added .DS_Store
Binary file not shown.
17 changes: 16 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
bin/
/build/
out/
output.raw
output.res
.classpath
Expand All @@ -19,4 +20,18 @@ results
*~

# maven output
target
target
results

# intellij files
*.idea
*.iml

# Traces
*.trace

# DBGEN
tpch/dbgen/

# nohup
nohup.out
43 changes: 43 additions & 0 deletions config/tpcc_config_comdb2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0"?>
<parameters>

<!-- Connection details -->
<dbtype>comdb2</dbtype>
<driver>com.bloomberg.comdb2.jdbc.Driver</driver>
<DBUrl><![CDATA[jdbc:comdb2://localhost/tpcc?statement_query_effects=1&verify_retry=1]]></DBUrl>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need the CDATA part here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The '&' operator causes some XML parsing issue - The 'CDATA' makes XML escape the '&'

<username></username>
<password></password>
<isolation>TRANSACTION_READ_COMMITTED</isolation>

<!-- Scale factor is the number of warehouses in TPCC -->
<scalefactor>16</scalefactor>

<!-- The workload -->
<terminals>16</terminals>
<works>
<work>
<time>300</time>
<rate>unlimited</rate>
<weights>45,43,4,4,4</weights>
</work>
</works>

<!-- TPCC specific -->
<transactiontypes>
<transactiontype>
<name>NewOrder</name>
</transactiontype>
<transactiontype>
<name>Payment</name>
</transactiontype>
<transactiontype>
<name>OrderStatus</name>
</transactiontype>
<transactiontype>
<name>Delivery</name>
</transactiontype>
<transactiontype>
<name>StockLevel</name>
</transactiontype>
</transactiontypes>
</parameters>
140 changes: 140 additions & 0 deletions config/tpch_config_comdb2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
<?xml version="1.0"?>
<parameters>

<!-- Connection details -->
<dbtype>comdb2</dbtype>
<driver>com.bloomberg.comdb2.jdbc.Driver</driver>
<DBUrl>jdbc:comdb2://localhost/tpch?statement_query_effects=1</DBUrl>
<isolation>TRANSACTION_READ_COMMITTED</isolation>

<!-- Location for the files generated by tpch dbgen -->
<datadir>tpch/dbgen</datadir>

<!-- Format of the files that contain the tpch data -->
<!-- Values: csv or tbl-->
<fileFormat>tbl</fileFormat>

<!-- This setting doesn't do anything here -->
<scalefactor>1</scalefactor>

<!-- The workload -->
<terminals>1</terminals>
<works>
<work>
<serial>true</serial>
<rate>unlimited</rate>
<weights>all</weights>
</work>
<work>
<serial>true</serial>
<rate>unlimited</rate>
<weights>even</weights>
</work>
<work>
<serial>true</serial>
<rate>unlimited</rate>
<weights>odd</weights>
</work>
</works>

<transactiontypes>
<groupings>
<grouping>
<name>odd</name>
<weights>1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0</weights>
</grouping>
<grouping>
<name>even</name>
<weights>0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1</weights>
</grouping>
</groupings>
<transactiontype>
<name>Q1</name>
<id>1</id>
</transactiontype>
<transactiontype>
<name>Q2</name>
<id>2</id>
</transactiontype>
<transactiontype>
<name>Q3</name>
<id>3</id>
</transactiontype>
<transactiontype>
<name>Q4</name>
<id>4</id>
</transactiontype>
<transactiontype>
<name>Q5</name>
<id>5</id>
</transactiontype>
<transactiontype>
<name>Q6</name>
<id>6</id>
</transactiontype>
<transactiontype>
<name>Q7</name>
<id>7</id>
</transactiontype>
<transactiontype>
<name>Q8</name>
<id>8</id>
</transactiontype>
<transactiontype>
<name>Q9</name>
<id>9</id>
</transactiontype>
<transactiontype>
<name>Q10</name>
<id>10</id>
</transactiontype>
<transactiontype>
<name>Q11</name>
<id>11</id>
</transactiontype>
<transactiontype>
<name>Q12</name>
<id>12</id>
</transactiontype>
<transactiontype>
<name>Q13</name>
<id>13</id>
</transactiontype>
<transactiontype>
<name>Q14</name>
<id>14</id>
</transactiontype>
<transactiontype>
<name>Q15</name>
<id>15</id>
</transactiontype>
<transactiontype>
<name>Q16</name>
<id>16</id>
</transactiontype>
<transactiontype>
<name>Q17</name>
<id>17</id>
</transactiontype>
<transactiontype>
<name>Q18</name>
<id>18</id>
</transactiontype>
<transactiontype>
<name>Q19</name>
<id>19</id>
</transactiontype>
<transactiontype>
<name>Q20</name>
<id>20</id>
</transactiontype>
<transactiontype>
<name>Q21</name>
<id>21</id>
</transactiontype>
<transactiontype>
<name>Q22</name>
<id>22</id>
</transactiontype>
</transactiontypes>
</parameters>
48 changes: 48 additions & 0 deletions config/wikipedia_config_comdb2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0"?>
<parameters>

<!-- Connection details -->
<dbtype>comdb2</dbtype>
<driver>com.bloomberg.comdb2.jdbc.Driver</driver>
<DBUrl><![CDATA[jdbc:comdb2://localhost/wikipedia?statement_query_effects=1&verify_retry=1]]></DBUrl>
<username></username>
<password></password>
<isolation>TRANSACTION_READ_COMMITTED</isolation>

<!-- Scale factor is the number of wikipages *1000 -->
<scalefactor>100</scalefactor>

<!-- Wikipedia Trace Options -->
<tracefile>config/traces/wikipedia-100k.trace</tracefile>
<traceOut>10</traceOut>
<base_ip>10.1.</base_ip>

<!-- The workload -->
<terminals>15</terminals>
<works>
<work>
<time>300</time>
<rate>unlimited</rate>
<weights>1.9882,1.9882,0.0,93.1837,2.8399</weights>
</work>
</works>

<!-- Wikipedia Procedures Declaration -->
<transactiontypes>
<transactiontype>
<name>AddWatchList</name>
</transactiontype>
<transactiontype>
<name>RemoveWatchList</name>
</transactiontype>
<transactiontype>
<name>UpdatePage</name>
</transactiontype>
<transactiontype>
<name>GetPageAnonymous</name>
</transactiontype>
<transactiontype>
<name>GetPageAuthenticated</name>
</transactiontype>
</transactiontypes>
</parameters>
Binary file added lib/cdb2jdbc-2.0.0-shaded.jar
Binary file not shown.
1 change: 1 addition & 0 deletions log4j.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ log4j.logger.com.oltpbenchmark=INFO
log4j.logger.com.oltpbenchmark.api=INFO

# Benchmarks
log4j.logger.com.oltpbenchmark.benchmarks.tpcc=INFO
log4j.logger.com.oltpbenchmark.benchmarks.tatp=INFO
log4j.logger.com.oltpbenchmark.benchmarks.twitter=INFO
log4j.logger.com.oltpbenchmark.benchmarks.wikipedia=INFO
Expand Down
2 changes: 1 addition & 1 deletion run/runTPCC.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
java -Xmx1024m -cp `run/classpath.sh` com.oltpbenchmark.DBWorkload -b tpcc -c config/sample_tpcc_config.xml --execute true
java -Xmx1024m -cp `run/classpath.sh` com.oltpbenchmark.DBWorkload -b tpcc -c config/tpcc_config_db2.xml --execute true

Loading