accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1437603 [1/8] - in /accumulo/trunk/proxy/src: main/java/org/apache/accumulo/proxy/ main/java/org/apache/accumulo/proxy/thrift/ main/thrift/ test/java/org/apache/accumulo/proxy/
Date Wed, 23 Jan 2013 18:00:00 GMT
Author: ecn
Date: Wed Jan 23 17:59:58 2013
New Revision: 1437603

URL: http://svn.apache.org/viewvc?rev=1437603&view=rev
Log:
ACCUMULO-969 removing the awkward prefixes for proxy users

Added:
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java   (with props)
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java   (with props)
Removed:
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PAccumuloException.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PAccumuloSecurityException.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PActiveCompaction.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PActiveScan.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PColumn.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PColumnUpdate.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PCompactionReason.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PCompactionType.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PIteratorScope.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PIteratorSetting.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PKey.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PKeyExtent.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PKeyValue.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PNoMoreEntriesException.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PPartialKey.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PRange.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PScanResult.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PScanState.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PScanType.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PSystemPermission.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PTableExistsException.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PTableNotFoundException.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PTablePermission.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PTimeType.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PUnknownScanner.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PUnknownWriter.java
Modified:
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Util.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UserPass.java
    accumulo/trunk/proxy/src/main/thrift/proxy.thrift
    accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
    accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyInstanceOperations.java
    accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java
    accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxySecurityOperations.java
    accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java

Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java?rev=1437603&r1=1437602&r2=1437603&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java Wed Jan 23 17:59:58 2013
@@ -67,32 +67,16 @@ import org.apache.accumulo.core.util.Byt
 import org.apache.accumulo.core.util.TextUtil;
 import org.apache.accumulo.proxy.thrift.AccumuloProxy;
 import org.apache.accumulo.proxy.thrift.KeyValueAndPeek;
-import org.apache.accumulo.proxy.thrift.PAccumuloException;
-import org.apache.accumulo.proxy.thrift.PAccumuloSecurityException;
-import org.apache.accumulo.proxy.thrift.PActiveCompaction;
-import org.apache.accumulo.proxy.thrift.PActiveScan;
-import org.apache.accumulo.proxy.thrift.PColumn;
-import org.apache.accumulo.proxy.thrift.PColumnUpdate;
-import org.apache.accumulo.proxy.thrift.PCompactionReason;
-import org.apache.accumulo.proxy.thrift.PCompactionType;
-import org.apache.accumulo.proxy.thrift.PIteratorScope;
-import org.apache.accumulo.proxy.thrift.PIteratorSetting;
-import org.apache.accumulo.proxy.thrift.PKey;
-import org.apache.accumulo.proxy.thrift.PKeyExtent;
-import org.apache.accumulo.proxy.thrift.PKeyValue;
-import org.apache.accumulo.proxy.thrift.PNoMoreEntriesException;
-import org.apache.accumulo.proxy.thrift.PPartialKey;
-import org.apache.accumulo.proxy.thrift.PRange;
-import org.apache.accumulo.proxy.thrift.PScanResult;
-import org.apache.accumulo.proxy.thrift.PScanState;
-import org.apache.accumulo.proxy.thrift.PScanType;
-import org.apache.accumulo.proxy.thrift.PSystemPermission;
-import org.apache.accumulo.proxy.thrift.PTableExistsException;
-import org.apache.accumulo.proxy.thrift.PTableNotFoundException;
-import org.apache.accumulo.proxy.thrift.PTablePermission;
-import org.apache.accumulo.proxy.thrift.PTimeType;
-import org.apache.accumulo.proxy.thrift.PUnknownScanner;
-import org.apache.accumulo.proxy.thrift.PUnknownWriter;
+import org.apache.accumulo.proxy.thrift.ColumnUpdate;
+import org.apache.accumulo.proxy.thrift.CompactionReason;
+import org.apache.accumulo.proxy.thrift.CompactionType;
+import org.apache.accumulo.proxy.thrift.KeyValue;
+import org.apache.accumulo.proxy.thrift.NoMoreEntriesException;
+import org.apache.accumulo.proxy.thrift.ScanResult;
+import org.apache.accumulo.proxy.thrift.ScanState;
+import org.apache.accumulo.proxy.thrift.ScanType;
+import org.apache.accumulo.proxy.thrift.UnknownScanner;
+import org.apache.accumulo.proxy.thrift.UnknownWriter;
 import org.apache.accumulo.proxy.thrift.UserPass;
 import org.apache.hadoop.io.Text;
 import org.apache.thrift.TException;
