Index: src/java/org/apache/hadoop/hbase/HStore.java =================================================================== --- src/java/org/apache/hadoop/hbase/HStore.java (revision 673092) +++ src/java/org/apache/hadoop/hbase/HStore.java Tue Jul 15 23:28:17 CST 2008 @@ -41,11 +41,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.fs.FSDataInputStream; -import org.apache.hadoop.fs.FSDataOutputStream; -import org.apache.hadoop.fs.FileStatus; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.*; import org.apache.hadoop.hbase.HStoreFile.HbaseMapFile; import org.apache.hadoop.hbase.filter.RowFilterInterface; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; @@ -998,7 +994,7 @@ throws IOException { // Look first at info files. If a reference, these contain info we need // to create the HStoreFile. - Path infofiles[] = fs.listPaths(new Path[] {infodir}); + Path infofiles[] = FileUtil.stat2Paths(fs.listStatus(new Path[] {infodir})); ArrayList results = new ArrayList(infofiles.length); ArrayList mapfiles = new ArrayList(infofiles.length); for (Path p: infofiles) { @@ -1049,8 +1045,8 @@ // Try fixing this file.. if we can. Use the hbase version of fix. // Need to remove the old index file first else fix won't go ahead. this.fs.delete(new Path(mapfile, MapFile.INDEX_FILE_NAME)); - long count = MapFile.fix(this.fs, mapfile, HbaseMapFile.KEY_CLASS, - HbaseMapFile.VALUE_CLASS, false, this.conf); + long count = MapFile.fix(this.fs, mapfile, HStoreFile.HbaseMapFile.KEY_CLASS, + HStoreFile.HbaseMapFile.VALUE_CLASS, false, this.conf); if (LOG.isDebugEnabled()) { LOG.debug("Fixed index on " + mapfile.toString() + "; had " + count + " entries"); @@ -1077,7 +1073,7 @@ // List paths by experience returns fully qualified names -- at least when // running on a mini hdfs cluster. - Path datfiles[] = fs.listPaths(new Path[] {mapdir}); + Path datfiles[] = FileUtil.stat2Paths(fs.listStatus(new Path[] {mapdir})); for (int i = 0; i < datfiles.length; i++) { // If does not have sympathetic info file, delete. if (!mapfiles.contains(fs.makeQualified(datfiles[i]))) {