Hadoop: Minor fixes and style changes to satisfy Hadoop's FindBugs system.

Remove a few deprecated methods.

diff --git a/src/client/hadoop/ceph/CephFileSystem.java b/src/client/hadoop/ceph/CephFileSystem.java
index ae6c43f794a791748f70dce2566efc54b4c21e45..7e8bd73641a5411dcb9b3e24caadae04da57912d 100644 (file)
--- a/src/client/hadoop/ceph/CephFileSystem.java
+++ b/src/client/hadoop/ceph/CephFileSystem.java
@@ -38,7 +38,6 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.fs.permission.FsAction;
 import org.apache.hadoop.util.Progressable;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FsStatus;
@@ -72,13 +71,13 @@ public class CephFileSystem extends FileSystem {
 
   private URI uri;
 
-  private Path root;
+  private final Path root;
   private boolean initialized = false;
 
-  private static boolean debug = false;
-  private static String cephDebugLevel;
-  private static String monAddr;
-  private static String fs_default_name;
+  private boolean debug = false;
+  private String cephDebugLevel;
+  private String monAddr;
+  private String fs_default_name;
   
   private native boolean ceph_initializeClient(String arguments, int block_size);
   private native String  ceph_getcwd();
@@ -142,12 +141,13 @@ public class CephFileSystem extends FileSystem {
       System.load(conf.get("fs.ceph.libDir")+"/libceph.so");
       super.initialize(uri, conf);
       setConf(conf);
-      this.uri = URI.create(uri.getScheme() + "://" + uri.getAuthority());    
+      this.uri = URI.create(uri.getScheme() + "://" + uri.getAuthority());  
+      statistics = getStatistics(uri.getScheme(), getClass());  
       
       fs_default_name = conf.get("fs.default.name");
       debug = ("true".equals(conf.get("fs.ceph.debug", "false")));
       //build up the arguments for Ceph
-      String arguments = new String("CephFSInterface");
+      String arguments = "CephFSInterface";
       arguments += conf.get("fs.ceph.commandLine", "");
       if (conf.get("fs.ceph.clientDebug") != null) {
        arguments += " --debug_client ";
@@ -222,20 +222,7 @@ public class CephFileSystem extends FileSystem {
     }
     CephOutputStream cephOStream = new CephOutputStream(getConf(), fd);
     if(debug) debug("append:exit");
-    return new FSDataOutputStream(cephOStream);
-  }
-
-  /**
-   * Get the name of this CephFileSystem.
-   * @return The name of the CephFileSystem as a string.
-   * @deprecated Use getUri() instead.
-   */
-  @Deprecated
-  public String getName() {
-    if (!initialized) return null;
-    if(debug) debug("getName:enter");
-    if(debug) debug("getName:exit with value " + getUri().toString());
-    return getUri().toString();
+    return new FSDataOutputStream(cephOStream, statistics);
   }
 
   /**
@@ -283,7 +270,7 @@ public class CephFileSystem extends FileSystem {
     if(debug) debug("exists:enter with path " + path);
     boolean result;
     Path abs_path = makeAbsolute(path);
-    if (abs_path.toString().equals("/")) {
+    if (abs_path.equals(root)) {
       result = true;
     }
     else {
@@ -332,7 +319,7 @@ public class CephFileSystem extends FileSystem {
     if(debug) debug("isFile:enter with path " + path);
     Path abs_path = makeAbsolute(path);
     boolean result;
-    if (abs_path.toString().equals("/")) {
+    if (abs_path.equals(root)) {
       result =  false;
     }
     else {
@@ -356,7 +343,7 @@ public class CephFileSystem extends FileSystem {
     if(debug) debug("isDirectory:enter with path " + path);
     Path abs_path = makeAbsolute(path);
     boolean result;
-    if (abs_path.toString().equals(root)) {
+    if (abs_path.equals(root)) {
       result = true;
     }
     else {
@@ -531,7 +518,7 @@ public class CephFileSystem extends FileSystem {
     // Step 4: create the stream
     OutputStream cephOStream = new CephOutputStream(getConf(), fh);
     if(debug) debug("create:exit");
-    return new FSDataOutputStream(cephOStream);
+    return new FSDataOutputStream(cephOStream, statistics);
     }
 
   /**
@@ -640,17 +627,18 @@ public class CephFileSystem extends FileSystem {
    * Get usage statistics on the Ceph filesystem.
    * @param path A path to the partition you're interested in.
    * Ceph doesn't partition, so this is ignored.
-   * @return FsStatus reportin capacity, usage, and remaining spac.
+   * @return FsStatus reporting capacity, usage, and remaining spac.
    * @throws IOException if initialize() hasn't been called, or the
    * stat somehow fails.
    */
+  @Override
   public FsStatus getStatus (Path path) throws IOException {
     if (!initialized) throw new IOException("You have to initialize the"
                      + " CephFileSystem before calling other methods.");
     if(debug) debug("getStatus:enter");
     Path abs_path = makeAbsolute(path);
     
-    //currently(Ceph .12) Ceph actually ignores the path
+    //currently(Ceph .14) Ceph actually ignores the path
     //but we still pass it in; if Ceph stops ignoring we may need more
     //error-checking code.
     CephStat ceph_stat = new CephStat();
@@ -661,16 +649,6 @@ public class CephFileSystem extends FileSystem {
                        ceph_stat.used, ceph_stat.remaining);
   }
 
-  /**
-   * Delete the given path, and any children if it's a directory.
-   * @param path The path to delete.
-   * @return true if the delete succeeded, false otherwise.
-   * @throws IOException If initialize() hasn't been called,
-   * or you try to delete the root directory.
-   * @deprecated Use delete(Path path, boolean recursive) instead.
-   */
-  public boolean delete(Path path) throws IOException { return delete(path, true); };
-
   /**
    * Delete the given path, and optionally its children.
    * @param path the path to delete.
@@ -690,7 +668,7 @@ public class CephFileSystem extends FileSystem {
     
     if(debug) debug("delete: Deleting path " + abs_path.toString());
     // sanity check
-    if (abs_path.toString().equals(root))
+    if (abs_path.equals(root))
       throw new IOException("Error: deleting the root directory is a Bad Idea.");
 
     if (!exists(abs_path)) return false;
@@ -719,7 +697,6 @@ public class CephFileSystem extends FileSystem {
       return false;
     }
     // delete the entries
-    Path parent = abs_path.getParent();
     for (Path p : contents) {
       if (!delete(p, true)) {
        if(debug) debug("delete: Failed to delete file \"" + 
@@ -746,31 +723,6 @@ public class CephFileSystem extends FileSystem {
   public short getDefaultReplication() {
     return 1;
   }
-  
-  /**
-   * Get the block size for a given file. This will return if path is a
-   * directory, but the value is meaningless.
-   * @param path The Path you want to get the block size for.
-   * @return the block size of path (in bytes) as a long.
-   * @throws IOException if initialize() hasn't been called or
-   * the path doesn't exist.
-   * @deprecated use getFileStatus instead.
-   */
-  @Deprecated
-  public long getBlockSize(Path path) throws IOException {
-    if (!initialized) throw new IOException ("You have to initialize the"
-                      +"CephFileSystem before calling other methods.");
-    if(debug) debug("getBlockSize:enter with path " + path);
-    Path abs_path = makeAbsolute(path);
-    long result = ceph_getblocksize(abs_path.toString());
-  
-    if (result < 0)
-      throw new IOException("org.apache.hadoop.fs.ceph.CephFileSystem.getBlockSize: File or directory "
-                           + path.toString() + " does not exist.");
-
-    if(debug) debug("getBlockSize:exit with result " + result);
-    return result;
-  }
 
   /**
    * Get the default block size.
@@ -837,7 +789,7 @@ public class CephFileSystem extends FileSystem {
     System.err.println(statement);
   }
 
-  private class Stat {
+  private static class Stat {
     public long size;
     public boolean is_dir;
     public long block_size;
@@ -848,7 +800,7 @@ public class CephFileSystem extends FileSystem {
     public Stat(){}
   }
 
-  private class CephStat {
+  private static class CephStat {
     public long capacity;
     public long used;
     public long remaining;

diff --git a/src/client/hadoop/ceph/CephInputStream.java b/src/client/hadoop/ceph/CephInputStream.java
index 24d0888777717e58df105bab87851293adf693c3..1d0eaf1f181d82d62b96441d1123c72646bb9d84 100644 (file)
--- a/src/client/hadoop/ceph/CephInputStream.java
+++ b/src/client/hadoop/ceph/CephInputStream.java
@@ -48,7 +48,7 @@ public class CephInputStream extends FSInputStream {
 
   private long fileLength;
 
-  private static boolean debug;
+  private boolean debug;
 
   private native int ceph_read(int fh, byte[] buffer, int buffer_offset, int length);
   private native long ceph_seek_from_start(int fh, long pos);
@@ -78,7 +78,7 @@ public class CephInputStream extends FSInputStream {
   /** Ceph likes things to be closed before it shuts down,
    * so closing the IOStream stuff voluntarily in a finalizer is good
    */
-  public void finalize () throws Throwable {
+  protected void finalize () throws Throwable {
     try {
       if (!closed) close();
     }

diff --git a/src/client/hadoop/ceph/CephOutputStream.java b/src/client/hadoop/ceph/CephOutputStream.java
index fdcc4e000ad4627af9268ea3253201a691e72588..9c2c6117436651e032b4463fd157588034c00348 100644 (file)
--- a/src/client/hadoop/ceph/CephOutputStream.java
+++ b/src/client/hadoop/ceph/CephOutputStream.java
@@ -47,7 +47,7 @@ public class CephOutputStream extends OutputStream {
 
   private int fileHandle;
 
-  private static boolean debug;
+  private boolean debug;
 
 
   private native long ceph_seek_from_start(int fh, long pos);
@@ -72,7 +72,7 @@ public class CephOutputStream extends OutputStream {
   /**Ceph likes things to be closed before it shuts down,
    *so closing the IOStream stuff voluntarily is good
    */
-  public void finalize () throws Throwable {
+  protected void finalize () throws Throwable {
     try {
       if (!closed) close();
     }