diff --git a/p4/src/main/java/cs448/Project4.java b/p4/src/main/java/cs448/Project4.java index c4be7bf..fb45fb9 100644 --- a/p4/src/main/java/cs448/Project4.java +++ b/p4/src/main/java/cs448/Project4.java @@ -11,6 +11,7 @@ import org.apache.spark.api.java.Optional; import org.apache.spark.api.java.function.Function; import org.apache.spark.api.java.function.Function2; import org.apache.spark.sql.Dataset; +import org.apache.spark.sql.Encoders; import org.apache.spark.sql.Row; import org.apache.spark.sql.SparkSession; import scala.Tuple2; @@ -136,6 +137,7 @@ public class Project4 { Dataset resultDF = spark.sql("SELECT DISTINCT CONVERT(varchar(10), m.movieId) FROM Movie m, Rating r, User u WHERE m.movieId = r.movieId AND r.userId = u.userId AND u.occupation = " + conf.q3Occupation + " AND r.rating = " + conf.q3Rating); resultDF.show(); + resultDF.map((MapFunction) row -> "" + row.getInteger(0), Encoders.STRING()); resultDF.write().text(CS448Utils.resolveUri(conf.outPath, "query-3")); //Don't forget to stop spark session @@ -177,6 +179,7 @@ public class Project4 { Dataset resultDF = spark.sql( "SELECT m.title, AVG(r.rating) FROM Movie m, Rating r, User u WHERE m.movieId = r.movieId AND r.userId = u.userId AND u.age = " + conf.q4Age + " GROUP BY m.title"); resultDF.show(); + resultDF.map((MapFunction) row -> row.getString(0) + "::" + row.getDecimal(1), Encoders.STRING()); resultDF.write().text(CS448Utils.resolveUri(conf.outPath, "query-4")); //Don't forget to stop spark session