Renamed chxx-* to actual chapter numbers.

trahasch · Sep 18, 2014 · 8710b56 · 8710b56
1 parent 6550a71
commit 8710b56
Show file tree

Hide file tree

Showing 126 changed files with 18 additions and 18 deletions.
diff --git a/chxx-yarn/capacity-scheduler.xml → ch04-yarn/capacity-scheduler.xml b/chxx-yarn/capacity-scheduler.xml → ch04-yarn/capacity-scheduler.xml
diff --git a/chxx-yarn/fair-scheduler.xml → ch04-yarn/fair-scheduler.xml b/chxx-yarn/fair-scheduler.xml → ch04-yarn/fair-scheduler.xml
diff --git a/ch04-avro/pom.xml → ch06-avro/pom.xml b/ch04-avro/pom.xml → ch06-avro/pom.xml
@@ -8,10 +8,10 @@
     <relativePath>../hadoop-meta/pom.xml</relativePath>
   </parent>
   <groupId>com.hadoopbook</groupId>
-  <artifactId>ch04-avro</artifactId>
+  <artifactId>ch06-avro</artifactId>
   <packaging>jar</packaging>
   <version>3.0</version>
-  <name>Chapter 4: Hadoop I/O (Avro)</name>
+  <name>Chapter 6: Hadoop I/O (Avro)</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.avro</groupId>

diff --git a/ch04-avro/src/main/assembly/job.xml → ch06-avro/src/main/assembly/job.xml b/ch04-avro/src/main/assembly/job.xml → ch06-avro/src/main/assembly/job.xml
diff --git a/ch04-avro/src/main/c/dump_pairs.c → ch06-avro/src/main/c/dump_pairs.c b/ch04-avro/src/main/c/dump_pairs.c → ch06-avro/src/main/c/dump_pairs.c
diff --git a/...mples/AvroGenericMaxTemperature/input.txt → ...mples/AvroGenericMaxTemperature/input.txt b/...mples/AvroGenericMaxTemperature/input.txt → ...mples/AvroGenericMaxTemperature/input.txt
diff --git a/...ericMaxTemperature/output/part-00000.avro → ...ericMaxTemperature/output/part-00000.avro b/...ericMaxTemperature/output/part-00000.avro → ...ericMaxTemperature/output/part-00000.avro
diff --git a/...avro/src/main/examples/AvroSort/input.txt → ...avro/src/main/examples/AvroSort/input.txt b/...avro/src/main/examples/AvroSort/input.txt → ...avro/src/main/examples/AvroSort/input.txt
@@ -1,2 +1,2 @@
 hadoop jar avro-examples.jar AvroSort input/avro/pairs.avro output \
