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

Monetdb #183

Open
KimMoriarty wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Monetdb #183

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd7dc7b
Modification for monetdb
kunmin-db Dec 15, 2017
f395c69
Added benchmark config files
kunmin-db Dec 15, 2017
9fe2bcc
Modifed tpch config file
kunmin-db Dec 15, 2017
061e706
Minor bug fixed
kunmin-db Dec 15, 2017
b05ca3e
Isolated changes in benchmark configs to new files
kunmin-db Dec 16, 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
22 changes: 11 additions & 11 deletions config/sample_tpcc_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
<parameters>

<!-- Connection details -->
<dbtype>mysql</dbtype>
<driver>com.mysql.jdbc.Driver</driver>
<DBUrl>jdbc:mysql://localhost:3306/tpcc</DBUrl>
<username>root</username>
<dbtype>MONETDB</dbtype>
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.

Do not change the default sample config file.

Copy link
Copy Markdown
Author

@KimMoriarty KimMoriarty Dec 16, 2017

Choose a reason for hiding this comment

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

Create new config xml files named tpcc_config_monetdb, tpch_config_monetdb, wikipedia_config_monetdb.

<driver>nl.cwi.monetdb.jdbc.MonetDriver</driver>
<DBUrl>jdbc:monetdb://localhost:50000/tpcc</DBUrl>
<username></username>
<password></password>
<isolation>TRANSACTION_SERIALIZABLE</isolation>
<isolation>TRANSACTION_READ_COMMITTED</isolation>

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

<!-- The workload -->
<terminals>2</terminals>
<terminals>1</terminals>
<works>
<work>
<time>60</time>
<rate>10000</rate>
<weights>45,43,4,4,4</weights>
<time>300</time>
<rate>unlimited</rate>
<weights>45,43,4,4,4</weights>
</work>
</works>

<!-- TPCC specific -->
<transactiontypes>
<transactiontype>
Expand Down
21 changes: 11 additions & 10 deletions config/sample_tpch_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0"?>
<parameters>
<parameters>
<!-- Connection details -->
<dbtype>mysql</dbtype>
<driver>com.mysql.jdbc.Driver</driver>
<DBUrl>jdbc:mysql://localhost:3306/tpch</DBUrl>
<username>user</username>
<password>pass</password>
<isolation>TRANSACTION_SERIALIZABLE</isolation>
<dbtype>monetdb</dbtype>
<driver>nl.cwi.monetdb.jdbc.MonetDriver</driver>
<DBUrl>jdbc:monetdb://localhost:50000/tpch</DBUrl>
<username>monetdb</username>
<password>monetdb</password>
<isolation>TRANSACTION_READ_COMMITTED</isolation>

<!-- Location for the files generated by tpch dbgen -->
<datadir>data/tpch1</datadir>
<datadir>data</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>

Expand Down Expand Up @@ -50,6 +50,7 @@
<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>
Expand Down
48 changes: 24 additions & 24 deletions config/sample_wikipedia_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
<?xml version="1.0"?>
<parameters>

<!-- Connection details -->
<dbtype>mysql</dbtype>
<driver>com.mysql.jdbc.Driver</driver>
<DBUrl>jdbc:mysql://server:3306/wikipedia</DBUrl>
<username>user</username>
<password>password</password>
<dbtype>monetdb</dbtype>
<driver>nl.cwi.monetdb.jdbc.MonetDriver</driver>
<DBUrl>jdbc:monetdb://localhost:50000/wiki</DBUrl>
<username></username>
<password></password>

<isolation>TRANSACTION_SERIALIZABLE</isolation>

<!-- Scale factor is the number of wikipages *1000 -->
<scalefactor>100</scalefactor>
<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>100</terminals>
<!-- The workload -->
<terminals>1</terminals>
<works>
<work>
<time>10</time>
<rate>1000</rate>
<weights>0.07,0.07,7.6725,91.2656,0.9219</weights>
<time>300</time>
<rate>unlimited</rate>
<weights>0.07,7.7425,91.2656,0.9219</weights>
</work>
</works>

<!-- Wikipedia Procedures Declaration -->
<transactiontypes>
<transactiontypes>
<transactiontype>
<name>AddWatchList</name>
</transactiontype>
<transactiontype>
<name>RemoveWatchList</name>
<name>AddWatchList</name>
</transactiontype>

<transactiontype>
<name>UpdatePage</name>
<name>RemoveWatchList</name>
</transactiontype>

<transactiontype>
<name>GetPageAnonymous</name>
<name>GetPageAnonymous</name>
</transactiontype>

<transactiontype>
<name>GetPageAuthenticated</name>
<name>GetPageAuthenticated</name>
</transactiontype>
</transactiontypes>
</parameters>
</parameters>
118 changes: 58 additions & 60 deletions src/com/oltpbenchmark/benchmarks/wikipedia/WikipediaLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ private void loadRevision() throws SQLException {
// Oracle handles quoted object identifiers differently, do not escape names
textSQL = SQLUtil.getInsertSQL(textTable, false);
}

PreparedStatement textInsert = this.conn.prepareStatement(textSQL);

