Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ZEPPELIN-198 Added -h flag for human readable byte sizes. Updated string creation to StringBuilder.

Browse source
This commit is contained in:
Tom Runyon 2016-02-26 21:18:16 -05:00
parent 797fd29dad
commit 32ed7cb3a6
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
file/src/main/java/org/apache/zeppelin/file/FileInterpreter.java
View file

@ -117,7 +117,7 @@ public abstract class FileInterpreter extends Interpreter {
String newPath = !args.args.isEmpty() ? getNewPath(args.args.get(0)) : currentDir;
if (!isDirectory(newPath))
return new InterpreterResult(Code.ERROR, Type.TEXT, "Invalid Directory");
return new InterpreterResult(Code.ERROR, Type.TEXT, newPath + ": No such directory");
currentDir = newPath;
return new InterpreterResult(Code.SUCCESS, Type.TEXT, "OK");
@ -126,7 +126,8 @@ public abstract class FileInterpreter extends Interpreter {
String newPath = !args.args.isEmpty() ? getNewPath(args.args.get(0)) : currentDir;
if (!isDirectory(newPath))
return new InterpreterResult(Code.ERROR, Type.TEXT, "Invalid List Directory");
return new InterpreterResult(Code.ERROR, Type.TEXT,
newPath + ": No such file or directory");
String results = listAll(newPath);
return new InterpreterResult(Code.SUCCESS, Type.TEXT, results);

35
file/src/main/java/org/apache/zeppelin/file/HDFSFileInterpreter.java
View file

@ -173,19 +173,31 @@ public class HDFSFileInterpreter extends FileInterpreter {
}
private String ListOne(String path, OneFileStatus fs) {
if (args.flags.contains(new Character('l'))) {
String s = "";
s += listPermission(fs) + "\t ";
s += ((fs.replication == 0) ? "-" : fs.replication) + "\t ";
s += fs.owner + "\t ";
s += fs.group + "\t ";
s += fs.length + "\t ";
s += listDate(fs) + " GMT\t ";
s += (path.length() == 1) ? path + fs.pathSuffix : path + '/' + fs.pathSuffix;
return s;
StringBuilder sb = new StringBuilder();
sb.append(listPermission(fs) + "\t");
sb.append(((fs.replication == 0) ? "-" : fs.replication) + "\t ");
sb.append(fs.owner + "\t");
sb.append(fs.group + "\t");
if (args.flags.contains(new Character('h'))){ //human readable
sb.append(humanReadableByteCount(fs.length) + "\t\t");
} else {
sb.append(fs.length + "\t");
}
sb.append(listDate(fs) + "GMT\t");
sb.append((path.length() == 1) ? path + fs.pathSuffix : path + '/' + fs.pathSuffix);
return sb.toString();
}
return fs.pathSuffix;
}
private String humanReadableByteCount(long bytes) {
int unit = 1024;
if (bytes < unit) return bytes + " B";
int exp = (int) (Math.log(bytes) / Math.log(unit));
String pre = "KMGTPE".charAt(exp - 1) + "";
return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
}
public String listAll(String path) {
String all = "";
if (exceptionOnConnect != null)
@ -205,7 +217,7 @@ public class HDFSFileInterpreter extends FileInterpreter {
}
} catch (Exception e) {
logger.error("listall: listDir " + path, e);
throw new InterpreterException(e);
throw new InterpreterException("Could not find file or directory:\t" + path);
}
return all;
}
@ -221,7 +233,8 @@ public class HDFSFileInterpreter extends FileInterpreter {
return sfs.FileStatus.type.equals("DIRECTORY");
} catch (Exception e) {
logger.error("IsDirectory: " + path, e);
throw new InterpreterException(e);
return false;
// throw new InterpreterException(path + " is not a directory.");
}
return ret;
}