incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1227769 - in /incubator/accumulo/trunk: ./ docs/examples/README.bloom src/core/ src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Date Thu, 05 Jan 2012 19:08:45 GMT
Author: ecn
Date: Thu Jan  5 19:08:44 2012
New Revision: 1227769

URL: http://svn.apache.org/viewvc?rev=1227769&view=rev
Log:
ACCUMULO-249 turn off verbose when executing a single command; remove shell code that loads
member classes: there are none

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/docs/examples/README.bloom
    incubator/accumulo/trunk/src/core/   (props changed)
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  5 19:08:44 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1222706,1225007,1227202,1227216,1227289,1227611-1227612,1227650
+/incubator/accumulo/branches/1.4:1201902-1222706,1225007,1227202,1227216,1227289,1227611-1227612,1227650,1227767

Modified: incubator/accumulo/trunk/docs/examples/README.bloom
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.bloom?rev=1227769&r1=1227768&r2=1227769&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.bloom (original)
+++ incubator/accumulo/trunk/docs/examples/README.bloom Thu Jan  5 19:08:44 2012
@@ -44,15 +44,6 @@ initialized with the seed 7.
 Below the table is flushed:
 
     $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test -w'
-    Shell - Accumulo Interactive Shell
-    - 
-    - version: 1.4.0-incubating-SNAPSHOT
-    - instance name: test
-    - instance id: 54e9b81f-bf36-4a66-a020-f93d98f151a6
-    - 
-    - type 'help' for a list of available commands
-    - 
-    root@test> flush -t bloom_test -w
     05 10:40:06,069 [shell.Shell] INFO : Flush of table bloom_test completed.
 
 After the flush completes, 500 random queries are done against the table.  The

Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  5 19:08:44 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
 /incubator/accumulo/branches/1.3.5rc/src/core:1209938
-/incubator/accumulo/branches/1.4/src/core:1201902-1227271,1227611-1227612,1227650
+/incubator/accumulo/branches/1.4/src/core:1201902-1227271,1227611-1227612,1227650,1227767

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1227769&r1=1227768&r2=1227769&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
(original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Thu Jan  5 19:08:44 2012
@@ -345,6 +345,7 @@ public class Shell {
     }
     if (cl.hasOption(execCommandOpt.getOpt())) {
       execCommand = cl.getOptionValue(execCommandOpt.getOpt());
+      verbose = false;
     }
     
     rootToken = new Token();
@@ -363,18 +364,6 @@ public class Shell {
     for (Command cmd : external) {
       commandFactory.put(cmd.getName(), cmd);
     }
-    for (Class<?> subclass : Shell.class.getClasses()) {
-      Object t;
-      try {
-        t = subclass.newInstance();
-      } catch (Exception e) {
-        continue;
-      }
-      if (t instanceof Command) {
-        Command sci = (Command) t;
-        commandFactory.put(sci.getName(), sci);
-      }
-    }
   }
   
   /**



Mime
View raw message