Renamed chxx-* to actual chapter numbers.

Author: tomwhite

chxx-yarn/capacity-scheduler.xml ch04-yarn/capacity-scheduler.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>

chxx-yarn/fair-scheduler.xml ch04-yarn/fair-scheduler.xml

@@ -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

ch04-avro/pom.xml ch06-avro/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>

ch04-avro/src/main/assembly/job.xml ch06-avro/src/main/assembly/job.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>

ch04-avro/src/main/c/dump_pairs.c ch06-avro/src/main/c/dump_pairs.c

@@ -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>

ch04-avro/src/main/examples/AvroGenericMaxTemperature/input.txt ch06-avro/src/main/examples/AvroGenericMaxTemperature/input.txt

@@ -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")

ch04-avro/src/main/examples/AvroGenericMaxTemperature/output/part-00000.avro ch06-avro/src/main/examples/AvroGenericMaxTemperature/output/part-00000.avro

@@ -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>

ch04-avro/src/main/examples/AvroSort/input.txt ch06-avro/src/main/examples/AvroSort/input.txt

@@ -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/*

ch04-avro/src/main/examples/AvroSort/output/part-00000.avro ch06-avro/src/main/examples/AvroSort/output/part-00000.avro

@@ -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

ch04-avro/src/main/examples/AvroSpecificMaxTemperature/input.txt ch06-avro/src/main/examples/AvroSpecificMaxTemperature/input.txt

@@ -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("_"));