From: <tho...@us...> - 2011-01-16 20:45:26
|
Revision: 4114 http://bigdata.svn.sourceforge.net/bigdata/?rev=4114&view=rev Author: thompsonbry Date: 2011-01-16 20:45:19 +0000 (Sun, 16 Jan 2011) Log Message: ----------- Fixed some spelling errors in the property files for the RW and WORM stores (sail properties mostly). Added support for "-seed random" to the bsbm TestDriver as an convenience for scripting random runs. Modified Paths: -------------- branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/RWStore.properties branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/WORMStore.properties branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/bsbmtools/src/benchmark/testdriver/TestDriver.java branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/build.properties branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/RWStore.properties branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/WORMStore.properties branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/build.properties Modified: branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/RWStore.properties =================================================================== --- branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/RWStore.properties 2011-01-16 20:21:58 UTC (rev 4113) +++ branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/RWStore.properties 2011-01-16 20:45:19 UTC (rev 4114) @@ -24,6 +24,17 @@ com.bigdata.namespace.BSBM_284826.spo.SPO.com.bigdata.btree.BTree.branchingFactor=512 com.bigdata.namespace.BSBM_284826.spo.OSP.com.bigdata.btree.BTree.branchingFactor=470 +# Reduce the branching factor for the lexicon since BSBM uses a lot of long +# literals. Note that you have to edit this override to specify the namespace +# into which the BSBM data will be loaded. +com.bigdata.namespace.BSBM_566496.lex.TERM2ID.com.bigdata.btree.BTree.branchingFactor=32 +com.bigdata.namespace.BSBM_566496.lex.ID2TERM.com.bigdata.btree.BTree.branchingFactor=32 + +# 4k pages. +com.bigdata.namespace.BSBM_566496.spo.POS.com.bigdata.btree.BTree.branchingFactor=970 +com.bigdata.namespace.BSBM_566496.spo.SPO.com.bigdata.btree.BTree.branchingFactor=512 +com.bigdata.namespace.BSBM_566496.spo.OSP.com.bigdata.btree.BTree.branchingFactor=470 + # Override the #of write cache buffers. com.bigdata.journal.AbstractJournal.writeCacheBufferCount=12 @@ -48,11 +59,17 @@ #com.bigdata.rdf.store.AbstractTripleStore.termCache.capacity=50000 com.bigdata.rdf.store.AbstractTripleStore.axiomsClass=com.bigdata.rdf.axioms.NoAxioms +# xsd:DateTime needs to be inlined for BSBM +com.bigdata.rdf.store.AbstractTripleStore.inlineDateTimes=true + ## ## Sail options. ## -com.bigdata.rdf.sail.BigdataSail.truthMaintenance=false +com.bigdata.rdf.sail.truthMaintenance=false # 10000 is default. -com.bigdata.rdf.sail.BigdataSail.bufferCapacity=100000 +com.bigdata.rdf.sail.bufferCapacity=100000 + +# direct sesame to bop translation. +com.bigdata.rdf.sail.newEvalStrategy=true Modified: branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/WORMStore.properties =================================================================== --- branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/WORMStore.properties 2011-01-16 20:21:58 UTC (rev 4113) +++ branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/WORMStore.properties 2011-01-16 20:45:19 UTC (rev 4114) @@ -27,11 +27,17 @@ #com.bigdata.rdf.store.AbstractTripleStore.termCache.capacity=50000 com.bigdata.rdf.store.AbstractTripleStore.axiomsClass=com.bigdata.rdf.axioms.NoAxioms +# xsd:DateTime needs to be inlined for BSBM +com.bigdata.rdf.store.AbstractTripleStore.inlineDateTimes=true + ## ## Sail options. ## -com.bigdata.rdf.sail.BigdataSail.truthMaintenance=false +com.bigdata.rdf.sail.truthMaintenance=false # 10000 is default. -com.bigdata.rdf.sail.BigdataSail.bufferCapacity=100000 +com.bigdata.rdf.sail.bufferCapacity=100000 + +# direct sesame to bop translation. +com.bigdata.rdf.sail.newEvalStrategy=true Modified: branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/bsbmtools/src/benchmark/testdriver/TestDriver.java =================================================================== --- branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/bsbmtools/src/benchmark/testdriver/TestDriver.java 2011-01-16 20:21:58 UTC (rev 4113) +++ branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/bsbmtools/src/benchmark/testdriver/TestDriver.java 2011-01-16 20:45:19 UTC (rev 4114) @@ -752,7 +752,14 @@ multithreading = true; nrThreads = Integer.parseInt(args[i++ + 1]); } else if (args[i].equals("-seed")) { - seed = Long.parseLong(args[i++ + 1]); +// Modified 1/16/2011 by BBT to recognize "random" seeds. +// seed = Long.parseLong(args[i++ + 1]); + final String s = args[i++ + 1]; + if (s.equals("random")) { + seed = System.nanoTime(); + } else { + seed = Long.parseLong(s); + } } else if (args[i].equals("-t")) { timeout = Integer.parseInt(args[i++ + 1]); } else if (args[i].equals("-dbdriver")) { Modified: branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/build.properties =================================================================== --- branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/build.properties 2011-01-16 20:21:58 UTC (rev 4113) +++ branches/QUADS_QUERY_BRANCH/bigdata-perf/bsbm3/build.properties 2011-01-16 20:45:19 UTC (rev 4114) @@ -46,8 +46,8 @@ #bsbm.pc=10 #bsbm.pc=2785 #bsbm.pc=70812 -bsbm.pc=284826 -#bsbm.pc=566496 +#bsbm.pc=284826 +bsbm.pc=566496 # The namespace of the KB instance (multiple KBs can be in the same database). bsbm.namespace=BSBM_${bsbm.pc} Modified: branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/RWStore.properties =================================================================== --- branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/RWStore.properties 2011-01-16 20:21:58 UTC (rev 4113) +++ branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/RWStore.properties 2011-01-16 20:45:19 UTC (rev 4114) @@ -66,7 +66,7 @@ # are loaded. (Actually, since we are not loading through the SAIL # making this true does not cause incremental TM but it does disable # closure, so "false" is what you need here). -com.bigdata.rdf.sail.BigdataSail.truthMaintenance=false +com.bigdata.rdf.sail.truthMaintenance=false # # Option to restrict ourselves to RDFS only inference. This condition @@ -92,7 +92,7 @@ com.bigdata.rdf.store.AbstractTripleStore.axiomsClass=com.bigdata.rdf.axioms.RdfsAxioms # 10000 is default. -com.bigdata.rdf.sail.BigdataSail.bufferCapacity=100000 +com.bigdata.rdf.sail.bufferCapacity=100000 # Produce a full closure (all entailments) so that the backward chainer # is always a NOP. Note that the configuration properties are stored in @@ -146,7 +146,7 @@ # (x rdf:type rdfs:Resource) and owl:sameAs even through those # entailments were not materialized during forward closure. (This # property is interpreted by the BigdataSail). -com.bigdata.rdf.stail.queryTimeExpander=false +com.bigdata.rdf.sail.queryTimeExpander=false # Note: LUBM uses blank nodes. Therefore re-loading LUBM will always # cause new statements to be asserted and result in the closure being Modified: branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/WORMStore.properties =================================================================== --- branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/WORMStore.properties 2011-01-16 20:21:58 UTC (rev 4113) +++ branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/WORMStore.properties 2011-01-16 20:45:19 UTC (rev 4114) @@ -32,7 +32,7 @@ # are loaded. (Actually, since we are not loading through the SAIL # making this true does not cause incremental TM but it does disable # closure, so "false" is what you need here). -com.bigdata.rdf.sail.BigdataSail.truthMaintenance=false +com.bigdata.rdf.sail.truthMaintenance=false # # Option to restrict ourselves to RDFS only inference. This condition @@ -58,7 +58,7 @@ com.bigdata.rdf.store.AbstractTripleStore.axiomsClass=com.bigdata.rdf.axioms.RdfsAxioms # 10000 is default. -com.bigdata.rdf.sail.BigdataSail.bufferCapacity=100000 +com.bigdata.rdf.sail.bufferCapacity=100000 # Produce a full closure (all entailments) so that the backward chainer # is always a NOP. Note that the configuration properties are stored in @@ -112,7 +112,7 @@ # (x rdf:type rdfs:Resource) and owl:sameAs even through those # entailments were not materialized during forward closure. (This # property is interpreted by the BigdataSail). -com.bigdata.rdf.stail.queryTimeExpander=false +com.bigdata.rdf.sail.queryTimeExpander=false # Note: LUBM uses blank nodes. Therefore re-loading LUBM will always # cause new statements to be asserted and result in the closure being Modified: branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/build.properties =================================================================== --- branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/build.properties 2011-01-16 20:21:58 UTC (rev 4113) +++ branches/QUADS_QUERY_BRANCH/bigdata-perf/lubm/build.properties 2011-01-16 20:45:19 UTC (rev 4114) @@ -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} @@ -128,8 +128,8 @@ #gcdebug=-XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:jvm_gc.log # The record cache (empty for the default cache). -#cache= -cache=-Dcom.bigdata.LRUNexus.enabled=false +cache= +#cache=-Dcom.bigdata.LRUNexus.enabled=false #cache=-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU2 -Dcom.bigdata.LRUNexus.threadLocalBuffers=true #cache=-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.BCHMGlobalLRU -Dcom.bigdata.LRUNexus.accessPolicy=LIRS -Dcom.bigdata.LRUNexus.limitingCapacity=2000000 #-Dcom.bigdata.LRUNexus.class=com.bigdata.cache.StoreAndAddressLRUCache This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |