Random profile view query triggered

mirkospasic · mirkospasic · commit 1d55f262387c · 2013-10-23T14:05:47.000+02:00
diff --git a/ldbc_socialnet_qgen/sib/int/profile_view/queryprofile.txt b/ldbc_socialnet_qgen/sib/int/profile_view/queryprofile.txt
@@ -0,0 +1,6 @@
+select ?first ?last
+from <sib>
+    {
+        %Person% snvoc:firstName ?first .
+        %Person% snvoc:lastName ?last .
+    }
diff --git a/ldbc_socialnet_qgen/sib/int/profile_view/queryprofiledesc.txt b/ldbc_socialnet_qgen/sib/int/profile_view/queryprofiledesc.txt
@@ -0,0 +1,3 @@
+QueryType=Select
+
+Person=PersonURI
diff --git a/ldbc_socialnet_qgen/sib/int/query10desc.txt b/ldbc_socialnet_qgen/sib/int/query10desc.txt
@@ -1,5 +1,7 @@
 QueryType=Select
 
+PersonURIString=fof
+
 Person=PersonURI
 HS0=HoroscopeSign_0
 HS1=HoroscopeSign_1
diff --git a/ldbc_socialnet_qgen/sib/int/query11desc.txt b/ldbc_socialnet_qgen/sib/int/query11desc.txt
@@ -1,5 +1,7 @@
 QueryType=Select
 
+PersonURIString=fr
+
 Person=PersonURI
 Country=CountryURI
 Date0=WorkFromDate_0_100
diff --git a/ldbc_socialnet_qgen/sib/int/query12desc.txt b/ldbc_socialnet_qgen/sib/int/query12desc.txt
@@ -1,5 +1,7 @@
 QueryType=Select
 
+PersonURIString=exp
+
 Person=PersonURI
 TagType=TagTypeURI
 OtherDetails=ProfileViewQuery_?exp_profile
diff --git a/ldbc_socialnet_qgen/sib/int/query1desc.txt b/ldbc_socialnet_qgen/sib/int/query1desc.txt
@@ -1,3 +1,5 @@
 QueryType=Select
 
+PersonURIString=person
+
 Name=PersonName
diff --git a/ldbc_socialnet_qgen/sib/int/query2desc.txt b/ldbc_socialnet_qgen/sib/int/query2desc.txt
@@ -1,5 +1,7 @@
 QueryType=Select
 
+PersonURIString=fr
+
 OtherDetails=ProfileViewQuery_?fr_profile
 Person=PersonURI
 Date0=CreationPostDate_33_66
diff --git a/ldbc_socialnet_qgen/sib/int/query3desc.txt b/ldbc_socialnet_qgen/sib/int/query3desc.txt
@@ -1,5 +1,7 @@
 QueryType=Select
 
+PersonURIString=fr
+
 Person=PersonURI
 Date0=CreationPostDate_0_66
 Duration=TotalDaysOfCreationPost_33_33
diff --git a/ldbc_socialnet_qgen/sib/int/query7desc.txt b/ldbc_socialnet_qgen/sib/int/query7desc.txt
@@ -1,4 +1,6 @@
 QueryType=Select
 
+PersonURIString=liker
+
 Person=PersonURI
 OtherDetails=ProfileViewQuery_?liker_profile
diff --git a/ldbc_socialnet_qgen/sib/int/query8desc.txt b/ldbc_socialnet_qgen/sib/int/query8desc.txt
@@ -1,4 +1,6 @@
 QueryType=Select
 
+PersonURIString=from
+
 Person=PersonURI
 OtherDetails=ProfileViewQuery_?from_profile
diff --git a/ldbc_socialnet_qgen/sib/int/query9desc.txt b/ldbc_socialnet_qgen/sib/int/query9desc.txt
@@ -1,5 +1,7 @@
 QueryType=Select
 
+PersonURIString=fr
+
 Person=PersonURI
 Date0=CreationPostDate_33_66
 OtherDetails=ProfileViewQuery_?fr_profile
