Patch.

Author: 17zhangw

src/main/java/com/oltpbenchmark/DBWorkload.java

@@ -18,11 +18,11 @@
 package com.oltpbenchmark;
 
 import com.oltpbenchmark.api.BenchmarkModule;
-import com.oltpbenchmark.api.collectors.DBParameterCollector;
-import com.oltpbenchmark.api.collectors.DBParameterCollectorGen;
 import com.oltpbenchmark.api.TransactionType;
 import com.oltpbenchmark.api.TransactionTypes;
 import com.oltpbenchmark.api.Worker;
+import com.oltpbenchmark.api.collectors.DBParameterCollector;
+import com.oltpbenchmark.api.collectors.DBParameterCollectorGen;
 import com.oltpbenchmark.types.DatabaseType;
 import com.oltpbenchmark.types.State;
 import com.oltpbenchmark.util.*;
@@ -494,31 +494,6 @@ public static void main(String[] args) throws Exception {
           runCreator(benchmark);
           LOG.info(
               "Finished creating new {} database...", benchmark.getBenchmarkName().toUpperCase());
-=======
-
-        // Execute Workload
-        if (isBooleanOptionSet(argsLine, "execute")) {
-            // Bombs away!
-            try {
-
-                Results r = runWorkload(benchList, intervalMonitor);
-                writeOutputs(initialParams, r, activeTXTypes, argsLine, xmlConfig);
-                writeHistograms(r);
-
-                if (argsLine.hasOption("json-histograms")) {
-                    String histogram_json = writeJSONHistograms(r);
-                    String fileName = argsLine.getOptionValue("json-histograms");
-                    FileUtil.writeStringToFile(new File(fileName), histogram_json);
-                    LOG.info("Histograms JSON Data: " + fileName);
-                }
-            } catch (Throwable ex) {
-                LOG.error("Unexpected error when executing benchmarks.", ex);
-                System.exit(1);
-            }
-
-        } else {
-            LOG.info("Skipping benchmark workload execution");
->>>>>>> 03509c0b (log metrics adjustment)
         }
       } catch (Throwable ex) {
         LOG.error("Unexpected error when creating benchmark database tables.", ex);
@@ -589,14 +564,15 @@ public static void main(String[] args) throws Exception {
       // Bombs away!
       try {
         DatabaseType dbType = DatabaseType.valueOf(xmlConfig.getString("type").toUpperCase());
-	String dbUrl = xmlConfig.getString("url");
-	String username = xmlConfig.getString("username");
-	String password = xmlConfig.getString("password");
-	DBParameterCollector collector = DBParameterCollectorGen.getCollector(dbType, dbUrl, username, password);
-	String initialParams = collector.collectMetrics();
+        String dbUrl = xmlConfig.getString("url");
+        String username = xmlConfig.getString("username");
+        String password = xmlConfig.getString("password");
+        DBParameterCollector collector =
+            DBParameterCollectorGen.getCollector(dbType, dbUrl, username, password);
+        String initialParams = collector.collectMetrics();
 
         Results r = runWorkload(benchList, monitorInfo);
-        writeOutputs(r, activeTXTypes, argsLine, xmlConfig);
+        writeOutputs(initialParams, r, activeTXTypes, argsLine, xmlConfig);
         writeHistograms(r);
 
         if (argsLine.hasOption("json-histograms")) {
@@ -779,9 +755,10 @@ private static void writeOutputs(
 
     if (rw.hasMetrics()) {
       String initialMetricsFileName = baseFileName + ".initial.metrics.json";
-      try (PrintStream ps = new PrintStream(FileUtil.joinPath(outputDirectory, initialMetricsFileName))) {
+      try (PrintStream ps =
+          new PrintStream(FileUtil.joinPath(outputDirectory, initialMetricsFileName))) {
         LOG.info("Output Initial DBMS metrics into file: {}", initialMetricsFileName);
-	ps.print(initialParams);
+        ps.print(initialParams);
       }
 
       String metricsFileName = baseFileName + ".metrics.json";
@@ -797,7 +774,6 @@ private static void writeOutputs(
       rw.writeConfig(ps);
     }
 
-
     if (xmlConfig.getBoolean("emitRaw", false)) {
       String resultsFileName = baseFileName + ".results.csv";
       try (PrintStream ps = new PrintStream(FileUtil.joinPath(outputDirectory, resultsFileName))) {