-  ch04-avro/src/main/resources/SortedStringPair.avsc
+  ch06-avro/src/main/resources/SortedStringPair.avsc
diff --git a/.../examples/AvroSort/output/part-00000.avro → .../examples/AvroSort/output/part-00000.avro b/.../examples/AvroSort/output/part-00000.avro → .../examples/AvroSort/output/part-00000.avro
diff --git a/...ples/AvroSpecificMaxTemperature/input.txt → ...ples/AvroSpecificMaxTemperature/input.txt b/...ples/AvroSpecificMaxTemperature/input.txt → ...ples/AvroSpecificMaxTemperature/input.txt
diff --git a/...ificMaxTemperature/output/part-00000.avro → ...ificMaxTemperature/output/part-00000.avro b/...ificMaxTemperature/output/part-00000.avro → ...ificMaxTemperature/output/part-00000.avro
diff --git a/.../main/java/AvroGenericMaxTemperature.java → .../main/java/AvroGenericMaxTemperature.java b/.../main/java/AvroGenericMaxTemperature.java → .../main/java/AvroGenericMaxTemperature.java
diff --git a/ch04-avro/src/main/java/AvroProjection.java → ch06-avro/src/main/java/AvroProjection.java b/ch04-avro/src/main/java/AvroProjection.java → ch06-avro/src/main/java/AvroProjection.java
diff --git a/ch04-avro/src/main/java/AvroSort.java → ch06-avro/src/main/java/AvroSort.java b/ch04-avro/src/main/java/AvroSort.java → ch06-avro/src/main/java/AvroSort.java
diff --git a/...main/java/AvroSpecificMaxTemperature.java → ...main/java/AvroSpecificMaxTemperature.java b/...main/java/AvroSpecificMaxTemperature.java → ...main/java/AvroSpecificMaxTemperature.java
diff --git a/...-avro/src/main/java/NcdcRecordParser.java → ...-avro/src/main/java/NcdcRecordParser.java b/...-avro/src/main/java/NcdcRecordParser.java → ...-avro/src/main/java/NcdcRecordParser.java
diff --git a/ch04-avro/src/main/py/test_avro.py → ch06-avro/src/main/py/test_avro.py b/ch04-avro/src/main/py/test_avro.py → ch06-avro/src/main/py/test_avro.py
diff --git a/ch04-avro/src/main/py/write_pairs.py → ch06-avro/src/main/py/write_pairs.py b/ch04-avro/src/main/py/write_pairs.py → ch06-avro/src/main/py/write_pairs.py
diff --git a/...src/main/resources/AliasedStringPair.avsc → ...src/main/resources/AliasedStringPair.avsc b/...src/main/resources/AliasedStringPair.avsc → ...src/main/resources/AliasedStringPair.avsc
diff --git a/ch04-avro/src/main/resources/Array.avsc → ch06-avro/src/main/resources/Array.avsc b/ch04-avro/src/main/resources/Array.avsc → ch06-avro/src/main/resources/Array.avsc
diff --git a/ch04-avro/src/main/resources/Enum.avsc → ch06-avro/src/main/resources/Enum.avsc b/ch04-avro/src/main/resources/Enum.avsc → ch06-avro/src/main/resources/Enum.avsc
diff --git a/ch04-avro/src/main/resources/Fixed.avsc → ch06-avro/src/main/resources/Fixed.avsc b/ch04-avro/src/main/resources/Fixed.avsc → ch06-avro/src/main/resources/Fixed.avsc
diff --git a/ch04-avro/src/main/resources/Map.avsc → ch06-avro/src/main/resources/Map.avsc b/ch04-avro/src/main/resources/Map.avsc → ch06-avro/src/main/resources/Map.avsc
diff --git a/...vro/src/main/resources/NewStringPair.avsc → ...vro/src/main/resources/NewStringPair.avsc b/...vro/src/main/resources/NewStringPair.avsc → ...vro/src/main/resources/NewStringPair.avsc
diff --git a/...main/resources/NewStringPairWithNull.avsc → ...main/resources/NewStringPairWithNull.avsc b/...main/resources/NewStringPairWithNull.avsc → ...main/resources/NewStringPairWithNull.avsc
diff --git a/...c/main/resources/ProjectedStringPair.avsc → ...c/main/resources/ProjectedStringPair.avsc b/...c/main/resources/ProjectedStringPair.avsc → ...c/main/resources/ProjectedStringPair.avsc
diff --git a/.../src/main/resources/SortedStringPair.avsc → .../src/main/resources/SortedStringPair.avsc b/.../src/main/resources/SortedStringPair.avsc → .../src/main/resources/SortedStringPair.avsc
diff --git a/ch04-avro/src/main/resources/StringPair.avsc → ch06-avro/src/main/resources/StringPair.avsc b/ch04-avro/src/main/resources/StringPair.avsc → ch06-avro/src/main/resources/StringPair.avsc
diff --git a/...rc/main/resources/SwitchedStringPair.avsc → ...rc/main/resources/SwitchedStringPair.avsc b/...rc/main/resources/SwitchedStringPair.avsc → ...rc/main/resources/SwitchedStringPair.avsc
diff --git a/ch04-avro/src/main/resources/Union.avsc → ch06-avro/src/main/resources/Union.avsc b/ch04-avro/src/main/resources/Union.avsc → ch06-avro/src/main/resources/Union.avsc
diff --git a/...vro/src/main/resources/WeatherRecord.avsc → ...vro/src/main/resources/WeatherRecord.avsc b/...vro/src/main/resources/WeatherRecord.avsc → ...vro/src/main/resources/WeatherRecord.avsc
diff --git a/ch04-avro/src/test/java/AvroTest.java → ch06-avro/src/test/java/AvroTest.java b/ch04-avro/src/test/java/AvroTest.java → ch06-avro/src/test/java/AvroTest.java
diff --git a/chxx-parquet/pom.xml → ch07-parquet/pom.xml b/chxx-parquet/pom.xml → ch07-parquet/pom.xml
@@ -8,10 +8,10 @@
     <relativePath>../hadoop-meta/pom.xml</relativePath>
   </parent>
   <groupId>com.hadoopbook</groupId>
-  <artifactId>chxx-parquet</artifactId>
+  <artifactId>ch07-parquet</artifactId>
   <packaging>jar</packaging>
   <version>3.0</version>