// REVISION
Expand Down Expand Up @@ -452,66 +453,63 @@ private void loadRevision() throws SQLException {
int old_text_length = h_textLength.nextValue().intValue();
assert(old_text_length > 0);
char old_text[] = TextGenerator.randomChars(rng(), old_text_length);

for (int i = 0; i < num_revised; i++) {
// Generate the User who's doing the revision and the Page revised
// Makes sure that we always update their counter
int user_id = h_users.nextInt();
assert(user_id > 0 && user_id <= this.num_users) : "Invalid UserId '" + user_id + "'";
this.user_revision_ctr[user_id-1]++;

// Generate what the new revision is going to be
if (i > 0) {
old_text = b.generateRevisionText(old_text);
old_text_length = old_text.length;
}

int rev_comment_len = Math.min(rev_comment_max, h_commentLength.nextValue().intValue()+1); // HACK
String rev_comment = TextGenerator.randomStr(rng(), rev_comment_len);
assert(rev_comment.length() <= rev_comment_max) :
String.format("[len=%d] ==> %s", rev_comment.length(), rev_comment);

// The REV_USER_TEXT field is usually the username, but we'll just
// put in gibberish for now
String user_text = TextGenerator.randomStr(rng(), h_nameLength.nextValue().intValue()+1);

// Insert the text
int col = 1;
textInsert.setInt(col++, rev_id); // old_id
textInsert.setString(col++, new String(old_text)); // old_text
textInsert.setString(col++, "utf-8"); // old_flags
textInsert.setInt(col++, page_id); // old_page
textInsert.addBatch();

// Insert the revision
col = 1;
revisionInsert.setInt(col++, rev_id); // rev_id
revisionInsert.setInt(col++, page_id); // rev_page
revisionInsert.setInt(col++, rev_id); // rev_text_id
revisionInsert.setString(col++, rev_comment); // rev_comment
revisionInsert.setInt(col++, user_id); // rev_user
revisionInsert.setString(col++, user_text); // rev_user_text
revisionInsert.setString(col++, TimeUtil.getCurrentTimeString14()); // rev_timestamp
revisionInsert.setInt(col++, h_minorEdit.nextValue().intValue()); // rev_minor_edit
revisionInsert.setInt(col++, 0); // rev_deleted
revisionInsert.setInt(col++, 0); // rev_len
revisionInsert.setInt(col++, 0); // rev_parent_id
revisionInsert.addBatch();

// Update Last Revision Stuff
this.page_last_rev_id[page_id-1] = rev_id;
this.page_last_rev_length[page_id-1] = old_text_length;
rev_id++;
if (this.getDatabaseType() == DatabaseType.ORACLE) {
PreparedStatement text_seq=this.conn.prepareStatement("select text_seq.nextval from dual");
text_seq.execute();
text_seq.close();
PreparedStatement revision_seq=this.conn.prepareStatement("select revision_seq.nextval from dual");
revision_seq.execute();
revision_seq.close();
}
batchSize++;
} // FOR (revision)

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.

What changed here? Is it just formatting? What parts are MonetDB specific?

Copy link
Copy Markdown
Author

@KimMoriarty KimMoriarty Dec 16, 2017

Choose a reason for hiding this comment

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

We tried to remove the loop for num_revised, which effectively the same as setting num_revised=1 in all cases. We do this because we found otherwise duplicate tuples will be inserted and causing a primary key violation error. We suspect Monetdb may not have a good support for transaction, but we are not sure...

// Generate the User who's doing the revision and the Page revised
// Makes sure that we always update their counter
int user_id = h_users.nextInt();
assert(user_id > 0 && user_id <= this.num_users) : "Invalid UserId '" + user_id + "'";
this.user_revision_ctr[user_id-1]++;

// Generate what the new revision is going to be
old_text = b.generateRevisionText(old_text);
old_text_length = old_text.length;

int rev_comment_len = Math.min(rev_comment_max, h_commentLength.nextValue().intValue()+1); // HACK
String rev_comment = TextGenerator.randomStr(rng(), rev_comment_len);
assert(rev_comment.length() <= rev_comment_max) :
String.format("[len=%d] ==> %s", rev_comment.length(), rev_comment);

// The REV_USER_TEXT field is usually the username, but we'll just
// put in gibberish for now
String user_text = TextGenerator.randomStr(rng(), h_nameLength.nextValue().intValue()+1);

// Insert the text
int col = 1;
textInsert.setInt(col++, rev_id); // old_id
textInsert.setString(col++, new String(old_text)); // old_text
textInsert.setString(col++, "utf-8"); // old_flags
textInsert.setInt(col++, page_id); // old_page
textInsert.addBatch();

// Insert the revision
col = 1;
revisionInsert.setInt(col++, rev_id); // rev_id
revisionInsert.setInt(col++, page_id); // rev_page
revisionInsert.setInt(col++, rev_id); // rev_text_id
revisionInsert.setString(col++, rev_comment); // rev_comment
revisionInsert.setInt(col++, user_id); // rev_user
revisionInsert.setString(col++, user_text); // rev_user_text
revisionInsert.setString(col++, TimeUtil.getCurrentTimeString14()); // rev_timestamp
revisionInsert.setInt(col++, h_minorEdit.nextValue().intValue()); // rev_minor_edit
revisionInsert.setInt(col++, 0); // rev_deleted
revisionInsert.setInt(col++, 0); // rev_len
revisionInsert.setInt(col++, 0); // rev_parent_id
revisionInsert.addBatch();

// Update Last Revision Stuff
this.page_last_rev_id[page_id-1] = rev_id;
this.page_last_rev_length[page_id-1] = old_text_length;
rev_id++;
if (this.getDatabaseType() == DatabaseType.ORACLE) {
PreparedStatement text_seq=this.conn.prepareStatement("select text_seq.nextval from dual");
text_seq.execute();
text_seq.close();
PreparedStatement revision_seq=this.conn.prepareStatement("select revision_seq.nextval from dual");
revision_seq.execute();
revision_seq.close();
}
batchSize++;

if (batchSize > WikipediaConstants.BATCH_SIZE) {
textInsert.executeBatch();
revisionInsert.executeBatch();
Expand Down
Loading