Merge pull request #7 from CodelyTV/addContent

Add content

Author: cherrera20

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '21'
+          java-version: '11'
           cache: 'sbt'
       - name: 👌 Run "pre-push" tasks (compile and style-check)
         run: sbt prep

.gitignore

@@ -8,3 +8,4 @@ project/plugins/project/
 /docker/spark/data/
 /docker/volume/
 /docker/spark/apps/
+/derby.log

docker/docker-compose.yml

@@ -24,6 +24,7 @@ services:
     environment:
       - SPARK_LOCAL_IP=172.19.0.10
       - SPARK_WORKLOAD=master
+      - SPARK_DAEMON_MEMORY=3G
     networks:
       spark-network:
         ipv4_address: 172.19.0.10
@@ -37,9 +38,8 @@ services:
       - spark-master
     environment:
       - SPARK_MASTER=spark://spark-master:7077
-      - SPARK_WORKER_CORES=2
-      - SPARK_WORKER_MEMORY=2G
-      - SPARK_DRIVER_MEMORY=2G
+      - SPARK_WORKER_CORES=3
+      - SPARK_WORKER_MEMORY=3G
       - SPARK_EXECUTOR_MEMORY=1G
       - SPARK_WORKLOAD=worker
       - SPARK_LOCAL_IP=172.19.0.2
@@ -62,9 +62,8 @@ services:
       - spark-master
     environment:
       - SPARK_MASTER=spark://spark-master:7077
-      - SPARK_WORKER_CORES=2
-      - SPARK_WORKER_MEMORY=2G
-      - SPARK_DRIVER_MEMORY=2G
+      - SPARK_WORKER_CORES=3
+      - SPARK_WORKER_MEMORY=3G
       - SPARK_EXECUTOR_MEMORY=1G
       - SPARK_WORKLOAD=worker
       - SPARK_LOCAL_IP=172.19.0.3
@@ -208,7 +207,7 @@ services:
         --deploy-mode client
         --executor-memory 1G
         --driver-memory 1G
-        --total-executor-cores 1 
+        --total-executor-cores 2
         --conf spark.sql.hive.metastore.version=2.3.9
         --conf spark.sql.uris=thrift://hive-metastore:9083
         --conf spark.hadoop.hive.metastore.uris=thrift://hive-metastore:9083

docker/hive/conf/hive-site.xml

@@ -5,7 +5,7 @@
     </property>
     <property>
         <name>javax.jdo.option.ConnectionURL</name>
-        <value>jdbc:postgresql://172.18.0.8:5432/metastore</value>
+        <value>jdbc:postgresql://postgres:5432/metastore</value>
     </property>
     <property>
         <name>javax.jdo.option.ConnectionUserName</name>

project/Settings.scala

@@ -6,7 +6,7 @@ object Settings {
   val settings = Seq(
     name                 := "spark-best_practises_and_deploy-course",
     version              := "0.1.0-SNAPSHOT",
-    scalaVersion         := "2.12.12",
+    scalaVersion         := "2.12.19",
     organization         := "com.codely",
     organizationName     := "com.codely, Inc.",
     organizationHomepage := Some(url("https://com.codely")),

src/main/com/codely/lesson_02_tests_in_spark/video_01__end_to_end_testing/app/SparkApp.scala

@@ -0,0 +1,12 @@
+package com.codely.lesson_02_tests_in_spark.video_01__end_to_end_testing.app
+
+import org.apache.spark.sql.SparkSession
+
+trait SparkApp extends App {
+
+  implicit val spark: SparkSession = SparkSession
+    .builder()
+    .enableHiveSupport()
+    .getOrCreate()
+
+}

src/main/com/codely/lesson_02_tests_in_spark/video_01__end_to_end_testing/app/TotalSpendingApp.scala

@@ -1,22 +1,18 @@
 package com.codely.lesson_02_tests_in_spark.video_01__end_to_end_testing.app
 
 import com.codely.lesson_02_tests_in_spark.video_01__end_to_end_testing.config.AppContext
-import com.codely.lesson_02_tests_in_spark.video_01__end_to_end_testing.job.AvgSpendingJob
+import com.codely.lesson_02_tests_in_spark.video_01__end_to_end_testing.job.TotalSpendingJob
 import com.codely.lesson_02_tests_in_spark.video_01__end_to_end_testing.service.{Reader, Writer}
 
-object AvgSpendingApp extends SparkApp {
-
-  private val appName = "avg-spending-app"
+object TotalSpendingApp extends SparkApp {
 
   private val context = AppContext.load(args)
 
-  spark.conf.set("spark.app.name", appName)
-
   private val reader = Reader()
 
   private val writer = Writer()
 
-  private val job = AvgSpendingJob(context, reader, writer)
+  private val job = TotalSpendingJob(context, reader, writer)
 
   job.run()
 }

src/main/com/codely/lesson_02_tests_in_spark/video_01__end_to_end_testing/config/AppContext.scala

@@ -4,7 +4,7 @@ import com.typesafe.config.ConfigFactory
 
 import java.io.File
 
-case class AppConfig(
+case class AppContext(
     spark: SparkConfig,
     source: SourceConfig,
     sink: SinkConfig
@@ -14,8 +14,8 @@ case class SparkConfig(appName: String)
 case class SourceConfig(format: String, options: Map[String, String])
 case class SinkConfig(format: String, mode: String, path: String)
 
-object AppConfig {
-  def load(args: Array[String]): AppConfig = {
+object AppContext {
+  def load(args: Array[String]): AppContext = {
 
     val cmdArgs    = ArgumentsParser.parse(args).getOrElse(CmdArgs())
     val configFile = new File(cmdArgs.configFile.get)
@@ -29,7 +29,7 @@ object AppConfig {
       "driver"   -> config.getString("source.options.driver")
     )
 
-    AppConfig(
+    AppContext(
       spark = SparkConfig(
         appName = config.getString("spark.appName")
       ),

src/main/com/codely/lesson_02_tests_in_spark/video_01__end_to_end_testing/config/ArgumentsParser.scala

@@ -3,8 +3,8 @@ package com.codely.lesson_02_tests_in_spark.video_01__end_to_end_testing.config
 import scopt.OParser
 
 object ArgumentsParser {
-  val builder = OParser.builder[CmdArgs]
-  val argsParser = {
+  private val builder = OParser.builder[CmdArgs]
+  private val argsParser = {
     import builder._
     OParser.sequence(
       programName("Scala Application"),

src/main/com/codely/lesson_02_tests_in_spark/video_01__end_to_end_testing/config/CmdArgs.scala

@@ -1,3 +1,3 @@
 package com.codely.lesson_02_tests_in_spark.video_01__end_to_end_testing.config
 
-case class CmdArgs(configFile: Option[String] = None)
+case class CmdArgs(configFile: Option[String] = None)