-  <name>Chapter xx: Parquet</name>
+  <name>Chapter 7: Parquet</name>
   <dependencies>
     <dependency>
       <groupId>com.twitter</groupId>

diff --git a/chxx-parquet/src/main/assembly/job.xml → ch07-parquet/src/main/assembly/job.xml b/chxx-parquet/src/main/assembly/job.xml → ch07-parquet/src/main/assembly/job.xml
diff --git a/.../examples/TextToParquetWithAvro/input.txt → .../examples/TextToParquetWithAvro/input.txt b/.../examples/TextToParquetWithAvro/input.txt → .../examples/TextToParquetWithAvro/input.txt
diff --git a/...les/TextToParquetWithAvro/output/_SUCCESS → ...les/TextToParquetWithAvro/output/_SUCCESS b/...les/TextToParquetWithAvro/output/_SUCCESS → ...les/TextToParquetWithAvro/output/_SUCCESS
diff --git a/...es/TextToParquetWithAvro/output/_metadata → ...es/TextToParquetWithAvro/output/_metadata b/...es/TextToParquetWithAvro/output/_metadata → ...es/TextToParquetWithAvro/output/_metadata
diff --git a/...rquetWithAvro/output/part-m-00000.parquet → ...rquetWithAvro/output/part-m-00000.parquet b/...rquetWithAvro/output/part-m-00000.parquet → ...rquetWithAvro/output/part-m-00000.parquet
diff --git a/.../src/main/java/ParquetToTextWithAvro.java → .../src/main/java/ParquetToTextWithAvro.java b/.../src/main/java/ParquetToTextWithAvro.java → .../src/main/java/ParquetToTextWithAvro.java
diff --git a/...c/main/java/ParquetToTextWithExample.java → ...c/main/java/ParquetToTextWithExample.java b/...c/main/java/ParquetToTextWithExample.java → ...c/main/java/ParquetToTextWithExample.java
diff --git a/.../src/main/java/TextToParquetWithAvro.java → .../src/main/java/TextToParquetWithAvro.java b/.../src/main/java/TextToParquetWithAvro.java → .../src/main/java/TextToParquetWithAvro.java
diff --git a/...c/main/java/TextToParquetWithExample.java → ...c/main/java/TextToParquetWithExample.java b/...c/main/java/TextToParquetWithExample.java → ...c/main/java/TextToParquetWithExample.java
diff --git a/.../src/test/java/ParquetMRWithAvroTest.java → .../src/test/java/ParquetMRWithAvroTest.java b/.../src/test/java/ParquetMRWithAvroTest.java → .../src/test/java/ParquetMRWithAvroTest.java
diff --git a/...c/test/java/ParquetMRWithExampleTest.java → ...c/test/java/ParquetMRWithExampleTest.java b/...c/test/java/ParquetMRWithExampleTest.java → ...c/test/java/ParquetMRWithExampleTest.java
diff --git a/chxx-parquet/src/test/java/ParquetTest.java → ch07-parquet/src/test/java/ParquetTest.java b/chxx-parquet/src/test/java/ParquetTest.java → ch07-parquet/src/test/java/ParquetTest.java
diff --git a/...uet/src/test/resources/NewStringPair.avsc → ...uet/src/test/resources/NewStringPair.avsc b/...uet/src/test/resources/NewStringPair.avsc → ...uet/src/test/resources/NewStringPair.avsc
diff --git a/...c/test/resources/ProjectedStringPair.avsc → ...c/test/resources/ProjectedStringPair.avsc b/...c/test/resources/ProjectedStringPair.avsc → ...c/test/resources/ProjectedStringPair.avsc
diff --git a/...arquet/src/test/resources/StringPair.avsc → ...arquet/src/test/resources/StringPair.avsc b/...arquet/src/test/resources/StringPair.avsc → ...arquet/src/test/resources/StringPair.avsc
diff --git a/chxx-crunch/src/test/resources/fruit.txt → ch07-parquet/src/test/resources/fruit.txt b/chxx-crunch/src/test/resources/fruit.txt → ch07-parquet/src/test/resources/fruit.txt
diff --git a/...flume/spool-to-hdfs-and-logger.properties → ...flume/spool-to-hdfs-and-logger.properties b/...flume/spool-to-hdfs-and-logger.properties → ...flume/spool-to-hdfs-and-logger.properties
diff --git a/chxx-flume/spool-to-hdfs-avro.properties → ch14-flume/spool-to-hdfs-avro.properties b/chxx-flume/spool-to-hdfs-avro.properties → ch14-flume/spool-to-hdfs-avro.properties
diff --git a/...lume/spool-to-hdfs-partitioned.properties → ...lume/spool-to-hdfs-partitioned.properties b/...lume/spool-to-hdfs-partitioned.properties → ...lume/spool-to-hdfs-partitioned.properties
diff --git a/...ol-to-hdfs-tiered-load-balance.properties → ...ol-to-hdfs-tiered-load-balance.properties b/...ol-to-hdfs-tiered-load-balance.properties → ...ol-to-hdfs-tiered-load-balance.properties
diff --git a/chxx-flume/spool-to-hdfs-tiered.properties → ch14-flume/spool-to-hdfs-tiered.properties b/chxx-flume/spool-to-hdfs-tiered.properties → ch14-flume/spool-to-hdfs-tiered.properties
diff --git a/chxx-flume/spool-to-hdfs.properties → ch14-flume/spool-to-hdfs.properties b/chxx-flume/spool-to-hdfs.properties → ch14-flume/spool-to-hdfs.properties
diff --git a/chxx-flume/spool-to-logger.properties → ch14-flume/spool-to-logger.properties b/chxx-flume/spool-to-logger.properties → ch14-flume/spool-to-logger.properties
diff --git a/chxx-crunch/pom.xml → ch18-crunch/pom.xml b/chxx-crunch/pom.xml → ch18-crunch/pom.xml
@@ -8,10 +8,10 @@
     <relativePath>../hadoop-meta/pom.xml</relativePath>
   </parent>
   <groupId>com.hadoopbook</groupId>
