+ * A local implementation exists for testing and for small Nutch instances. + *
* The standard job of NutchFileSystem is to take the location- * independent NutchFile objects, and resolve them using local * knowledge and local instances of ShareGroup. - * + *
+ * The local implementation is {@link LocalFileSystem} and distributed + * implementation is {@link NDFSFileSystem}. * @author Mike Cafarella *****************************************************************/ public abstract class NutchFileSystem { Index: src/java/org/apache/nutch/mapred/JobConf.java =================================================================== --- src/java/org/apache/nutch/mapred/JobConf.java (revision 320901) +++ src/java/org/apache/nutch/mapred/JobConf.java (working copy) @@ -52,7 +52,7 @@ /** Construct a map/reduce job configuration. * - * @param confg a NutchConf whose settings will be inherited. + * @param conf a NutchConf whose settings will be inherited. */ public JobConf(NutchConf conf) { super(conf); Index: src/java/org/apache/nutch/ndfs/NDFSClient.java =================================================================== --- src/java/org/apache/nutch/ndfs/NDFSClient.java (revision 320901) +++ src/java/org/apache/nutch/ndfs/NDFSClient.java (working copy) @@ -26,9 +26,8 @@ import java.util.logging.*; /******************************************************** - * NDFSClient does what's necessary to connect to a Nutch Filesystem - * and perform basic file tasks. - * + * NDFSClient can connect to a Nutch Filesystem and perform basic file tasks. + * Connects to a namenode daemon. * @author Mike Cafarella, Tessa MacDuff ********************************************************/ public class NDFSClient implements FSConstants { @@ -41,7 +40,7 @@ Daemon leaseChecker; - /** + /** Create a new NDFSClient connected to the given namenode server. */ public NDFSClient(InetSocketAddress nameNodeAddr) { this.namenode = (ClientProtocol) RPC.getProxy(ClientProtocol.class, nameNodeAddr); @@ -154,6 +153,7 @@ } /** + * */ public void release(UTF8 src) throws IOException { boolean hasReleased = false; @@ -186,8 +186,8 @@ } /*************************************************************** - * If any leases are outstanding, periodically check in with the - * namenode and renew all the leases. + * Periodically check in with the namenode and renew all the leases + * when the lease period is half over. ***************************************************************/ class LeaseChecker implements Runnable { /** Index: src/java/org/apache/nutch/ndfs/DatanodeInfo.java =================================================================== --- src/java/org/apache/nutch/ndfs/DatanodeInfo.java (revision 320901) +++ src/java/org/apache/nutch/ndfs/DatanodeInfo.java (working copy) @@ -27,11 +27,11 @@ * @author Mike Cafarella **************************************************/ public class DatanodeInfo implements Writable, Comparable { - UTF8 name; - long capacity, remaining, lastUpdate; - volatile TreeSet blocks; + private UTF8 name; + private long capacityBytes, remainingBytes, lastUpdate; + private volatile TreeSet blocks; - /** + /** Create an empty DatanodeInfo. */ public DatanodeInfo() { this(new UTF8(), 0, 0); @@ -37,9 +37,11 @@ this(new UTF8(), 0, 0); } + /** + * @param name hostname:portNumber as UTF8 object. + */ public DatanodeInfo(UTF8 name) { this.name = name; - int colon = name.toString().indexOf(":"); this.blocks = new TreeSet(); updateHeartbeat(0, 0); } @@ -44,8 +46,9 @@ updateHeartbeat(0, 0); } - /** - */ + /** + * @param name hostname:portNumber as UTF8 object. + */ public DatanodeInfo(UTF8 name, long capacity, long remaining) { this.name = name; this.blocks = new TreeSet(); @@ -52,8 +55,8 @@ updateHeartbeat(capacity, remaining); } - /** - */ + /** + */ public void updateBlocks(Block newBlocks[]) { blocks.clear(); for (int i = 0; i < newBlocks.length; i++) { @@ -61,8 +64,8 @@ } } - /** - */ + /** + */ public void addBlock(Block b) { blocks.add(b); } @@ -70,13 +73,21 @@ /** */ public void updateHeartbeat(long capacity, long remaining) { - this.capacity = capacity; - this.remaining = remaining; + this.capacityBytes = capacity; + this.remainingBytes = remaining; this.lastUpdate = System.currentTimeMillis(); } + + /** + * @return hostname:portNumber as UTF8 object. + */ public UTF8 getName() { return name; } + + /** + * @return hostname and no :portNumber as UTF8 object. + */ public UTF8 getHost() { String nameStr = name.toString(); int colon = nameStr.indexOf(":"); @@ -96,10 +107,10 @@ return blocks.iterator(); } public long getCapacity() { - return capacity; + return capacityBytes; } public long getRemaining() { - return remaining; + return remainingBytes; } public long lastUpdate() { return lastUpdate; @@ -105,9 +116,11 @@ return lastUpdate; } - ///////////////////////////////////////////////// - // Comparable - ///////////////////////////////////////////////// + /** Comparable. + * Basis of compare is the UTF8 name (host:portNumber) only. + * @param o + * @return as specified by Comparable. + */ public int compareTo(Object o) { DatanodeInfo d = (DatanodeInfo) o; return name.compareTo(d.getName()); @@ -120,8 +133,8 @@ */ public void write(DataOutput out) throws IOException { name.write(out); - out.writeLong(capacity); - out.writeLong(remaining); + out.writeLong(capacityBytes); + out.writeLong(remainingBytes); out.writeLong(lastUpdate); /** @@ -137,8 +150,8 @@ public void readFields(DataInput in) throws IOException { this.name = new UTF8(); this.name.readFields(in); - this.capacity = in.readLong(); - this.remaining = in.readLong(); + this.capacityBytes = in.readLong(); + this.remainingBytes = in.readLong(); this.lastUpdate = in.readLong(); /**