Permalink
Browse files

fixing wikipedia .. but temporarily

  • Loading branch information...
dedcode committed Dec 9, 2014
1 parent c466c30 commit f1202ceaeff2dac9d3a0214cabbc593e5be18d7e
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<parameters>
+
+ <!-- Connection details -->
+ <dbtype>postgres</dbtype>
+ <driver>org.postgresql.Driver</driver>
+ <DBUrl>jdbc:postgresql://localhost:5432/wikipedia/</DBUrl>
+ <DBName>wikipedia</DBName>
+ <username>joe</username>
+ <password>joe</password>
+ <isolation>TRANSACTION_SERIALIZABLE</isolation>
+
+ <!-- Scale factor is the number of wikipages *1000 -->
+ <scalefactor>10</scalefactor>
+
+ <!-- Wikipedia Trace Options -->
+ <tracefile>config/traces/wikipedia-100k.trace</tracefile>
+ <traceOut>10</traceOut>
+ <tracefiledebug>debug_wiki</tracefiledebug>
+ <base_ip>10.1.</base_ip>
+
+ <!-- The workload -->
+ <terminals>1</terminals>
+ <works>
+ <work>
+ <time>60</time>
+ <rate>1000</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>
@@ -15,7 +15,7 @@
<works>
<work>
<time>3000</time>
- <rate>100</rate>
+ <rate>unlimited</rate>
<weights>50,50,0,0,0,0</weights>
</work>
</works>
View
@@ -24,6 +24,9 @@ log4j.logger.com.oltpbenchmark.benchmarks.seats=INFO
log4j.logger.com.oltpbenchmark.benchmarks.auctionmark=INFO
log4j.logger.com.oltpbenchmark.benchmarks.chbenchmark=INFO
+# Loaders
+log4j.logger.com.oltpbenchmark.benchmarks.wikipedia.WikipediaLoader=INFO
+
!==============================================================================
! log4j.properties - An example configuration properties file for log4j.
@@ -146,7 +146,7 @@ public void run(Connection conn, int textId, int pageId,
param = 1;
ps.setInt(param++, pageId);
ps.setString(param++, pageText);
-// ps.setString(param++, "utf-8"); //This is an error
+ ps.setString(param++, "utf-8"); //This is an error
// ps.execute();
execute(conn, ps);
@@ -163,11 +163,11 @@ public void run(Connection conn, int textId, int pageId,
ps.setInt(param++, pageId); // rev_page
ps.setInt(param++, nextTextId); // rev_text_id
ps.setString(param++, revComment);// rev_comment
-// ps.setInt(param++, revMinorEdit); // rev_minor_edit // this is an error
+ ps.setInt(param++, revMinorEdit); // rev_minor_edit // this is an error
ps.setInt(param++, userId); // rev_user
ps.setString(param++, userText); // rev_user_text
ps.setString(param++, timestamp); // rev_timestamp
-// ps.setInt(param++, 0); // rev_deleted //this is an error
+ ps.setInt(param++, 0); // rev_deleted //this is an error
ps.setInt(param++, pageText.length()); // rev_len
ps.setInt(param++, revisionId); // rev_parent_id // this is an error
// ps.execute();
@@ -202,17 +202,17 @@ public void run(Connection conn, int textId, int pageId,
ps.setString(param++, timestamp); // rc_cur_time
ps.setInt(param++, pageNamespace); // rc_namespace
ps.setString(param++, pageTitle); // rc_title
-// ps.setInt(param++, 0); // rc_type
-// ps.setInt(param++, 0); // rc_minor
+ ps.setInt(param++, 0); // rc_type
+ ps.setInt(param++, 0); // rc_minor
ps.setInt(param++, pageId); // rc_cur_id
ps.setInt(param++, userId); // rc_user
ps.setString(param++, userText); // rc_user_text
-// ps.setString(param++, revComment); // rc_comment
+ ps.setString(param++, revComment); // rc_comment
ps.setInt(param++, nextTextId); // rc_this_oldid
ps.setInt(param++, textId); // rc_last_oldid
-// ps.setInt(param++, 0); // rc_bot
-// ps.setInt(param++, 0); // rc_moved_to_ns
-// ps.setString(param++, ""); // rc_moved_to_title
+ ps.setInt(param++, 0); // rc_bot
+ ps.setInt(param++, 0); // rc_moved_to_ns
+ ps.setString(param++, ""); // rc_moved_to_title
ps.setString(param++, userIp); // rc_ip
ps.setInt(param++, pageText.length());// rc_old_len
ps.setInt(param++, pageText.length());// rc_new_len

0 comments on commit f1202ce

Please sign in to comment.