Skip to content

Commit aa75d6b

Browse files
author
James Lee
committed
fix typos in makerspace exmaples
1 parent 4473c72 commit aa75d6b

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

src/main/java/com/sparkTutorial/advanced/broadcast/UkMarketSpaces.java src/main/java/com/sparkTutorial/advanced/broadcast/UkMakerSpaces.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
import java.io.FileNotFoundException;
1313
import java.util.*;
1414

15-
public class UkMarketSpaces {
15+
public class UkMakerSpaces {
1616

1717
public static void main(String[] args) throws Exception {
1818
Logger.getLogger("org").setLevel(Level.ERROR);
19-
SparkConf conf = new SparkConf().setAppName("UkMarketSpaces").setMaster("local[1]");
19+
SparkConf conf = new SparkConf().setAppName("UkMakerSpaces").setMaster("local[1]");
2020
JavaSparkContext javaSparkContext = new JavaSparkContext(conf);
2121

2222
final Broadcast<Map<String, String>> postCodeMap = javaSparkContext.broadcast(loadPostCodeMap());
2323

24-
JavaRDD<String> marketsRdd = javaSparkContext.textFile("in/uk-market-spaces-identifiable-data.csv");
24+
JavaRDD<String> makerSpaceRdd = javaSparkContext.textFile("in/uk-makerspaces-identifiable-data.csv");
2525

26-
JavaRDD<String> regions = marketsRdd
26+
JavaRDD<String> regions = makerSpaceRdd
2727
.filter(line -> !line.split(Utils.COMMA_DELIMITER, -1)[0].equals("Timestamp"))
2828
.map(line -> {
2929
Optional<String> postPrefix = getPostPrefix(line);

src/main/java/com/sparkTutorial/advanced/broadcast/UkMarketSpacesWithoutBroadcaset.java src/main/java/com/sparkTutorial/advanced/broadcast/UkMakerSpacesWithoutBroadcast.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
import java.io.FileNotFoundException;
1212
import java.util.*;
1313

14-
public class UkMarketSpacesWithoutBroadcaset {
14+
public class UkMakerSpacesWithoutBroadcast {
1515

1616
public static void main(String[] args) throws Exception {
1717
Logger.getLogger("org").setLevel(Level.ERROR);
18-
SparkConf conf = new SparkConf().setAppName("UkMarketSpaces").setMaster("local[1]");
18+
SparkConf conf = new SparkConf().setAppName("UkMakerSpaces").setMaster("local[1]");
1919
JavaSparkContext javaSparkContext = new JavaSparkContext(conf);
2020

2121
final Map<String, String> postCodeMap = loadPostCodeMap();
2222

23-
JavaRDD<String> marketsRdd = javaSparkContext.textFile("in/uk-market-spaces-identifiable-data.csv");
23+
JavaRDD<String> makerSpaceRdd = javaSparkContext.textFile("in/uk-makerspaces-identifiable-data.csv");
2424

25-
JavaRDD<String> regions = marketsRdd
25+
JavaRDD<String> regions = makerSpaceRdd
2626
.filter(line -> !line.split(Utils.COMMA_DELIMITER, -1)[0].equals("Timestamp"))
2727
.map(line -> {
2828
List<String> postCodePrefixes = getPostPrefixes(line);

src/main/java/com/sparkTutorial/sparkSql/join/UkMarketSpaces.java src/main/java/com/sparkTutorial/sparkSql/join/UkMakerSpaces.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@
88

99
import static org.apache.spark.sql.functions.*;
1010

11-
public class UkMarketSpaces {
11+
public class UkMakerSpaces {
1212

1313
public static void main(String[] args) throws Exception {
1414

1515
Logger.getLogger("org").setLevel(Level.ERROR);
1616

17-
SparkSession session = SparkSession.builder().appName("UkMarketSpaces").master("local[*]").getOrCreate();
17+
SparkSession session = SparkSession.builder().appName("UkMakerSpaces").master("local[*]").getOrCreate();
1818

19-
Dataset<Row> marketSpace = session.read().option("header", "true").csv("in/uk-market-spaces-identifiable-data.csv");
19+
Dataset<Row> makerSpace = session.read().option("header", "true").csv("in/uk-makerspaces-identifiable-data.csv");
2020

2121
Dataset<Row> postCode = session.read().option("header", "true").csv("in/uk-postcode.csv")
2222
.withColumn("PostCode", concat_ws("", col("PostCode"), lit(" ")));
2323

24-
System.out.println("=== Print 20 records of market space table ===");
25-
marketSpace.show();
24+
System.out.println("=== Print 20 records of makerspace table ===");
25+
makerSpace.show();
2626

2727
System.out.println("=== Print 20 records of postcode table ===");
2828
postCode.show();
2929

30-
Dataset<Row> joined = marketSpace.join(postCode,
31-
marketSpace.col("Postcode").startsWith(postCode.col("Postcode")), "left_outer");
30+
Dataset<Row> joined = makerSpace.join(postCode,
31+
makerSpace.col("Postcode").startsWith(postCode.col("Postcode")), "left_outer");
3232

3333
System.out.println("=== Group by Region ===");
3434
joined.groupBy("Region").count().show(200);

0 commit comments

Comments
 (0)