[phoenix] 01/03: Revert missing jira number commit "Phoenix-pherf writes the result file even disableRuntimeResult flag is true"

[yanxinyi]

This is an automated email from the ASF dual-hosted git repository.

yanxinyi pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git

commit 85bce0517bbfb7456b972e72f537048d0badc2ef
Author: Xinyi Yan <yanxi...@apache.org>
AuthorDate: Wed Sep 30 22:05:24 2020 -0700

    Revert missing jira number commit "Phoenix-pherf writes the result file 
even disableRuntimeResult flag is true"
    
    This reverts commit 4f778ec8df316907910de82f2c1ba8e06bd1cd02.
---
 .../phoenix/pherf/workload/MultiThreadedRunner.java    | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git 
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/MultiThreadedRunner.java
 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/MultiThreadedRunner.java
index c4c38bd..b4562e3 100644
--- 
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/MultiThreadedRunner.java
+++ 
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/MultiThreadedRunner.java
@@ -57,7 +57,7 @@ class MultiThreadedRunner implements Callable<Void> {
     private final Scenario scenario;
     private final WorkloadExecutor workloadExecutor;
     private final XMLConfigParser parser;
-    private final boolean writeRuntimeResults;
+    
 
     /**
      * MultiThreadedRunner
@@ -83,7 +83,6 @@ class MultiThreadedRunner implements Callable<Void> {
                this.resultManager = new 
ResultManager(dataModelResult.getName(), writeRuntimeResults);
                this.workloadExecutor = workloadExecutor;
                this.parser = parser;
-               this.writeRuntimeResults = writeRuntimeResults;
     }
 
     /**
@@ -106,25 +105,16 @@ class MultiThreadedRunner implements Callable<Void> {
                 if (!timedQuery(i+1)) {
                     break;
                 }
-                if (writeRuntimeResults &&
-                        (EnvironmentEdgeManager.currentTimeMillis() - 
lastResultWritten) > 1000) {
+                if ((EnvironmentEdgeManager.currentTimeMillis() - 
lastResultWritten) > 1000) {
                     resultManager.write(dataModelResult, ruleApplier);
                     lastResultWritten = 
EnvironmentEdgeManager.currentTimeMillis();
                 }
             }
         }
 
-        if (!writeRuntimeResults) {
-            long duration = EnvironmentEdgeManager.currentTimeMillis() - 
threadStartTime;
-            LOGGER.info("The read query " + query.getStatement() + " for this 
thread in ("
-                    + duration + ") Ms");
-        }
-
         // Make sure all result have been dumped before exiting
-        if (writeRuntimeResults) {
-            synchronized (workloadExecutor) {
-                resultManager.flush();
-            }
+        synchronized (workloadExecutor) {
+            resultManager.flush();
         }
 
         LOGGER.info("\n\nThread exiting." + threadName + "\n\n");