-  <artifactId>chxx-crunch</artifactId>
+  <artifactId>ch18-crunch</artifactId>
   <packaging>jar</packaging>
   <version>3.0</version>
-  <name>Chapter xx: Crunch</name>
+  <name>Chapter 18: Crunch</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.crunch</groupId>

diff --git a/chxx-crunch/src/main/assembly/hadoop-job.xml → ch18-crunch/src/main/assembly/hadoop-job.xml b/chxx-crunch/src/main/assembly/hadoop-job.xml → ch18-crunch/src/main/assembly/hadoop-job.xml
diff --git a/...unch/AvroGenericMaxTemperatureCrunch.java → ...unch/AvroGenericMaxTemperatureCrunch.java b/...unch/AvroGenericMaxTemperatureCrunch.java → ...unch/AvroGenericMaxTemperatureCrunch.java
diff --git a/...unch/JoinRecordWithStationNameCrunch.java → ...unch/JoinRecordWithStationNameCrunch.java b/...unch/JoinRecordWithStationNameCrunch.java → ...unch/JoinRecordWithStationNameCrunch.java
diff --git a/...ch/MaxTemperatureByStationNameCrunch.java → ...ch/MaxTemperatureByStationNameCrunch.java b/...ch/MaxTemperatureByStationNameCrunch.java → ...ch/MaxTemperatureByStationNameCrunch.java
diff --git a/...ain/java/crunch/MaxTemperatureCrunch.java → ...ain/java/crunch/MaxTemperatureCrunch.java b/...ain/java/crunch/MaxTemperatureCrunch.java → ...ain/java/crunch/MaxTemperatureCrunch.java
diff --git a/...MaxTemperatureCrunchWithShutdownHook.java → ...MaxTemperatureCrunchWithShutdownHook.java b/...MaxTemperatureCrunchWithShutdownHook.java → ...MaxTemperatureCrunchWithShutdownHook.java
diff --git a/...xTemperatureUsingSecondarySortCrunch.java → ...xTemperatureUsingSecondarySortCrunch.java b/...xTemperatureUsingSecondarySortCrunch.java → ...xTemperatureUsingSecondarySortCrunch.java
diff --git a/.../MaxTemperatureWithCompressionCrunch.java → .../MaxTemperatureWithCompressionCrunch.java b/.../MaxTemperatureWithCompressionCrunch.java → .../MaxTemperatureWithCompressionCrunch.java
diff --git a/...nch/MaxTemperatureWithCountersCrunch.java → ...nch/MaxTemperatureWithCountersCrunch.java b/...nch/MaxTemperatureWithCountersCrunch.java → ...nch/MaxTemperatureWithCountersCrunch.java
diff --git a/...xTemperatureWithMultipleInputsCrunch.java → ...xTemperatureWithMultipleInputsCrunch.java b/...xTemperatureWithMultipleInputsCrunch.java → ...xTemperatureWithMultipleInputsCrunch.java
diff --git a/...in/java/crunch/MetOfficeRecordParser.java → ...in/java/crunch/MetOfficeRecordParser.java b/...in/java/crunch/MetOfficeRecordParser.java → ...in/java/crunch/MetOfficeRecordParser.java
diff --git a/...rc/main/java/crunch/NcdcRecordParser.java → ...rc/main/java/crunch/NcdcRecordParser.java b/...rc/main/java/crunch/NcdcRecordParser.java → ...rc/main/java/crunch/NcdcRecordParser.java
diff --git a/...ava/crunch/NcdcStationMetadataParser.java → ...ava/crunch/NcdcStationMetadataParser.java b/...ava/crunch/NcdcStationMetadataParser.java → ...ava/crunch/NcdcStationMetadataParser.java
diff --git a/.../java/crunch/SortByTemperatureCrunch.java → .../java/crunch/SortByTemperatureCrunch.java b/.../java/crunch/SortByTemperatureCrunch.java → .../java/crunch/SortByTemperatureCrunch.java
diff --git a/...nch/src/main/java/crunch/SplitCrunch.java → ...nch/src/main/java/crunch/SplitCrunch.java b/...nch/src/main/java/crunch/SplitCrunch.java → ...nch/src/main/java/crunch/SplitCrunch.java
diff --git a/.../src/test/java/crunch/CheckpointTest.java → .../src/test/java/crunch/CheckpointTest.java b/.../src/test/java/crunch/CheckpointTest.java → .../src/test/java/crunch/CheckpointTest.java
diff --git a/...h/src/test/java/crunch/CountValuesFn.java → ...h/src/test/java/crunch/CountValuesFn.java b/...h/src/test/java/crunch/CountValuesFn.java → ...h/src/test/java/crunch/CountValuesFn.java
diff --git a/...unch/src/test/java/crunch/CustomDoFn.java → ...unch/src/test/java/crunch/CustomDoFn.java b/...unch/src/test/java/crunch/CustomDoFn.java → ...unch/src/test/java/crunch/CustomDoFn.java
diff --git a/...h/src/test/java/crunch/InversePairFn.java → ...h/src/test/java/crunch/InversePairFn.java b/...h/src/test/java/crunch/InversePairFn.java → ...h/src/test/java/crunch/InversePairFn.java
diff --git a/...crunch/src/test/java/crunch/JoinTest.java → ...crunch/src/test/java/crunch/JoinTest.java b/...crunch/src/test/java/crunch/JoinTest.java → ...crunch/src/test/java/crunch/JoinTest.java
diff --git a/...src/test/java/crunch/MaterializeTest.java → ...src/test/java/crunch/MaterializeTest.java b/...src/test/java/crunch/MaterializeTest.java → ...src/test/java/crunch/MaterializeTest.java
diff --git a/...ava/crunch/NonSerializableOuterClass.java → ...ava/crunch/NonSerializableOuterClass.java b/...ava/crunch/NonSerializableOuterClass.java → ...ava/crunch/NonSerializableOuterClass.java
diff --git a/...src/test/java/crunch/ObjectReuseTest.java → ...src/test/java/crunch/ObjectReuseTest.java b/...src/test/java/crunch/ObjectReuseTest.java → ...src/test/java/crunch/ObjectReuseTest.java
diff --git a/...ch/src/test/java/crunch/PCollections.java → ...ch/src/test/java/crunch/PCollections.java b/...ch/src/test/java/crunch/PCollections.java → ...ch/src/test/java/crunch/PCollections.java
diff --git a/...ch/src/test/java/crunch/PageRankTest.java → ...ch/src/test/java/crunch/PageRankTest.java b/...ch/src/test/java/crunch/PageRankTest.java → ...ch/src/test/java/crunch/PageRankTest.java
diff --git a/...c/test/java/crunch/PipelineDebugTest.java → ...c/test/java/crunch/PipelineDebugTest.java b/...c/test/java/crunch/PipelineDebugTest.java → ...c/test/java/crunch/PipelineDebugTest.java
diff --git a/...st/java/crunch/PipelineExecutionTest.java → ...st/java/crunch/PipelineExecutionTest.java b/...st/java/crunch/PipelineExecutionTest.java → ...st/java/crunch/PipelineExecutionTest.java
diff --git a/.../java/crunch/PrimitiveOperationsTest.java → .../java/crunch/PrimitiveOperationsTest.java b/.../java/crunch/PrimitiveOperationsTest.java → .../java/crunch/PrimitiveOperationsTest.java
diff --git a/...ava/crunch/SerializableFunctionsTest.java → ...ava/crunch/SerializableFunctionsTest.java b/...ava/crunch/SerializableFunctionsTest.java → ...ava/crunch/SerializableFunctionsTest.java
diff --git a/...crunch/src/test/java/crunch/SortTest.java → ...crunch/src/test/java/crunch/SortTest.java b/...crunch/src/test/java/crunch/SortTest.java → ...crunch/src/test/java/crunch/SortTest.java
diff --git a/...st/java/crunch/SourcesAndTargetsTest.java → ...st/java/crunch/SourcesAndTargetsTest.java b/...st/java/crunch/SourcesAndTargetsTest.java → ...st/java/crunch/SourcesAndTargetsTest.java
diff --git a/...runch/src/test/java/crunch/ToLowerFn.java → ...runch/src/test/java/crunch/ToLowerFn.java b/...runch/src/test/java/crunch/ToLowerFn.java → ...runch/src/test/java/crunch/ToLowerFn.java
diff --git a/...runch/src/test/java/crunch/TypesTest.java → ...runch/src/test/java/crunch/TypesTest.java b/...runch/src/test/java/crunch/TypesTest.java → ...runch/src/test/java/crunch/TypesTest.java
diff --git a/...h/src/test/java/crunch/WeatherRecord.java → ...h/src/test/java/crunch/WeatherRecord.java b/...h/src/test/java/crunch/WeatherRecord.java → ...h/src/test/java/crunch/WeatherRecord.java
diff --git a/chxx-crunch/src/test/resources/A → ch18-crunch/src/test/resources/A b/chxx-crunch/src/test/resources/A → ch18-crunch/src/test/resources/A
diff --git a/chxx-crunch/src/test/resources/B → ch18-crunch/src/test/resources/B b/chxx-crunch/src/test/resources/B → ch18-crunch/src/test/resources/B
diff --git a/chxx-parquet/src/test/resources/fruit.txt → ch18-crunch/src/test/resources/fruit.txt b/chxx-parquet/src/test/resources/fruit.txt → ch18-crunch/src/test/resources/fruit.txt
diff --git a/chxx-crunch/src/test/resources/ints.txt → ch18-crunch/src/test/resources/ints.txt b/chxx-crunch/src/test/resources/ints.txt → ch18-crunch/src/test/resources/ints.txt
diff --git a/...runch/src/test/resources/log4j.properties → ...runch/src/test/resources/log4j.properties b/...runch/src/test/resources/log4j.properties → ...runch/src/test/resources/log4j.properties
diff --git a/chxx-crunch/src/test/resources/numbers.seq → ch18-crunch/src/test/resources/numbers.seq b/chxx-crunch/src/test/resources/numbers.seq → ch18-crunch/src/test/resources/numbers.seq
diff --git a/chxx-crunch/src/test/resources/sample.txt → ch18-crunch/src/test/resources/sample.txt b/chxx-crunch/src/test/resources/sample.txt → ch18-crunch/src/test/resources/sample.txt
diff --git a/chxx-crunch/src/test/resources/set1.txt → ch18-crunch/src/test/resources/set1.txt b/chxx-crunch/src/test/resources/set1.txt → ch18-crunch/src/test/resources/set1.txt
diff --git a/chxx-crunch/src/test/resources/set2.txt → ch18-crunch/src/test/resources/set2.txt b/chxx-crunch/src/test/resources/set2.txt → ch18-crunch/src/test/resources/set2.txt
diff --git a/chxx-crunch/src/test/resources/urls.txt → ch18-crunch/src/test/resources/urls.txt b/chxx-crunch/src/test/resources/urls.txt → ch18-crunch/src/test/resources/urls.txt
diff --git a/chxx-spark/pom.xml → ch19-spark/pom.xml b/chxx-spark/pom.xml → ch19-spark/pom.xml
@@ -8,10 +8,10 @@
     <relativePath>../book/pom.xml</relativePath>
   </parent>
   <groupId>com.hadoopbook</groupId>
