adjust parameters

Author: Tobias Hafner

build.gradle

@@ -14,6 +14,7 @@ buildscript {
             url = uri("https://plugins.gradle.org/m2/")
         }
     }
+
     dependencies {
         // Shadowing; used to make a fat jar (https://github.com/johnrengelman/shadow)
         classpath group: "com.github.johnrengelman", name: "shadow", version: "8.1.1"
@@ -192,6 +193,7 @@ shadowJar {
     mergeServiceFiles {
         setPath("META-INF/services")
         include("io.grpc.*")
+        include("java.sql.Driver")
     }
     // Include everything from 'libs' but rename JARs to another extension to trick the plugin
     from('libs') {

src/main/java/org/polypheny/simpleclient/scenario/lockingBench/ErrorHandlingPolyphenyScenario.java

@@ -24,7 +24,10 @@
 
 package org.polypheny.simpleclient.scenario.lockingBench;
 
+import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -132,5 +135,24 @@ private double calculateSuccessRatio() {
         return Math.round( unroundedRatio * 100.0 ) / 100.0;
     }
 
+    public void storeIndividualExecutionTimes(File outputDirectory, String baseFileName) {
+        if (!outputDirectory.exists()) {
+            outputDirectory.mkdirs();
+        }
+
+        measuredTimePerQueryType.forEach((templateId, times) -> {
+            File outputFile = new File(outputDirectory, baseFileName + "_template" + templateId + ".txt");
+
+            try ( BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile))) {
+                for (Long time : times) {
+                    writer.write(time.toString());
+                    writer.newLine();
+                }
+            } catch ( IOException e) {
+                throw new RuntimeException( "Exception while exporting individual execution times.", e );
+            }
+        });
+    }
+
 
 }

src/main/java/org/polypheny/simpleclient/scenario/lockingBench/LockingBench.java

@@ -173,13 +173,15 @@ public synchronized void store( OutputStream out, String comments) throws IOExce
             }
         };
 
-        String fileName = String.format(
-                "analysis_S%d_N%d_E%d_R%f.txt",
+        String baseFileName = String.format(
+                "analysis_S%d_N%d_E%d_R%f",
                 config.sessionCount,
                 config.namespaceCount,
                 config.entityCount,
                 config.readWriteRatio);
 
+        String fileName = baseFileName + ".txt";
+
         File analysisFile = new File(outputDirectory, fileName);
         analyze(analysis, analysisFile);
 
@@ -193,6 +195,7 @@ public synchronized void store( OutputStream out, String comments) throws IOExce
         } catch (IOException e) {
             log.error("Exception while generating analysis", e);
         }
+        storeIndividualExecutionTimes( outputDirectory, baseFileName );
     }
 
 

src/main/resources/org/polypheny/simpleclient/scenario/lockingBench/lockingbench.properties

@@ -22,7 +22,7 @@
 # SOFTWARE.
 #
 
-numberOfEntriesPerTable = 100
+numberOfEntriesPerTable = 1000
 maxBatchSize = 100
 
 progressReportBase = 100

src/main/resources/org/polypheny/simpleclient/scenario/oltpbench/tpcc.properties

@@ -1,4 +1,4 @@
-numberOfThreads = 1
+numberOfThreads = 16
 progressReportBase = 100
 workloadMonitoringExecutingWorkload = true
 workloadMonitoringLoadingData = true
@@ -14,4 +14,4 @@ newOrderWeight = 45
 paymentWeight = 43
 orderStatusWeight = 4
 deliveryWeight = 4
-stockLevelWeight = 4
+stockLevelWeight = 4

src/main/resources/org/polypheny/simpleclient/scenario/oltpbench/tpch.properties

@@ -1,4 +1,4 @@
-numberOfThreads = 1
+numberOfThreads = 16
 progressReportBase = 100
 workloadMonitoringExecutingWorkload = true
 workloadMonitoringLoadingData = true
@@ -10,4 +10,4 @@ numberOfWarmUpIterations = 0
 
 transactionTypes = Q1,Q3,Q4,Q6,Q9,Q12,Q13,Q14,Q16,Q17
 
-partitionItemTable = false
+partitionItemTable = false

src/main/resources/org/polypheny/simpleclient/scenario/oltpbench/ycsb.properties

@@ -1,4 +1,4 @@
-numberOfThreads = 1
+numberOfThreads = 16
 progressReportBase = 100
 workloadMonitoringExecutingWorkload = true
 workloadMonitoringLoadingData = true
@@ -16,4 +16,4 @@ updateRecordWeight = 10
 deleteRecordWeight = 10
 readModifyWriteRecordWeight = 10
 
-partitionTable = false
+partitionTable = false