svn commit: r1866457 - /jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy

[ca...@apache.org]

Author: catholicon
Date: Thu Sep  5 13:51:24 2019
New Revision: 1866457

URL: http://svn.apache.org/viewvc?rev=1866457&view=rev
Log:
OAK-8597: lc command is unable to construct OakDirectory

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy

Modified: jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy?rev=1866457&r1=1866456&r2=1866457&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy Thu Sep  5 13:51:24 2019
@@ -22,8 +22,8 @@ package org.apache.jackrabbit.oak.consol
 import com.google.common.base.Stopwatch
 import org.apache.jackrabbit.oak.commons.PathUtils
 import org.apache.jackrabbit.oak.console.ConsoleSession
+import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition
 import org.apache.jackrabbit.oak.plugins.index.lucene.directory.OakDirectory
-import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition
 import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo
 import org.apache.jackrabbit.oak.spi.commit.EmptyHook
@@ -129,7 +129,7 @@ class LuceneCommand extends ComplexComma
             //OakDirectory is package scope but Groovy allows us
             //to use it. Good or bad but its helpful debug scripts
             //can access inner classes and prod code cannot. Win win :)
-            return new OakDirectory(new ReadOnlyBuilder(definition), new IndexDefinition(session.root, definition, path), true);
+            return new OakDirectory(new ReadOnlyBuilder(definition), new LuceneIndexDefinition(session.root, definition, path), true);
         }
         return null
     }
@@ -143,8 +143,12 @@ class LuceneCommand extends ComplexComma
             return ""
         }
         int exp = (int) (Math.log(bytes) / Math.log(1024));
-        String pre = "KMGTPE".charAt(exp - 1);
-        return String.format("%.1f %sB", bytes / Math.pow(1024, exp), pre);
+        if (exp == 0) {
+            return String.format("%d bytes", bytes);
+        } else {
+            String pre = "KMGTPE".charAt(exp - 1);
+            return String.format("%.1f %sB", bytes / Math.pow(1024, exp), pre);
+        }
     }
 
     private ConsoleSession getSession(){