@@ -134,13 +118,13 @@ public class ProxyServer implements Accu
     try {
       throw ex;
     } catch (AccumuloException e) {
-      return new PAccumuloException(e.toString());
+      return new org.apache.accumulo.proxy.thrift.AccumuloException(e.toString());
     } catch (AccumuloSecurityException e) {
-      return new PAccumuloSecurityException(e.toString());
+      return new org.apache.accumulo.proxy.thrift.AccumuloSecurityException(e.toString());
     } catch (TableNotFoundException e) {
-      return new PTableNotFoundException(e.toString());
+      return new org.apache.accumulo.proxy.thrift.TableNotFoundException(e.toString());
     } catch (TableExistsException e) {
-      return new PTableExistsException(e.toString());
+      return new org.apache.accumulo.proxy.thrift.TableExistsException(e.toString());
     } catch (RuntimeException e) {
       if (e.getCause() != null) {
         if (e.getCause() instanceof Exception)
@@ -158,7 +142,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public int tableOperations_addConstraint(UserPass userpass, String tableName, String constraintClassName) throws TException {
+  public int addConstraint(UserPass userpass, String tableName, String constraintClassName) throws TException {
     try {
       return getConnector(userpass).tableOperations().addConstraint(tableName, constraintClassName);
     } catch (Exception e) {
@@ -167,7 +151,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_addSplits(UserPass userpass, String tableName, Set<ByteBuffer> splits) throws TException {
+  public void addSplits(UserPass userpass, String tableName, Set<ByteBuffer> splits) throws TException {
     try {
       SortedSet<Text> sorted = new TreeSet<Text>();
       for (ByteBuffer split : splits) {
@@ -180,7 +164,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_clearLocatorCache(UserPass userpass, String tableName) throws TException {
+  public void clearLocatorCache(UserPass userpass, String tableName) throws TException {
     try {
       getConnector(userpass).tableOperations().clearLocatorCache(tableName);
     } catch (Exception e) {
@@ -189,20 +173,20 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_compact(UserPass userpass, String tableName, ByteBuffer start, ByteBuffer end, List<PIteratorSetting> iterators, boolean flush,
+  public void compactTable(UserPass userpass, String tableName, ByteBuffer start, ByteBuffer end, List<org.apache.accumulo.proxy.thrift.IteratorSetting> iterators, boolean flush,
       boolean wait) throws TException {
     try {
-      getConnector(userpass).tableOperations().compact(tableName, ByteBufferUtil.toText(start), ByteBufferUtil.toText(end), getPIteratorSettings(iterators),
+      getConnector(userpass).tableOperations().compact(tableName, ByteBufferUtil.toText(start), ByteBufferUtil.toText(end), getIteratorSettings(iterators),
           flush, wait);
     } catch (Exception e) {
       throw translateException(e);
     }
   }
   
-  private List<IteratorSetting> getPIteratorSettings(List<PIteratorSetting> iterators) {
+  private List<IteratorSetting> getIteratorSettings(List<org.apache.accumulo.proxy.thrift.IteratorSetting> iterators) {
     List<IteratorSetting> result = new ArrayList<IteratorSetting>();
     if (iterators != null) {
-      for (PIteratorSetting is : iterators) {
+      for (org.apache.accumulo.proxy.thrift.IteratorSetting is : iterators) {
         result.add(getIteratorSetting(is));
       }
     }
@@ -210,7 +194,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_create(UserPass userpass, String tableName, boolean versioningIter, PTimeType timeType) throws TException {
+  public void createTable(UserPass userpass, String tableName, boolean versioningIter, org.apache.accumulo.proxy.thrift.TimeType timeType) throws TException {
     try {
       getConnector(userpass).tableOperations().create(tableName, versioningIter, TimeType.valueOf(timeType.toString()));
     } catch (Exception e) {
@@ -219,7 +203,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_delete(UserPass userpass, String tableName) throws TException {
+  public void deleteTable(UserPass userpass, String tableName) throws TException {
     try {
       getConnector(userpass).tableOperations().delete(tableName);
     } catch (Exception e) {
@@ -228,7 +212,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_deleteRows(UserPass userpass, String tableName, ByteBuffer start, ByteBuffer end) throws TException {
+  public void deleteRows(UserPass userpass, String tableName, ByteBuffer start, ByteBuffer end) throws TException {
     try {
       getConnector(userpass).tableOperations().deleteRows(tableName, ByteBufferUtil.toText(start), ByteBufferUtil.toText(end));
     } catch (Exception e) {
@@ -237,7 +221,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public boolean tableOperations_exists(UserPass userpass, String tableName) throws TException {
+  public boolean tableExists(UserPass userpass, String tableName) throws TException {
     try {
       return getConnector(userpass).tableOperations().exists(tableName);
     } catch (Exception e) {
@@ -246,7 +230,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_flush(UserPass userpass, String tableName, ByteBuffer startRow, ByteBuffer endRow, boolean wait) throws TException {
+  public void flushTable(UserPass userpass, String tableName, ByteBuffer startRow, ByteBuffer endRow, boolean wait) throws TException {
     try {
       getConnector(userpass).tableOperations().flush(tableName, ByteBufferUtil.toText(startRow), ByteBufferUtil.toText(endRow), wait);
     } catch (Exception e) {
@@ -255,7 +239,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public Map<String,Set<String>> tableOperations_getLocalityGroups(UserPass userpass, String tableName) throws TException {
+  public Map<String,Set<String>> getLocalityGroups(UserPass userpass, String tableName) throws TException {
     try {
       Map<String,Set<Text>> groups = getConnector(userpass).tableOperations().getLocalityGroups(tableName);
       Map<String,Set<String>> ret = new HashMap<String,Set<String>>();
@@ -272,7 +256,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public ByteBuffer tableOperations_getMaxRow(UserPass userpass, String tableName, List<ByteBuffer> auths, ByteBuffer startRow, boolean startinclusive,
+  public ByteBuffer getMaxRow(UserPass userpass, String tableName, List<ByteBuffer> auths, ByteBuffer startRow, boolean startinclusive,
       ByteBuffer endRow, boolean endinclusive) throws TException {
     try {
       
@@ -286,7 +270,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public Map<String,String> tableOperations_getProperties(UserPass userpass, String tableName) throws TException {
+  public Map<String,String> getTableProperties(UserPass userpass, String tableName) throws TException {
     try {
       Map<String,String> ret = new HashMap<String,String>();
       
@@ -300,7 +284,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public List<ByteBuffer> tableOperations_getSplits(UserPass userpass, String tableName, int maxSplits) throws TException {
+  public List<ByteBuffer> getSplits(UserPass userpass, String tableName, int maxSplits) throws TException {
     try {
       Collection<Text> splits = getConnector(userpass).tableOperations().getSplits(tableName, maxSplits);
       List<ByteBuffer> ret = new ArrayList<ByteBuffer>();
@@ -314,7 +298,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public Set<String> tableOperations_list(UserPass userpass) throws TException {
+  public Set<String> listTables(UserPass userpass) throws TException {
     try {
       return getConnector(userpass).tableOperations().list();
     } catch (Exception e) {
@@ -323,7 +307,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public Map<String,Integer> tableOperations_listConstraints(UserPass userpass, String arg2) throws TException {
+  public Map<String,Integer> listConstraints(UserPass userpass, String arg2) throws TException {
     try {
       return getConnector(userpass).tableOperations().listConstraints(arg2);
     } catch (Exception e) {
@@ -332,7 +316,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_merge(UserPass userpass, String tableName, ByteBuffer start, ByteBuffer end) throws TException {
+  public void mergeTablets(UserPass userpass, String tableName, ByteBuffer start, ByteBuffer end) throws TException {
     try {
       getConnector(userpass).tableOperations().merge(tableName, ByteBufferUtil.toText(start), ByteBufferUtil.toText(end));
     } catch (Exception e) {
@@ -341,7 +325,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_offline(UserPass userpass, String tableName) throws TException {
+  public void offlineTable(UserPass userpass, String tableName) throws TException {
     try {
       getConnector(userpass).tableOperations().offline(tableName);
     } catch (Exception e) {
@@ -350,7 +334,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_online(UserPass userpass, String tableName) throws TException {
+  public void onlineTable(UserPass userpass, String tableName) throws TException {
     try {
       getConnector(userpass).tableOperations().online(tableName);
     } catch (Exception e) {
@@ -359,7 +343,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_removeConstraint(UserPass userpass, String tableName, int number) throws TException {
+  public void removeConstraint(UserPass userpass, String tableName, int number) throws TException {
     try {
       getConnector(userpass).tableOperations().removeConstraint(tableName, number);
     } catch (Exception e) {
@@ -368,7 +352,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_removeProperty(UserPass userpass, String tableName, String property) throws TException {
+  public void removeTableProperty(UserPass userpass, String tableName, String property) throws TException {
     try {
       getConnector(userpass).tableOperations().removeProperty(tableName, property);
     } catch (Exception e) {
@@ -377,7 +361,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_rename(UserPass userpass, String oldTableName, String newTableName) throws TException {
+  public void renameTable(UserPass userpass, String oldTableName, String newTableName) throws TException {
     try {
       getConnector(userpass).tableOperations().rename(oldTableName, newTableName);
     } catch (Exception e) {
@@ -386,7 +370,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_setLocalityGroups(UserPass userpass, String tableName, Map<String,Set<String>> groupStrings) throws TException {
+  public void setLocalityGroups(UserPass userpass, String tableName, Map<String,Set<String>> groupStrings) throws TException {
     try {
       Map<String,Set<Text>> groups = new HashMap<String,Set<Text>>();
       for (String key : groupStrings.keySet()) {
@@ -402,7 +386,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_setProperty(UserPass userpass, String tableName, String property, String value) throws TException {
+  public void setTableProperty(UserPass userpass, String tableName, String property, String value) throws TException {
     try {
       getConnector(userpass).tableOperations().setProperty(tableName, property, value);
     } catch (Exception e) {
@@ -411,7 +395,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public Map<String,String> tableOperations_tableIdMap(UserPass userpass) throws TException {
+  public Map<String,String> tableIdMap(UserPass userpass) throws TException {
     try {
       return getConnector(userpass).tableOperations().tableIdMap();
     } catch (Exception e) {
@@ -420,7 +404,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public Map<String,String> instanceOperations_getSiteConfiguration(UserPass userpass) throws TException {
+  public Map<String,String> getSiteConfiguration(UserPass userpass) throws TException {
     try {
       return getConnector(userpass).instanceOperations().getSiteConfiguration();
     } catch (Exception e) {
@@ -429,7 +413,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public Map<String,String> instanceOperations_getSystemConfiguration(UserPass userpass) throws TException {
+  public Map<String,String> getSystemConfiguration(UserPass userpass) throws TException {
     try {
       return getConnector(userpass).instanceOperations().getSystemConfiguration();
     } catch (Exception e) {
@@ -438,7 +422,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public List<String> instanceOperations_getTabletServers(UserPass userpass) throws TException {
+  public List<String> getTabletServers(UserPass userpass) throws TException {
     try {
       return getConnector(userpass).instanceOperations().getTabletServers();
     } catch (Exception e) {
@@ -447,39 +431,39 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public List<PActiveScan> instanceOperations_getActiveScans(UserPass userpass, String tserver) throws TException {
-    List<PActiveScan> result = new ArrayList<PActiveScan>();
+  public List<org.apache.accumulo.proxy.thrift.ActiveScan> getActiveScans(UserPass userpass, String tserver) throws TException {
+    List<org.apache.accumulo.proxy.thrift.ActiveScan> result = new ArrayList<org.apache.accumulo.proxy.thrift.ActiveScan>();
     try {
       List<ActiveScan> activeScans = getConnector(userpass).instanceOperations().getActiveScans(tserver);
       for (ActiveScan scan : activeScans) {
-        PActiveScan pscan = new PActiveScan();
+        org.apache.accumulo.proxy.thrift.ActiveScan pscan = new org.apache.accumulo.proxy.thrift.ActiveScan();
         pscan.client = scan.getClient();
         pscan.user = scan.getUser();
         pscan.table = scan.getTable();
         pscan.age = scan.getAge();
         pscan.idleTime = scan.getIdleTime();
-        pscan.type = PScanType.valueOf(scan.getType().toString());
-        pscan.state = PScanState.valueOf(scan.getState().toString());
+        pscan.type = ScanType.valueOf(scan.getType().toString());
+        pscan.state = ScanState.valueOf(scan.getState().toString());
         KeyExtent e = scan.getExtent();
-        pscan.extent = new PKeyExtent(e.getTableId().toString(), TextUtil.getByteBuffer(e.getEndRow()), TextUtil.getByteBuffer(e.getPrevEndRow()));
-        pscan.columns = new ArrayList<PColumn>();
+        pscan.extent = new org.apache.accumulo.proxy.thrift.KeyExtent(e.getTableId().toString(), TextUtil.getByteBuffer(e.getEndRow()), TextUtil.getByteBuffer(e.getPrevEndRow()));
+        pscan.columns = new ArrayList<org.apache.accumulo.proxy.thrift.Column>();
         if (scan.getColumns() != null) {
           for (Column c : scan.getColumns()) {
-            PColumn column = new PColumn();
+            org.apache.accumulo.proxy.thrift.Column column = new org.apache.accumulo.proxy.thrift.Column();
             column.setColFamily(c.getColumnFamily());
             column.setColQualifier(c.getColumnQualifier());
             column.setColVisibility(c.getColumnVisibility());
             pscan.columns.add(column);
           }
         }
-        pscan.iterators = new ArrayList<PIteratorSetting>();
+        pscan.iterators = new ArrayList<org.apache.accumulo.proxy.thrift.IteratorSetting>();
         for (String iteratorString : scan.getSsiList()) {
           String[] parts = iteratorString.split("[=,]");
           if (parts.length == 3) {
             String name = parts[0];
             int priority = Integer.parseInt(parts[1]);
             String classname = parts[2];
-            PIteratorSetting settings = new PIteratorSetting(priority, name, classname, scan.getSsio().get(name));
+            org.apache.accumulo.proxy.thrift.IteratorSetting settings = new org.apache.accumulo.proxy.thrift.IteratorSetting(priority, name, classname, scan.getSsio().get(name));
             pscan.iterators.add(settings);
           }
         }
@@ -498,30 +482,30 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public List<PActiveCompaction> instanceOperations_getActiveCompactions(UserPass userpass, String tserver) throws TException {
+  public List<org.apache.accumulo.proxy.thrift.ActiveCompaction> getActiveCompactions(UserPass userpass, String tserver) throws TException {
     try {
-      List<PActiveCompaction> result = new ArrayList<PActiveCompaction>();
+      List<org.apache.accumulo.proxy.thrift.ActiveCompaction> result = new ArrayList<org.apache.accumulo.proxy.thrift.ActiveCompaction>();
       List<ActiveCompaction> active = getConnector(userpass).instanceOperations().getActiveCompactions(tserver);
       for (ActiveCompaction comp : active) {
-        PActiveCompaction pcomp = new PActiveCompaction();
+        org.apache.accumulo.proxy.thrift.ActiveCompaction pcomp = new org.apache.accumulo.proxy.thrift.ActiveCompaction();
         pcomp.age = comp.getAge();
         pcomp.entriesRead = comp.getEntriesRead();
         pcomp.entriesWritten = comp.getEntriesWritten();
         KeyExtent e = comp.getExtent();
-        pcomp.extent = new PKeyExtent(e.getTableId().toString(), TextUtil.getByteBuffer(e.getEndRow()), TextUtil.getByteBuffer(e.getPrevEndRow()));
+        pcomp.extent = new org.apache.accumulo.proxy.thrift.KeyExtent(e.getTableId().toString(), TextUtil.getByteBuffer(e.getEndRow()), TextUtil.getByteBuffer(e.getPrevEndRow()));
         pcomp.inputFiles = new ArrayList<String>();
         if (comp.getInputFiles() != null) {
           pcomp.inputFiles.addAll(comp.getInputFiles());
         }
         pcomp.localityGroup = comp.getLocalityGroup();
         pcomp.outputFile = comp.getOutputFile();
-        pcomp.reason = PCompactionReason.valueOf(comp.getReason().toString());
-        pcomp.type = PCompactionType.valueOf(comp.getType().toString());
+        pcomp.reason = CompactionReason.valueOf(comp.getReason().toString());
+        pcomp.type = CompactionType.valueOf(comp.getType().toString());
         
-        pcomp.iterators = new ArrayList<PIteratorSetting>();
+        pcomp.iterators = new ArrayList<org.apache.accumulo.proxy.thrift.IteratorSetting>();
         if (comp.getIterators() != null) {
           for (IteratorSetting setting : comp.getIterators()) {
-            PIteratorSetting psetting = new PIteratorSetting(setting.getPriority(), setting.getName(), setting.getIteratorClass(), setting.getOptions());
+            org.apache.accumulo.proxy.thrift.IteratorSetting psetting = new org.apache.accumulo.proxy.thrift.IteratorSetting(setting.getPriority(), setting.getName(), setting.getIteratorClass(), setting.getOptions());
             pcomp.iterators.add(psetting);
           }
         }
@@ -534,7 +518,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void instanceOperations_removeProperty(UserPass userpass, String property) throws TException {
+  public void removeProperty(UserPass userpass, String property) throws TException {
     try {
       getConnector(userpass).instanceOperations().removeProperty(property);
     } catch (Exception e) {
@@ -543,7 +527,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void instanceOperations_setProperty(UserPass userpass, String property, String value) throws TException {
+  public void setProperty(UserPass userpass, String property, String value) throws TException {
     try {
       getConnector(userpass).instanceOperations().setProperty(property, value);
     } catch (Exception e) {
@@ -552,7 +536,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public boolean instanceOperations_testClassLoad(UserPass userpass, String className, String asTypeName) throws TException {
+  public boolean testClassLoad(UserPass userpass, String className, String asTypeName) throws TException {
     try {
       return getConnector(userpass).instanceOperations().testClassLoad(className, asTypeName);
     } catch (Exception e) {
@@ -561,7 +545,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public boolean securityOperations_authenticateUser(UserPass userpass, String user, ByteBuffer password) throws TException {
+  public boolean authenticateUser(UserPass userpass, String user, ByteBuffer password) throws TException {
     try {
       return getConnector(userpass).securityOperations().authenticateUser(user, password.array());
     } catch (Exception e) {
@@ -570,7 +554,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void securityOperations_changeUserAuthorizations(UserPass userpass, String user, Set<ByteBuffer> authorizations) throws TException {
+  public void changeUserAuthorizations(UserPass userpass, String user, Set<ByteBuffer> authorizations) throws TException {
     try {
       Set<String> auths = new HashSet<String>();
       for (ByteBuffer auth : authorizations) {
@@ -583,7 +567,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void securityOperations_changeUserPassword(UserPass userpass, String user, ByteBuffer password) throws TException {
+  public void changeUserPassword(UserPass userpass, String user, ByteBuffer password) throws TException {
     try {
       getConnector(userpass).securityOperations().changeUserPassword(user, password.array());
     } catch (Exception e) {
@@ -592,7 +576,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void securityOperations_createUser(UserPass userpass, String user, ByteBuffer password) throws TException {
+  public void createUser(UserPass userpass, String user, ByteBuffer password) throws TException {
     try {
       getConnector(userpass).securityOperations().createUser(user, password.array());
     } catch (Exception e) {
@@ -601,7 +585,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void securityOperations_dropUser(UserPass userpass, String user) throws TException {
+  public void dropUser(UserPass userpass, String user) throws TException {
     try {
       getConnector(userpass).securityOperations().dropUser(user);
     } catch (Exception e) {
@@ -610,7 +594,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public List<ByteBuffer> securityOperations_getUserAuthorizations(UserPass userpass, String user) throws TException {
+  public List<ByteBuffer> getUserAuthorizations(UserPass userpass, String user) throws TException {
     try {
       return getConnector(userpass).securityOperations().getUserAuthorizations(user).getAuthorizationsBB();
     } catch (Exception e) {
@@ -619,7 +603,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void securityOperations_grantSystemPermission(UserPass userpass, String user, PSystemPermission perm) throws TException {
+  public void grantSystemPermission(UserPass userpass, String user, org.apache.accumulo.proxy.thrift.SystemPermission perm) throws TException {
     try {
       getConnector(userpass).securityOperations().grantSystemPermission(user, SystemPermission.getPermissionById((byte) perm.getValue()));
     } catch (Exception e) {
@@ -628,7 +612,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void securityOperations_grantTablePermission(UserPass userpass, String user, String table, PTablePermission perm) throws TException {
+  public void grantTablePermission(UserPass userpass, String user, String table, org.apache.accumulo.proxy.thrift.TablePermission perm) throws TException {
     try {
       getConnector(userpass).securityOperations().grantTablePermission(user, table, TablePermission.getPermissionById((byte) perm.getValue()));
     } catch (Exception e) {
@@ -637,7 +621,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public boolean securityOperations_hasSystemPermission(UserPass userpass, String user, PSystemPermission perm) throws TException {
+  public boolean hasSystemPermission(UserPass userpass, String user, org.apache.accumulo.proxy.thrift.SystemPermission perm) throws TException {
     try {
       return getConnector(userpass).securityOperations().hasSystemPermission(user, SystemPermission.getPermissionById((byte) perm.getValue()));
     } catch (Exception e) {
@@ -646,7 +630,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public boolean securityOperations_hasTablePermission(UserPass userpass, String user, String table, PTablePermission perm) throws TException {
+  public boolean hasTablePermission(UserPass userpass, String user, String table, org.apache.accumulo.proxy.thrift.TablePermission perm) throws TException {
     try {
       return getConnector(userpass).securityOperations().hasTablePermission(user, table, TablePermission.getPermissionById((byte) perm.getValue()));
     } catch (Exception e) {
@@ -655,7 +639,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public Set<String> securityOperations_listUsers(UserPass userpass) throws TException {
+  public Set<String> listUsers(UserPass userpass) throws TException {
     try {
       return getConnector(userpass).securityOperations().listUsers();
     } catch (Exception e) {
@@ -664,7 +648,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void securityOperations_revokeSystemPermission(UserPass userpass, String user, PSystemPermission perm) throws TException {
+  public void revokeSystemPermission(UserPass userpass, String user, org.apache.accumulo.proxy.thrift.SystemPermission perm) throws TException {
     try {
       getConnector(userpass).securityOperations().revokeSystemPermission(user, SystemPermission.getPermissionById((byte) perm.getValue()));
     } catch (Exception e) {
@@ -673,7 +657,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void securityOperations_revokeTablePermission(UserPass userpass, String user, String table, PTablePermission perm) throws TException {
+  public void revokeTablePermission(UserPass userpass, String user, String table, org.apache.accumulo.proxy.thrift.TablePermission perm) throws TException {
     try {
       getConnector(userpass).securityOperations().revokeTablePermission(user, table, TablePermission.getPermissionById((byte) perm.getValue()));
     } catch (Exception e) {
@@ -690,7 +674,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public String createScanner(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<PIteratorSetting> iterators, PRange prange)
+  public String createScanner(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<org.apache.accumulo.proxy.thrift.IteratorSetting> iterators, org.apache.accumulo.proxy.thrift.Range prange)
       throws TException {
     try {
       Connector connector = getConnector(userpass);
@@ -705,7 +689,7 @@ public class ProxyServer implements Accu
       Scanner scanner = connector.createScanner(tableName, auth);
       
       if (iterators != null) {
-        for (PIteratorSetting iter : iterators) {
+        for (org.apache.accumulo.proxy.thrift.IteratorSetting iter : iterators) {
           IteratorSetting is = new IteratorSetting(iter.getPriority(), iter.getName(), iter.getIteratorClass(), iter.getProperties());
           scanner.addScanIterator(is);
         }
@@ -728,7 +712,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public String createBatchScanner(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<PIteratorSetting> iterators, List<PRange> pranges)
+  public String createBatchScanner(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<org.apache.accumulo.proxy.thrift.IteratorSetting> iterators, List<org.apache.accumulo.proxy.thrift.Range> pranges)
       throws TException {
     try {
       Connector connector = getConnector(userpass);
@@ -743,7 +727,7 @@ public class ProxyServer implements Accu
       BatchScanner scanner = connector.createBatchScanner(tableName, auth, 10);
       
       if (iterators != null) {
-        for (PIteratorSetting iter : iterators) {
+        for (org.apache.accumulo.proxy.thrift.IteratorSetting iter : iterators) {
           IteratorSetting is = new IteratorSetting(iter.getPriority(), iter.getName(), iter.getIteratorClass(), iter.getProperties());
           scanner.addScanIterator(is);
         }
@@ -754,7 +738,7 @@ public class ProxyServer implements Accu
       if (pranges == null) {
         ranges.add(new Range());
       } else {
-        for (PRange range : pranges) {
+        for (org.apache.accumulo.proxy.thrift.Range range : pranges) {
           Range aRange = new Range(range.getStart() == null ? null : Util.fromThrift(range.getStart()), true, range.getStop() == null ? null
               : Util.fromThrift(range.getStop()), false);
           ranges.add(aRange);
@@ -786,33 +770,33 @@ public class ProxyServer implements Accu
   @Override
   public KeyValueAndPeek scanner_next(String scanner) throws TException {
     
-    PScanResult scanResult = scanner_next_k(scanner, 1);
+    ScanResult scanResult = scanner_next_k(scanner, 1);
     if (scanResult.results.size() > 0) {
       return new KeyValueAndPeek(scanResult.results.get(0), scanResult.isMore());
     } else {
-      throw new PNoMoreEntriesException();
+      throw new NoMoreEntriesException();
     }
     
   }
   
   @Override
-  public PScanResult scanner_next_k(String scanner, int k) throws TException {
+  public ScanResult scanner_next_k(String scanner, int k) throws TException {
     
     // fetch the scanner
     ScannerPlusIterator spi = scannerCache.getIfPresent(UUID.fromString(scanner));
     if (spi == null) {
-      throw new PUnknownScanner("Scanner never existed or no longer exists");
+      throw new UnknownScanner("Scanner never existed or no longer exists");
     }
     Iterator<Map.Entry<Key,Value>> batchScanner = spi.iterator;
     // synchronized to prevent race conditions
     synchronized (batchScanner) {
-      PScanResult ret = new PScanResult();
-      ret.setResults(new ArrayList<PKeyValue>());
+      ScanResult ret = new ScanResult();
+      ret.setResults(new ArrayList<KeyValue>());
       int numRead = 0;
       try {
         while (batchScanner.hasNext() && numRead < k) {
           Map.Entry<Key,Value> next = batchScanner.next();
-          ret.addToResults(new PKeyValue(Util.toThrift(next.getKey()), ByteBuffer.wrap(next.getValue().get())));
+          ret.addToResults(new KeyValue(Util.toThrift(next.getKey()), ByteBuffer.wrap(next.getValue().get())));
           numRead++;
         }
         ret.setMore(numRead == k);
@@ -830,7 +814,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void updateAndFlush(UserPass userpass, String tableName, Map<ByteBuffer,List<PColumnUpdate>> cells) throws TException {
+  public void updateAndFlush(UserPass userpass, String tableName, Map<ByteBuffer,List<ColumnUpdate>> cells) throws TException {
     try {
       BatchWriter writer = getWriter(userpass, tableName);
       addCellsToWriter(cells, writer);
@@ -843,13 +827,13 @@ public class ProxyServer implements Accu
   
   private static final ColumnVisibility EMPTY_VIS = new ColumnVisibility();
   
-  private void addCellsToWriter(Map<ByteBuffer,List<PColumnUpdate>> cells, BatchWriter writer) throws MutationsRejectedException {
+  private void addCellsToWriter(Map<ByteBuffer,List<ColumnUpdate>> cells, BatchWriter writer) throws MutationsRejectedException {
     HashMap<Text,ColumnVisibility> vizMap = new HashMap<Text,ColumnVisibility>();
     
-    for (Entry<ByteBuffer,List<PColumnUpdate>> entry : cells.entrySet()) {
+    for (Entry<ByteBuffer,List<ColumnUpdate>> entry : cells.entrySet()) {
       Mutation m = new Mutation(ByteBufferUtil.toBytes(entry.getKey()));
       
-      for (PColumnUpdate update : entry.getValue()) {
+      for (ColumnUpdate update : entry.getValue()) {
         ColumnVisibility viz = EMPTY_VIS;
         if (update.isSetColVisibility()) {
           Text vizText = new Text(update.getColVisibility());
@@ -892,11 +876,11 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void writer_update(String writer, Map<ByteBuffer,List<PColumnUpdate>> cells) throws TException {
+  public void writer_update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells) throws TException {
     try {
       BatchWriter batchwriter = writerCache.getIfPresent(UUID.fromString(writer));
       if (batchwriter == null) {
-        throw new PUnknownWriter("Writer never existed or no longer exists");
+        throw new UnknownWriter("Writer never existed or no longer exists");
       }
       addCellsToWriter(cells, batchwriter);
     } catch (Exception e) {
@@ -909,7 +893,7 @@ public class ProxyServer implements Accu
     try {
       BatchWriter batchwriter = writerCache.getIfPresent(UUID.fromString(writer));
       if (batchwriter == null) {
-        throw new PUnknownWriter("Writer never existed or no longer exists");
+        throw new UnknownWriter("Writer never existed or no longer exists");
       }
       batchwriter.flush();
     } catch (Exception e) {
@@ -922,7 +906,7 @@ public class ProxyServer implements Accu
     try {
       BatchWriter batchwriter = writerCache.getIfPresent(UUID.fromString(writer));
       if (batchwriter == null) {
-        throw new PUnknownWriter("Writer never existed or no longer exists");
+        throw new UnknownWriter("Writer never existed or no longer exists");
       }
       batchwriter.close();
       writerCache.invalidate(UUID.fromString(writer));
@@ -935,32 +919,32 @@ public class ProxyServer implements Accu
     return getConnector(userpass).createBatchWriter(tableName, new BatchWriterConfig());
   }
   
-  private IteratorSetting getIteratorSetting(PIteratorSetting setting) {
+  private IteratorSetting getIteratorSetting(org.apache.accumulo.proxy.thrift.IteratorSetting setting) {
     return new IteratorSetting(setting.priority, setting.name, setting.iteratorClass, setting.getProperties());
   }
   
-  private IteratorScope getIteratorScope(PIteratorScope scope) {
+  private IteratorScope getIteratorScope(org.apache.accumulo.proxy.thrift.IteratorScope scope) {
     return IteratorScope.valueOf(scope.toString().toLowerCase());
   }
   
-  private EnumSet<IteratorScope> getIteratorScopes(Set<PIteratorScope> scopes) {
+  private EnumSet<IteratorScope> getIteratorScopes(Set<org.apache.accumulo.proxy.thrift.IteratorScope> scopes) {
     EnumSet<IteratorScope> scopes_ = EnumSet.noneOf(IteratorScope.class);
-    for (PIteratorScope scope : scopes) {
+    for (org.apache.accumulo.proxy.thrift.IteratorScope scope : scopes) {
       scopes_.add(getIteratorScope(scope));
     }
     return scopes_;
   }
   
-  private EnumSet<PIteratorScope> getPIteratorScopes(Set<IteratorScope> scopes) {
-    EnumSet<PIteratorScope> scopes_ = EnumSet.noneOf(PIteratorScope.class);
+  private EnumSet<org.apache.accumulo.proxy.thrift.IteratorScope> getProxyIteratorScopes(Set<IteratorScope> scopes) {
+    EnumSet<org.apache.accumulo.proxy.thrift.IteratorScope> scopes_ = EnumSet.noneOf(org.apache.accumulo.proxy.thrift.IteratorScope.class);
     for (IteratorScope scope : scopes) {
-      scopes_.add(PIteratorScope.valueOf(scope.toString().toUpperCase()));
+      scopes_.add(org.apache.accumulo.proxy.thrift.IteratorScope.valueOf(scope.toString().toUpperCase()));
     }
     return scopes_;
   }
   
   @Override
-  public void tableOperations_attachIterator(UserPass userpass, String tableName, PIteratorSetting setting, Set<PIteratorScope> scopes) throws TException {
+  public void attachIterator(UserPass userpass, String tableName, org.apache.accumulo.proxy.thrift.IteratorSetting setting, Set<org.apache.accumulo.proxy.thrift.IteratorScope> scopes) throws TException {
     try {
       getConnector(userpass).tableOperations().attachIterator(tableName, getIteratorSetting(setting), getIteratorScopes(scopes));
     } catch (Exception e) {
@@ -969,7 +953,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_checkIteratorConflicts(UserPass userpass, String tableName, PIteratorSetting setting, Set<PIteratorScope> scopes)
+  public void checkIteratorConflicts(UserPass userpass, String tableName, org.apache.accumulo.proxy.thrift.IteratorSetting setting, Set<org.apache.accumulo.proxy.thrift.IteratorScope> scopes)
       throws TException {
     try {
       getConnector(userpass).tableOperations().checkIteratorConflicts(tableName, getIteratorSetting(setting), getIteratorScopes(scopes));
@@ -979,7 +963,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_clone(UserPass userpass, String tableName, String newTableName, boolean flush, Map<String,String> propertiesToSet,
+  public void cloneTable(UserPass userpass, String tableName, String newTableName, boolean flush, Map<String,String> propertiesToSet,
       Set<String> propertiesToExclude) throws TException {
     try {
       getConnector(userpass).tableOperations().clone(tableName, newTableName, flush, propertiesToSet, propertiesToExclude);
@@ -989,7 +973,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_exportTable(UserPass userpass, String tableName, String exportDir) throws TException {
+  public void exportTable(UserPass userpass, String tableName, String exportDir) throws TException {
     try {
       getConnector(userpass).tableOperations().exportTable(tableName, exportDir);
     } catch (Exception e) {
@@ -998,7 +982,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_importTable(UserPass userpass, String tableName, String importDir) throws TException {
+  public void importTable(UserPass userpass, String tableName, String importDir) throws TException {
     try {
       getConnector(userpass).tableOperations().importTable(tableName, importDir);
     } catch (Exception e) {
@@ -1007,22 +991,22 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public PIteratorSetting tableOperations_getIteratorSetting(UserPass userpass, String tableName, String iteratorName, PIteratorScope scope) throws TException {
+  public org.apache.accumulo.proxy.thrift.IteratorSetting getIteratorSetting(UserPass userpass, String tableName, String iteratorName, org.apache.accumulo.proxy.thrift.IteratorScope scope) throws TException {
     try {
       IteratorSetting is = getConnector(userpass).tableOperations().getIteratorSetting(tableName, iteratorName, getIteratorScope(scope));
-      return new PIteratorSetting(is.getPriority(), is.getName(), is.getIteratorClass(), is.getOptions());
+      return new org.apache.accumulo.proxy.thrift.IteratorSetting(is.getPriority(), is.getName(), is.getIteratorClass(), is.getOptions());
     } catch (Exception e) {
       throw translateException(e);
     }
   }
   
   @Override
-  public Map<String,Set<PIteratorScope>> tableOperations_listIterators(UserPass userpass, String tableName) throws TException {
+  public Map<String,Set<org.apache.accumulo.proxy.thrift.IteratorScope>> listIterators(UserPass userpass, String tableName) throws TException {
     try {
       Map<String,EnumSet<IteratorScope>> iterMap = getConnector(userpass).tableOperations().listIterators(tableName);
-      Map<String,Set<PIteratorScope>> result = new HashMap<String,Set<PIteratorScope>>();
+      Map<String,Set<org.apache.accumulo.proxy.thrift.IteratorScope>> result = new HashMap<String,Set<org.apache.accumulo.proxy.thrift.IteratorScope>>();
       for (Entry<String,EnumSet<IteratorScope>> entry : iterMap.entrySet()) {
-        result.put(entry.getKey(), getPIteratorScopes(entry.getValue()));
+        result.put(entry.getKey(), getProxyIteratorScopes(entry.getValue()));
       }
       return result;
     } catch (Exception e) {
@@ -1031,7 +1015,7 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public void tableOperations_removeIterator(UserPass userpass, String tableName, String iterName, Set<PIteratorScope> scopes) throws TException {
+  public void removeIterator(UserPass userpass, String tableName, String iterName, Set<org.apache.accumulo.proxy.thrift.IteratorScope> scopes) throws TException {
     try {
       getConnector(userpass).tableOperations().removeIterator(tableName, iterName, getIteratorScopes(scopes));
     } catch (Exception e) {
@@ -1040,12 +1024,12 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public Set<PRange> tableOperations_splitRangeByTablets(UserPass userpass, String tableName, PRange range, int maxSplits) throws TException {
+  public Set<org.apache.accumulo.proxy.thrift.Range> splitRangeByTablets(UserPass userpass, String tableName, org.apache.accumulo.proxy.thrift.Range range, int maxSplits) throws TException {
     try {
       Set<Range> ranges = getConnector(userpass).tableOperations().splitRangeByTablets(tableName, getRange(range), maxSplits);
-      Set<PRange> result = new HashSet<PRange>();
+      Set<org.apache.accumulo.proxy.thrift.Range> result = new HashSet<org.apache.accumulo.proxy.thrift.Range>();
       for (Range r : ranges) {
-        result.add(getPRange(r));
+        result.add(getRange(r));
       }
       return result;
     } catch (Exception e) {
@@ -1053,30 +1037,30 @@ public class ProxyServer implements Accu
     }
   }
   
-  private PRange getPRange(Range r) {
-    return new PRange(getPKey(r.getStartKey()), r.isStartKeyInclusive(), getPKey(r.getEndKey()), r.isEndKeyInclusive());
+  private org.apache.accumulo.proxy.thrift.Range getRange(Range r) {
+    return new org.apache.accumulo.proxy.thrift.Range(getProxyKey(r.getStartKey()), r.isStartKeyInclusive(), getProxyKey(r.getEndKey()), r.isEndKeyInclusive());
   }
   
-  private PKey getPKey(Key k) {
+  private org.apache.accumulo.proxy.thrift.Key getProxyKey(Key k) {
     if (k == null)
       return null;
-    PKey result = new PKey(TextUtil.getByteBuffer(k.getRow()), TextUtil.getByteBuffer(k.getColumnFamily()), TextUtil.getByteBuffer(k.getColumnQualifier()),
+    org.apache.accumulo.proxy.thrift.Key result = new org.apache.accumulo.proxy.thrift.Key(TextUtil.getByteBuffer(k.getRow()), TextUtil.getByteBuffer(k.getColumnFamily()), TextUtil.getByteBuffer(k.getColumnQualifier()),
         TextUtil.getByteBuffer(k.getColumnVisibility()));
     return result;
   }
   
-  private Range getRange(PRange range) {
+  private Range getRange(org.apache.accumulo.proxy.thrift.Range range) {
     return new Range(getKey(range.start), getKey(range.stop));
   }
   
-  private Key getKey(PKey start) {
+  private Key getKey(org.apache.accumulo.proxy.thrift.Key start) {
     if (start == null)
       return null;
     return new Key(start.getRow(), start.getColFamily(), start.getColQualifier(), start.getColVisibility(), 0);
   }
   
   @Override
-  public void tableOperations_importDirectory(UserPass userpass, String tableName, String importDir, String failureDir, boolean setTime) throws TException {
+  public void importDirectory(UserPass userpass, String tableName, String importDir, String failureDir, boolean setTime) throws TException {
     try {
       getConnector(userpass).tableOperations().importDirectory(tableName, importDir, failureDir, setTime);
     } catch (Exception e) {
@@ -1088,20 +1072,20 @@ public class ProxyServer implements Accu
   static private final ByteBuffer EMPTY = ByteBuffer.wrap(new byte[] {});
   
   @Override
-  public PRange getRowRange(ByteBuffer row) throws TException {
-    return new PRange(new PKey(row, EMPTY, EMPTY, EMPTY), true, new PKey(row, EMPTY, EMPTY, EMPTY), true);
+  public org.apache.accumulo.proxy.thrift.Range getRowRange(ByteBuffer row) throws TException {
+    return new org.apache.accumulo.proxy.thrift.Range(new org.apache.accumulo.proxy.thrift.Key(row, EMPTY, EMPTY, EMPTY), true, new org.apache.accumulo.proxy.thrift.Key(row, EMPTY, EMPTY, EMPTY), true);
   }
   
   @Override
-  public PKey getFollowing(PKey key, PPartialKey part) throws TException {
+  public org.apache.accumulo.proxy.thrift.Key getFollowing(org.apache.accumulo.proxy.thrift.Key key, org.apache.accumulo.proxy.thrift.PartialKey part) throws TException {
     Key key_ = getKey(key);
     PartialKey part_ = PartialKey.valueOf(part.toString());
     Key followingKey = key_.followingKey(part_);
-    return getPKey(followingKey);
+    return getProxyKey(followingKey);
   }
   
   @Override
-  public void instanceOperations_pingTabletServer(UserPass userpass, String tserver) throws TException {
+  public void pingTabletServer(UserPass userpass, String tserver) throws TException {
     try {
       getConnector(userpass).instanceOperations().ping(tserver);
     } catch (Exception e) {

Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java?rev=1437603&r1=1437602&r2=1437603&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java Wed Jan 23 17:59:58 2013
@@ -26,10 +26,10 @@ import java.util.Map;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.iterators.user.RegExFilter;
 import org.apache.accumulo.proxy.thrift.AccumuloProxy;
-import org.apache.accumulo.proxy.thrift.PColumnUpdate;
-import org.apache.accumulo.proxy.thrift.PKey;
-import org.apache.accumulo.proxy.thrift.PScanResult;
-import org.apache.accumulo.proxy.thrift.PTimeType;
+import org.apache.accumulo.proxy.thrift.ColumnUpdate;
+import org.apache.accumulo.proxy.thrift.Key;
+import org.apache.accumulo.proxy.thrift.ScanResult;
+import org.apache.accumulo.proxy.thrift.TimeType;
 import org.apache.accumulo.proxy.thrift.UserPass;
 import org.apache.thrift.protocol.TCompactProtocol;
 import org.apache.thrift.protocol.TProtocol;
@@ -64,35 +64,35 @@ public class TestProxyClient {
     userpass.setPassword("secret".getBytes());
     
     System.out.println("Creating user: ");
-    if (!tpc.proxy().securityOperations_listUsers(userpass).contains("testuser")) {
-      tpc.proxy().securityOperations_createUser(userpass, "testuser", ByteBuffer.wrap("testpass".getBytes()));
+    if (!tpc.proxy().listUsers(userpass).contains("testuser")) {
+      tpc.proxy().createUser(userpass, "testuser", ByteBuffer.wrap("testpass".getBytes()));
     }
-    System.out.println("UserList: " + tpc.proxy().securityOperations_listUsers(userpass));
+    System.out.println("UserList: " + tpc.proxy().listUsers(userpass));
     
     System.out.println("Pinging: " + tpc.proxy().ping(userpass));
-    System.out.println("Listing: " + tpc.proxy().tableOperations_list(userpass));
+    System.out.println("Listing: " + tpc.proxy().listTables(userpass));
     
     System.out.println("Deleting: ");
     String testTable = "testtableOMGOMGOMG";
     
     System.out.println("Creating: ");
     
-    if (tpc.proxy().tableOperations_exists(userpass, testTable))
-      tpc.proxy().tableOperations_delete(userpass, testTable);
+    if (tpc.proxy().tableExists(userpass, testTable))
+      tpc.proxy().deleteTable(userpass, testTable);
     
-    tpc.proxy().tableOperations_create(userpass, testTable, true, PTimeType.MILLIS);
+    tpc.proxy().createTable(userpass, testTable, true, TimeType.MILLIS);
     
-    System.out.println("Listing: " + tpc.proxy().tableOperations_list(userpass));
+    System.out.println("Listing: " + tpc.proxy().listTables(userpass));
     
     System.out.println("Writing: ");
     Date start = new Date();
     Date then = new Date();
     int maxInserts = 1000000;
     String format = "%1$05d";
-    Map<ByteBuffer,List<PColumnUpdate>> mutations = new HashMap<ByteBuffer,List<PColumnUpdate>>();
+    Map<ByteBuffer,List<ColumnUpdate>> mutations = new HashMap<ByteBuffer,List<ColumnUpdate>>();
     for (int i = 0; i < maxInserts; i++) {
       String result = String.format(format, i);
-      PColumnUpdate update = new PColumnUpdate(ByteBuffer.wrap(("cf" + i).getBytes()), ByteBuffer.wrap(("cq" + i).getBytes()));
+      ColumnUpdate update = new ColumnUpdate(ByteBuffer.wrap(("cf" + i).getBytes()), ByteBuffer.wrap(("cq" + i).getBytes()));
       update.setValue(Util.randStringBuffer(10));
       mutations.put(ByteBuffer.wrap(result.getBytes()), Collections.singletonList(update));
       
@@ -105,8 +105,8 @@ public class TestProxyClient {
     Date end = new Date();
     System.out.println(" End of writing: " + (end.getTime() - start.getTime()));
     
-    tpc.proxy().tableOperations_delete(userpass, testTable);
-    tpc.proxy().tableOperations_create(userpass, testTable, true, PTimeType.MILLIS);
+    tpc.proxy().deleteTable(userpass, testTable);
+    tpc.proxy().createTable(userpass, testTable, true, TimeType.MILLIS);
     
     // Thread.sleep(1000);
     
@@ -117,9 +117,9 @@ public class TestProxyClient {
     String writer = tpc.proxy().createWriter(userpass, testTable);
     for (int i = 0; i < maxInserts; i++) {
       String result = String.format(format, i);
-      PKey pkey = new PKey();
+      Key pkey = new Key();
       pkey.setRow(result.getBytes());
-      PColumnUpdate update = new PColumnUpdate(ByteBuffer.wrap(("cf" + i).getBytes()), ByteBuffer.wrap(("cq" + i).getBytes()));
+      ColumnUpdate update = new ColumnUpdate(ByteBuffer.wrap(("cf" + i).getBytes()), ByteBuffer.wrap(("cq" + i).getBytes()));
       update.setValue(Util.randStringBuffer(10));
       mutations.put(ByteBuffer.wrap(result.getBytes()), Collections.singletonList(update));
       tpc.proxy().writer_update(writer, mutations);
@@ -141,7 +141,7 @@ public class TestProxyClient {
     IteratorSetting is = new IteratorSetting(50, regex, RegExFilter.class);
     RegExFilter.setRegexs(is, null, regex, null, null, false);
     
-    PKey stop = new PKey();
+    Key stop = new Key();
     stop.setRow("5".getBytes());
     String cookie = tpc.proxy().createBatchScanner(userpass, testTable, null, null, null);
     
@@ -152,7 +152,7 @@ public class TestProxyClient {
     
     int k = 1000;
     while (hasNext) {
-      PScanResult kvList = tpc.proxy().scanner_next_k(cookie, k);
+      ScanResult kvList = tpc.proxy().scanner_next_k(cookie, k);
       
       Date now = new Date();
       System.out.println(i + " " + (now.getTime() - then.getTime()));

Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Util.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Util.java?rev=1437603&r1=1437602&r2=1437603&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Util.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Util.java Wed Jan 23 17:59:58 2013
@@ -16,10 +16,8 @@
  */
 package org.apache.accumulo.proxy;
 
-import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.proxy.thrift.PIteratorSetting;
-import org.apache.accumulo.proxy.thrift.PKey;
+import org.apache.accumulo.proxy.thrift.IteratorSetting;
+import org.apache.accumulo.proxy.thrift.Key;
 
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
@@ -37,19 +35,19 @@ public class Util {
     return ByteBuffer.wrap(new BigInteger(numbytes * 5, random).toString(32).getBytes());
   }
   
-  public static PIteratorSetting iteratorSetting2ProxyIteratorSetting(IteratorSetting is) {
-    return new PIteratorSetting(is.getPriority(), is.getName(), is.getIteratorClass(), is.getOptions());
+  public static IteratorSetting iteratorSetting2ProxyIteratorSetting(org.apache.accumulo.core.client.IteratorSetting is) {
+    return new IteratorSetting(is.getPriority(), is.getName(), is.getIteratorClass(), is.getOptions());
   }
   
-  public static PKey toThrift(Key key) {
-    PKey pkey = new PKey(ByteBuffer.wrap(key.getRow().getBytes()), ByteBuffer.wrap(key.getColumnFamily().getBytes()), ByteBuffer.wrap(key.getColumnQualifier()
+  public static Key toThrift(org.apache.accumulo.core.data.Key key) {
+    Key pkey = new Key(ByteBuffer.wrap(key.getRow().getBytes()), ByteBuffer.wrap(key.getColumnFamily().getBytes()), ByteBuffer.wrap(key.getColumnQualifier()
         .getBytes()), ByteBuffer.wrap(key.getColumnVisibility().getBytes()));
     pkey.setTimestamp(key.getTimestamp());
     return pkey;
   }
   
-  public static Key fromThrift(PKey pkey) {
-    return new Key(deNullify(pkey.getRow()), deNullify(pkey.getColFamily()), deNullify(pkey.getColQualifier()), deNullify(pkey.getColVisibility()),
+  public static org.apache.accumulo.core.data.Key fromThrift(Key pkey) {
+    return new org.apache.accumulo.core.data.Key(deNullify(pkey.getRow()), deNullify(pkey.getColFamily()), deNullify(pkey.getColQualifier()), deNullify(pkey.getColVisibility()),
         pkey.getTimestamp());
   }
   

Added: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java?rev=1437603&view=auto
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java (added)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java Wed Jan 23 17:59:58 2013
@@ -0,0 +1,386 @@
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.accumulo.proxy.thrift;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AccumuloException extends TException implements org.apache.thrift.TBase<AccumuloException, AccumuloException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AccumuloException");
+
+  private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new AccumuloExceptionStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new AccumuloExceptionTupleSchemeFactory());
+  }
+
+  public String msg; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MSG((short)1, "msg");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MSG
+          return MSG;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MSG, new org.apache.thrift.meta_data.FieldMetaData("msg", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AccumuloException.class, metaDataMap);
+  }
+
+  public AccumuloException() {
+  }
+
+  public AccumuloException(
+    String msg)
+  {
+    this();
+    this.msg = msg;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public AccumuloException(AccumuloException other) {
+    if (other.isSetMsg()) {
+      this.msg = other.msg;
+    }
+  }
+
+  public AccumuloException deepCopy() {
+    return new AccumuloException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.msg = null;
+  }
+
+  public String getMsg() {
+    return this.msg;
+  }
+
+  public AccumuloException setMsg(String msg) {
+    this.msg = msg;
+    return this;
+  }
+
+  public void unsetMsg() {
+    this.msg = null;
+  }
+
+  /** Returns true if field msg is set (has been assigned a value) and false otherwise */
+  public boolean isSetMsg() {
+    return this.msg != null;
+  }
+
+  public void setMsgIsSet(boolean value) {
+    if (!value) {
+      this.msg = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MSG:
+      if (value == null) {
+        unsetMsg();
+      } else {
+        setMsg((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MSG:
+      return getMsg();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MSG:
+      return isSetMsg();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof AccumuloException)
+      return this.equals((AccumuloException)that);
+    return false;
+  }
+
+  public boolean equals(AccumuloException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_msg = true && this.isSetMsg();
+    boolean that_present_msg = true && that.isSetMsg();
+    if (this_present_msg || that_present_msg) {
+      if (!(this_present_msg && that_present_msg))
+        return false;
+      if (!this.msg.equals(that.msg))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(AccumuloException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    AccumuloException typedOther = (AccumuloException)other;
+
+    lastComparison = Boolean.valueOf(isSetMsg()).compareTo(typedOther.isSetMsg());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMsg()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.msg, typedOther.msg);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("AccumuloException(");
+    boolean first = true;
+
+    sb.append("msg:");
+    if (this.msg == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.msg);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    // check for sub-struct validity
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private static class AccumuloExceptionStandardSchemeFactory implements SchemeFactory {
+    public AccumuloExceptionStandardScheme getScheme() {
+      return new AccumuloExceptionStandardScheme();
+    }
+  }
+
+  private static class AccumuloExceptionStandardScheme extends StandardScheme<AccumuloException> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, AccumuloException struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // MSG
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.msg = iprot.readString();
+              struct.setMsgIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, AccumuloException struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.msg != null) {
+        oprot.writeFieldBegin(MSG_FIELD_DESC);
+        oprot.writeString(struct.msg);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class AccumuloExceptionTupleSchemeFactory implements SchemeFactory {
+    public AccumuloExceptionTupleScheme getScheme() {
+      return new AccumuloExceptionTupleScheme();
+    }
+  }
+
+  private static class AccumuloExceptionTupleScheme extends TupleScheme<AccumuloException> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, AccumuloException struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetMsg()) {
+        optionals.set(0);
+      }
+      oprot.writeBitSet(optionals, 1);
+      if (struct.isSetMsg()) {
+        oprot.writeString(struct.msg);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, AccumuloException struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(1);
+      if (incoming.get(0)) {
+        struct.msg = iprot.readString();
+        struct.setMsgIsSet(true);
+      }
+    }
+  }
+
+}
+

Propchange: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message