Browse files

Upgrade from Hadoop 2.0.3-alpha to 2.2.0.

  • Loading branch information...
1 parent e05e771 commit c148d8c36dda57cb9ec792e0f859e1163b4d45f6 @tomwhite committed Jan 9, 2014
Showing with 5 additions and 4 deletions.
  1. +1 −1 README
  2. 0 ch02/src/main/examples/max_temperature_py/{2.0.3-alpha → 2.2.0}/input.txt
  3. 0 ch02/src/main/examples/max_temperature_py/{2.0.3-alpha → 2.2.0}/output/part-00000
  4. +2 −1 ch03/src/test/java/ShowFileStatusTest.java
  5. 0 ch07/src/main/examples/PartitionByStationUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/input.txt
  6. 0 ...examples/PartitionByStationUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029070-99999-r-00000
  7. 0 ...examples/PartitionByStationUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029500-99999-r-00000
  8. 0 ...examples/PartitionByStationUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029600-99999-r-00000
  9. 0 ...examples/PartitionByStationUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029720-99999-r-00000
  10. 0 ...examples/PartitionByStationUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029810-99999-r-00000
  11. 0 ...examples/PartitionByStationUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/227070-99999-r-00000
  12. 0 ...ngMultipleOutputs/2.0.3-alpha → PartitionByStationUsingMultipleOutputs/2.2.0}/output/part-r-00000
  13. 0 ch07/src/main/examples/PartitionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/input.txt
  14. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029070-99999/1901/part-r-00000
  15. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029070-99999/1902/part-r-00000
  16. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029500-99999/1901/part-r-00000
  17. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029500-99999/1902/part-r-00000
  18. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029600-99999/1901/part-r-00000
  19. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029600-99999/1902/part-r-00000
  20. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029720-99999/1901/part-r-00000
  21. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029720-99999/1902/part-r-00000
  22. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029810-99999/1901/part-r-00000
  23. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/029810-99999/1902/part-r-00000
  24. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/227070-99999/1901/part-r-00000
  25. 0 ...tionByStationYearUsingMultipleOutputs/{2.0.3-alpha → 2.2.0}/output/227070-99999/1902/part-r-00000
  26. 0 ...ltipleOutputs/2.0.3-alpha → PartitionByStationYearUsingMultipleOutputs/2.2.0}/output/part-r-00000
  27. 0 ch08/src/main/examples/JoinRecordWithStationName/{2.0.3-alpha → 2.2.0}/input.txt
  28. 0 ch08/src/main/examples/JoinRecordWithStationName/{2.0.3-alpha → 2.2.0}/output/part-r-00000
  29. +2 −2 hadoop-meta/pom.xml
