accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1496226 [4/13] - in /accumulo/branches/ACCUMULO-CURATOR: ./ assemble/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3GB/native-standalone...
Date Mon, 24 Jun 2013 21:34:25 GMT
Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java Mon Jun 24 21:34:20 2013
@@ -16,15 +16,24 @@
  */
 package org.apache.accumulo.core.util;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import junit.framework.TestCase;
-
 import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.hadoop.io.Text;
+import org.junit.Test;
 
-public class MetadataTableTest extends TestCase {
+public class MetadataTableTest {
+  
+  @Test
+  public void checkSystemTableIdentifiers() {
+    assertNotEquals(RootTable.ID, MetadataTable.ID);
+    assertNotEquals(RootTable.NAME, MetadataTable.NAME);
+  }
   
   private KeyExtent createKeyExtent(String tname, String er, String per) {
     return new KeyExtent(new Text(tname), er == null ? null : new Text(er), per == null ? null : new Text(per));
@@ -90,6 +99,7 @@ public class MetadataTableTest extends T
     
   }
   
+  @Test
   public void testICR1() {
     runTest(null, null);
     runTest(null, "r4");

Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java Mon Jun 24 21:34:20 2013
@@ -22,8 +22,6 @@ import java.io.InputStream;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
-import org.junit.Assert;
-
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.TableExistsException;
@@ -32,9 +30,9 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.util.format.Formatter;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -50,7 +48,7 @@ public class FormatterCommandTest {
     Logger.getLogger(Shell.class).setLevel(Level.WARN);
     
     final String[] args = new String[] {"--fake", "-u", "root", "-p", ""};
-   
+    
     final String[] commands = createCommands();
     
     in = MockShell.makeCommands(commands);
@@ -61,32 +59,25 @@ public class FormatterCommandTest {
     
     // Can't call createtable in the shell with MockAccumulo
     shell.getConnector().tableOperations().create("test");
-
+    
     try {
       shell.start();
     } catch (Exception e) {
       Assert.fail("Exception while running commands: " + e.getMessage());
-    } 
+    }
     
     shell.getReader().flush();
     
-    final String[] output = StringUtils.split(new String(out.toByteArray()), '\n');
-   
+    final String[] output = new String(out.toByteArray()).split("\n\r");
+    
     boolean formatterOn = false;
     
-    final String[] expectedDefault = new String[] {
-        "row cf:cq []    1234abcd",
-        "row cf1:cq1 []    9876fedc",
-        "row2 cf:cq []    13579bdf",
-        "row2 cf1:cq []    2468ace"
-    };
-    
-    final String[] expectedFormatted = new String[] {
-        "row cf:cq []    0x31 0x32 0x33 0x34 0x61 0x62 0x63 0x64",
-        "row cf1:cq1 []    0x39 0x38 0x37 0x36 0x66 0x65 0x64 0x63",
-        "row2 cf:cq []    0x31 0x33 0x35 0x37 0x39 0x62 0x64 0x66",
-        "row2 cf1:cq []    0x32 0x34 0x36 0x38 0x61 0x63 0x65"
-    };
+    final String[] expectedDefault = new String[] {"row cf:cq []    1234abcd", "row cf1:cq1 []    9876fedc", "row2 cf:cq []    13579bdf",
+        "row2 cf1:cq []    2468ace"};
+    
+    final String[] expectedFormatted = new String[] {"row cf:cq []    0x31 0x32 0x33 0x34 0x61 0x62 0x63 0x64",
+        "row cf1:cq1 []    0x39 0x38 0x37 0x36 0x66 0x65 0x64 0x63", "row2 cf:cq []    0x31 0x33 0x35 0x37 0x39 0x62 0x64 0x66",
+        "row2 cf1:cq []    0x32 0x34 0x36 0x38 0x61 0x63 0x65"};
     
     int outputIndex = 0;
     while (outputIndex < output.length) {
@@ -96,7 +87,7 @@ public class FormatterCommandTest {
         if (line.contains("formatter")) {
           formatterOn = true;
         }
-       
+        
         outputIndex++;
       } else if (line.startsWith("row")) {
         int expectedIndex = 0;
@@ -121,48 +112,37 @@ public class FormatterCommandTest {
   }
   
   private String[] createCommands() {
-    return new String[] {
-        "table test",
-        "insert row cf cq 1234abcd",
-        "insert row cf1 cq1 9876fedc",
-        "insert row2 cf cq 13579bdf",
-        "insert row2 cf1 cq 2468ace",
-        "scan",
-        "formatter -t test -f org.apache.accumulo.core.util.shell.command.FormatterCommandTest$HexFormatter",
-        "scan"
-    };
+    return new String[] {"table test", "insert row cf cq 1234abcd", "insert row cf1 cq1 9876fedc", "insert row2 cf cq 13579bdf", "insert row2 cf1 cq 2468ace",
+        "scan", "formatter -t test -f org.apache.accumulo.core.util.shell.command.FormatterCommandTest$HexFormatter", "scan"};
   }
   
   /**
-   * <p>Simple <code>Formatter</code> that will convert each character in the Value
-   * from decimal to hexadecimal. Will automatically skip over characters in the value
-   * which do not fall within the [0-9,a-f] range.</p>
+   * <p>
+   * Simple <code>Formatter</code> that will convert each character in the Value from decimal to hexadecimal. Will automatically skip over characters in the
+   * value which do not fall within the [0-9,a-f] range.
+   * </p>
    * 
-   * <p>Example: <code>'0'</code> will be displayed as <code>'0x30'</code></p>
+   * <p>
+   * Example: <code>'0'</code> will be displayed as <code>'0x30'</code>
+   * </p>
    */
   public static class HexFormatter implements Formatter {
-    private Iterator<Entry<Key, Value>> iter = null;
+    private Iterator<Entry<Key,Value>> iter = null;
     private boolean printTs = false;
-
+    
     private final static String tab = "\t";
     private final static String newline = "\n";
     
     public HexFormatter() {}
     
-    /* (non-Javadoc)
-     * @see java.util.Iterator#hasNext()
-     */
     @Override
     public boolean hasNext() {
       return this.iter.hasNext();
     }
-
-    /* (non-Javadoc)
-     * @see java.util.Iterator#next()
-     */
+    
     @Override
     public String next() {
-      final Entry<Key, Value> entry = iter.next();
+      final Entry<Key,Value> entry = iter.next();
       
       String key;
       
@@ -176,7 +156,7 @@ public class FormatterCommandTest {
       final Value v = entry.getValue();
       
       // Approximate how much space we'll need
-      final StringBuilder sb = new StringBuilder(key.length() + v.getSize() * 5); 
+      final StringBuilder sb = new StringBuilder(key.length() + v.getSize() * 5);
       
       sb.append(key).append(tab);
       
@@ -190,17 +170,10 @@ public class FormatterCommandTest {
       
       return sb.toString();
     }
-
-    /* (non-Javadoc)
-     * @see java.util.Iterator#remove()
-     */
+    
     @Override
-    public void remove() {
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.accumulo.core.util.format.Formatter#initialize(java.lang.Iterable, boolean)
-     */
+    public void remove() {}
+    
     @Override
     public void initialize(final Iterable<Entry<Key,Value>> scanner, final boolean printTimestamps) {
       this.iter = scanner.iterator();

Modified: accumulo/branches/ACCUMULO-CURATOR/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex (original)
+++ accumulo/branches/ACCUMULO-CURATOR/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex Mon Jun 24 21:34:20 2013
@@ -50,4 +50,5 @@ Version 1.5}
 \include{chapters/analytics}
 \include{chapters/security}
 \include{chapters/administration}
+\include{chapters/multivolume}
 \end{document}

Propchange: accumulo/branches/ACCUMULO-CURATOR/examples/
------------------------------------------------------------------------------
  Reverse-merged /accumulo/trunk/examples:r1478775
  Merged /accumulo/trunk/examples:r1491852-1496190
  Merged /accumulo/branches/1.5/examples:r1488056-1488357,1488359-1492948,1493894,1494361,1494372,1495072,1495441

Modified: accumulo/branches/ACCUMULO-CURATOR/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java Mon Jun 24 21:34:20 2013
@@ -16,10 +16,8 @@
  */
 package org.apache.accumulo.examples.simple.client;
 
-import java.io.IOException;
 import java.util.Map.Entry;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.cli.BatchWriterOpts;
 import org.apache.accumulo.core.cli.ClientOpts;
 import org.apache.accumulo.core.cli.ScannerOpts;
@@ -35,6 +33,7 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.security.Authorizations;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 
@@ -166,7 +165,8 @@ public class RowOperations {
   
   /**
    * Deletes a row given a text object
-   * @param opts 
+   * 
+   * @param opts
    * 
    * @param row
    * @throws TableNotFoundException
@@ -209,18 +209,10 @@ public class RowOperations {
   
   /**
    * Gets a scanner over one row
-   * @param opts 
-   * 
-   * @param row
-   * @return
-   * @throws TableNotFoundException
-   * @throws AccumuloSecurityException
-   * @throws AccumuloException
-   * @throws IOException
    */
   private static Scanner getRow(ClientOpts opts, ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     // Create a scanner
-    Scanner scanner = connector.createScanner(table, Constants.NO_AUTHS);
+    Scanner scanner = connector.createScanner(table, Authorizations.EMPTY);
     scanner.setBatchSize(scanOpts.scanBatchSize);
     // Say start key is the one with key of row
     // and end key is the one that immediately follows the row

Propchange: accumulo/branches/ACCUMULO-CURATOR/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Reverse-merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1478775
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1488056-1488357,1488359-1492948,1493894,1494361,1494372,1495072,1495441
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1382578-1382612,1382614-1388119,1388121-1388628,1388630-1393867,1393869-1396064,1396066-1396571,1396573-1396615,1396617-1396757,1396759-1396771,1396773-1397047,1397049-1397112,1397114-1397116,1397118-1397175,1397177-1397188,1397190-1397382,1397384-1397699,1397701-1397920,1397922-1398285,1398287-1398307,1398309-1398358,1398360-1398392,1398394-1398398,1398400-1398437,1398439-1398800,1398802-1399210,1399212-1399716,1399718-1400975,1400977-1402570,1402572-1402681,1402683-1407300,1407302-1423031,1423033-1427863,1427865-1450270,1450272-1451699,1451701-1455609,1455611-1455638,1455640-1455979,1455981-1461547,1461549-1465686,1465688-1466198,1466200-1466258,1466260-1466626,1466628-1468530,1468532-1468957,1468959-1480032,1480034-1482988,1482990-1483953,1483955-1492947,1495439
  Merged /incubator/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1201899-1201901
  Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1491852-1496190

Propchange: accumulo/branches/ACCUMULO-CURATOR/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Reverse-merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1478775
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1488056-1488357,1488359-1492948,1493894,1494361,1494372,1495072,1495441
  Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1491852-1496190
  Merged /incubator/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1201899-1201901
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1382578-1382612,1382614-1388119,1388121-1388628,1388630-1393867,1393869-1396064,1396066-1396571,1396573-1396615,1396617-1396757,1396759-1396771,1396773-1397047,1397049-1397112,1397114-1397116,1397118-1397175,1397177-1397188,1397190-1397382,1397384-1397699,1397701-1397920,1397922-1398285,1398287-1398307,1398309-1398358,1398360-1398392,1398394-1398398,1398400-1398437,1398439-1398800,1398802-1399210,1399212-1399716,1399718-1400975,1400977-1402570,1402572-1402681,1402683-1407300,1407302-1423031,1423033-1427863,1427865-1450270,1450272-1451699,1451701-1455609,1455611-1455638,1455640-1455979,1455981-1461547,1461549-1465686,1465688-1466198,1466200-1466258,1466260-1466626,1466628-1468530,1468532-1468957,1468959-1480032,1480034-1482988,1482990-1483953,1483955-1492947,1495439

Modified: accumulo/branches/ACCUMULO-CURATOR/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Mon Jun 24 21:34:20 2013
@@ -32,6 +32,12 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.server.master.Master;
@@ -194,12 +200,6 @@ public class MiniAccumuloCluster {
    */
   public MiniAccumuloCluster(MiniAccumuloConfig config) throws IOException {
 
-    if (config.getDir().exists() && !config.getDir().isDirectory())
-      throw new IllegalArgumentException("Must pass in directory, " + config.getDir() + " is a file");
-
-    if (config.getDir().exists() && config.getDir().list().length != 0)
-      throw new IllegalArgumentException("Directory " + config.getDir() + " is not empty");
-
     this.config = config.initialize();
 
     config.getConfDir().mkdirs();
@@ -264,7 +264,7 @@ public class MiniAccumuloCluster {
 
     // sleep a little bit to let zookeeper come up before calling init, seems to work better
     UtilWaitThread.sleep(250);
-
+    
     Process initProcess = exec(Initialize.class, "--instance-name", config.getInstanceName(), "--password", config.getRootPassword(), "--username", "root");
     int ret = initProcess.waitFor();
     if (ret != 0) {
@@ -334,4 +334,9 @@ public class MiniAccumuloCluster {
   public MiniAccumuloConfig getConfig() {
     return config;
   }
+
+  public Connector getConnector(String user, String passwd) throws AccumuloException, AccumuloSecurityException {
+    Instance instance = new ZooKeeperInstance(this.getInstanceName(), this.getZooKeepers());
+    return instance.getConnector(user, new PasswordToken(passwd));
+  }
 }

Modified: accumulo/branches/ACCUMULO-CURATOR/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java Mon Jun 24 21:34:20 2013
@@ -71,6 +71,14 @@ public class MiniAccumuloConfig {
    * Set directories and fully populate site config
    */
   MiniAccumuloConfig initialize() {
+    
+    //Sanity checks
+    if (this.getDir().exists() && !this.getDir().isDirectory())
+      throw new IllegalArgumentException("Must pass in directory, " + this.getDir() + " is a file");
+
+    if (this.getDir().exists() && this.getDir().list().length != 0)
+      throw new IllegalArgumentException("Directory " + this.getDir() + " is not empty");
+    
     if (!initialized) {
       libDir = new File(dir, "lib");
       confDir = new File(dir, "conf");

Modified: accumulo/branches/ACCUMULO-CURATOR/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/pom.xml?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/pom.xml (original)
+++ accumulo/branches/ACCUMULO-CURATOR/pom.xml Mon Jun 24 21:34:20 2013
@@ -95,7 +95,7 @@
   </issueManagement>
   <ciManagement>
     <system>Apache Jenkins</system>
-    <url>https://builds.apache.org/view/A-F/view/Accumulo/</url>
+    <url>https://builds.apache.org/view/A-D/view/Accumulo/</url>
   </ciManagement>
   <distributionManagement>
     <site>
@@ -192,7 +192,7 @@
       <dependency>
         <groupId>jline</groupId>
         <artifactId>jline</artifactId>
-        <version>2.10</version>
+        <version>2.11</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>

Propchange: accumulo/branches/ACCUMULO-CURATOR/pom.xml
------------------------------------------------------------------------------
  Reverse-merged /accumulo/trunk/pom.xml:r1478775
  Merged /accumulo/branches/1.5/pom.xml:r1488056-1488357,1488359-1492948,1493894,1494361,1494372,1495072,1495441
  Merged /accumulo/trunk/pom.xml:r1491852-1496190

Propchange: accumulo/branches/ACCUMULO-CURATOR/proxy/README
------------------------------------------------------------------------------
  Reverse-merged /accumulo/trunk/proxy/README:r1478775
  Merged /accumulo/branches/1.4/proxy/README:r1382578-1382612,1382614-1388119,1388121-1388628,1388630-1393867,1393869-1396064,1396066-1396571,1396573-1396615,1396617-1396757,1396759-1396771,1396773-1397047,1397049-1397112,1397114-1397116,1397118-1397175,1397177-1397188,1397190-1397382,1397384-1397699,1397701-1397920,1397922-1398285,1398287-1398307,1398309-1398358,1398360-1398392,1398394-1398398,1398400-1398437,1398439-1398513,1398515-1398800,1398802-1399210,1399212-1399716,1399718-1400975,1400977-1402570,1402572-1402681,1402683-1407300,1407302-1423031,1423033-1423628,1423630-1427863,1427865-1450270,1450272-1451699,1451701-1455609,1455611-1455638,1455640-1455979,1455981-1461547,1461549-1465686,1465688-1466198,1466200-1466258,1466260-1466626,1466628-1468530,1468532-1468957,1468959-1480032,1480034-1482988,1482990-1483953,1483955-1492947,1495439
  Merged /accumulo/trunk/proxy/README:r1491852-1496190
  Merged /incubator/accumulo/branches/1.4/proxy/README:r1201899-1201901
  Merged /accumulo/branches/1.5/proxy/README:r1488056-1488357,1488359-1492948,1493894,1494361,1494372,1495072,1495441

Modified: accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java Mon Jun 24 21:34:20 2013
@@ -10056,7 +10056,7 @@ import org.slf4j.LoggerFactory;
                   struct.splits = new HashSet<ByteBuffer>(2*_set132.size);
                   for (int _i133 = 0; _i133 < _set132.size; ++_i133)
                   {
-                    ByteBuffer _elem134; // required
+                    ByteBuffer _elem134; // optional
                     _elem134 = iprot.readBinary();
                     struct.splits.add(_elem134);
                   }
@@ -10167,7 +10167,7 @@ import org.slf4j.LoggerFactory;
             struct.splits = new HashSet<ByteBuffer>(2*_set137.size);
             for (int _i138 = 0; _i138 < _set137.size; ++_i138)
             {
-              ByteBuffer _elem139; // required
+              ByteBuffer _elem139; // optional
               _elem139 = iprot.readBinary();
               struct.splits.add(_elem139);
             }
@@ -11322,7 +11322,7 @@ import org.slf4j.LoggerFactory;
                   struct.scopes = new HashSet<IteratorScope>(2*_set140.size);
                   for (int _i141 = 0; _i141 < _set140.size; ++_i141)
                   {
-                    IteratorScope _elem142; // required
+                    IteratorScope _elem142; // optional
                     _elem142 = IteratorScope.findByValue(iprot.readI32());
                     struct.scopes.add(_elem142);
                   }
@@ -11449,7 +11449,7 @@ import org.slf4j.LoggerFactory;
             struct.scopes = new HashSet<IteratorScope>(2*_set145.size);
             for (int _i146 = 0; _i146 < _set145.size; ++_i146)
             {
-              IteratorScope _elem147; // required
+              IteratorScope _elem147; // optional
               _elem147 = IteratorScope.findByValue(iprot.readI32());
               struct.scopes.add(_elem147);
             }
@@ -12604,7 +12604,7 @@ import org.slf4j.LoggerFactory;
                   struct.scopes = new HashSet<IteratorScope>(2*_set148.size);
                   for (int _i149 = 0; _i149 < _set148.size; ++_i149)
                   {
-                    IteratorScope _elem150; // required
+                    IteratorScope _elem150; // optional
                     _elem150 = IteratorScope.findByValue(iprot.readI32());
                     struct.scopes.add(_elem150);
                   }
@@ -12731,7 +12731,7 @@ import org.slf4j.LoggerFactory;
             struct.scopes = new HashSet<IteratorScope>(2*_set153.size);
             for (int _i154 = 0; _i154 < _set153.size; ++_i154)
             {
-              IteratorScope _elem155; // required
+              IteratorScope _elem155; // optional
               _elem155 = IteratorScope.findByValue(iprot.readI32());
               struct.scopes.add(_elem155);
             }
@@ -14910,7 +14910,7 @@ import org.slf4j.LoggerFactory;
                   struct.propertiesToExclude = new HashSet<String>(2*_set160.size);
                   for (int _i161 = 0; _i161 < _set160.size; ++_i161)
                   {
-                    String _elem162; // required
+                    String _elem162; // optional
                     _elem162 = iprot.readString();
                     struct.propertiesToExclude.add(_elem162);
                   }
@@ -15090,7 +15090,7 @@ import org.slf4j.LoggerFactory;
             struct.propertiesToExclude = new HashSet<String>(2*_set171.size);
             for (int _i172 = 0; _i172 < _set171.size; ++_i172)
             {
-              String _elem173; // required
+              String _elem173; // optional
               _elem173 = iprot.readString();
               struct.propertiesToExclude.add(_elem173);
             }
@@ -16600,7 +16600,7 @@ import org.slf4j.LoggerFactory;
                   struct.iterators = new ArrayList<IteratorSetting>(_list174.size);
                   for (int _i175 = 0; _i175 < _list174.size; ++_i175)
                   {
-                    IteratorSetting _elem176; // required
+                    IteratorSetting _elem176; // optional
                     _elem176 = new IteratorSetting();
                     _elem176.read(iprot);
                     struct.iterators.add(_elem176);
@@ -16776,7 +16776,7 @@ import org.slf4j.LoggerFactory;
             struct.iterators = new ArrayList<IteratorSetting>(_list179.size);
             for (int _i180 = 0; _i180 < _list179.size; ++_i180)
             {
-              IteratorSetting _elem181; // required
+              IteratorSetting _elem181; // optional
               _elem181 = new IteratorSetting();
               _elem181.read(iprot);
               struct.iterators.add(_elem181);
@@ -24772,7 +24772,7 @@ import org.slf4j.LoggerFactory;
                   struct.tables = new HashSet<String>(2*_set182.size);
                   for (int _i183 = 0; _i183 < _set182.size; ++_i183)
                   {
-                    String _elem184; // required
+                    String _elem184; // optional
                     _elem184 = iprot.readString();
                     struct.tables.add(_elem184);
                   }
@@ -24868,7 +24868,7 @@ import org.slf4j.LoggerFactory;
             struct.tables = new HashSet<String>(2*_set187.size);
             for (int _i188 = 0; _i188 < _set187.size; ++_i188)
             {
-              String _elem189; // required
+              String _elem189; // optional
               _elem189 = iprot.readString();
               struct.tables.add(_elem189);
             }
@@ -25424,7 +25424,7 @@ import org.slf4j.LoggerFactory;
                   struct.success = new ArrayList<DiskUsage>(_list190.size);
                   for (int _i191 = 0; _i191 < _list190.size; ++_i191)
                   {
-                    DiskUsage _elem192; // required
+                    DiskUsage _elem192; // optional
                     _elem192 = new DiskUsage();
                     _elem192.read(iprot);
                     struct.success.add(_elem192);
@@ -25566,7 +25566,7 @@ import org.slf4j.LoggerFactory;
             struct.success = new ArrayList<DiskUsage>(_list195.size);
             for (int _i196 = 0; _i196 < _list195.size; ++_i196)
             {
-              DiskUsage _elem197; // required
+              DiskUsage _elem197; // optional
               _elem197 = new DiskUsage();
               _elem197.read(iprot);
               struct.success.add(_elem197);
@@ -26620,7 +26620,7 @@ import org.slf4j.LoggerFactory;
                       _val201 = new HashSet<String>(2*_set202.size);
                       for (int _i203 = 0; _i203 < _set202.size; ++_i203)
                       {
-                        String _elem204; // required
+                        String _elem204; // optional
                         _elem204 = iprot.readString();
                         _val201.add(_elem204);
                       }
@@ -26788,7 +26788,7 @@ import org.slf4j.LoggerFactory;
                 _val212 = new HashSet<String>(2*_set213.size);
                 for (int _i214 = 0; _i214 < _set213.size; ++_i214)
                 {
-                  String _elem215; // required
+                  String _elem215; // optional
                   _elem215 = iprot.readString();
                   _val212.add(_elem215);
                 }
@@ -28986,7 +28986,7 @@ import org.slf4j.LoggerFactory;
                   struct.auths = new HashSet<ByteBuffer>(2*_set216.size);
                   for (int _i217 = 0; _i217 < _set216.size; ++_i217)
                   {
-                    ByteBuffer _elem218; // required
+                    ByteBuffer _elem218; // optional
                     _elem218 = iprot.readBinary();
                     struct.auths.add(_elem218);
                   }
@@ -29169,7 +29169,7 @@ import org.slf4j.LoggerFactory;
             struct.auths = new HashSet<ByteBuffer>(2*_set221.size);
             for (int _i222 = 0; _i222 < _set221.size; ++_i222)
             {
-              ByteBuffer _elem223; // required
+              ByteBuffer _elem223; // optional
               _elem223 = iprot.readBinary();
               struct.auths.add(_elem223);
             }
@@ -34613,7 +34613,7 @@ import org.slf4j.LoggerFactory;
                   struct.success = new ArrayList<ByteBuffer>(_list234.size);
                   for (int _i235 = 0; _i235 < _list234.size; ++_i235)
                   {
-                    ByteBuffer _elem236; // required
+                    ByteBuffer _elem236; // optional
                     _elem236 = iprot.readBinary();
                     struct.success.add(_elem236);
                   }
@@ -34754,7 +34754,7 @@ import org.slf4j.LoggerFactory;
             struct.success = new ArrayList<ByteBuffer>(_list239.size);
             for (int _i240 = 0; _i240 < _list239.size; ++_i240)
             {
-              ByteBuffer _elem241; // required
+              ByteBuffer _elem241; // optional
               _elem241 = iprot.readBinary();
               struct.success.add(_elem241);
             }
@@ -35459,7 +35459,7 @@ import org.slf4j.LoggerFactory;
                   struct.success = new HashSet<String>(2*_set242.size);
                   for (int _i243 = 0; _i243 < _set242.size; ++_i243)
                   {
-                    String _elem244; // required
+                    String _elem244; // optional
                     _elem244 = iprot.readString();
                     struct.success.add(_elem244);
                   }
@@ -35540,7 +35540,7 @@ import org.slf4j.LoggerFactory;
             struct.success = new HashSet<String>(2*_set247.size);
             for (int _i248 = 0; _i248 < _set247.size; ++_i248)
             {
-              String _elem249; // required
+              String _elem249; // optional
               _elem249 = iprot.readString();
               struct.success.add(_elem249);
             }
@@ -36578,7 +36578,7 @@ import org.slf4j.LoggerFactory;
                       _val253 = new HashSet<IteratorScope>(2*_set254.size);
                       for (int _i255 = 0; _i255 < _set254.size; ++_i255)
                       {
-                        IteratorScope _elem256; // required
+                        IteratorScope _elem256; // optional
                         _elem256 = IteratorScope.findByValue(iprot.readI32());
                         _val253.add(_elem256);
                       }
@@ -36746,7 +36746,7 @@ import org.slf4j.LoggerFactory;
                 _val264 = new HashSet<IteratorScope>(2*_set265.size);
                 for (int _i266 = 0; _i266 < _set265.size; ++_i266)
                 {
-                  IteratorScope _elem267; // required
+                  IteratorScope _elem267; // optional
                   _elem267 = IteratorScope.findByValue(iprot.readI32());
                   _val264.add(_elem267);
                 }
@@ -42963,7 +42963,7 @@ import org.slf4j.LoggerFactory;
                   struct.scopes = new HashSet<IteratorScope>(2*_set278.size);
                   for (int _i279 = 0; _i279 < _set278.size; ++_i279)
                   {
-                    IteratorScope _elem280; // required
+                    IteratorScope _elem280; // optional
                     _elem280 = IteratorScope.findByValue(iprot.readI32());
                     struct.scopes.add(_elem280);
                   }
@@ -43089,7 +43089,7 @@ import org.slf4j.LoggerFactory;
             struct.scopes = new HashSet<IteratorScope>(2*_set283.size);
             for (int _i284 = 0; _i284 < _set283.size; ++_i284)
             {
-              IteratorScope _elem285; // required
+              IteratorScope _elem285; // optional
               _elem285 = IteratorScope.findByValue(iprot.readI32());
               struct.scopes.add(_elem285);
             }
@@ -46524,7 +46524,7 @@ import org.slf4j.LoggerFactory;
                       _val289 = new HashSet<String>(2*_set290.size);
                       for (int _i291 = 0; _i291 < _set290.size; ++_i291)
                       {
-                        String _elem292; // required
+                        String _elem292; // optional
                         _elem292 = iprot.readString();
                         _val289.add(_elem292);
                       }
@@ -46662,7 +46662,7 @@ import org.slf4j.LoggerFactory;
                 _val300 = new HashSet<String>(2*_set301.size);
                 for (int _i302 = 0; _i302 < _set301.size; ++_i302)
                 {
-                  String _elem303; // required
+                  String _elem303; // optional
                   _elem303 = iprot.readString();
                   _val300.add(_elem303);
                 }
@@ -49674,7 +49674,7 @@ import org.slf4j.LoggerFactory;
                   struct.success = new HashSet<Range>(2*_set304.size);
                   for (int _i305 = 0; _i305 < _set304.size; ++_i305)
                   {
-                    Range _elem306; // required
+                    Range _elem306; // optional
                     _elem306 = new Range();
                     _elem306.read(iprot);
                     struct.success.add(_elem306);
@@ -49816,7 +49816,7 @@ import org.slf4j.LoggerFactory;
             struct.success = new HashSet<Range>(2*_set309.size);
             for (int _i310 = 0; _i310 < _set309.size; ++_i310)
             {
-              Range _elem311; // required
+              Range _elem311; // optional
               _elem311 = new Range();
               _elem311.read(iprot);
               struct.success.add(_elem311);
@@ -54625,7 +54625,7 @@ import org.slf4j.LoggerFactory;
                   struct.success = new ArrayList<ActiveScan>(_list322.size);
                   for (int _i323 = 0; _i323 < _list322.size; ++_i323)
                   {
-                    ActiveScan _elem324; // required
+                    ActiveScan _elem324; // optional
                     _elem324 = new ActiveScan();
                     _elem324.read(iprot);
                     struct.success.add(_elem324);
@@ -54747,7 +54747,7 @@ import org.slf4j.LoggerFactory;
             struct.success = new ArrayList<ActiveScan>(_list327.size);
             for (int _i328 = 0; _i328 < _list327.size; ++_i328)
             {
-              ActiveScan _elem329; // required
+              ActiveScan _elem329; // optional
               _elem329 = new ActiveScan();
               _elem329.read(iprot);
               struct.success.add(_elem329);
@@ -55702,7 +55702,7 @@ import org.slf4j.LoggerFactory;
                   struct.success = new ArrayList<ActiveCompaction>(_list330.size);
                   for (int _i331 = 0; _i331 < _list330.size; ++_i331)
                   {
-                    ActiveCompaction _elem332; // required
+                    ActiveCompaction _elem332; // optional
                     _elem332 = new ActiveCompaction();
                     _elem332.read(iprot);
                     struct.success.add(_elem332);
@@ -55824,7 +55824,7 @@ import org.slf4j.LoggerFactory;
             struct.success = new ArrayList<ActiveCompaction>(_list335.size);
             for (int _i336 = 0; _i336 < _list335.size; ++_i336)
             {
-              ActiveCompaction _elem337; // required
+              ActiveCompaction _elem337; // optional
               _elem337 = new ActiveCompaction();
               _elem337.read(iprot);
               struct.success.add(_elem337);
@@ -58497,7 +58497,7 @@ import org.slf4j.LoggerFactory;
                   struct.success = new ArrayList<String>(_list358.size);
                   for (int _i359 = 0; _i359 < _list358.size; ++_i359)
                   {
-                    String _elem360; // required
+                    String _elem360; // optional
                     _elem360 = iprot.readString();
                     struct.success.add(_elem360);
                   }
@@ -58578,7 +58578,7 @@ import org.slf4j.LoggerFactory;
             struct.success = new ArrayList<String>(_list363.size);
             for (int _i364 = 0; _i364 < _list363.size; ++_i364)
             {
-              String _elem365; // required
+              String _elem365; // optional
               _elem365 = iprot.readString();
               struct.success.add(_elem365);
             }
@@ -63341,7 +63341,7 @@ import org.slf4j.LoggerFactory;
                   struct.authorizations = new HashSet<ByteBuffer>(2*_set376.size);
                   for (int _i377 = 0; _i377 < _set376.size; ++_i377)
                   {
-                    ByteBuffer _elem378; // required
+                    ByteBuffer _elem378; // optional
                     _elem378 = iprot.readBinary();
                     struct.authorizations.add(_elem378);
                   }
@@ -63452,7 +63452,7 @@ import org.slf4j.LoggerFactory;
             struct.authorizations = new HashSet<ByteBuffer>(2*_set381.size);
             for (int _i382 = 0; _i382 < _set381.size; ++_i382)
             {
-              ByteBuffer _elem383; // required
+              ByteBuffer _elem383; // optional
               _elem383 = iprot.readBinary();
               struct.authorizations.add(_elem383);
             }
@@ -67847,7 +67847,7 @@ import org.slf4j.LoggerFactory;
                   struct.success = new ArrayList<ByteBuffer>(_list384.size);
                   for (int _i385 = 0; _i385 < _list384.size; ++_i385)
                   {
-                    ByteBuffer _elem386; // required
+                    ByteBuffer _elem386; // optional
                     _elem386 = iprot.readBinary();
                     struct.success.add(_elem386);
                   }
@@ -67968,7 +67968,7 @@ import org.slf4j.LoggerFactory;
             struct.success = new ArrayList<ByteBuffer>(_list389.size);
             for (int _i390 = 0; _i390 < _list389.size; ++_i390)
             {
-              ByteBuffer _elem391; // required
+              ByteBuffer _elem391; // optional
               _elem391 = iprot.readBinary();
               struct.success.add(_elem391);
             }
@@ -73659,7 +73659,7 @@ import org.slf4j.LoggerFactory;
                   struct.success = new HashSet<String>(2*_set392.size);
                   for (int _i393 = 0; _i393 < _set392.size; ++_i393)
                   {
-                    String _elem394; // required
+                    String _elem394; // optional
                     _elem394 = iprot.readString();
                     struct.success.add(_elem394);
                   }
@@ -73800,7 +73800,7 @@ import org.slf4j.LoggerFactory;
             struct.success = new HashSet<String>(2*_set397.size);
             for (int _i398 = 0; _i398 < _set397.size; ++_i398)
             {
-              String _elem399; // required
+              String _elem399; // optional
               _elem399 = iprot.readString();
               struct.success.add(_elem399);
             }
@@ -82735,7 +82735,7 @@ import org.slf4j.LoggerFactory;
                       _val403 = new ArrayList<ColumnUpdate>(_list404.size);
                       for (int _i405 = 0; _i405 < _list404.size; ++_i405)
                       {
-                        ColumnUpdate _elem406; // required
+                        ColumnUpdate _elem406; // optional
                         _elem406 = new ColumnUpdate();
                         _elem406.read(iprot);
                         _val403.add(_elem406);
@@ -82874,7 +82874,7 @@ import org.slf4j.LoggerFactory;
                 _val414 = new ArrayList<ColumnUpdate>(_list415.size);
                 for (int _i416 = 0; _i416 < _list415.size; ++_i416)
                 {
-                  ColumnUpdate _elem417; // required
+                  ColumnUpdate _elem417; // optional
                   _elem417 = new ColumnUpdate();
                   _elem417.read(iprot);
                   _val414.add(_elem417);
@@ -85198,7 +85198,7 @@ import org.slf4j.LoggerFactory;
                       _val421 = new ArrayList<ColumnUpdate>(_list422.size);
                       for (int _i423 = 0; _i423 < _list422.size; ++_i423)
                       {
-                        ColumnUpdate _elem424; // required
+                        ColumnUpdate _elem424; // optional
                         _elem424 = new ColumnUpdate();
                         _elem424.read(iprot);
                         _val421.add(_elem424);
@@ -85322,7 +85322,7 @@ import org.slf4j.LoggerFactory;
                 _val432 = new ArrayList<ColumnUpdate>(_list433.size);
                 for (int _i434 = 0; _i434 < _list433.size; ++_i434)
                 {
-                  ColumnUpdate _elem435; // required
+                  ColumnUpdate _elem435; // optional
                   _elem435 = new ColumnUpdate();
                   _elem435.read(iprot);
                   _val432.add(_elem435);

Modified: accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java Mon Jun 24 21:34:20 2013
@@ -1116,7 +1116,7 @@ import org.slf4j.LoggerFactory;
                 struct.inputFiles = new ArrayList<String>(_list106.size);
                 for (int _i107 = 0; _i107 < _list106.size; ++_i107)
                 {
-                  String _elem108; // required
+                  String _elem108; // optional
                   _elem108 = iprot.readString();
                   struct.inputFiles.add(_elem108);
                 }
@@ -1182,7 +1182,7 @@ import org.slf4j.LoggerFactory;
                 struct.iterators = new ArrayList<IteratorSetting>(_list109.size);
                 for (int _i110 = 0; _i110 < _list109.size; ++_i110)
                 {
-                  IteratorSetting _elem111; // required
+                  IteratorSetting _elem111; // optional
                   _elem111 = new IteratorSetting();
                   _elem111.read(iprot);
                   struct.iterators.add(_elem111);
@@ -1379,7 +1379,7 @@ import org.slf4j.LoggerFactory;
           struct.inputFiles = new ArrayList<String>(_list116.size);
           for (int _i117 = 0; _i117 < _list116.size; ++_i117)
           {
-            String _elem118; // required
+            String _elem118; // optional
             _elem118 = iprot.readString();
             struct.inputFiles.add(_elem118);
           }
@@ -1416,7 +1416,7 @@ import org.slf4j.LoggerFactory;
           struct.iterators = new ArrayList<IteratorSetting>(_list119.size);
           for (int _i120 = 0; _i120 < _list119.size; ++_i120)
           {
-            IteratorSetting _elem121; // required
+            IteratorSetting _elem121; // optional
             _elem121 = new IteratorSetting();
             _elem121.read(iprot);
             struct.iterators.add(_elem121);

Modified: accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java Mon Jun 24 21:34:20 2013
@@ -1267,7 +1267,7 @@ import org.slf4j.LoggerFactory;
                 struct.columns = new ArrayList<Column>(_list82.size);
                 for (int _i83 = 0; _i83 < _list82.size; ++_i83)
                 {
-                  Column _elem84; // required
+                  Column _elem84; // optional
                   _elem84 = new Column();
                   _elem84.read(iprot);
                   struct.columns.add(_elem84);
@@ -1286,7 +1286,7 @@ import org.slf4j.LoggerFactory;
                 struct.iterators = new ArrayList<IteratorSetting>(_list85.size);
                 for (int _i86 = 0; _i86 < _list85.size; ++_i86)
                 {
-                  IteratorSetting _elem87; // required
+                  IteratorSetting _elem87; // optional
                   _elem87 = new IteratorSetting();
                   _elem87.read(iprot);
                   struct.iterators.add(_elem87);
@@ -1305,7 +1305,7 @@ import org.slf4j.LoggerFactory;
                 struct.authorizations = new ArrayList<ByteBuffer>(_list88.size);
                 for (int _i89 = 0; _i89 < _list88.size; ++_i89)
                 {
-                  ByteBuffer _elem90; // required
+                  ByteBuffer _elem90; // optional
                   _elem90 = iprot.readBinary();
                   struct.authorizations.add(_elem90);
                 }
@@ -1551,7 +1551,7 @@ import org.slf4j.LoggerFactory;
           struct.columns = new ArrayList<Column>(_list97.size);
           for (int _i98 = 0; _i98 < _list97.size; ++_i98)
           {
-            Column _elem99; // required
+            Column _elem99; // optional
             _elem99 = new Column();
             _elem99.read(iprot);
             struct.columns.add(_elem99);
@@ -1565,7 +1565,7 @@ import org.slf4j.LoggerFactory;
           struct.iterators = new ArrayList<IteratorSetting>(_list100.size);
           for (int _i101 = 0; _i101 < _list100.size; ++_i101)
           {
-            IteratorSetting _elem102; // required
+            IteratorSetting _elem102; // optional
             _elem102 = new IteratorSetting();
             _elem102.read(iprot);
             struct.iterators.add(_elem102);
@@ -1579,7 +1579,7 @@ import org.slf4j.LoggerFactory;
           struct.authorizations = new ArrayList<ByteBuffer>(_list103.size);
           for (int _i104 = 0; _i104 < _list103.size; ++_i104)
           {
-            ByteBuffer _elem105; // required
+            ByteBuffer _elem105; // optional
             _elem105 = iprot.readBinary();
             struct.authorizations.add(_elem105);
           }

Modified: accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java Mon Jun 24 21:34:20 2013
@@ -724,7 +724,7 @@ import org.slf4j.LoggerFactory;
                 struct.authorizations = new HashSet<ByteBuffer>(2*_set50.size);
                 for (int _i51 = 0; _i51 < _set50.size; ++_i51)
                 {
-                  ByteBuffer _elem52; // required
+                  ByteBuffer _elem52; // optional
                   _elem52 = iprot.readBinary();
                   struct.authorizations.add(_elem52);
                 }
@@ -742,7 +742,7 @@ import org.slf4j.LoggerFactory;
                 struct.ranges = new ArrayList<Range>(_list53.size);
                 for (int _i54 = 0; _i54 < _list53.size; ++_i54)
                 {
-                  Range _elem55; // required
+                  Range _elem55; // optional
                   _elem55 = new Range();
                   _elem55.read(iprot);
                   struct.ranges.add(_elem55);
@@ -761,7 +761,7 @@ import org.slf4j.LoggerFactory;
                 struct.columns = new ArrayList<ScanColumn>(_list56.size);
                 for (int _i57 = 0; _i57 < _list56.size; ++_i57)
                 {
-                  ScanColumn _elem58; // required
+                  ScanColumn _elem58; // optional
                   _elem58 = new ScanColumn();
                   _elem58.read(iprot);
                   struct.columns.add(_elem58);
@@ -780,7 +780,7 @@ import org.slf4j.LoggerFactory;
                 struct.iterators = new ArrayList<IteratorSetting>(_list59.size);
                 for (int _i60 = 0; _i60 < _list59.size; ++_i60)
                 {
-                  IteratorSetting _elem61; // required
+                  IteratorSetting _elem61; // optional
                   _elem61 = new IteratorSetting();
                   _elem61.read(iprot);
                   struct.iterators.add(_elem61);
@@ -961,7 +961,7 @@ import org.slf4j.LoggerFactory;
           struct.authorizations = new HashSet<ByteBuffer>(2*_set70.size);
           for (int _i71 = 0; _i71 < _set70.size; ++_i71)
           {
-            ByteBuffer _elem72; // required
+            ByteBuffer _elem72; // optional
             _elem72 = iprot.readBinary();
             struct.authorizations.add(_elem72);
           }
@@ -974,7 +974,7 @@ import org.slf4j.LoggerFactory;
           struct.ranges = new ArrayList<Range>(_list73.size);
           for (int _i74 = 0; _i74 < _list73.size; ++_i74)
           {
-            Range _elem75; // required
+            Range _elem75; // optional
             _elem75 = new Range();
             _elem75.read(iprot);
             struct.ranges.add(_elem75);
@@ -988,7 +988,7 @@ import org.slf4j.LoggerFactory;
           struct.columns = new ArrayList<ScanColumn>(_list76.size);
           for (int _i77 = 0; _i77 < _list76.size; ++_i77)
           {
-            ScanColumn _elem78; // required
+            ScanColumn _elem78; // optional
             _elem78 = new ScanColumn();
             _elem78.read(iprot);
             struct.columns.add(_elem78);
@@ -1002,7 +1002,7 @@ import org.slf4j.LoggerFactory;
           struct.iterators = new ArrayList<IteratorSetting>(_list79.size);
           for (int _i80 = 0; _i80 < _list79.size; ++_i80)
           {
-            IteratorSetting _elem81; // required
+            IteratorSetting _elem81; // optional
             _elem81 = new IteratorSetting();
             _elem81.read(iprot);
             struct.iterators.add(_elem81);

Modified: accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java Mon Jun 24 21:34:20 2013
@@ -436,7 +436,7 @@ import org.slf4j.LoggerFactory;
                 struct.tables = new ArrayList<String>(_list0.size);
                 for (int _i1 = 0; _i1 < _list0.size; ++_i1)
                 {
-                  String _elem2; // required
+                  String _elem2; // optional
                   _elem2 = iprot.readString();
                   struct.tables.add(_elem2);
                 }
@@ -534,7 +534,7 @@ import org.slf4j.LoggerFactory;
           struct.tables = new ArrayList<String>(_list5.size);
           for (int _i6 = 0; _i6 < _list5.size; ++_i6)
           {
-            String _elem7; // required
+            String _elem7; // optional
             _elem7 = iprot.readString();
             struct.tables.add(_elem7);
           }

Modified: accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java Mon Jun 24 21:34:20 2013
@@ -707,7 +707,7 @@ import org.slf4j.LoggerFactory;
                 struct.authorizations = new HashSet<ByteBuffer>(2*_set26.size);
                 for (int _i27 = 0; _i27 < _set26.size; ++_i27)
                 {
-                  ByteBuffer _elem28; // required
+                  ByteBuffer _elem28; // optional
                   _elem28 = iprot.readBinary();
                   struct.authorizations.add(_elem28);
                 }
@@ -734,7 +734,7 @@ import org.slf4j.LoggerFactory;
                 struct.columns = new ArrayList<ScanColumn>(_list29.size);
                 for (int _i30 = 0; _i30 < _list29.size; ++_i30)
                 {
-                  ScanColumn _elem31; // required
+                  ScanColumn _elem31; // optional
                   _elem31 = new ScanColumn();
                   _elem31.read(iprot);
                   struct.columns.add(_elem31);
@@ -753,7 +753,7 @@ import org.slf4j.LoggerFactory;
                 struct.iterators = new ArrayList<IteratorSetting>(_list32.size);
                 for (int _i33 = 0; _i33 < _list32.size; ++_i33)
                 {
-                  IteratorSetting _elem34; // required
+                  IteratorSetting _elem34; // optional
                   _elem34 = new IteratorSetting();
                   _elem34.read(iprot);
                   struct.iterators.add(_elem34);
@@ -921,7 +921,7 @@ import org.slf4j.LoggerFactory;
           struct.authorizations = new HashSet<ByteBuffer>(2*_set41.size);
           for (int _i42 = 0; _i42 < _set41.size; ++_i42)
           {
-            ByteBuffer _elem43; // required
+            ByteBuffer _elem43; // optional
             _elem43 = iprot.readBinary();
             struct.authorizations.add(_elem43);
           }
@@ -939,7 +939,7 @@ import org.slf4j.LoggerFactory;
           struct.columns = new ArrayList<ScanColumn>(_list44.size);
           for (int _i45 = 0; _i45 < _list44.size; ++_i45)
           {
-            ScanColumn _elem46; // required
+            ScanColumn _elem46; // optional
             _elem46 = new ScanColumn();
             _elem46.read(iprot);
             struct.columns.add(_elem46);
@@ -953,7 +953,7 @@ import org.slf4j.LoggerFactory;
           struct.iterators = new ArrayList<IteratorSetting>(_list47.size);
           for (int _i48 = 0; _i48 < _list47.size; ++_i48)
           {
-            IteratorSetting _elem49; // required
+            IteratorSetting _elem49; // optional
             _elem49 = new IteratorSetting();
             _elem49.read(iprot);
             struct.iterators.add(_elem49);

Modified: accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java Mon Jun 24 21:34:20 2013
@@ -436,7 +436,7 @@ import org.slf4j.LoggerFactory;
                 struct.results = new ArrayList<KeyValue>(_list8.size);
                 for (int _i9 = 0; _i9 < _list8.size; ++_i9)
                 {
-                  KeyValue _elem10; // required
+                  KeyValue _elem10; // optional
                   _elem10 = new KeyValue();
                   _elem10.read(iprot);
                   struct.results.add(_elem10);
@@ -535,7 +535,7 @@ import org.slf4j.LoggerFactory;
           struct.results = new ArrayList<KeyValue>(_list13.size);
           for (int _i14 = 0; _i14 < _list13.size; ++_i14)
           {
-            KeyValue _elem15; // required
+            KeyValue _elem15; // optional
             _elem15 = new KeyValue();
             _elem15.read(iprot);
             struct.results.add(_elem15);

Modified: accumulo/branches/ACCUMULO-CURATOR/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java Mon Jun 24 21:34:20 2013
@@ -40,7 +40,6 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.UUID;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.Property;
@@ -51,6 +50,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.user.SummingCombiner;
 import org.apache.accumulo.core.iterators.user.VersioningIterator;
+import org.apache.accumulo.core.util.MetadataTable;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint;
 import org.apache.accumulo.minicluster.MiniAccumuloCluster;
@@ -982,7 +982,7 @@ public class SimpleTest {
     assertEquals("10", new String(more.getResults().get(0).getValue()));
     try {
       client.checkIteratorConflicts(creds, TABLE_TEST, setting, EnumSet.allOf(IteratorScope.class));
-      fail("checkIteratorConflicts did not throw and exception");
+      fail("checkIteratorConflicts did not throw an exception");
     } catch (Exception ex) {}
     client.deleteRows(creds, TABLE_TEST, null, null);
     client.removeIterator(creds, TABLE_TEST, "test", EnumSet.allOf(IteratorScope.class));
@@ -1111,7 +1111,7 @@ public class SimpleTest {
     ScanOptions opt = new ScanOptions();
     opt.range = new Range(start, true, end, false);
     opt.columns = Collections.singletonList(new ScanColumn(s2bb("file")));
-    String scanner = client.createScanner(creds, Constants.METADATA_TABLE_NAME, opt);
+    String scanner = client.createScanner(creds, MetadataTable.NAME, opt);
     int result = 0;
     while (true) {
       ScanResult more = client.nextK(scanner, 100);

Propchange: accumulo/branches/ACCUMULO-CURATOR/server/
------------------------------------------------------------------------------
  Reverse-merged /accumulo/trunk/server:r1478775
  Merged /incubator/accumulo/branches/1.4/server:r1201899-1201901
  Merged /accumulo/branches/1.4/server:r1382578-1382612,1382614-1388119,1388121-1388628,1388630-1393867,1393869-1396064,1396066-1396571,1396573-1396615,1396617-1396757,1396759-1396771,1396773-1397047,1397049-1397112,1397114-1397116,1397118-1397175,1397177-1397188,1397190-1397382,1397384-1397699,1397701-1397920,1397922-1398285,1398287-1398307,1398309-1398358,1398360-1398392,1398394-1398398,1398400-1398437,1398439-1398513,1398515-1398800,1398802-1399210,1399212-1399716,1399718-1400975,1400977-1402570,1402572-1402681,1402683-1407300,1407302-1423031,1423033-1423628,1423630-1427863,1427865-1438668,1438670-1450270,1450272-1451699,1451701-1455609,1455611-1455638,1455640-1455979,1455981-1461547,1461549-1465686,1465688-1466198,1466200-1466258,1466260-1466626,1466628-1468530,1468532-1468957,1468959-1480032,1480034-1482988,1482990-1483953,1483955-1492947,1495439
  Merged /accumulo/branches/1.5/server:r1488056-1488357,1488359-1492948,1493894,1494361,1494372,1495072,1495441
  Merged /accumulo/trunk/server:r1491852-1496190

Modified: accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/Accumulo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/Accumulo.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/Accumulo.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/Accumulo.java Mon Jun 24 21:34:20 2013
@@ -20,7 +20,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Map.Entry;
@@ -33,12 +32,11 @@ import org.apache.accumulo.core.util.Uti
 import org.apache.accumulo.core.util.Version;
 import org.apache.accumulo.server.client.HdfsZooInstance;
 import org.apache.accumulo.server.conf.ServerConfiguration;
+import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.accumulo.server.util.time.SimpleTimer;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.log4j.Logger;
 import org.apache.log4j.helpers.LogLog;
 import org.apache.log4j.xml.DOMConfigurator;
@@ -48,21 +46,21 @@ public class Accumulo {
   
   private static final Logger log = Logger.getLogger(Accumulo.class);
   
-  public static synchronized void updateAccumuloVersion(FileSystem fs) {
+  public static synchronized void updateAccumuloVersion(VolumeManager fs) {
     try {
-      if (getAccumuloPersistentVersion(fs) == Constants.PREV_DATA_VERSION) {
-        fs.create(new Path(ServerConstants.getDataVersionLocation() + "/" + Constants.DATA_VERSION));
-        fs.delete(new Path(ServerConstants.getDataVersionLocation() + "/" + Constants.PREV_DATA_VERSION), false);
+      if (getAccumuloPersistentVersion(fs) == ServerConstants.PREV_DATA_VERSION) {
+        fs.create(new Path(ServerConstants.getDataVersionLocation() + "/" + ServerConstants.DATA_VERSION));
+        fs.delete(new Path(ServerConstants.getDataVersionLocation() + "/" + ServerConstants.PREV_DATA_VERSION));
       }
     } catch (IOException e) {
       throw new RuntimeException("Unable to set accumulo version: an error occurred.", e);
     }
   }
   
-  public static synchronized int getAccumuloPersistentVersion(FileSystem fs) {
+  public static synchronized int getAccumuloPersistentVersion(VolumeManager fs) {
     int dataVersion;
     try {
-      FileStatus[] files = fs.listStatus(ServerConstants.getDataVersionLocation());
+      FileStatus[] files = fs.getDefaultVolume().listStatus(ServerConstants.getDataVersionLocation());
       if (files == null || files.length == 0) {
         dataVersion = -1; // assume it is 0.5 or earlier
       } else {
@@ -82,7 +80,7 @@ public class Accumulo {
     }
   }
   
-  public static void init(FileSystem fs, ServerConfiguration config, String application) throws UnknownHostException {
+  public static void init(VolumeManager fs, ServerConfiguration config, String application) throws UnknownHostException {
     
     System.setProperty("org.apache.accumulo.core.application", application);
     
@@ -107,25 +105,23 @@ public class Accumulo {
     }
     // Turn off messages about not being able to reach the remote logger... we protect against that.
     LogLog.setQuietMode(true);
-
-      // Configure logging
+    
+    // Configure logging
     DOMConfigurator.configureAndWatch(logConfig, 5000);
-
+    
     // Read the auditing config
     String auditConfig = String.format("%s/conf/auditLog.xml", System.getenv("ACCUMULO_HOME"), application);
-
-     DOMConfigurator.configureAndWatch(auditConfig, 5000);
-
-
-
-      log.info(application + " starting");
+    
+    DOMConfigurator.configureAndWatch(auditConfig, 5000);
+    
+    log.info(application + " starting");
     log.info("Instance " + config.getInstance().getInstanceID());
     int dataVersion = Accumulo.getAccumuloPersistentVersion(fs);
     log.info("Data Version " + dataVersion);
     Accumulo.waitForZookeeperAndHdfs(fs);
     
     Version codeVersion = new Version(Constants.VERSION);
-    if (dataVersion != Constants.DATA_VERSION && dataVersion != Constants.PREV_DATA_VERSION) {
+    if (dataVersion != ServerConstants.DATA_VERSION && dataVersion != ServerConstants.PREV_DATA_VERSION) {
       throw new RuntimeException("This version of accumulo (" + codeVersion + ") is not compatible with files stored using data version " + dataVersion);
     }
     
@@ -134,11 +130,8 @@ public class Accumulo {
       sortedProps.put(entry.getKey(), entry.getValue());
     
     for (Entry<String,String> entry : sortedProps.entrySet()) {
-      if (entry.getKey().toLowerCase().contains("password") || entry.getKey().toLowerCase().contains("secret")
-          || entry.getKey().startsWith(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey()))
-        log.info(entry.getKey() + " = <hidden>");
-      else
-        log.info(entry.getKey() + " = " + entry.getValue());
+      String key = entry.getKey();
+      log.info(key + " = " + (Property.isSensitive(key) ? "<hidden>" : entry.getValue()));
     }
     
     monitorSwappiness();
@@ -188,7 +181,7 @@ public class Accumulo {
     return result.getHostName();
   }
   
-  public static void waitForZookeeperAndHdfs(FileSystem fs) {
+  public static void waitForZookeeperAndHdfs(VolumeManager fs) {
     log.info("Attempting to talk to zookeeper");
     while (true) {
       try {
@@ -205,7 +198,7 @@ public class Accumulo {
     long sleep = 1000;
     while (true) {
       try {
-        if (!isInSafeMode(fs))
+        if (fs.isReady())
           break;
         log.warn("Waiting for the NameNode to leave safemode");
       } catch (IOException ex) {
@@ -218,37 +211,4 @@ public class Accumulo {
     log.info("Connected to HDFS");
   }
   
-  private static boolean isInSafeMode(FileSystem fs) throws IOException {
-    if (!(fs instanceof DistributedFileSystem))
-      return false;
-    DistributedFileSystem dfs = (DistributedFileSystem)fs;
-    // So this: if (!dfs.setSafeMode(SafeModeAction.SAFEMODE_GET))
-    // Becomes this:
-    Class<?> safeModeAction;
-    try {
-      // hadoop 2.0
-      safeModeAction = Class.forName("org.apache.hadoop.hdfs.protocol.HdfsConstants$SafeModeAction");
-    } catch (ClassNotFoundException ex) {
-      // hadoop 1.0
-      try {
-        safeModeAction = Class.forName("org.apache.hadoop.hdfs.protocol.FSConstants$SafeModeAction");
-      } catch (ClassNotFoundException e) {
-        throw new RuntimeException("Cannot figure out the right class for Constants");
-      }
-    }
-    Object get = null;
-    for (Object obj : safeModeAction.getEnumConstants()) {
-      if (obj.toString().equals("SAFEMODE_GET"))
-        get = obj;
-    }
-    if (get == null) {
-      throw new RuntimeException("cannot find SAFEMODE_GET");
-    }
-    try {
-      Method setSafeMode = dfs.getClass().getMethod("setSafeMode", safeModeAction);
-      return (Boolean) setSafeMode.invoke(dfs, get);
-    } catch (Exception ex) {
-      throw new RuntimeException("cannot find method setSafeMode");
-    }
-  }
 }

Modified: accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/ServerConstants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/ServerConstants.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/ServerConstants.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/ServerConstants.java Mon Jun 24 21:34:20 2013
@@ -17,39 +17,81 @@
 package org.apache.accumulo.server;
 
 import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.util.CachedConfiguration;
+import org.apache.accumulo.core.util.MetadataTable;
+import org.apache.accumulo.core.util.RootTable;
 import org.apache.accumulo.server.conf.ServerConfiguration;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 
-import static org.apache.accumulo.core.Constants.*;
-
 public class ServerConstants {
+  
+  // versions should never be negative
+  public static final Integer WIRE_VERSION = 2;
+  public static final int DATA_VERSION = 5;
+  public static final int PREV_DATA_VERSION = 4;
+  
   // these are functions to delay loading the Accumulo configuration unless we must
-  public static String getBaseDir() {
-    return ServerConfiguration.getSiteConfiguration().get(Property.INSTANCE_DFS_DIR);
+  public static String[] getBaseDirs() {
+    String singleNamespace = ServerConfiguration.getSiteConfiguration().get(Property.INSTANCE_DFS_DIR);
+    String ns = ServerConfiguration.getSiteConfiguration().get(Property.INSTANCE_VOLUMES);
+    if (ns == null || ns.isEmpty()) {
+      Configuration hadoopConfig = CachedConfiguration.getInstance();
+      String fullPath = hadoopConfig.get("fs.default.name") + singleNamespace;
+      return new String[] {fullPath};
+    }
+    String namespaces[] = ns.split(",");
+    if (namespaces.length < 2) {
+      Configuration hadoopConfig = CachedConfiguration.getInstance();
+      String fullPath = hadoopConfig.get("fs.default.name") + singleNamespace;
+      return new String[] {fullPath};
+    }
+    return prefix(namespaces, singleNamespace);
+  }
+  
+  public static String[] prefix(String bases[], String suffix) {
+    if (suffix.startsWith("/"))
+      suffix = suffix.substring(1);
+    String result[] = new String[bases.length];
+    for (int i = 0; i < bases.length; i++) {
+      result[i] = bases[i] + "/" + suffix;
+    }
+    return result;
+  }
+  
+  public static String[] getTablesDirs() {
+    return prefix(getBaseDirs(), "tables");
+  }
+  
+  public static String[] getRecoveryDirs() {
+    return prefix(getBaseDirs(), "recovery");
   }
   
-  public static String getTablesDir() {
-    return getBaseDir() + "/tables";
+  public static String[] getWalDirs() {
+    return prefix(getBaseDirs(), "wal");
   }
   
-  public static String getRecoveryDir() {
-    return getBaseDir() + "/recovery";
+  public static String[] getWalogArchives() {
+    return prefix(getBaseDirs(), "walogArchive");
   }
   
   public static Path getInstanceIdLocation() {
-    return new Path(getBaseDir() + "/instance_id");
+    return new Path(getBaseDirs()[0], "instance_id");
   }
   
   public static Path getDataVersionLocation() {
-    return new Path(getBaseDir() + "/version");
+    return new Path(getBaseDirs()[0], "version");
   }
   
-  public static String getMetadataTableDir() {
-    return getTablesDir() + "/" + METADATA_TABLE_ID;
+  public static String[] getRootTableDirs() {
+    return prefix(getTablesDirs(), RootTable.ID);
   }
   
-  public static String getRootTabletDir() {
-    return getMetadataTableDir() + ZROOT_TABLET;
+  public static String[] getMetadataTableDirs() {
+    return prefix(getTablesDirs(), MetadataTable.ID);
   }
   
+  public static String getRootTabletDir() {
+    return prefix(getRootTableDirs(), RootTable.ZROOT_TABLET)[0];
+  }
 }

Modified: accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java Mon Jun 24 21:34:20 2013
@@ -32,7 +32,6 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Instance;
@@ -56,6 +55,7 @@ import org.apache.accumulo.core.security
 import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.core.util.LoggingRunnable;
+import org.apache.accumulo.core.util.MetadataTable;
 import org.apache.accumulo.core.util.NamingThreadFactory;
 import org.apache.accumulo.core.util.StopWatch;
 import org.apache.accumulo.core.util.ThriftUtil;
@@ -281,7 +281,7 @@ public class BulkImporter {
     log.debug("BULK IMPORT TIMING STATISTICS");
     log.debug(String.format("Examine map files    : %,10.2f secs %6.2f%s", timer.getSecs(Timers.EXAMINE_MAP_FILES), 100.0 * timer.get(Timers.EXAMINE_MAP_FILES)
         / timer.get(Timers.TOTAL), "%"));
-    log.debug(String.format("Query %-14s : %,10.2f secs %6.2f%s", Constants.METADATA_TABLE_NAME, timer.getSecs(Timers.QUERY_METADATA),
+    log.debug(String.format("Query %-14s : %,10.2f secs %6.2f%s", MetadataTable.NAME, timer.getSecs(Timers.QUERY_METADATA),
         100.0 * timer.get(Timers.QUERY_METADATA) / timer.get(Timers.TOTAL), "%"));
     log.debug(String.format("Import Map Files     : %,10.2f secs %6.2f%s", timer.getSecs(Timers.IMPORT_MAP_FILES), 100.0 * timer.get(Timers.IMPORT_MAP_FILES)
         / timer.get(Timers.TOTAL), "%"));

Modified: accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java Mon Jun 24 21:34:20 2013
@@ -52,10 +52,10 @@ import org.apache.accumulo.core.security
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.util.CachedConfiguration;
-import org.apache.accumulo.core.util.TableDiskUsage;
 import org.apache.accumulo.server.conf.ServerConfiguration;
 import org.apache.accumulo.server.security.AuditedSecurityOperation;
 import org.apache.accumulo.server.security.SecurityOperation;
+import org.apache.accumulo.server.util.TableDiskUsage;
 import org.apache.accumulo.server.zookeeper.TransactionWatcher;
 import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
 import org.apache.accumulo.trace.thrift.TInfo;
@@ -197,19 +197,15 @@ public class ClientServiceHandler implem
     return security.listUsers(credentials);
   }
   
-  static private Map<String,String> conf(TCredentials credentials, AccumuloConfiguration conf) throws TException {
+  private static Map<String,String> conf(TCredentials credentials, AccumuloConfiguration conf) throws TException {
     security.authenticateUser(credentials, credentials);
     conf.invalidateCache();
     
     Map<String,String> result = new HashMap<String,String>();
     for (Entry<String,String> entry : conf) {
-      if (entry.getKey().equals(Property.INSTANCE_SECRET.getKey()))
-        continue;
-      if (entry.getKey().toLowerCase().contains("password"))
-        continue;
-      if (entry.getKey().startsWith(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey()))
-        continue;
-      result.put(entry.getKey(), entry.getValue());
+      String key = entry.getKey();
+      if (!Property.isSensitive(key))
+        result.put(key, entry.getValue());
     }
     return result;
   }
@@ -293,7 +289,7 @@ public class ClientServiceHandler implem
     security.authenticateUser(credentials, credentials);
     
     String tableId = checkTableId(tableName, null);
-
+    
     ClassLoader loader = getClass().getClassLoader();
     Class shouldMatch;
     try {
@@ -339,7 +335,7 @@ public class ClientServiceHandler implem
       FileSystem fs = FileUtil.getFileSystem(CachedConfiguration.getInstance(), conf);
       
       // use the same set of tableIds that were validated above to avoid race conditions
-      Map<TreeSet<String>,Long> diskUsage = TableDiskUsage.getDiskUsage(new ServerConfiguration(instance).getConfiguration(), tableIds, fs, conn, false);
+      Map<TreeSet<String>,Long> diskUsage = TableDiskUsage.getDiskUsage(new ServerConfiguration(instance).getConfiguration(), tableIds, fs, conn);
       List<TDiskUsage> retUsages = new ArrayList<TDiskUsage>();
       for (Map.Entry<TreeSet<String>,Long> usageItem : diskUsage.entrySet()) {
         retUsages.add(new TDiskUsage(new ArrayList<String>(usageItem.getKey()), usageItem.getValue()));

Modified: accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java Mon Jun 24 21:34:20 2013
@@ -36,6 +36,7 @@ import org.apache.accumulo.core.security
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.OpTimer;
+import org.apache.accumulo.core.util.RootTable;
 import org.apache.accumulo.core.util.StringUtil;
 import org.apache.accumulo.core.util.TextUtil;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -81,7 +82,7 @@ public class HdfsZooInstance implements 
   
   @Override
   public String getRootTabletLocation() {
-    String zRootLocPath = ZooUtil.getRoot(this) + Constants.ZROOT_TABLET_LOCATION;
+    String zRootLocPath = ZooUtil.getRoot(this) + RootTable.ZROOT_TABLET_LOCATION;
     
     OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up root tablet location in zoocache.");
     

Modified: accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java Mon Jun 24 21:34:20 2013
@@ -52,7 +52,6 @@ public class TableConfiguration extends 
     this.parent = parent;
     
     this.observers = Collections.synchronizedSet(new HashSet<ConfigurationObserver>());
-    
     if (tablePropCache == null)
       synchronized (TableConfiguration.class) {
         if (tablePropCache == null)
@@ -99,6 +98,7 @@ public class TableConfiguration extends 
       co.propertiesChanged();
   }
   
+  @Override
   public String get(Property property) {
     String key = property.getKey();
     String value = get(key);



Mime
View raw message