accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1338319 - /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
Date Mon, 14 May 2012 18:06:07 GMT
Author: billie
Date: Mon May 14 18:06:07 2012
New Revision: 1338319

URL: http://svn.apache.org/viewvc?rev=1338319&view=rev
Log:
ACCUMULO-589 revert to old config command for now

Modified:
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java?rev=1338319&r1=1338318&r2=1338319&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
Mon May 14 18:06:07 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.core.util.shell.commands;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -24,6 +25,9 @@ import java.util.TreeMap;
 
 import jline.ConsoleReader;
 
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.security.ColumnVisibility;
@@ -37,7 +41,7 @@ import org.apache.commons.cli.OptionGrou
 import org.apache.commons.cli.Options;
 
 public class ConfigCommand extends Command {
-  private Option deleteOpt, setOpt, filterOpt, disablePaginationOpt;
+  private Option tableOpt, deleteOpt, setOpt, filterOpt, disablePaginationOpt;
   
   private int COL1 = 8, COL2 = 7;
   private ConsoleReader reader;
@@ -54,10 +58,14 @@ public class ConfigCommand extends Comma
     root.addSubcommand(cmd);
   }
   
-  public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception
{
-    String tableName = OptUtil.configureTableOpt(cl, shellState);
+  public int execute(String fullCommand, CommandLine cl, Shell shellState) throws AccumuloException,
AccumuloSecurityException, TableNotFoundException,
+      IOException, ClassNotFoundException {
     reader = shellState.getReader();
     
+    String tableName = cl.getOptionValue(tableOpt.getOpt());
+    if (tableName != null && !shellState.getConnector().tableOperations().exists(tableName))
+      throw new TableNotFoundException(null, tableName, null);
+    
     if (cl.hasOption(deleteOpt.getOpt())) {
       // delete property from table
       String property = cl.getOptionValue(deleteOpt.getOpt());
@@ -66,6 +74,7 @@ public class ConfigCommand extends Comma
       if (tableName != null) {
         if (!Property.isValidTablePropertyKey(property))
           Shell.log.warn("Invalid per-table property : " + property + ", still removing from
zookeeper if it's there.");
+        
         shellState.getConnector().tableOperations().removeProperty(tableName, property);
         Shell.log.debug("Successfully deleted table configuration option.");
       } else {
@@ -208,11 +217,13 @@ public class ConfigCommand extends Comma
     Options o = new Options();
     OptionGroup og = new OptionGroup();
     
+    tableOpt = new Option(Shell.tableOption, "table", true, "table to display/set/delete
properties for");
     deleteOpt = new Option("d", "delete", true, "delete a per-table property");
     setOpt = new Option("s", "set", true, "set a per-table property");
     filterOpt = new Option("f", "filter", true, "show only properties that contain this string");
     disablePaginationOpt = new Option("np", "no-pagination", false, "disables pagination
of output");
     
+    tableOpt.setArgName("table");
     deleteOpt.setArgName("property");
     setOpt.setArgName("property=value");
     filterOpt.setArgName("string");
@@ -221,7 +232,7 @@ public class ConfigCommand extends Comma
     og.addOption(setOpt);
     og.addOption(filterOpt);
     
-    o.addOption(OptUtil.tableOpt("table to display/set/delete properties for"));
+    o.addOption(tableOpt);
     o.addOptionGroup(og);
     o.addOption(disablePaginationOpt);
     



Mime
View raw message