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

Benchmark Modification For Cubrid #188

Open
Qianmin-Jiang wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Benchmark Modification For Cubrid #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cdccc9d
tpcc
Dec 9, 2017
da91781
ddls
Dec 10, 2017
632e5f4
add configuration file for tpch/wikipedia; add AUTO_INCREMENT to cubr…
Dec 10, 2017
9d05c27
modify auto_increment constraint
Dec 13, 2017
35ad298
fixed auto increment bug
Dec 13, 2017
6635d8a
fixed execute batch bug in wikipedia; now it runs
Dec 13, 2017
4765c13
Recover accidently deleted file
Dec 14, 2017
f1656c6
Unify fix for Wikipedia loading + cleanup
Dec 14, 2017
42c9e96
Fix for executeBatch in Cubrid
Dec 14, 2017
0b50469
Cubrid TPCC config setting
Dec 16, 2017
c4be148
Comments
Dec 16, 2017
b28a7ca
the space and tab
Qianmin-Jiang Dec 17, 2017
4b801f2
Merge branch 'cubrid_dev' of https://github.com/Qianmin-Jiang/oltpben…
Qianmin-Jiang Dec 17, 2017
cdb5bd6
the space and tab
Qianmin-Jiang Dec 17, 2017
ab1c013
add comment to special cubrid prepareStatement method
Qianmin-Jiang Dec 17, 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
43 changes: 43 additions & 0 deletions config/cubrid_tpcc_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0"?>
<parameters>

<!-- Connection details -->
<dbtype>cubrid</dbtype>
<driver>cubrid.jdbc.driver.CUBRIDDriver</driver>
<DBUrl>jdbc:cubrid:localhost:33000:tpcc:PUBLIC::</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>64</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>
147 changes: 147 additions & 0 deletions config/cubrid_tpch_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<?xml version="1.0"?>
<parameters>

<!-- Connection details -->
<dbtype>cubrid</dbtype>

<driver>cubrid.jdbc.driver.CUBRIDDriver</driver>

<DBUrl>jdbc:cubrid:127.0.0.1:33000:tpch:public::</DBUrl>

<username></username>

<password></password>

<isolation>TRANSACTION_READ_COMMITTED</isolation>

<!-- Location for the files generated by tpch dbgen -->
<datadir>data/tpch1</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>20</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>
95 changes: 95 additions & 0 deletions config/cubrid_wikipedia_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<?xml version="1.0"?>

<parameters>



<!-- Connection details -->

<dbtype>cubrid</dbtype>

<driver>cubrid.jdbc.driver.CUBRIDDriver</driver>

<DBUrl>jdbc:cubrid:127.0.0.1:33000:wikipedia:public::</DBUrl>

<username></username>

<password></password>

<isolation>TRANSACTION_READ_COMMITTED</isolation>



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

<scalefactor>1</scalefactor>



<!-- Wikipedia Trace Options -->

<tracefile>config/traces/wikipedia-100k.trace</tracefile>

<traceOut>10</traceOut>

<base_ip>10.1.</base_ip>



<!-- The workload -->

<terminals>64</terminals>

<works>

<work>

<time>300</time>

<rate>unlimited</rate>

<weights>0.07,0.07,7.6725,91.2656,0.9219</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/JDBC-10.1.0.7663-cubrid.jar
View file
Open in desktop
Binary file not shown.
7 changes: 6 additions & 1 deletion src/com/oltpbenchmark/api/Procedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,12 @@ public final PreparedStatement getPreparedStatementReturnKeys(Connection conn, S
}
// Everyone else can use the regular getGeneratedKeys() method
else if (is != null) {
pStmt = conn.prepareStatement(stmt.getSQL(), is);
if (getDatabaseType() == DatabaseType.CUBRID) {
Copy link
Copy Markdown
Member

@apavlo apavlo Dec 16, 2017

Choose a reason for hiding this comment

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

Can you add a comment to explain why you need this special clause?

Copy link
Copy Markdown
Author

@Qianmin-Jiang Qianmin-Jiang Dec 17, 2017

Choose a reason for hiding this comment

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

Done.

// Required by cubrid jdbc to add an integer parameter in prepareStatement method.
pStmt = conn.prepareStatement(stmt.getSQL(), pStmt.RETURN_GENERATED_KEYS);
} else {
pStmt = conn.prepareStatement(stmt.getSQL(), is);
}
}
// They don't care about keys
else {
Expand Down
Loading