diff --git a/ldbc_socialnet_qgen/sib/int/querymix.txt b/ldbc_socialnet_qgen/sib/int/querymix.txt
@@ -1 +1 @@
-10
+1 2 3 4 5 6 7 8 9 10 11 12
diff --git a/ldbc_socialnet_qgen/src/com/openlinksw/bibm/Query.java b/ldbc_socialnet_qgen/src/com/openlinksw/bibm/Query.java
@@ -50,6 +50,8 @@ public class Query extends ResultDescriptionLists  implements Nameable {
 
     private AbstractParameterPool parameterPool;
     private QueryMix queryMix;
+    
+    private String personURIString;
 
 	public Query(String qName, AbstractParameterPool parameterPool, File queryDir, File descDir) throws IOException {
 		this.parameterPool=parameterPool;
@@ -107,9 +109,13 @@ private void processBsbmParameters(File parameterDescriptionFile) {
 			offset++;
 			// Parameter Type
 			String paramType = line.substring(offset);
+			
+			if (parameter.toLowerCase().equals("personuristring")) {
+				setPersonURIString(paramType);
+			}
 
 			// If special parameter querytype is given save query type for later use
-			if (parameter.toLowerCase().equals("querytype")) {
+			else if (parameter.toLowerCase().equals("querytype")) {
 				byte qType = getQueryType(paramType);
 				if (qType == 0) {
 					DoubleLogger.getErr().println("Invalid query type chosen."	+ " Using default: Select");
@@ -310,4 +316,12 @@ public byte[] getQueryTypeSequence() {
         return queryTypeSequence;
     }
 
+	public String getPersonURIString() {
+		return personURIString;
+	}
+
+	public void setPersonURIString(String personURIString) {
+		this.personURIString = personURIString;
+	}
+
 }
diff --git a/ldbc_socialnet_qgen/src/com/openlinksw/bibm/sib/ClientManager.java b/ldbc_socialnet_qgen/src/com/openlinksw/bibm/sib/ClientManager.java
@@ -30,9 +30,9 @@ public class ClientManager extends AbstractClientManager<QueryMixStatistics> imp
 	public ClientManager(TestDriver parent) {
 		this.driver = parent;
 		this.nrWarmup = parent.warmups.getValue();
-		this.nrRuns = parent.nrRuns.getValue();
+		this.setNrRuns(parent.nrRuns.getValue());
 		this.nrThreads = parent.nrThreads.getValue();
-		this.queryMix = parent.queryMix;
+		this.setQueryMix(parent.queryMix);
         queryMixStat = new QueryMixStatistics();
 		clients = new ClientThread[this.nrThreads];		
 		outBuf=new FiniteQueue<CompiledQueryMix>(new ArrayDeque<CompiledQueryMix>(nrThreads*2)); 
@@ -74,7 +74,7 @@ public void doActualRuns() throws InterruptedException {
         DoubleLogger.getOut().println("Starting actual run...").flush();
 		warmupPhase=false;
 
-        double totalRunTimeInSeconds = makeRuns(0, nrRuns, true);
+        double totalRunTimeInSeconds = makeRuns(0, getNrRuns(), true);
 
 		queryMixStat.setElapsedRuntime(totalRunTimeInSeconds);
 		DoubleLogger.getOut().printf("Benchmark run completed in %.3f s\n", totalRunTimeInSeconds);
@@ -85,14 +85,14 @@ public void doActualRuns() throws InterruptedException {
 	private double makeRuns(int startNr, int endNr, boolean doUpdate) throws InterruptedException {
 		int nrRun=startNr;
 		for (; nrRun<endNr; nrRun++) {
-			CompiledQueryMix item=createCompiledQueriMix(queryMix, nrRun,  doUpdate);
+			CompiledQueryMix item=createCompiledQueriMix(getQueryMix(), nrRun,  doUpdate);
 			boolean full=!outBuf.offer(item);
 			if (full) break;
 		}
         long start = System.nanoTime();
         startClients();
 		for (; nrRun<endNr; nrRun++) {
-			CompiledQueryMix item=createCompiledQueriMix(queryMix, nrRun,  doUpdate);
+			CompiledQueryMix item=createCompiledQueriMix(getQueryMix(), nrRun,  doUpdate);
 			outBuf.add(item);
 		}
 		outBuf.setFinish();
@@ -102,7 +102,7 @@ private double makeRuns(int startNr, int endNr, boolean doUpdate) throws Interru
 	}
 
     public Object[] getParametersForQuery(Query query, int level) {
-        if (driver.useDefaultParams.getValue()) {
+    	if (driver.useDefaultParams.getValue()) {
             FormalParameter[] fps=query.getFormalParameters();
             int paramCount=fps.length;
             String[] parameters = new String[paramCount];
@@ -192,11 +192,27 @@ public void run()  {
             driver.sutStart();
             doActualRuns();
             driver.sutEnd();
-            queryMixStat.fillFrame(true, driver, queryMix.getQueries());
+            queryMixStat.fillFrame(true, driver, getQueryMix().getQueries());
         } catch (InterruptedException e) {
         } finally {
             outBuf.setFinish();
             driver.resultQueue.setFinish();
         }
     }
+
+	public int getNrRuns() {
+		return nrRuns;
+	}
+
+	public void setNrRuns(int nrRuns) {
+		this.nrRuns = nrRuns;
+	}
+
+	public SIBQueryMix getQueryMix() {
+		return queryMix;
+	}
+
+	public void setQueryMix(SIBQueryMix queryMix) {
+		this.queryMix = queryMix;
+	}
 }
diff --git a/ldbc_socialnet_qgen/src/com/openlinksw/bibm/sib/LocalSPARQLParameterPool.java b/ldbc_socialnet_qgen/src/com/openlinksw/bibm/sib/LocalSPARQLParameterPool.java
@@ -9,7 +9,9 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Queue;
 
 import benchmark.generator.DateGenerator;
 import benchmark.generator.RandomBucket;
@@ -32,6 +34,7 @@ public class LocalSPARQLParameterPool extends SIBParameterPool {
 	private File updateDatasetFile;
 	private BufferedReader updateFileReader = null;
 	private GregorianCalendar publishDateMin = new GregorianCalendar(2007,5,20);
+	private LinkedList<String> listOfPeople = new LinkedList<String>();
 	
 	public LocalSPARQLParameterPool(File resourceDirectory, Long seed) {
 		parameterChar='%';
@@ -53,6 +56,15 @@ public Object[] getParametersForQuery(Query query, int level) {
 		FormalParameter[] fps=query.getFormalParameters();
 		int paramCount=fps.length;
 		Object[] parameters = new Object[paramCount];
+		
+		if (query.getName().equals("profile")) {
+			StringBuilder tmp = new StringBuilder(listOfPeople.pop());
+			tmp.setCharAt(0, '<');
+			tmp.setCharAt(tmp.length() - 1, '>');
+			parameters[0] = tmp.toString();
+			return parameters;
+		}
+		
 		ArrayList<Integer> productFeatureIndices = new ArrayList<Integer>();
 		ProductType pt = null;
 		GregorianCalendar randomDate = null;
@@ -301,4 +313,8 @@ private String getUpdateTransactionData() {
 	protected String formatDateString(GregorianCalendar date) {
 		return "\"" + DateGenerator.formatDateTime(date) + "\"^^<" + XSD.DateTime + ">";
 	}
+	
+	public void addPeopleURI(String s) {
+		listOfPeople.push(s);
+	}
 }
diff --git a/ldbc_socialnet_qgen/src/com/openlinksw/bibm/sib/TestDriver.java b/ldbc_socialnet_qgen/src/com/openlinksw/bibm/sib/TestDriver.java
@@ -28,9 +28,14 @@
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Random;
 
 import org.apache.log4j.xml.DOMConfigurator;
 
+import umontreal.iro.lecuyer.util.PrintfFormat;
+
+import benchmark.qualification.QueryResult;
+
 import com.openlinksw.bibm.AbstractQueryResult;
 import com.openlinksw.bibm.AbstractTestDriver;
 import com.openlinksw.bibm.Query;
@@ -39,6 +44,7 @@
 import com.openlinksw.bibm.Exceptions.RequestFailedException;
 import com.openlinksw.bibm.qualification.Comparator;
 import com.openlinksw.bibm.qualification.ResultCollector;
+import com.openlinksw.bibm.qualification.ResultDescription;
 import com.openlinksw.bibm.statistics.AbstractQueryMixStatistics;
 import com.openlinksw.util.DoubleLogger;
 import com.openlinksw.util.FiniteQueue;
@@ -51,6 +57,8 @@ public class TestDriver extends AbstractTestDriver {
             ,"Directly specifies a query mix directory."
             ,"Can be used several times, and with -ucf optionDirectly specifies a query mix directory.");
     
+    BooleanOption randomProfileViewQuery = new BooleanOption("rpvq", "trigger the profile view query from the specified directory for some of the returned persons");
+    
     public IntegerOption warmups=new IntegerOption("w <number of warm up runs before actual measuring>", 0,
         "default: 0");
     public BooleanOption warmUpdate=new BooleanOption("wud"
@@ -71,7 +79,9 @@ public class TestDriver extends AbstractTestDriver {
             ,"Specifies where the use case description file can be found.");
         
     public File[] querymixDirs;
+    public File querymixProfileViewDir;
     public SIBQueryMix queryMix;// The Benchmark Querymix
+    public SIBQueryMix queryMixProfileView;
    
     public TestDriver(String args[]) throws IOException {
         super(version,
@@ -130,6 +140,18 @@ public TestDriver(String args[]) throws IOException {
             throw new BadSetupException("no query files found");
         }
         queryMix=mix0;
+        
+        if (randomProfileViewQuery.getValue()) {
+        	querymixProfileViewDir = new File(querymixDirs[0] + "/profile_view");
+	        if (!querymixProfileViewDir.exists()) {
+	            throw new BadSetupException("no such usecase directory: "+ querymixProfileViewDir);
+	        }
+	        SIBQueryMix mix1 = new SIBQueryMix(parameterPool, querymixProfileViewDir, seedLoc);
+	        if (mix1.getQueries().size()==0) {
+	            throw new BadSetupException("no query files for profile view found");
+	        }
+	        queryMixProfileView=mix1;
+        }
   }
 
     /*
@@ -179,12 +201,28 @@ public void run() throws Exception {
             collector.addResultDescriptionsFromDriver(this);
        }
 
+        ClientManager manager1 = new ClientManager(this);
+		manager1.setNrRuns(0);
+		manager1.setQueryMix(this.queryMixProfileView);
+        
         for (;;) {
             AbstractQueryResult result = resultQueue.take();
             if (result==null) {
                 // finish
                 break;
             }
+            Random r =  new Random(System.currentTimeMillis());
+            com.openlinksw.bibm.qualification.QueryResult qr = result.getQueryResult();
+            int index = qr.getHeader().indexOf(result.getQuery().getQuery().getPersonURIString());
+            if (index != -1) {
+            	result.getQuery().getQueryTypeSequence();
+            	for (int i = 0; i < qr.getResultCount(); i++) {
+            		if (r.nextInt(10) == 0) {
+            			manager1.setNrRuns(manager1.getNrRuns() + 1);
+            			((LocalSPARQLParameterPool)(manager1.driver.parameterPool)).addPeopleURI(qr.getResults().get(i).get(index));
+            		}
+            	}
+            }
             if (collector != null) {
                 collector.addResult(result.getQueryResult());
             }
@@ -195,6 +233,24 @@ public void run() throws Exception {
                 cmp.addQueryResult(result.getQueryResult());
             }
         }
+        
+        Thread managerThread1 = new Thread(manager1);
+        if (this.randomProfileViewQuery.getValue()) {
+	        managerThread1.start();
+	        
+	        Thread.sleep(1000);
+	        
+	        for (;;) {
+	            AbstractQueryResult result = resultQueue.take();
+	            if (result==null) {
+	                // finish
+	                break;
+	            }
+	            if (printResults.getValue()) {
+	                result.logResultInfo(logger);
+	             }
+	        }
+        }
 
         AbstractQueryMixStatistics queryMixStat = manager.getQueryMixStat();
         logger.append(queryMixStat.getResultString());
@@ -203,6 +259,13 @@ public void run() throws Exception {
         if (cmp!=null) {
             cmp.reportTotal();
         }
+        
+        if (this.randomProfileViewQuery.getValue()) {
+		    AbstractQueryMixStatistics queryMixStat1 = manager1.getQueryMixStat();
+		    logger.append(queryMixStat1.getResultString());
+		    logger.flush();
+		    printXML(queryMixStat1);
+        }
     }
 
     protected void testDriverShutdown() {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+QueryType=Select`
	`2`	`+`
	`3`	`+Person=PersonURI`