-  <artifactId>chxx-spark</artifactId>
+  <artifactId>ch19-spark</artifactId>
   <packaging>jar</packaging>
   <version>3.0</version>
-  <name>Chapter xx: Spark</name>
+  <name>Chapter 19: Spark</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.spark</groupId>

diff --git a/...rk/src/main/java/MaxTemperatureSpark.java → ...rk/src/main/java/MaxTemperatureSpark.java b/...rk/src/main/java/MaxTemperatureSpark.java → ...rk/src/main/java/MaxTemperatureSpark.java
diff --git a/chxx-spark/src/main/python/MaxTemperature.py → ch19-spark/src/main/python/MaxTemperature.py b/chxx-spark/src/main/python/MaxTemperature.py → ch19-spark/src/main/python/MaxTemperature.py
diff --git a/...spark/src/main/scala/MaxTemperature.scala → ...spark/src/main/scala/MaxTemperature.scala b/...spark/src/main/scala/MaxTemperature.scala → ...spark/src/main/scala/MaxTemperature.scala
diff --git a/...n/scala/MaxTemperatureWithPlacement.scala → ...n/scala/MaxTemperatureWithPlacement.scala b/...n/scala/MaxTemperatureWithPlacement.scala → ...n/scala/MaxTemperatureWithPlacement.scala
diff --git a/chxx-spark/src/test/avro/IntWrapper.avsc → ch19-spark/src/test/avro/IntWrapper.avsc b/chxx-spark/src/test/avro/IntWrapper.avsc → ch19-spark/src/test/avro/IntWrapper.avsc
diff --git a/chxx-spark/src/test/avro/WeatherRecord.avsc → ch19-spark/src/test/avro/WeatherRecord.avsc b/chxx-spark/src/test/avro/WeatherRecord.avsc → ch19-spark/src/test/avro/WeatherRecord.avsc
diff --git a/chxx-spark/src/test/java/SimpleTest.java → ch19-spark/src/test/java/SimpleTest.java b/chxx-spark/src/test/java/SimpleTest.java → ch19-spark/src/test/java/SimpleTest.java
diff --git a/chxx-spark/src/test/resources/fruit.txt → ch19-spark/src/test/resources/fruit.txt b/chxx-spark/src/test/resources/fruit.txt → ch19-spark/src/test/resources/fruit.txt
diff --git a/...spark/src/test/resources/log4j.properties → ...spark/src/test/resources/log4j.properties b/...spark/src/test/resources/log4j.properties → ...spark/src/test/resources/log4j.properties
diff --git a/chxx-spark/src/test/resources/numbers.seq → ch19-spark/src/test/resources/numbers.seq b/chxx-spark/src/test/resources/numbers.seq → ch19-spark/src/test/resources/numbers.seq
diff --git a/chxx-spark/src/test/resources/quangle.txt → ch19-spark/src/test/resources/quangle.txt b/chxx-spark/src/test/resources/quangle.txt → ch19-spark/src/test/resources/quangle.txt
diff --git a/chxx-spark/src/test/resources/set2.txt → ch19-spark/src/test/resources/set2.txt b/chxx-spark/src/test/resources/set2.txt → ch19-spark/src/test/resources/set2.txt
diff --git a/...rc/test/scala/CustomKryoRegistrator.scala → ...rc/test/scala/CustomKryoRegistrator.scala b/...rc/test/scala/CustomKryoRegistrator.scala → ...rc/test/scala/CustomKryoRegistrator.scala
diff --git a/...rc/test/scala/DataSerializationTest.scala → ...rc/test/scala/DataSerializationTest.scala b/...rc/test/scala/DataSerializationTest.scala → ...rc/test/scala/DataSerializationTest.scala
diff --git a/...est/scala/FunctionSerializationTest.scala → ...est/scala/FunctionSerializationTest.scala b/...est/scala/FunctionSerializationTest.scala → ...est/scala/FunctionSerializationTest.scala
diff --git a/...park/src/test/scala/RDDCreationTest.scala → ...park/src/test/scala/RDDCreationTest.scala b/...park/src/test/scala/RDDCreationTest.scala → ...park/src/test/scala/RDDCreationTest.scala
@@ -51,7 +51,7 @@ class RDDCreationTest extends FunSuite with BeforeAndAfterEach {
   }
 
 //  test("whole text file") {
