cleanup cont'd

stanford-futuredata · Jun 22, 2018 · be912ab · be912ab
1 parent 05bc28a
commit be912ab
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 76 deletions.
diff --git a/core/src/main/java/edu/stanford/futuredata/macrobase/pipeline/BasicBatchPipeline.java b/core/src/main/java/edu/stanford/futuredata/macrobase/pipeline/BasicBatchPipeline.java
@@ -40,12 +40,9 @@ public class BasicBatchPipeline implements Pipeline {
     private String ratioMetric;
     private double minSupport;
     private double minRiskRatio;
+
 
-    private int numRows;
-    private String columnFiltersJson;
-
-
-    public BasicBatchPipeline (PipelineConfig conf) {
+    public BasicBatchPipeline(PipelineConfig conf) {
         inputURI = conf.get("inputURI");
 
         classifierType = conf.get("classifier", "percentile");
@@ -64,32 +61,14 @@ public BasicBatchPipeline (PipelineConfig conf) {
             cutoff = conf.get("cutoff", 1.0);
         }
 
-        pctileHigh = conf.get("includeHi",true);
+        pctileHigh = conf.get("includeHi", true);
         pctileLow = conf.get("includeLo", true);
         predicateStr = conf.get("predicate", "==").trim();
-
         summarizerType = conf.get("summarizer", "apriori");
         attributes = conf.get("attributes");
         ratioMetric = conf.get("ratioMetric", "globalRatio");
-
-        //Allowing conversion from integer b/c of type confusion by UI (via JSON.stringify)
-        if(conf.get("minRatioMetric", 3.0) instanceof Double) {
-            minRiskRatio = (double) conf.get("minRatioMetric", 3.0);
-        }
-        else {
-            minRiskRatio = (double) (int) conf.get("minRatioMetric", 3);
-        }
-
-        if(conf.get("minSupport", 0.01) instanceof Double) {
-            minSupport = (double) conf.get("minSupport", 0.01);
-        }
-        else {
-            minSupport= (double) (int) conf.get("minSupport", 0);
-        }
-
-        numRows = conf.get("numRows", -1); //-1 indicating all
-        columnFiltersJson = conf.get("columnFilters", "");
-
+        minRiskRatio = conf.get("minRatioMetric", 3.0);
+        minSupport = conf.get("minSupport", 0.01);
         numThreads = conf.get("numThreads", Runtime.getRuntime().availableProcessors());
     }
 
@@ -103,14 +82,14 @@ public Classifier getClassifier() throws MacroBaseException {
                 return classifier;
             }
             case "predicate": {
-                if (isStrPredicate){
+                if (isStrPredicate) {
                     PredicateClassifier classifier = new PredicateClassifier(metric, predicateStr, strCutoff);
                     return classifier;
                 }
                 PredicateClassifier classifier = new PredicateClassifier(metric, predicateStr, cutoff);
                 return classifier;
             }
-            default : {
+            default: {
                 throw new MacroBaseException("Bad Classifier Type");
             }
         }
@@ -147,8 +126,7 @@ public DataFrame loadData() throws Exception {
         Map<String, Schema.ColType> colTypes = new HashMap<>();
         if (isStrPredicate) {
             colTypes.put(metric, Schema.ColType.STRING);
-        }
-        else{
+        } else {
             colTypes.put(metric, Schema.ColType.DOUBLE);
         }
         List<String> requiredColumns = new ArrayList<>(attributes);
@@ -181,32 +159,4 @@ public Explanation results() throws Exception {
 
         return output;
     }
-
-    @Override
-    public DataFrame getRows() throws Exception {
-        long startTime = System.currentTimeMillis();
-        DataFrame df = loadData();
-        long elapsed = System.currentTimeMillis() - startTime;
-
-        log.info("Loading time: {} ms", elapsed);
-        log.info("{} rows", df.getNumRows());
-        log.info("Metric: {}", metric);
-        log.info("Attributes: {}", attributes);
-
-        if(!columnFiltersJson.equals("")){
-            Map<String, Object> columnFilters = PipelineUtils.jsonStringToMap(columnFiltersJson);
-            for(String columnName: columnFilters.keySet()) {
-                Predicate<Object> columnPredicate = (i) -> (i.equals(columnFilters.get(columnName)));
-                df = df.filter(columnName, columnPredicate);
-                log.info("Filtering on column {} == {}", columnName, columnFilters.get(columnName));
-            }
-        }
-
-        if(numRows >= 0){
-            df = df.limit(numRows);
-            log.info("Limiting on {} rows", numRows);
-        }
-
-        return df;
-    }
-}
+}
diff --git a/core/src/main/java/edu/stanford/futuredata/macrobase/pipeline/CubePipeline.java b/core/src/main/java/edu/stanford/futuredata/macrobase/pipeline/CubePipeline.java
@@ -143,11 +143,6 @@ public APLExplanation results() throws Exception {
         return explanation;
     }
 
-    @Override
-    public DataFrame getRows() {
-        return null;
-    }
-
     private Map<String, Schema.ColType> getColTypes() throws MacroBaseException {
         Map<String, Schema.ColType> colTypes = new HashMap<>();
         colTypes.put(countColumn, Schema.ColType.DOUBLE);

diff --git a/core/src/main/java/edu/stanford/futuredata/macrobase/pipeline/Pipeline.java b/core/src/main/java/edu/stanford/futuredata/macrobase/pipeline/Pipeline.java
@@ -5,5 +5,4 @@
 
 public interface Pipeline {
     Explanation results() throws Exception;
-    DataFrame getRows() throws Exception;
 }
diff --git a/core/src/main/java/edu/stanford/futuredata/macrobase/rest/RestServer.java b/core/src/main/java/edu/stanford/futuredata/macrobase/rest/RestServer.java
@@ -46,7 +46,6 @@ public static void main(String[] args) {
 
         post("/sql", RestServer::processSQLQuery, RestServer::toJsonString);
         post("/query", RestServer::processBasicBatchQuery, RestServer::toJsonString);
-        post("/rows", RestServer::getRows, RestServer::toJsonString);
 
         exception(Exception.class, (exception, request, response) -> {
             log.error("An exception occurred: ", exception);
@@ -70,16 +69,6 @@ public static Explanation processBasicBatchQuery(
         return p.results();
     }
 
-    public static DataFrame getRows(
-            Request req, Response res
-    ) throws Exception {
-        //res.type()
-        PipelineConfig conf = PipelineConfig.fromJsonString(req.body());
-        Pipeline p = PipelineUtils.createPipeline(conf);
-        DataFrame df = p.getRows();
-        return df;
-    }
-
     public static String toJsonString(Object o) throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
         return mapper.writeValueAsString(o);