Move dumpQueryList to PolyphenyScenario

Author: gartens

src/main/java/org/polypheny/simpleclient/scenario/PolyphenyScenario.java

@@ -25,6 +25,8 @@
 package org.polypheny.simpleclient.scenario;
 
 import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -123,4 +125,25 @@ public void analyze( Properties properties, File outputDirectory ) {
         properties.put( "throughput", measuredTimes.size() / (executeRuntime / 1000000000.0) );
     }
 
+
+    private void dumpQueryList( File outputDirectory, List<QueryListEntry> queryList, Function<Query, String> toString ) {
+        if ( outputDirectory != null && dumpQueryList ) {
+            log.info( "Dump query list..." );
+            try {
+                FileWriter fw = new FileWriter( outputDirectory.getPath() + File.separator + "queryList" );
+                queryList.forEach( query -> {
+                    try {
+                        fw.append( toString.apply( query.query ) ).append( "\n" );
+                    } catch ( IOException e ) {
+                        log.error( "Error while dumping query list", e );
+                    }
+                } );
+                fw.close();
+            } catch ( IOException e ) {
+                log.error( "Error while dumping query list", e );
+            }
+        }
+
+    }
+
 }

src/main/java/org/polypheny/simpleclient/scenario/Scenario.java

@@ -26,16 +26,13 @@
 
 import com.google.common.base.Joiner;
 import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.util.List;
 import java.util.LongSummaryStatistics;
 import java.util.Map;
 import java.util.OptionalDouble;
 import java.util.Properties;
-import java.util.function.Function;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.polypheny.simpleclient.QueryMode;
@@ -47,8 +44,6 @@
 import org.polypheny.simpleclient.main.ChronosAgent;
 import org.polypheny.simpleclient.main.CsvWriter;
 import org.polypheny.simpleclient.main.ProgressReporter;
-import org.polypheny.simpleclient.query.Query;
-import org.polypheny.simpleclient.query.QueryListEntry;
 
 
 @Slf4j
@@ -184,25 +179,4 @@ protected static void commitAndCloseExecutor( Executor executor ) {
         }
     }
 
-
-    protected void dumpQueryList( File outputDirectory, List<QueryListEntry> queryList, Function<Query, String> toString ) {
-        if ( outputDirectory != null && dumpQueryList ) {
-            log.info( "Dump query list..." );
-            try {
-                FileWriter fw = new FileWriter( outputDirectory.getPath() + File.separator + "queryList" );
-                queryList.forEach( query -> {
-                    try {
-                        fw.append( toString.apply( query.query ) ).append( "\n" );
-                    } catch ( IOException e ) {
-                        log.error( "Error while dumping query list", e );
-                    }
-                } );
-                fw.close();
-            } catch ( IOException e ) {
-                log.error( "Error while dumping query list", e );
-            }
-        }
-
-    }
-
 }