-//    val inputPath = "chxx-spark/src/test/resources/fruit.txt"
+//    val inputPath = "ch19-spark/src/test/resources/fruit.txt"
 //    val files: RDD[(String, String)] = sc.wholeTextFiles(inputPath)
 //    assert(files.first._1.endsWith(inputPath))
 //    assert(files.first._2 === "cherry\napple\nbanana\n")

diff --git a/...src/test/scala/ReflectWeatherRecord.scala → ...src/test/scala/ReflectWeatherRecord.scala b/...src/test/scala/ReflectWeatherRecord.scala → ...src/test/scala/ReflectWeatherRecord.scala
diff --git a/...spark/src/test/scala/SharedDataTest.scala → ...spark/src/test/scala/SharedDataTest.scala b/...spark/src/test/scala/SharedDataTest.scala → ...spark/src/test/scala/SharedDataTest.scala
diff --git a/...scala/TransformationsAndActionsTest.scala → ...scala/TransformationsAndActionsTest.scala b/...scala/TransformationsAndActionsTest.scala → ...scala/TransformationsAndActionsTest.scala
diff --git a/...c/test/scala/WordCountHistogramTest.scala → ...c/test/scala/WordCountHistogramTest.scala b/...c/test/scala/WordCountHistogramTest.scala → ...c/test/scala/WordCountHistogramTest.scala
diff --git a/pom.xml b/pom.xml
@@ -14,15 +14,15 @@
     <module>ch02</module>
     <module>ch03</module>
     <module>ch04</module>
