You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2014/07/25 08:19:48 UTC
svn commit: r1613354 - in
/jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands:
CdCommand.groovy LsCommand.groovy
Author: chetanm
Date: Fri Jul 25 06:19:48 2014
New Revision: 1613354
URL: http://svn.apache.org/r1613354
Log:
OAK-1994 - Oak Console improvements
-- Limit the no of child dump to 50 by default. Use 'ls <no of child>' to change the limit
-- Fixed issue in cd command to cd to absolute path
Modified:
jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/CdCommand.groovy
jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LsCommand.groovy
Modified: jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/CdCommand.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/CdCommand.groovy?rev=1613354&r1=1613353&r2=1613354&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/CdCommand.groovy (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/CdCommand.groovy Fri Jul 25 06:19:48 2014
@@ -18,6 +18,7 @@
*/
package org.apache.jackrabbit.oak.console.commands
+import com.google.common.collect.Iterables
import com.google.common.collect.Lists
import jline.console.completer.Completer
import org.apache.jackrabbit.oak.commons.PathUtils
@@ -40,7 +41,7 @@ class CdCommand extends CommandSupport{
@Override
SortedSet getCandidates() {
SortedSet<String> names = new TreeSet<String>()
- getSession().getWorkingNode().childNodeNames.each {
+ Iterables.limit(getSession().getWorkingNode().childNodeNames, 100).each {
names << it
}
return names
@@ -63,7 +64,7 @@ class CdCommand extends CommandSupport{
}
String path;
if (PathUtils.isAbsolute(arg)) {
- path = args;
+ path = arg;
} else {
path = PathUtils.concat(session.getWorkingPath(), arg);
}
Modified: jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LsCommand.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LsCommand.groovy?rev=1613354&r1=1613353&r2=1613354&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LsCommand.groovy (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LsCommand.groovy Fri Jul 25 06:19:48 2014
@@ -18,6 +18,7 @@
*/
package org.apache.jackrabbit.oak.console.commands
+import com.google.common.collect.Iterables
import groovy.transform.CompileStatic
import org.apache.jackrabbit.oak.console.ConsoleSession
import org.codehaus.groovy.tools.shell.CommandSupport
@@ -33,10 +34,16 @@ class LsCommand extends CommandSupport{
@Override
Object execute(List<String> args) {
- assertNoArguments(args)
- session.workingNode.childNodeNames.each {
+ int limit = args ? args[0] as int : 50
+ def count = 0
+ Iterables.limit(session.workingNode.childNodeNames, limit).each {
+ count++
io.out.println(it)
}
+
+ if(count == limit){
+ io.out.println("More than $limit children found...")
+ }
return null
}