From fcf3ec326e6f996888e31d41e1a852074556ab96 Mon Sep 17 00:00:00 2001
From: Max O'Cull <max.ocull@protonmail.com>
Date: Sat, 20 Apr 2019 21:49:39 -0400
Subject: [PATCH] Fix makefile, fix zip

---
 p4/Makefile                          | 19 ++++++++++++-------
 p4/src/main/java/cs448/Project4.java |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/p4/Makefile b/p4/Makefile
index d07fccc..00e7534 100644
--- a/p4/Makefile
+++ b/p4/Makefile
@@ -1,18 +1,23 @@
 .PHONY=clean build submit
 
-all: package submit
+all: build
 
-clean:
-	mvn clean
+build:
+	mvn clean package
 
-package:
-	mvn package
-
-submit:
+q1:
 	spark-submit --class cs448.App target/p4-1.0-SNAPSHOT.jar -i "/user/mocull/input" -o "/user/mocull/output" -q 1,12,3 -test
+
+q2:
 	spark-submit --class cs448.App target/p4-1.0-SNAPSHOT.jar -i "/user/mocull/input" -o "/user/mocull/output" -q 2,12,3 -test
+
+q3:
 	spark-submit --class cs448.App target/p4-1.0-SNAPSHOT.jar -i "/user/mocull/input" -o "/user/mocull/output" -q 3,12,3 -test
+
+q4:
 	spark-submit --class cs448.App target/p4-1.0-SNAPSHOT.jar -i "/user/mocull/input" -o "/user/mocull/output" -q 4,12 -test
 
+test: q1 q2 q3 q4
+
 warmup:
 	spark-submit --class cs448.App target/p4-1.0-SNAPSHOT.jar -i "/user/mocull/input" -warmup
diff --git a/p4/src/main/java/cs448/Project4.java b/p4/src/main/java/cs448/Project4.java
index 87dc128..9166552 100644
--- a/p4/src/main/java/cs448/Project4.java
+++ b/p4/src/main/java/cs448/Project4.java
@@ -93,7 +93,7 @@ public class Project4 {
         ratingDF.createOrReplaceTempView("Rating");
 
         // Compute the result.
-        Dataset<Row> resultDF = spark.sql("SELECT DISTINCT u.zip-code FROM User u WHERE u.occupation = " +
+        Dataset<Row> resultDF = spark.sql("SELECT DISTINCT u.zipcode FROM User u WHERE u.occupation = " +
                 conf.q2Occupation1 + " OR u.occupation = " +
                 conf.q2Occupation2);
         resultDF.show();