-
Notifications
You must be signed in to change notification settings - Fork 259
Comdb2 addition #184
base: master
Are you sure you want to change the base?
Comdb2 addition #184
Changes from 14 commits
d1ef862
6ce30a4
8687704
e7b6c84
349b7e6
edfbc6b
06c3509
1316596
db9dba8
47ed811
5e7eaea
57ede77
bfae054
7265393
0bce533
e31ea2a
b113d62
15c0be7
b4c29b2
3a0c2bb
1cdb6fe
5b1e39b
9d9fff9
834b59b
e0b36d7
62cfe4e
fa38c5f
c836aa5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| 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> | ||
| <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> | ||
| 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> |
| 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> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ log4j.logger.com.oltpbenchmark=INFO | |
| log4j.logger.com.oltpbenchmark.api=INFO | ||
|
|
||
| # Benchmarks | ||
| log4j.logger.com.oltpbenchmark.benchmarks.tpcc=DEBUG | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Switch to 'INFO' |
||
| log4j.logger.com.oltpbenchmark.benchmarks.tatp=INFO | ||
| log4j.logger.com.oltpbenchmark.benchmarks.twitter=INFO | ||
| log4j.logger.com.oltpbenchmark.benchmarks.wikipedia=INFO | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -150,5 +150,7 @@ | |
| <artifactId>ojdbc14</artifactId> | ||
| <version>10.2.0.1.0</version> | ||
| </dependency> | ||
|
|
||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What did you change in this file?
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No changes - We'll revert this. |
||
| </dependencies> | ||
| </project> | ||
|
|
||
| </project> | ||
| 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 | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -173,7 +173,7 @@ public void unload(Catalog catalog) throws SQLException { | |
| Statement st = conn.createStatement(); | ||
| for (Table catalog_tbl : catalog.getTables()) { | ||
| LOG.debug(String.format("Deleting data from %s.%s", workConf.getDBName(), catalog_tbl.getName())); | ||
| String sql = "DELETE FROM " + catalog_tbl.getEscapedName(); | ||
| String sql = "truncate " + catalog_tbl.getEscapedName(); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this comdb2 specific?
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There were a number of issues in trying to get TPCH play well with ComDB2 - Most of the changes in the Oltpbench source were our attempts(and suggestions from ComDB2 devs) to get it to work. @qinyuhu and I will revert these changes soon since TPC-H didnt end up working. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We will revert the changes - they only change "DELETE FROM" to "truncate" for speed up reason. Also System.out was used for debug purpose so we will also revert them. |
||
| st.execute(sql); | ||
| } // FOR | ||
| conn.commit(); | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you need the
CDATApart here?There was a problem hiding this comment.
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 '&'