View
2 README
@@ -9,7 +9,7 @@ for the first edition at http://github.com/tomwhite/hadoop-book/tree/1e, and
for the second edition at http://github.com/tomwhite/hadoop-book/tree/2e.
This version of the code has been tested with:
- * Hadoop 1.2.1/0.22.0/0.23.0/2.0.2-alpha
+ * Hadoop 1.2.1/0.22.0/0.23.x/2.2.0
* Avro 1.5.4
* Pig 0.9.1
* Hive 0.8.0
View
0 .../max_temperature_py/2.0.3-alpha/input.txt → ...amples/max_temperature_py/2.2.0/input.txt
File renamed without changes.
View
0 ...perature_py/2.0.3-alpha/output/part-00000 → ...ax_temperature_py/2.2.0/output/part-00000
File renamed without changes.
View
3 ch03/src/test/java/ShowFileStatusTest.java
@@ -49,7 +49,8 @@ public void fileStatusForFile() throws IOException {
assertThat(stat.getModificationTime(),
is(lessThanOrEqualTo(System.currentTimeMillis())));
assertThat(stat.getReplication(), is((short) 1));
- assertThat(stat.getBlockSize(), is(64 * 1024 * 1024L));
+ assertThat(stat.getBlockSize(),
+ anyOf(is(64 * 1024 * 1024L), is(128 * 1024 * 1024L)));
assertThat(stat.getOwner(), is(System.getProperty("user.name")));
assertThat(stat.getGroup(), is("supergroup"));
assertThat(stat.getPermission().toString(), is("rw-r--r--"));
View
0 ...singMultipleOutputs/2.0.3-alpha/input.txt → ...ationUsingMultipleOutputs/2.2.0/input.txt
File renamed without changes.
View
0 ...s/2.0.3-alpha/output/029070-99999-r-00000 → ...Outputs/2.2.0/output/029070-99999-r-00000
File renamed without changes.
View
0 ...s/2.0.3-alpha/output/029500-99999-r-00000 → ...Outputs/2.2.0/output/029500-99999-r-00000
File renamed without changes.
View
0 ...s/2.0.3-alpha/output/029600-99999-r-00000 → ...Outputs/2.2.0/output/029600-99999-r-00000
File renamed without changes.
View
0 ...s/2.0.3-alpha/output/029720-99999-r-00000 → ...Outputs/2.2.0/output/029720-99999-r-00000
File renamed without changes.
View
0 ...s/2.0.3-alpha/output/029810-99999-r-00000 → ...Outputs/2.2.0/output/029810-99999-r-00000
File renamed without changes.
View
0 ...s/2.0.3-alpha/output/227070-99999-r-00000 → ...Outputs/2.2.0/output/227070-99999-r-00000
File renamed without changes.
View
0 ...leOutputs/2.0.3-alpha/output/part-r-00000 → ...MultipleOutputs/2.2.0/output/part-r-00000
File renamed without changes.
View
0 ...singMultipleOutputs/2.0.3-alpha/input.txt → ...nYearUsingMultipleOutputs/2.2.0/input.txt
File renamed without changes.
View
0 ...pha/output/029070-99999/1901/part-r-00000 → ...2.0/output/029070-99999/1901/part-r-00000
File renamed without changes.
View
0 ...pha/output/029070-99999/1902/part-r-00000 → ...2.0/output/029070-99999/1902/part-r-00000
File renamed without changes.
View
0 ...pha/output/029500-99999/1901/part-r-00000 → ...2.0/output/029500-99999/1901/part-r-00000
File renamed without changes.
View
0 ...pha/output/029500-99999/1902/part-r-00000 → ...2.0/output/029500-99999/1902/part-r-00000
File renamed without changes.
View
0 ...pha/output/029600-99999/1901/part-r-00000 → ...2.0/output/029600-99999/1901/part-r-00000
File renamed without changes.
View
0 ...pha/output/029600-99999/1902/part-r-00000 → ...2.0/output/029600-99999/1902/part-r-00000
File renamed without changes.
View
0 ...pha/output/029720-99999/1901/part-r-00000 → ...2.0/output/029720-99999/1901/part-r-00000
File renamed without changes.
View
0 ...pha/output/029720-99999/1902/part-r-00000 → ...2.0/output/029720-99999/1902/part-r-00000
File renamed without changes.
View
0 ...pha/output/029810-99999/1901/part-r-00000 → ...2.0/output/029810-99999/1901/part-r-00000
File renamed without changes.
View
0 ...pha/output/029810-99999/1902/part-r-00000 → ...2.0/output/029810-99999/1902/part-r-00000
File renamed without changes.
View
0 ...pha/output/227070-99999/1901/part-r-00000 → ...2.0/output/227070-99999/1901/part-r-00000
File renamed without changes.
View
0 ...pha/output/227070-99999/1902/part-r-00000 → ...2.0/output/227070-99999/1902/part-r-00000
File renamed without changes.
View
0 ...leOutputs/2.0.3-alpha/output/part-r-00000 → ...MultipleOutputs/2.2.0/output/part-r-00000
File renamed without changes.
View
0 ...cordWithStationName/2.0.3-alpha/input.txt → ...JoinRecordWithStationName/2.2.0/input.txt
File renamed without changes.
View
0 ...ationName/2.0.3-alpha/output/part-r-00000 → ...WithStationName/2.2.0/output/part-r-00000
File renamed without changes.
View
4 hadoop-meta/pom.xml
@@ -335,11 +335,11 @@ A module which allows the Hadoop dependencies to be specified by a Maven profile
<activation>
<property>
<name>hadoop.version</name>
- <value>2.0.3-alpha</value>
+ <value>2.2.0</value>
</property>
</activation>
<properties>
- <hadoop.version>2.0.3-alpha</hadoop.version>
+ <hadoop.version>2.2.0</hadoop.version>
</properties>
<dependencies>
<dependency>

0 comments on commit c148d8c

Please sign in to comment.