to compile

uwescience · Dec 13, 2016 · b6246f0 · b6246f0
1 parent 4a9b514
commit b6246f0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 9 deletions.
diff --git a/src/edu/washington/escience/myria/api/PerfEnforceResource.java b/src/edu/washington/escience/myria/api/PerfEnforceResource.java
@@ -1,5 +1,6 @@
 package edu.washington.escience.myria.api;
 
+import java.io.FileNotFoundException;
 import java.util.List;
 
 import javax.ws.rs.Consumes;
@@ -45,11 +46,17 @@ public Response isDonePSLA() {
     return Response.ok(server.getPerfEnforceDriver().isDonePSLA()).build();
   }
 
+  @GET
+  @Path("/getPSLA")
+  public Response getPSLA() throws FileNotFoundException {
+    return Response.ok(server.getPerfEnforceDriver().getPSLA()).build();
+  }
+
   @POST
   @Path("/setTier")
   @Consumes(MediaType.MULTIPART_FORM_DATA)
-  public Response setTier(@FormDataParam("tier") final int queryRuntime) {
-    server.getPerfEnforceDriver().setTier(queryRuntime);
+  public Response setTier(@FormDataParam("tier") final int tier) {
+    server.getPerfEnforceDriver().setTier(tier);
     return Response.noContent().build();
   }
 

diff --git a/src/edu/washington/escience/myria/operator/TupleSink.java b/src/edu/washington/escience/myria/operator/TupleSink.java
@@ -27,7 +27,7 @@ public final class TupleSink extends RootOperator {
 
   private boolean includeColumnHeader = true;
 
-  public DataOutput(
+  public TupleSink(
       final Operator child,
       final TupleWriter tupleWriter,
       final DataSink dataSink,

diff --git a/src/edu/washington/escience/myria/parallel/Server.java b/src/edu/washington/escience/myria/parallel/Server.java
@@ -1233,7 +1233,7 @@ public long createMaterializedView(
               "create materialized view",
               "create materialized view",
               "create materialized view",
-              new SubQueryPlan(new SinkRoot(new EOSSource())),
+              new SubQueryPlan(new EmptySink(new EOSSource())),
               workerPlans);
       try {
         queryID = qf.get().getQueryId();
@@ -1387,7 +1387,7 @@ public void executeSQLStatement(final String sqlString, final Set<Integer> worke
               "sql execute " + sqlString,
               "sql execute " + sqlString,
               "sql execute " + sqlString,
-              new SubQueryPlan(new SinkRoot(new EOSSource())),
+              new SubQueryPlan(new EmptySink(new EOSSource())),
               workerPlans);
       try {
         qf.get();
@@ -1415,7 +1415,7 @@ public String[] executeSQLStatement(
       workerPlans.put(w, workerPlan);
     }
     final CollectConsumer consumer = new CollectConsumer(outputSchema, operatorId, workers);
-    DataOutput output = new DataOutput(consumer, writer, byteSink, false);
+    TupleSink output = new TupleSink(consumer, writer, byteSink, false);
     final SubQueryPlan masterPlan = new SubQueryPlan(output);
 
     String planString = "execute sql statement : " + sqlString;

diff --git a/src/edu/washington/escience/myria/perfenforce/PerfEnforceDataPreparation.java b/src/edu/washington/escience/myria/perfenforce/PerfEnforceDataPreparation.java
@@ -34,8 +34,8 @@
 import edu.washington.escience.myria.operator.DbInsert;
 import edu.washington.escience.myria.operator.DbQueryScan;
 import edu.washington.escience.myria.operator.EOSSource;
+import edu.washington.escience.myria.operator.EmptySink;
 import edu.washington.escience.myria.operator.RootOperator;
-import edu.washington.escience.myria.operator.SinkRoot;
 import edu.washington.escience.myria.operator.network.GenericShuffleConsumer;
 import edu.washington.escience.myria.operator.network.GenericShuffleProducer;
 import edu.washington.escience.myria.operator.network.partition.FixValuePartitionFunction;
@@ -157,7 +157,7 @@ public HashMap<Integer, RelationKey> ingestFact(final PerfEnforceTableEncoding f
           workerPlans.put(workerID, new RootOperator[] {insert});
         }
 
-        server.submitQueryPlan(new SinkRoot(new EOSSource()), workerPlans).get();
+        server.submitQueryPlan(new EmptySink(new EOSSource()), workerPlans).get();
         relationKeysToUnion.add(currentRelationKeyToUnion);
 
         RelationKey currentConfigRelationKey =
@@ -231,7 +231,7 @@ public void ingestDimension(final PerfEnforceTableEncoding dimTableDesc) throws
         workerPlans.put(workerID, new RootOperator[] {producer, insert});
       }
 
-      server.submitQueryPlan(new SinkRoot(new EOSSource()), workerPlans).get();
+      server.submitQueryPlan(new EmptySink(new EOSSource()), workerPlans).get();
     } catch (Exception e) {
       throw e;
       //throw new PerfEnforceException("Error ingesting dimension tables");

diff --git a/src/edu/washington/escience/myria/perfenforce/PerfEnforceDriver.java b/src/edu/washington/escience/myria/perfenforce/PerfEnforceDriver.java
@@ -5,12 +5,17 @@
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringWriter;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
 import org.slf4j.LoggerFactory;
 
 import com.amazonaws.auth.AnonymousAWSCredentials;
@@ -101,6 +106,17 @@ public boolean isDonePSLA() {
     return isDonePSLA;
   }
 
+  public String getPSLA() throws FileNotFoundException {
+    Reader input = new FileReader(new File(configurationPath.resolve("PSLA.json").toString()));
+    StringWriter output = new StringWriter();
+    try {
+      IOUtils.copy(input, output);
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    return output.toString();
+  }
+
   public void setTier(final int tier) {
     perfenforceOnlineLearning = new PerfEnforceOnlineLearning(server, tier);
   }