Fix makefile, fix zip
This commit is contained in:
parent
0764e20842
commit
fcf3ec326e
19
p4/Makefile
19
p4/Makefile
@ -1,18 +1,23 @@
|
|||||||
.PHONY=clean build submit
|
.PHONY=clean build submit
|
||||||
|
|
||||||
all: package submit
|
all: build
|
||||||
|
|
||||||
clean:
|
build:
|
||||||
mvn clean
|
mvn clean package
|
||||||
|
|
||||||
package:
|
q1:
|
||||||
mvn package
|
|
||||||
|
|
||||||
submit:
|
|
||||||
spark-submit --class cs448.App target/p4-1.0-SNAPSHOT.jar -i "/user/mocull/input" -o "/user/mocull/output" -q 1,12,3 -test
|
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
|
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
|
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
|
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:
|
warmup:
|
||||||
spark-submit --class cs448.App target/p4-1.0-SNAPSHOT.jar -i "/user/mocull/input" -warmup
|
spark-submit --class cs448.App target/p4-1.0-SNAPSHOT.jar -i "/user/mocull/input" -warmup
|
||||||
|
@ -93,7 +93,7 @@ public class Project4 {
|
|||||||
ratingDF.createOrReplaceTempView("Rating");
|
ratingDF.createOrReplaceTempView("Rating");
|
||||||
|
|
||||||
// Compute the result.
|
// 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.q2Occupation1 + " OR u.occupation = " +
|
||||||
conf.q2Occupation2);
|
conf.q2Occupation2);
|
||||||
resultDF.show();
|
resultDF.show();
|
||||||
|
Loading…
Reference in New Issue
Block a user