[Bigdata-commit] SF.net SVN: bigdata:[3550] branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm

[<tho...@us...>]

Revision: 3550
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3550&view=rev
Author:   thompsonbry
Date:     2010-09-14 19:15:27 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
Modified the LUBM performance test to use 10M write cache buffers and to locate its log4j configuration file correctly.

Modified Paths:
--------------
    branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/RWStore.properties
    branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/build.properties
    branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/build.xml

Modified: branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/RWStore.properties
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/RWStore.properties	2010-09-14 19:14:30 UTC (rev 3549)
+++ branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/RWStore.properties	2010-09-14 19:15:27 UTC (rev 3550)
@@ -10,9 +10,12 @@
 
 # Disk is the worm store.  DiskRW is the read/write store.
 com.bigdata.journal.AbstractJournal.bufferMode=DiskRW
-com.bigdata.btree.writeRetentionQueue.capacity=4000
+com.bigdata.btree.writeRetentionQueue.capacity=8000
 com.bigdata.btree.BTree.branchingFactor=128
 
+# Override the #of write cache buffers.
+com.bigdata.journal.AbstractJournal.writeCacheBufferCount=12
+
 # 200M initial extent.
 com.bigdata.journal.AbstractJournal.initialExtent=209715200
 com.bigdata.journal.AbstractJournal.maximumExtent=209715200

Modified: branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/build.properties
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/build.properties	2010-09-14 19:14:30 UTC (rev 3549)
+++ branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/build.properties	2010-09-14 19:15:27 UTC (rev 3550)
@@ -40,7 +40,7 @@
 lubm.maxMem=4g
 
 # The data set size (U50, U1000, etc.)
-lubm.univ=50
+lubm.univ=8000
 
 # The namespace of the KB instance (multiple KBs can be in the same database).
 lubm.namespace=LUBM_U${lubm.univ}
@@ -48,9 +48,9 @@
 # Laptop benchmark data directory.
 #lubm.baseDir=d:/bigdata-perf-analysis/lubm/U${lubm.univ}
 # Server benchmark directory.
-#lubm.baseDir=/nas/data/lubm/U${lubm.univ}
+lubm.baseDir=/nas/data/lubm/U${lubm.univ}
 # Windows Server 2008 benchmark data directory.
-lubm.baseDir=c:/usr/local/data/lubm/lubm_${lubm.univ}
+#lubm.baseDir=c:/usr/local/data/lubm/lubm_${lubm.univ}
 
 ## Where to put the XML results files.
 #bsbm.resultsDir=${bsbm.baseDir}/..
@@ -68,8 +68,8 @@
 lubm.compressType=GZip
 
 # Which mode to use for the Journal. (DiskRW or DiskWORM)
-#journalMode=RW
-journalMode=WORM
+journalMode=RW
+#journalMode=WORM
 
 ## The name of the directory containing the generated RDF data without the filename extension.
 #lubm.outputFile=${lubm.baseDir}
@@ -80,11 +80,11 @@
 # The name of the file used for the journal.
 #lubm.journalFile=${lubm.baseDir}/bigdata-lubm.${journalMode}.jnl
 # Note: This is on the large volume.
-#lubm.journalFile=/data/lubm/U${lubm.univ}/bigdata-lubm.${journalMode}.jnl
+lubm.journalFile=/data/lubm/U${lubm.univ}/bigdata-lubm.${journalMode}.jnl
 # SSD.
 #lubm.journalFile=e:/data/lubm/U${lubm.univ}/bigdata-lubm.${journalMode}.jnl
 # SAS
-lubm.journalFile=f:/data/lubm/U${lubm.univ}/bigdata-lubm.${journalMode}.jnl
+#lubm.journalFile=f:/data/lubm/U${lubm.univ}/bigdata-lubm.${journalMode}.jnl
 
 # The database to test.
 lubm.configFile=${lubm.dir}/src/resources/config/config.kb.sparql
@@ -136,4 +136,4 @@
 #-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.HardReferenceGlobalLRURecycler
 
 # all jvm args for query.
-queryJvmArgs=-server -Xmx${lubm.maxMem} ${gcopts} ${gcdebug} ${profiler} ${cache} -Dlog4j.configuration=log4j.properties
+queryJvmArgs=-server -Xmx${lubm.maxMem} ${gcopts} ${gcdebug} ${profiler} ${cache} -Dlog4j.configuration=file:src/resources/logging/log4j.properties

Modified: branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/build.xml
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/build.xml	2010-09-14 19:14:30 UTC (rev 3549)
+++ branches/JOURNAL_HA_BRANCH/bigdata-perf/lubm/build.xml	2010-09-14 19:15:27 UTC (rev 3550)
@@ -54,14 +54,14 @@
 				<exclude name="**/*.java" />
 				<exclude name="**/package.html" />
 			</fileset>
-			<!-- copy log4j configuration file. -->
-			<fileset dir="${lubm.dir}/src/resources/logging" />
 		</copy>
 		<copy toDir="${build.dir}/bin">
 			<!-- copy benchmark data and queries. -->
 			<fileset dir="${lubm.dir}/src/resources/config" />
 			<!-- copy the journal configuration file. -->
 			<fileset file="${lubm.dir}/*.properties" />
+			<!-- copy log4j configuration file. -->
+			<fileset dir="${lubm.dir}/src/resources/logging" />
 		</copy>
 	</target>
 
@@ -90,7 +90,9 @@
 		<java classname="com.bigdata.rdf.store.DataLoader" fork="true" failonerror="true">
 			<arg line="-closure -namespace ${lubm.namespace} ${lubm.journalPropertyFile} ${lubm.ontologyFile} ${lubm.dataDir}" />
 			<!-- specify/override the journal file name. -->
-			<jvmarg line="${queryJvmArgs} -Dcom.bigdata.journal.AbstractJournal.file=${lubm.journalFile}" />
+			<jvmarg line="${queryJvmArgs} -Dcom.bigdata.journal.AbstractJournal.file=${lubm.journalFile}
+				-Dcom.bigdata.io.DirectBufferPool.bufferCapacity=10485760
+				" />
 			<classpath>
 				<path refid="runtime.classpath" />
 			</classpath>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.