You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2010/06/11 23:35:05 UTC
svn commit: r953881 [2/5] - in /hadoop/common/trunk: ./
src/java/org/apache/hadoop/ src/java/org/apache/hadoop/classification/
src/java/org/apache/hadoop/conf/ src/java/org/apache/hadoop/fs/
src/java/org/apache/hadoop/fs/ftp/ src/java/org/apache/hadoop...
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java Fri Jun 11 21:34:56 2010
@@ -29,6 +29,8 @@ import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPReply;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CreateFlag;
import org.apache.hadoop.fs.FSDataInputStream;
@@ -46,6 +48,8 @@ import org.apache.hadoop.util.Progressab
* href="http://commons.apache.org/net/">Apache Commons Net</a>.
* </p>
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class FTPFileSystem extends FileSystem {
public static final Log LOG = LogFactory
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/ftp/FTPInputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/ftp/FTPInputStream.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/ftp/FTPInputStream.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/ftp/FTPInputStream.java Fri Jun 11 21:34:56 2010
@@ -21,9 +21,13 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.net.ftp.FTPClient;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.FSInputStream;
import org.apache.hadoop.fs.FileSystem;
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
public class FTPInputStream extends FSInputStream {
InputStream wrappedStream;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSConfigKeys.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSConfigKeys.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSConfigKeys.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSConfigKeys.java Fri Jun 11 21:34:56 2010
@@ -18,6 +18,8 @@
package org.apache.hadoop.fs.kfs;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.CommonConfigurationKeys;
/**
@@ -25,7 +27,8 @@ import org.apache.hadoop.fs.CommonConfig
* in the kfs file system.
*
*/
-
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
public class KFSConfigKeys extends CommonConfigurationKeys {
public static final String KFS_BLOCK_SIZE_KEY = "kfs.blocksize";
public static final long KFS_BLOCK_SIZE_DEFAULT = 64*1024*1024;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSImpl.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSImpl.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSImpl.java Fri Jun 11 21:34:56 2010
@@ -20,6 +20,8 @@ package org.apache.hadoop.fs.kfs;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
@@ -30,6 +32,8 @@ import org.kosmix.kosmosfs.access.KfsAcc
import org.kosmix.kosmosfs.access.KfsFileAttr;
import org.apache.hadoop.util.Progressable;
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
class KFSImpl implements IFSImpl {
private KfsAccess kfsAccess = null;
private FileSystem.Statistics statistics;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSInputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSInputStream.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSInputStream.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSInputStream.java Fri Jun 11 21:34:56 2010
@@ -22,12 +22,16 @@ package org.apache.hadoop.fs.kfs;
import java.io.*;
import java.nio.ByteBuffer;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FSInputStream;
import org.kosmix.kosmosfs.access.KfsAccess;
import org.kosmix.kosmosfs.access.KfsInputChannel;
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
class KFSInputStream extends FSInputStream {
private KfsInputChannel kfsChannel;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSOutputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSOutputStream.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSOutputStream.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KFSOutputStream.java Fri Jun 11 21:34:56 2010
@@ -24,6 +24,8 @@ import java.net.*;
import java.util.*;
import java.nio.ByteBuffer;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.FSDataOutputStream;
@@ -32,6 +34,8 @@ import org.apache.hadoop.util.Progressab
import org.kosmix.kosmosfs.access.KfsAccess;
import org.kosmix.kosmosfs.access.KfsOutputChannel;
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
class KFSOutputStream extends OutputStream {
private String path;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KosmosFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KosmosFileSystem.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KosmosFileSystem.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/kfs/KosmosFileSystem.java Fri Jun 11 21:34:56 2010
@@ -24,6 +24,8 @@ import java.io.IOException;
import java.net.URI;
import java.util.EnumSet;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.BlockLocation;
import org.apache.hadoop.fs.CreateFlag;
@@ -40,7 +42,8 @@ import org.apache.hadoop.util.Progressab
* A FileSystem backed by KFS.
*
*/
-
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class KosmosFileSystem extends FileSystem {
private FileSystem localFs;
Added: hadoop/common/trunk/src/java/org/apache/hadoop/fs/local/package-info.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/local/package-info.java?rev=953881&view=auto
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/local/package-info.java (added)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/local/package-info.java Fri Jun 11 21:34:56 2010
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
+@InterfaceStability.Unstable
+package org.apache.hadoop.fs.local;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
Propchange: hadoop/common/trunk/src/java/org/apache/hadoop/fs/local/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/AccessControlException.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/AccessControlException.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/AccessControlException.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/AccessControlException.java Fri Jun 11 21:34:56 2010
@@ -19,12 +19,17 @@ package org.apache.hadoop.fs.permission;
import java.io.IOException;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* An exception class for access control related issues.
* @deprecated Use {@link org.apache.hadoop.security.AccessControlException}
* instead.
*/
@Deprecated
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class AccessControlException extends IOException {
//Required by {@link java.io.Serializable}.
private static final long serialVersionUID = 1L;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/ChmodParser.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/ChmodParser.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/ChmodParser.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/ChmodParser.java Fri Jun 11 21:34:56 2010
@@ -19,12 +19,16 @@ package org.apache.hadoop.fs.permission;
import java.util.regex.Pattern;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.FileStatus;
/**
* Parse a permission mode passed in from a chmod command and apply that
* mode against an existing file.
*/
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
public class ChmodParser extends PermissionParser {
private static Pattern chmodOctalPattern =
Pattern.compile("^\\s*[+]?([01]?)([0-7]{3})\\s*$");
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/FsAction.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/FsAction.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/FsAction.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/FsAction.java Fri Jun 11 21:34:56 2010
@@ -17,9 +17,14 @@
*/
package org.apache.hadoop.fs.permission;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* File system actions, e.g. read, write, etc.
*/
+@InterfaceAudience.LimitedPrivate({"HDFS"})
+@InterfaceStability.Unstable
public enum FsAction {
// POSIX style
NONE("---"),
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/FsPermission.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/FsPermission.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/FsPermission.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/FsPermission.java Fri Jun 11 21:34:56 2010
@@ -23,6 +23,8 @@ import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.io.Writable;
@@ -32,6 +34,8 @@ import org.apache.hadoop.io.WritableFact
/**
* A class for file/directory permissions.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class FsPermission implements Writable {
private static final Log LOG = LogFactory.getLog(FsPermission.class);
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/PermissionParser.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/PermissionParser.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/PermissionParser.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/PermissionParser.java Fri Jun 11 21:34:56 2010
@@ -20,11 +20,16 @@ package org.apache.hadoop.fs.permission;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* Base class for parsing either chmod permissions or umask permissions.
* Includes common code needed by either operation as implemented in
* UmaskParser and ChmodParser classes.
*/
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
class PermissionParser {
protected boolean symbolic = false;
protected short userMode;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/PermissionStatus.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/PermissionStatus.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/PermissionStatus.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/PermissionStatus.java Fri Jun 11 21:34:56 2010
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.fs.permission;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.io.*;
import java.io.DataInput;
@@ -26,6 +28,8 @@ import java.io.IOException;
/**
* Store permission related information.
*/
+@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
+@InterfaceStability.Unstable
public class PermissionStatus implements Writable {
static final WritableFactory FACTORY = new WritableFactory() {
public Writable newInstance() { return new PermissionStatus(); }
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/UmaskParser.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/UmaskParser.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/UmaskParser.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/permission/UmaskParser.java Fri Jun 11 21:34:56 2010
@@ -19,6 +19,9 @@ package org.apache.hadoop.fs.permission;
import java.util.regex.Pattern;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* Parse umask value provided as a string, either in octal or symbolic
* format and return it as a short value. Umask values are slightly
@@ -26,6 +29,8 @@ import java.util.regex.Pattern;
* or X.
*
*/
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
class UmaskParser extends PermissionParser {
private static Pattern chmodOctalPattern =
Pattern.compile("^\\s*[+]?()([0-7]{3})\\s*$"); // no leading 1 for sticky bit
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/Block.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/Block.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/Block.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/Block.java Fri Jun 11 21:34:56 2010
@@ -18,9 +18,14 @@
package org.apache.hadoop.fs.s3;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* Holds metadata about a block of data being stored in a {@link FileSystemStore}.
*/
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
public class Block {
private long id;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/FileSystemStore.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/FileSystemStore.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/FileSystemStore.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/FileSystemStore.java Fri Jun 11 21:34:56 2010
@@ -23,12 +23,16 @@ import java.io.IOException;
import java.net.URI;
import java.util.Set;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
/**
* A facility for storing and retrieving {@link INode}s and {@link Block}s.
*/
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
public interface FileSystemStore {
void initialize(URI uri, Configuration conf) throws IOException;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/INode.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/INode.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/INode.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/INode.java Fri Jun 11 21:34:56 2010
@@ -25,10 +25,15 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* Holds file metadata including type (regular file, or directory),
* and the list of blocks that are pointers to the data.
*/
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
public class INode {
enum FileType {
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java Fri Jun 11 21:34:56 2010
@@ -35,6 +35,8 @@ import java.util.TreeSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.s3.INode.FileType;
@@ -45,6 +47,8 @@ import org.jets3t.service.model.S3Bucket
import org.jets3t.service.model.S3Object;
import org.jets3t.service.security.AWSCredentials;
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
class Jets3tFileSystemStore implements FileSystemStore {
private static final String FILE_SYSTEM_NAME = "fs";
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/MigrationTool.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/MigrationTool.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/MigrationTool.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/MigrationTool.java Fri Jun 11 21:34:56 2010
@@ -26,6 +26,8 @@ import java.net.URLEncoder;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.util.Tool;
@@ -47,6 +49,8 @@ import org.jets3t.service.security.AWSCr
* - no datafiles are touched.
* </p>
*/
+@InterfaceAudience.Public
+@InterfaceStability.Unstable
public class MigrationTool extends Configured implements Tool {
private S3Service s3Service;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3Credentials.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3Credentials.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3Credentials.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3Credentials.java Fri Jun 11 21:34:56 2010
@@ -20,6 +20,8 @@ package org.apache.hadoop.fs.s3;
import java.net.URI;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
/**
@@ -27,6 +29,8 @@ import org.apache.hadoop.conf.Configurat
* Extracts AWS credentials from the filesystem URI or configuration.
* </p>
*/
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
public class S3Credentials {
private String accessKey;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3Exception.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3Exception.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3Exception.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3Exception.java Fri Jun 11 21:34:56 2010
@@ -20,9 +20,14 @@ package org.apache.hadoop.fs.s3;
import java.io.IOException;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* Thrown if there is a problem communicating with Amazon S3.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class S3Exception extends IOException {
private static final long serialVersionUID = 1L;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystem.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystem.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystem.java Fri Jun 11 21:34:56 2010
@@ -28,6 +28,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CreateFlag;
import org.apache.hadoop.fs.FSDataInputStream;
@@ -49,6 +51,8 @@ import org.apache.hadoop.util.Progressab
* </p>
* @see NativeS3FileSystem
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class S3FileSystem extends FileSystem {
private URI uri;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystemConfigKeys.java Fri Jun 11 21:34:56 2010
@@ -18,6 +18,8 @@
package org.apache.hadoop.fs.s3;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.CommonConfigurationKeys;
/**
@@ -25,7 +27,8 @@ import org.apache.hadoop.fs.CommonConfig
* in the s3 file system.
*
*/
-
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
public class S3FileSystemConfigKeys extends CommonConfigurationKeys {
public static final String S3_BLOCK_SIZE_KEY = "s3.blocksize";
public static final long S3_BLOCK_SIZE_DEFAULT = 64*1024*1024;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystemException.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystemException.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystemException.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3FileSystemException.java Fri Jun 11 21:34:56 2010
@@ -19,9 +19,14 @@ package org.apache.hadoop.fs.s3;
import java.io.IOException;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* Thrown when there is a fatal exception while using {@link S3FileSystem}.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class S3FileSystemException extends IOException {
private static final long serialVersionUID = 1L;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3InputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3InputStream.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3InputStream.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3InputStream.java Fri Jun 11 21:34:56 2010
@@ -25,10 +25,14 @@ import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSInputStream;
import org.apache.hadoop.fs.FileSystem;
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
class S3InputStream extends FSInputStream {
private FileSystemStore store;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3OutputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3OutputStream.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3OutputStream.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/S3OutputStream.java Fri Jun 11 21:34:56 2010
@@ -28,11 +28,15 @@ import java.util.Random;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.s3.INode.FileType;
import org.apache.hadoop.util.Progressable;
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
class S3OutputStream extends OutputStream {
private Configuration conf;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/VersionMismatchException.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/VersionMismatchException.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/VersionMismatchException.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3/VersionMismatchException.java Fri Jun 11 21:34:56 2010
@@ -17,10 +17,15 @@
*/
package org.apache.hadoop.fs.s3;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* Thrown when Hadoop cannot read the version of the data stored
* in {@link S3FileSystem}.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class VersionMismatchException extends S3FileSystemException {
private static final long serialVersionUID = 1L;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/FileMetadata.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/FileMetadata.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/FileMetadata.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/FileMetadata.java Fri Jun 11 21:34:56 2010
@@ -18,11 +18,16 @@
package org.apache.hadoop.fs.s3native;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* <p>
* Holds basic metadata for a file stored in a {@link NativeFileSystemStore}.
* </p>
*/
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
class FileMetadata {
private final String key;
private final long length;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java Fri Jun 11 21:34:56 2010
@@ -29,6 +29,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.s3.S3Credentials;
import org.apache.hadoop.fs.s3.S3Exception;
@@ -40,6 +42,8 @@ import org.jets3t.service.model.S3Bucket
import org.jets3t.service.model.S3Object;
import org.jets3t.service.security.AWSCredentials;
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
class Jets3tNativeFileSystemStore implements NativeFileSystemStore {
private S3Service s3Service;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/NativeFileSystemStore.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/NativeFileSystemStore.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/NativeFileSystemStore.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/NativeFileSystemStore.java Fri Jun 11 21:34:56 2010
@@ -23,6 +23,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
/**
@@ -30,6 +32,8 @@ import org.apache.hadoop.conf.Configurat
* An abstraction for a key-based {@link File} store.
* </p>
*/
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
interface NativeFileSystemStore {
void initialize(URI uri, Configuration conf) throws IOException;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java Fri Jun 11 21:34:56 2010
@@ -40,6 +40,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.BufferedFSInputStream;
import org.apache.hadoop.fs.CreateFlag;
@@ -77,6 +79,8 @@ import org.apache.hadoop.util.Progressab
* </p>
* @see org.apache.hadoop.fs.s3.S3FileSystem
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class NativeS3FileSystem extends FileSystem {
public static final Log LOG =
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/PartialListing.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/PartialListing.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/PartialListing.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/PartialListing.java Fri Jun 11 21:34:56 2010
@@ -18,6 +18,9 @@
package org.apache.hadoop.fs.s3native;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* <p>
* Holds information on a directory listing for a
@@ -31,6 +34,8 @@ package org.apache.hadoop.fs.s3native;
* </p>
* @see NativeFileSystemStore#list(String, int, String)
*/
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
class PartialListing {
private final String priorLastKey;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/S3NativeFileSystemConfigKeys.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/S3NativeFileSystemConfigKeys.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/S3NativeFileSystemConfigKeys.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/s3native/S3NativeFileSystemConfigKeys.java Fri Jun 11 21:34:56 2010
@@ -18,6 +18,8 @@
package org.apache.hadoop.fs.s3native;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.CommonConfigurationKeys;
/**
@@ -25,7 +27,8 @@ import org.apache.hadoop.fs.CommonConfig
* in the s3 file system.
*
*/
-
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
public class S3NativeFileSystemConfigKeys extends CommonConfigurationKeys {
public static final String S3_NATIVE_BLOCK_SIZE_KEY = "s3native.blocksize";
public static final long S3_NATIVE_BLOCK_SIZE_DEFAULT = 64*1024*1024;
Added: hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/package-info.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/package-info.java?rev=953881&view=auto
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/package-info.java (added)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/package-info.java Fri Jun 11 21:34:56 2010
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
+package org.apache.hadoop.fs.shell;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
Propchange: hadoop/common/trunk/src/java/org/apache/hadoop/fs/shell/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: hadoop/common/trunk/src/java/org/apache/hadoop/http/package-info.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/http/package-info.java?rev=953881&view=auto
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/http/package-info.java (added)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/http/package-info.java Fri Jun 11 21:34:56 2010
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@InterfaceAudience.LimitedPrivate({"HBase", "HDFS", "MapReduce"})
+@InterfaceStability.Unstable
+package org.apache.hadoop.http;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
Propchange: hadoop/common/trunk/src/java/org/apache/hadoop/http/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/AbstractMapWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/AbstractMapWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/AbstractMapWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/AbstractMapWritable.java Fri Jun 11 21:34:56 2010
@@ -24,6 +24,8 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
@@ -37,6 +39,8 @@ import org.apache.hadoop.conf.Configurat
* Class ids range from 1 to 127 so there can be at most 127 distinct classes
* in any specific map instance.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public abstract class AbstractMapWritable implements Writable, Configurable {
private AtomicReference<Configuration> conf;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/ArrayFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/ArrayFile.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/ArrayFile.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/ArrayFile.java Fri Jun 11 21:34:56 2010
@@ -20,12 +20,16 @@ package org.apache.hadoop.io;
import java.io.*;
import org.apache.hadoop.fs.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.util.*;
import org.apache.hadoop.io.SequenceFile.CompressionType;
/** A dense file-based mapping from integers to values. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class ArrayFile extends MapFile {
protected ArrayFile() {} // no public ctor
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/ArrayWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/ArrayWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/ArrayWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/ArrayWritable.java Fri Jun 11 21:34:56 2010
@@ -21,6 +21,9 @@ package org.apache.hadoop.io;
import java.io.*;
import java.lang.reflect.Array;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* A Writable for arrays containing instances of a class. The elements of this
* writable must all be instances of the same class. If this writable will be
@@ -36,6 +39,8 @@ import java.lang.reflect.Array;
* }
* </code>
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class ArrayWritable implements Writable {
private Class<? extends Writable> valueClass;
private Writable[] values;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/BinaryComparable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/BinaryComparable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/BinaryComparable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/BinaryComparable.java Fri Jun 11 21:34:56 2010
@@ -18,10 +18,15 @@
package org.apache.hadoop.io;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* Interface supported by {@link org.apache.hadoop.io.WritableComparable}
* types supporting ordering/permutation by a representative set of bytes.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public abstract class BinaryComparable implements Comparable<BinaryComparable> {
/**
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/BloomMapFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/BloomMapFile.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/BloomMapFile.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/BloomMapFile.java Fri Jun 11 21:34:56 2010
@@ -24,6 +24,8 @@ import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -42,6 +44,8 @@ import org.apache.hadoop.util.hash.Hash;
* {@link Reader#get(WritableComparable, Writable)} operation, especially in
* case of sparsely populated MapFile-s.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class BloomMapFile {
private static final Log LOG = LogFactory.getLog(BloomMapFile.class);
public static final String BLOOM_FILE_NAME = "bloom";
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/BooleanWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/BooleanWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/BooleanWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/BooleanWritable.java Fri Jun 11 21:34:56 2010
@@ -20,9 +20,14 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* A WritableComparable for booleans.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class BooleanWritable implements WritableComparable {
private boolean value;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/BoundedByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/BoundedByteArrayOutputStream.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/BoundedByteArrayOutputStream.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/BoundedByteArrayOutputStream.java Fri Jun 11 21:34:56 2010
@@ -21,11 +21,16 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* A byte array backed output stream with a limit. The limit should be smaller
* than the buffer capacity. The object can be reused through <code>reset</code>
* API and choose different limits in each round.
*/
+@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
+@InterfaceStability.Unstable
public class BoundedByteArrayOutputStream extends OutputStream {
private final byte[] buffer;
private int limit;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/ByteWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/ByteWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/ByteWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/ByteWritable.java Fri Jun 11 21:34:56 2010
@@ -20,7 +20,12 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A WritableComparable for a single byte. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class ByteWritable implements WritableComparable {
private byte value;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/BytesWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/BytesWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/BytesWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/BytesWritable.java Fri Jun 11 21:34:56 2010
@@ -24,6 +24,8 @@ import java.io.DataOutput;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
/**
* A byte sequence that is usable as a key or value.
@@ -31,6 +33,8 @@ import org.apache.commons.logging.LogFac
* the current capacity. The hash function is the front of the md5 of the
* buffer. The sort order is the same as memcmp.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class BytesWritable extends BinaryComparable
implements WritableComparable<BinaryComparable> {
private static final Log LOG = LogFactory.getLog(BytesWritable.class);
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/Closeable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/Closeable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/Closeable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/Closeable.java Fri Jun 11 21:34:56 2010
@@ -18,7 +18,12 @@
package org.apache.hadoop.io;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** @deprecated use java.io.Closeable */
@Deprecated
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public interface Closeable extends java.io.Closeable{
}
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/CompressedWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/CompressedWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/CompressedWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/CompressedWritable.java Fri Jun 11 21:34:56 2010
@@ -29,11 +29,16 @@ import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.InflaterInputStream;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A base-class for Writables which store themselves compressed and lazily
* inflate on field access. This is useful for large objects whose fields are
* not be altered during a map or reduce operation: leaving the field data
* compressed makes copying the instance from one file to another much
* faster. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public abstract class CompressedWritable implements Writable {
// if non-null, the compressed field data of this instance.
private byte[] compressed;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/DataInputBuffer.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/DataInputBuffer.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/DataInputBuffer.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/DataInputBuffer.java Fri Jun 11 21:34:56 2010
@@ -20,6 +20,9 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A reusable {@link DataInput} implementation that reads from an in-memory
* buffer.
*
@@ -38,6 +41,8 @@ import java.io.*;
* </pre>
*
*/
+@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
+@InterfaceStability.Unstable
public class DataInputBuffer extends DataInputStream {
private static class Buffer extends ByteArrayInputStream {
public Buffer() {
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/DataOutputBuffer.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/DataOutputBuffer.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/DataOutputBuffer.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/DataOutputBuffer.java Fri Jun 11 21:34:56 2010
@@ -20,6 +20,9 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A reusable {@link DataOutput} implementation that writes to an in-memory
* buffer.
*
@@ -39,6 +42,8 @@ import java.io.*;
* </pre>
*
*/
+@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
+@InterfaceStability.Unstable
public class DataOutputBuffer extends DataOutputStream {
private static class Buffer extends ByteArrayOutputStream {
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/DefaultStringifier.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/DefaultStringifier.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/DefaultStringifier.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/DefaultStringifier.java Fri Jun 11 21:34:56 2010
@@ -23,6 +23,8 @@ import java.nio.charset.UnsupportedChars
import java.util.ArrayList;
import org.apache.commons.codec.binary.Base64;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.serializer.Deserializer;
import org.apache.hadoop.io.serializer.Serialization;
@@ -41,6 +43,8 @@ import org.apache.hadoop.util.GenericsUt
*
* @param <T> the class of the objects to stringify
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class DefaultStringifier<T> implements Stringifier<T> {
private static final String SEPARATOR = ",";
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/DoubleWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/DoubleWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/DoubleWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/DoubleWritable.java Fri Jun 11 21:34:56 2010
@@ -22,9 +22,14 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* Writable for Double values.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class DoubleWritable implements WritableComparable {
private double value = 0.0;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/EnumSetWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/EnumSetWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/EnumSetWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/EnumSetWritable.java Fri Jun 11 21:34:56 2010
@@ -26,10 +26,14 @@ import java.util.Iterator;
import java.util.Collection;
import java.util.AbstractCollection;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
/** A Writable wrapper for EnumSet. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class EnumSetWritable<E extends Enum<E>> extends AbstractCollection<E>
implements Writable, Configurable {
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/FloatWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/FloatWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/FloatWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/FloatWritable.java Fri Jun 11 21:34:56 2010
@@ -20,7 +20,12 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A WritableComparable for floats. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class FloatWritable implements WritableComparable {
private float value;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/GenericWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/GenericWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/GenericWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/GenericWritable.java Fri Jun 11 21:34:56 2010
@@ -22,6 +22,8 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.ReflectionUtils;
@@ -73,6 +75,8 @@ import org.apache.hadoop.util.Reflection
*
* @since Nov 8, 2006
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public abstract class GenericWritable implements Writable, Configurable {
private static final byte NOT_SET = -1;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/IOUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/IOUtils.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/IOUtils.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/IOUtils.java Fri Jun 11 21:34:56 2010
@@ -23,11 +23,15 @@ import java.net.Socket;
import org.apache.commons.logging.Log;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
/**
* An utility class for I/O related functionality.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Evolving
public class IOUtils {
/**
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/InputBuffer.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/InputBuffer.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/InputBuffer.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/InputBuffer.java Fri Jun 11 21:34:56 2010
@@ -20,6 +20,9 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A reusable {@link InputStream} implementation that reads from an in-memory
* buffer.
@@ -40,6 +43,8 @@ import java.io.*;
* @see DataInputBuffer
* @see DataOutput
*/
+@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
+@InterfaceStability.Unstable
public class InputBuffer extends FilterInputStream {
private static class Buffer extends ByteArrayInputStream {
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/IntWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/IntWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/IntWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/IntWritable.java Fri Jun 11 21:34:56 2010
@@ -20,7 +20,12 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A WritableComparable for ints. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class IntWritable implements WritableComparable {
private int value;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/LongWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/LongWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/LongWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/LongWritable.java Fri Jun 11 21:34:56 2010
@@ -20,7 +20,12 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A WritableComparable for longs. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class LongWritable implements WritableComparable {
private long value;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/MD5Hash.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/MD5Hash.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/MD5Hash.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/MD5Hash.java Fri Jun 11 21:34:56 2010
@@ -25,8 +25,13 @@ import java.io.InputStream;
import java.util.Arrays;
import java.security.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A Writable for MD5 hash values.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class MD5Hash implements WritableComparable<MD5Hash> {
public static final int MD5_LEN = 16;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/MapFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/MapFile.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/MapFile.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/MapFile.java Fri Jun 11 21:34:56 2010
@@ -25,6 +25,8 @@ import java.io.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.util.Progressable;
import org.apache.hadoop.util.ReflectionUtils;
@@ -48,6 +50,8 @@ import org.apache.hadoop.io.compress.Def
* a new file. Sorting large change lists can be done with {@link
* SequenceFile.Sorter}.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class MapFile {
private static final Log LOG = LogFactory.getLog(MapFile.class);
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/MapWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/MapWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/MapWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/MapWritable.java Fri Jun 11 21:34:56 2010
@@ -25,11 +25,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.util.ReflectionUtils;
/**
* A Writable Map.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class MapWritable extends AbstractMapWritable
implements Map<Writable, Writable> {
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/MultipleIOException.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/MultipleIOException.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/MultipleIOException.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/MultipleIOException.java Fri Jun 11 21:34:56 2010
@@ -20,7 +20,12 @@ package org.apache.hadoop.io;
import java.io.IOException;
import java.util.List;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** Encapsulate a list of {@link IOException} into an {@link IOException} */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class MultipleIOException extends IOException {
/** Require by {@link java.io.Serializable} */
private static final long serialVersionUID = 1L;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/NullWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/NullWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/NullWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/NullWritable.java Fri Jun 11 21:34:56 2010
@@ -20,7 +20,12 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** Singleton Writable with no data. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class NullWritable implements WritableComparable {
private static final NullWritable THIS = new NullWritable();
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/ObjectWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/ObjectWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/ObjectWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/ObjectWritable.java Fri Jun 11 21:34:56 2010
@@ -23,11 +23,15 @@ import java.lang.reflect.Array;
import java.io.*;
import java.util.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.*;
/** A polymorphic Writable that writes an instance with it's class name.
* Handles arrays, strings and primitive types without a Writable wrapper.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class ObjectWritable implements Writable, Configurable {
private Class declaredClass;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/OutputBuffer.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/OutputBuffer.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/OutputBuffer.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/OutputBuffer.java Fri Jun 11 21:34:56 2010
@@ -20,6 +20,9 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A reusable {@link OutputStream} implementation that writes to an in-memory
* buffer.
*
@@ -40,6 +43,8 @@ import java.io.*;
* @see DataOutputBuffer
* @see InputBuffer
*/
+@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
+@InterfaceStability.Unstable
public class OutputBuffer extends FilterOutputStream {
private static class Buffer extends ByteArrayOutputStream {
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/RawComparator.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/RawComparator.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/RawComparator.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/RawComparator.java Fri Jun 11 21:34:56 2010
@@ -20,6 +20,8 @@ package org.apache.hadoop.io;
import java.util.Comparator;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.io.serializer.DeserializerComparator;
/**
@@ -30,6 +32,8 @@ import org.apache.hadoop.io.serializer.D
* @param <T>
* @see DeserializerComparator
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public interface RawComparator<T> extends Comparator<T> {
public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2);
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/SequenceFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/SequenceFile.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/SequenceFile.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/SequenceFile.java Fri Jun 11 21:34:56 2010
@@ -36,6 +36,8 @@ import org.apache.hadoop.io.compress.zli
import org.apache.hadoop.io.serializer.Deserializer;
import org.apache.hadoop.io.serializer.Serializer;
import org.apache.hadoop.io.serializer.SerializationFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.util.Progressable;
import org.apache.hadoop.util.Progress;
@@ -183,6 +185,8 @@ import org.apache.hadoop.util.PriorityQu
*
* @see CompressionCodec
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class SequenceFile {
private static final Log LOG = LogFactory.getLog(SequenceFile.class);
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/SetFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/SetFile.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/SetFile.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/SetFile.java Fri Jun 11 21:34:56 2010
@@ -21,9 +21,13 @@ package org.apache.hadoop.io;
import java.io.*;
import org.apache.hadoop.fs.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.*;
/** A file-based set of keys. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class SetFile extends MapFile {
protected SetFile() {} // no public ctor
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/SortedMapWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/SortedMapWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/SortedMapWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/SortedMapWritable.java Fri Jun 11 21:34:56 2010
@@ -27,11 +27,15 @@ import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.util.ReflectionUtils;
/**
* A Writable SortedMap.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class SortedMapWritable extends AbstractMapWritable
implements SortedMap<WritableComparable, Writable> {
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/Stringifier.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/Stringifier.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/Stringifier.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/Stringifier.java Fri Jun 11 21:34:56 2010
@@ -20,12 +20,17 @@ package org.apache.hadoop.io;
import java.io.IOException;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* Stringifier interface offers two methods to convert an object
* to a string representation and restore the object given its
* string representation.
* @param <T> the class of the objects to stringify
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public interface Stringifier<T> extends java.io.Closeable {
/**
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/Text.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/Text.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/Text.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/Text.java Fri Jun 11 21:34:56 2010
@@ -37,6 +37,8 @@ import org.apache.avro.reflect.Stringabl
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
/** This class stores text using standard UTF8 encoding. It provides methods
* to serialize, deserialize, and compare texts at byte level. The type of
@@ -48,6 +50,8 @@ import org.apache.commons.logging.LogFac
* string.
*/
@Stringable
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class Text extends BinaryComparable
implements WritableComparable<BinaryComparable> {
private static final Log LOG= LogFactory.getLog(Text.class);
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/TwoDArrayWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/TwoDArrayWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/TwoDArrayWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/TwoDArrayWritable.java Fri Jun 11 21:34:56 2010
@@ -21,7 +21,12 @@ package org.apache.hadoop.io;
import java.io.*;
import java.lang.reflect.Array;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A Writable for 2D arrays containing a matrix of instances of a class. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class TwoDArrayWritable implements Writable {
private Class valueClass;
private Writable[][] values;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/UTF8.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/UTF8.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/UTF8.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/UTF8.java Fri Jun 11 21:34:56 2010
@@ -24,6 +24,8 @@ import java.io.DataOutput;
import org.apache.commons.logging.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
/** A WritableComparable for strings that uses the UTF8 encoding.
*
@@ -31,6 +33,9 @@ import org.apache.commons.logging.*;
*
* @deprecated replaced by Text
*/
+@Deprecated
+@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
+@InterfaceStability.Stable
public class UTF8 implements WritableComparable {
private static final Log LOG= LogFactory.getLog(UTF8.class);
private static final DataInputBuffer IBUF = new DataInputBuffer();
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/VIntWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/VIntWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/VIntWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/VIntWritable.java Fri Jun 11 21:34:56 2010
@@ -20,11 +20,16 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A WritableComparable for integer values stored in variable-length format.
* Such values take between one and five bytes. Smaller values take fewer bytes.
*
* @see org.apache.hadoop.io.WritableUtils#readVInt(DataInput)
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class VIntWritable implements WritableComparable {
private int value;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/VLongWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/VLongWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/VLongWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/VLongWritable.java Fri Jun 11 21:34:56 2010
@@ -20,11 +20,16 @@ package org.apache.hadoop.io;
import java.io.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A WritableComparable for longs in a variable-length format. Such values take
* between one and five bytes. Smaller values take fewer bytes.
*
* @see org.apache.hadoop.io.WritableUtils#readVLong(DataInput)
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class VLongWritable implements WritableComparable {
private long value;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/VersionMismatchException.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/VersionMismatchException.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/VersionMismatchException.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/VersionMismatchException.java Fri Jun 11 21:34:56 2010
@@ -20,9 +20,14 @@ package org.apache.hadoop.io;
import java.io.IOException;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** Thrown by {@link VersionedWritable#readFields(DataInput)} when the
* version of an object being read does not match the current implementation
* version as returned by {@link VersionedWritable#getVersion()}. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class VersionMismatchException extends IOException {
private byte expectedVersion;
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/VersionedWritable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/VersionedWritable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/VersionedWritable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/VersionedWritable.java Fri Jun 11 21:34:56 2010
@@ -22,6 +22,9 @@ import java.io.DataOutput;
import java.io.DataInput;
import java.io.IOException;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A base class for Writables that provides version checking.
*
* <p>This is useful when a class may evolve, so that instances written by the
@@ -29,6 +32,8 @@ import java.io.IOException;
* handle this situation, {@link #readFields(DataInput)}
* implementations should catch {@link VersionMismatchException}.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public abstract class VersionedWritable implements Writable {
/** Return the version number of the current implementation. */
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/Writable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/Writable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/Writable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/Writable.java Fri Jun 11 21:34:56 2010
@@ -22,6 +22,9 @@ import java.io.DataOutput;
import java.io.DataInput;
import java.io.IOException;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* A serializable object which implements a simple, efficient, serialization
* protocol, based on {@link DataInput} and {@link DataOutput}.
@@ -58,6 +61,8 @@ import java.io.IOException;
* }
* </pre></blockquote></p>
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public interface Writable {
/**
* Serialize the fields of this object to <code>out</code>.
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableComparable.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableComparable.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableComparable.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableComparable.java Fri Jun 11 21:34:56 2010
@@ -18,6 +18,9 @@
package org.apache.hadoop.io;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/**
* A {@link Writable} which is also {@link Comparable}.
*
@@ -53,5 +56,7 @@ package org.apache.hadoop.io;
* }
* </pre></blockquote></p>
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public interface WritableComparable<T> extends Writable, Comparable<T> {
}
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableComparator.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableComparator.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableComparator.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableComparator.java Fri Jun 11 21:34:56 2010
@@ -21,6 +21,8 @@ package org.apache.hadoop.io;
import java.io.*;
import java.util.*;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.util.ReflectionUtils;
/** A Comparator for {@link WritableComparable}s.
@@ -32,6 +34,8 @@ import org.apache.hadoop.util.Reflection
* {@link #compare(byte[],int,int,byte[],int,int)}. Static utility methods are
* provided to assist in optimized implementations of this method.
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class WritableComparator implements RawComparator {
private static HashMap<Class, WritableComparator> comparators =
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableFactories.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableFactories.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableFactories.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableFactories.java Fri Jun 11 21:34:56 2010
@@ -18,12 +18,16 @@
package org.apache.hadoop.io;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.*;
import org.apache.hadoop.util.ReflectionUtils;
import java.util.HashMap;
/** Factories for non-public writables. Defining a factory permits {@link
* ObjectWritable} to be able to construct instances of non-public classes. */
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public class WritableFactories {
private static final HashMap<Class, WritableFactory> CLASS_TO_FACTORY =
new HashMap<Class, WritableFactory>();
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableFactory.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableFactory.java?rev=953881&r1=953880&r2=953881&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableFactory.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/io/WritableFactory.java Fri Jun 11 21:34:56 2010
@@ -18,9 +18,14 @@
package org.apache.hadoop.io;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
/** A factory for a class of Writable.
* @see WritableFactories
*/
+@InterfaceAudience.Public
+@InterfaceStability.Stable
public interface WritableFactory {
/** Return a new instance. */
Writable newInstance();