Author: eli
Date: Sat Nov 13 05:55:54 2010
New Revision: 1034672
URL: http://svn.apache.org/viewvc?rev=1034672&view=rev
Log:
HDFS-727. svn merge -c 882708 from trunk.
Modified:
hadoop/common/branches/branch-0.20/ (props changed)
hadoop/common/branches/branch-0.20/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20/src/c++/libhdfs/hdfs.c
hadoop/common/branches/branch-0.20/src/c++/libhdfs/hdfsJniHelper.c
hadoop/common/branches/branch-0.20/src/core/ (props changed)
hadoop/common/branches/branch-0.20/src/mapred/ (props changed)
hadoop/common/branches/branch-0.20/src/test/ (props changed)
Propchange: hadoop/common/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 13 05:55:54 2010
@@ -1,3 +1,4 @@
/hadoop/common/trunk:910709
/hadoop/core/branches/branch-0.19:713112
/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
+/hadoop/hdfs/trunk:882708
Modified: hadoop/common/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=1034672&r1=1034671&r2=1034672&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20/CHANGES.txt Sat Nov 13 05:55:54 2010
@@ -65,6 +65,8 @@ Release 0.20.3 - Unreleased
HDFS-1240. TestDFSShell failing in branch-20.
(Todd Lipcon via Eli Collins)
+ HDFS-727. bug setting block size hdfsOpenFile (Eli Collins via cos)
+
IMPROVEMENTS
MAPREDUCE-1407. Update javadoc in mapreduce.{Mapper,Reducer} to match
Propchange: hadoop/common/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 13 05:55:54 2010
@@ -2,3 +2,4 @@
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
+/hadoop/hdfs/trunk/CHANGES.txt:882708
Modified: hadoop/common/branches/branch-0.20/src/c++/libhdfs/hdfs.c
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/c%2B%2B/libhdfs/hdfs.c?rev=1034672&r1=1034671&r2=1034672&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/c++/libhdfs/hdfs.c (original)
+++ hadoop/common/branches/branch-0.20/src/c++/libhdfs/hdfs.c Sat Nov 13
05:55:54 2010
@@ -492,7 +492,7 @@ hdfsFile hdfsOpenFile(hdfsFS fs, const c
if (!blockSize) {
if (invokeMethod(env, &jVal, &jExc, INSTANCE, jConfiguration,
HADOOP_CONF, "getLong", "(Ljava/lang/String;J)J",
- jStrBlockSize, 67108864)) {
+ jStrBlockSize, (jlong)67108864)) {
errno = errnoFromException(jExc, env, "org.apache.hadoop.conf."
"FileSystem::%s(%s)", method,
signature);
Modified: hadoop/common/branches/branch-0.20/src/c++/libhdfs/hdfsJniHelper.c
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/c%2B%2B/libhdfs/hdfsJniHelper.c?rev=1034672&r1=1034671&r2=1034672&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/c++/libhdfs/hdfsJniHelper.c
(original)
+++ hadoop/common/branches/branch-0.20/src/c++/libhdfs/hdfsJniHelper.c Sat Nov
13 05:55:54 2010
@@ -222,7 +222,7 @@ int invokeMethod(JNIEnv *env, RetVal *re
}
jarray constructNewArrayString(JNIEnv *env, Exc *exc, const char **elements,
int size) {
- const char *className = "Ljava/lang/String;";
+ const char *className = "java/lang/String";
jobjectArray result;
int i;
jclass arrCls = (*env)->FindClass(env, className);
Propchange: hadoop/common/branches/branch-0.20/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 13 05:55:54 2010
@@ -2,3 +2,4 @@
/hadoop/common/trunk/src/java:979485
/hadoop/core/branches/branch-0.19/src/core:713112
/hadoop/core/trunk/src/core:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
+/hadoop/hdfs/trunk/src/core:882708
Propchange: hadoop/common/branches/branch-0.20/src/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 13 05:55:54 2010
@@ -1,3 +1,4 @@
/hadoop/core/branches/branch-0.19/src/mapred:713112
/hadoop/core/trunk/src/mapred:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
+/hadoop/hdfs/trunk/src/mapred:882708
/hadoop/mapreduce/trunk/src/java:808650
Propchange: hadoop/common/branches/branch-0.20/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 13 05:55:54 2010
@@ -2,3 +2,4 @@
/hadoop/common/trunk/src/test/core:979485
/hadoop/core/branches/branch-0.19/src/test:713112
/hadoop/core/trunk/src/test:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
+/hadoop/hdfs/trunk/src/test:882708