-    <module>ch04-avro</module>
-    <module>chxx-parquet</module>
+    <module>ch06-avro</module>
+    <module>ch07-parquet</module>
     <module>ch05</module>
     <module>ch07</module>
     <module>ch08</module>
     <module>ch11</module>
     <module>ch12</module>
-    <module>chxx-crunch</module>
-    <module>chxx-spark</module>
+    <module>ch18-crunch</module>
+    <module>ch19-spark</module>
     <module>ch13</module>
     <module>ch14</module>
     <module>ch15</module>

diff --git a/snippet/bin/check_manuscript.sh b/snippet/bin/check_manuscript.sh
@@ -17,8 +17,8 @@ done
 
 # Avro check
 sed -e '/<programlisting/s/ id="[^"]*"//; s|</programlisting>|\
-</programlisting>|' $book_workspace/chxx-avro.xml > /tmp/chxx-avro.xml
-$bin/check_manuscript.py /tmp/chxx-avro.xml $actual/ch04-avro/*
+</programlisting>|' $book_workspace/ch06-avro.xml > /tmp/ch06-avro.xml
+$bin/check_manuscript.py /tmp/ch06-avro.xml $actual/ch06-avro/*
 
 # Common check
 $bin/check_manuscript.py /tmp/ch07.xml $actual/common/*
diff --git a/snippet/bin/generate_listings.sh b/snippet/bin/generate_listings.sh
@@ -9,7 +9,7 @@ actual="$bin"/../actual
 perl $bin/phragmite_db.pl $actual/ch02/ $(grep -ElR '(// ?cc|// ?==)' --include '*.java' $bin/../../ch02)
 perl $bin/phragmite_db.pl $actual/ch03/ $(grep -ElR '(// ?cc|// ?==)' --include '*.java' $bin/../../ch03)
 perl $bin/phragmite_db.pl $actual/ch04/ $(grep -ElR '(// ?cc|// ?==)' --include '*.java' $bin/../../ch04)
-perl $bin/phragmite_db.pl $actual/ch04-avro/ $(grep -ElR '(// ?cc|// ?==)' --include '*.java' $bin/../../ch04-avro)
+perl $bin/phragmite_db.pl $actual/ch06-avro/ $(grep -ElR '(// ?cc|// ?==)' --include '*.java' $bin/../../ch06-avro)
 perl $bin/phragmite_db.pl $actual/ch05/ $(grep -ElR '(// ?cc|// ?==)' --include '*.java' $bin/../../ch05)
 perl $bin/phragmite_db.pl $actual/ch05/ $bin/../../../hadoop-book-mr-dev/pom.xml
 perl $bin/phragmite_db.pl $actual/ch05/ $bin/../../ch05/src/main/resources/max-temp-workflow/workflow.xml

diff --git a/snippet/src/test/java/ExamplesIT.java b/snippet/src/test/java/ExamplesIT.java
@@ -58,7 +58,7 @@ public class ExamplesIT {
   private static final String MODE_DEFAULT = "local";
 
   private static final String EXAMPLE_CHAPTERS_PROPERTY = "example.chapters";
-  private static final String EXAMPLE_CHAPTERS_DEFAULT = "ch02,ch04,ch04-avro,ch05,ch07,ch08";
+  private static final String EXAMPLE_CHAPTERS_DEFAULT = "ch02,ch04,ch06-avro,ch05,ch07,ch08";
 
   private static final IOFileFilter HIDDEN_FILE_FILTER =
     new OrFileFilter(HiddenFileFilter.HIDDEN, new PrefixFileFilter("_"));