You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by el...@apache.org on 2011/06/07 08:47:03 UTC
svn commit: r1132883 - in /hadoop/hdfs/branches/branch-0.22: ./
src/c++/libhdfs/ src/contrib/hdfsproxy/ src/java/
src/java/org/apache/hadoop/hdfs/server/datanode/ src/test/hdfs/
src/webapps/datanode/ src/webapps/hdfs/ src/webapps/secondary/
Author: eli
Date: Tue Jun 7 06:47:03 2011
New Revision: 1132883
URL: http://svn.apache.org/viewvc?rev=1132883&view=rev
Log:
HDFS-1619. svn merge -c 1132881 from trunk
Modified:
hadoop/hdfs/branches/branch-0.22/ (props changed)
hadoop/hdfs/branches/branch-0.22/CHANGES.txt
hadoop/hdfs/branches/branch-0.22/build.xml (props changed)
hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/configure.ac
hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/java/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java (props changed)
hadoop/hdfs/branches/branch-0.22/src/test/hdfs/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/webapps/datanode/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/ (props changed)
hadoop/hdfs/branches/branch-0.22/src/webapps/secondary/ (props changed)
Propchange: hadoop/hdfs/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 06:47:03 2011
@@ -2,4 +2,4 @@
/hadoop/core/branches/branch-0.19/hdfs:713112
/hadoop/hdfs/branches/HDFS-265:796829-820463
/hadoop/hdfs/branches/branch-0.21:820487
-/hadoop/hdfs/trunk:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819
+/hadoop/hdfs/trunk:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819,1132881
Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1132883&r1=1132882&r2=1132883&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Tue Jun 7 06:47:03 2011
@@ -255,6 +255,8 @@ Release 0.22.0 - Unreleased
HDFS-1980. Move build/webapps deeper in the build directory heirarchy
to aid eclipse users. (todd)
+ HDFS-1619. Remove AC_TYPE* from the libhdfs. (Roman Shaposhnik via eli)
+
OPTIMIZATIONS
HDFS-1140. Speedup INode.getPathComponents. (Dmytro Molkov via shv)
Propchange: hadoop/hdfs/branches/branch-0.22/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 06:47:03 2011
@@ -3,4 +3,4 @@
/hadoop/core/trunk/build.xml:779102
/hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463
/hadoop/hdfs/branches/branch-0.21/build.xml:820487
-/hadoop/hdfs/trunk/build.xml:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819
+/hadoop/hdfs/trunk/build.xml:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819,1132881
Propchange: hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 06:47:03 2011
@@ -1,4 +1,4 @@
/hadoop/common/trunk/src/c++/libhdfs:1096645
/hadoop/core/branches/branch-0.19/mapred/src/c++/libhdfs:713112
/hadoop/core/trunk/src/c++/libhdfs:776175-784663
-/hadoop/hdfs/trunk/src/c++/libhdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819
+/hadoop/hdfs/trunk/src/c++/libhdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819,1132881
Modified: hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/c%2B%2B/libhdfs/configure.ac?rev=1132883&r1=1132882&r2=1132883&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/configure.ac (original)
+++ hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/configure.ac Tue Jun 7 06:47:03 2011
@@ -18,7 +18,6 @@
# Autoconf input file
# $Id$
-AC_PREREQ(2.61)
AC_INIT([libhdfs], [0.1.0], omalley@apache.org)
AC_PREFIX_DEFAULT([`pwd`/../install])
AC_CONFIG_AUX_DIR([config])
@@ -115,9 +114,5 @@ AC_C_CONST
AC_C_VOLATILE
#AC_FUNC_MALLOC
AC_HEADER_STDBOOL
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_UINT16_T
AC_SUBST(PRODUCT_MK)
AC_OUTPUT
Propchange: hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 06:47:03 2011
@@ -3,4 +3,4 @@
/hadoop/core/trunk/src/contrib/hdfsproxy:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/contrib/hdfsproxy:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy:820487
-/hadoop/hdfs/trunk/src/contrib/hdfsproxy:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819
+/hadoop/hdfs/trunk/src/contrib/hdfsproxy:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819,1132881
Propchange: hadoop/hdfs/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 06:47:03 2011
@@ -3,4 +3,4 @@
/hadoop/core/trunk/src/hdfs:776175-785643,785929-786278
/hadoop/hdfs/branches/HDFS-265/src/java:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/java:820487
-/hadoop/hdfs/trunk/src/java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819
+/hadoop/hdfs/trunk/src/java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819,1132881
Propchange: hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 06:47:03 2011
@@ -5,4 +5,4 @@
/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:776175-785643,785929-786278
/hadoop/hdfs/branches/HDFS-265/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:820487
-/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819
+/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819,1132881
Propchange: hadoop/hdfs/branches/branch-0.22/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 06:47:03 2011
@@ -3,4 +3,4 @@
/hadoop/core/trunk/src/test/hdfs:776175-785643
/hadoop/hdfs/branches/HDFS-265/src/test/hdfs:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/test/hdfs:820487
-/hadoop/hdfs/trunk/src/test/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819
+/hadoop/hdfs/trunk/src/test/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819,1132881
Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 06:47:03 2011
@@ -3,4 +3,4 @@
/hadoop/core/trunk/src/webapps/datanode:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/webapps/datanode:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/datanode:820487
-/hadoop/hdfs/trunk/src/webapps/datanode:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819
+/hadoop/hdfs/trunk/src/webapps/datanode:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819,1132881
Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 06:47:03 2011
@@ -3,4 +3,4 @@
/hadoop/core/trunk/src/webapps/hdfs:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/webapps/hdfs:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs:820487
-/hadoop/hdfs/trunk/src/webapps/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819
+/hadoop/hdfs/trunk/src/webapps/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819,1132881
Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 7 06:47:03 2011
@@ -3,4 +3,4 @@
/hadoop/core/trunk/src/webapps/secondary:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/webapps/secondary:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/secondary:820487
-/hadoop/hdfs/trunk/src/webapps/secondary:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819
+/hadoop/hdfs/trunk/src/webapps/secondary:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312,1127809,1127819,1132881