accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1405202 [1/2] - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/client/mapreduce/ core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/ core/sr...
Date Fri, 02 Nov 2012 22:50:02 GMT
Author: vines
Date: Fri Nov  2 22:49:59 2012
New Revision: 1405202

URL: http://svn.apache.org/viewvc?rev=1405202&view=rev
Log:
Reverting 1403871 from ACCUMULO-836 until the discussion
http://mail-archives.apache.org/mod_mbox/accumulo-dev/201210.mbox/%3CCAOiJXP4Nenbv7dMkzTGaOeHguPJEHV7hc2CV7BGZWUfovmaPZQ@mail.gmail.com%3E is resolved


Modified:
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/InstanceUserPassword.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Encoding.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Merge.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TextUtil.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateUserCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/PasswdCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/QuotedStringTokenizer.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/ZooKeeperStatus.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/UniqueNameAllocator.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Admin.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/RandomWriter.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TablePropUtil.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooQueueLock.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java Fri Nov  2 22:49:59 2012
@@ -20,7 +20,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -109,8 +108,6 @@ public class TableOperationsImpl extends
   private AuthInfo credentials;
   
   private static final Logger log = Logger.getLogger(TableOperations.class);
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   /**
    * @param instance
@@ -191,7 +188,7 @@ public class TableOperationsImpl extends
   public void create(String tableName, boolean limitVersion, TimeType timeType) throws AccumuloException, AccumuloSecurityException, TableExistsException {
     ArgumentChecker.notNull(tableName, timeType);
     
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(utf8)), ByteBuffer.wrap(timeType.name().getBytes(utf8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes()), ByteBuffer.wrap(timeType.name().getBytes()));
     
     Map<String,String> opts = IteratorUtil.generateInitialTableProperties(limitVersion);
     
@@ -488,7 +485,7 @@ public class TableOperationsImpl extends
     
     ArgumentChecker.notNull(tableName);
     ByteBuffer EMPTY = ByteBuffer.allocate(0);
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(utf8)), start == null ? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes()), start == null ? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
         : TextUtil.getByteBuffer(end));
     Map<String,String> opts = new HashMap<String,String>();
     try {
@@ -503,7 +500,7 @@ public class TableOperationsImpl extends
     
     ArgumentChecker.notNull(tableName);
     ByteBuffer EMPTY = ByteBuffer.allocate(0);
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(utf8)), start == null ? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes()), start == null ? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
         : TextUtil.getByteBuffer(end));
     Map<String,String> opts = new HashMap<String,String>();
     try {
@@ -600,7 +597,7 @@ public class TableOperationsImpl extends
   public void delete(String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
     ArgumentChecker.notNull(tableName);
     
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(utf8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes()));
     Map<String,String> opts = new HashMap<String,String>();
     
     try {
@@ -626,7 +623,7 @@ public class TableOperationsImpl extends
     if (!Collections.disjoint(propertiesToExclude, propertiesToSet.keySet()))
       throw new IllegalArgumentException("propertiesToSet and propertiesToExclude not disjoint");
     
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(srcTableId.getBytes(utf8)), ByteBuffer.wrap(newTableName.getBytes(utf8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(srcTableId.getBytes()), ByteBuffer.wrap(newTableName.getBytes()));
     Map<String,String> opts = new HashMap<String,String>();
     opts.putAll(propertiesToSet);
     for (String prop : propertiesToExclude)
@@ -654,7 +651,7 @@ public class TableOperationsImpl extends
   public void rename(String oldTableName, String newTableName) throws AccumuloSecurityException, TableNotFoundException, AccumuloException,
       TableExistsException {
     
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(oldTableName.getBytes(utf8)), ByteBuffer.wrap(newTableName.getBytes(utf8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(oldTableName.getBytes()), ByteBuffer.wrap(newTableName.getBytes()));
     Map<String,String> opts = new HashMap<String,String>();
     doTableOperation(TableOperation.RENAME, args, opts);
   }
@@ -703,7 +700,7 @@ public class TableOperationsImpl extends
     if (flush)
       _flush(tableId, start, end, true);
     
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes(utf8)), start == null ? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableId.getBytes()), start == null ? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
         : TextUtil.getByteBuffer(end), ByteBuffer.wrap(IteratorUtil.encodeIteratorSettings(iterators)));
 
     Map<String,String> opts = new HashMap<String,String>();
@@ -1020,8 +1017,8 @@ public class TableOperationsImpl extends
       throw new AccumuloException("Bulk import failure directory " + failPath + " is not empty");
     }
     
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(utf8)), ByteBuffer.wrap(dir.getBytes(utf8)), ByteBuffer.wrap(failureDir.getBytes(utf8)),
-        ByteBuffer.wrap((setTime + "").getBytes(utf8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes()), ByteBuffer.wrap(dir.getBytes()), ByteBuffer.wrap(failureDir.getBytes()),
+        ByteBuffer.wrap((setTime + "").getBytes()));
     Map<String,String> opts = new HashMap<String,String>();
     
     try {
@@ -1047,7 +1044,7 @@ public class TableOperationsImpl extends
   public void offline(String tableName) throws AccumuloSecurityException, AccumuloException, TableNotFoundException {
     
     ArgumentChecker.notNull(tableName);
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(utf8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes()));
     Map<String,String> opts = new HashMap<String,String>();
     
     try {
@@ -1070,7 +1067,7 @@ public class TableOperationsImpl extends
    */
   public void online(String tableName) throws AccumuloSecurityException, AccumuloException, TableNotFoundException {
     ArgumentChecker.notNull(tableName);
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(utf8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes()));
     Map<String,String> opts = new HashMap<String,String>();
     
     try {
@@ -1155,7 +1152,7 @@ public class TableOperationsImpl extends
       Logger.getLogger(this.getClass()).warn("Failed to check if imported table references external java classes : " + ioe.getMessage());
     }
     
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(utf8)), ByteBuffer.wrap(importDir.getBytes(utf8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes()), ByteBuffer.wrap(importDir.getBytes()));
     
     Map<String,String> opts = Collections.emptyMap();
     
@@ -1172,7 +1169,7 @@ public class TableOperationsImpl extends
   public void exportTable(String tableName, String exportDir) throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(tableName, exportDir);
     
-    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes(utf8)), ByteBuffer.wrap(exportDir.getBytes(utf8)));
+    List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes()), ByteBuffer.wrap(exportDir.getBytes()));
     
     Map<String,String> opts = Collections.emptyMap();
     

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.client.mapreduce;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.concurrent.TimeUnit;
@@ -67,8 +66,6 @@ import org.apache.log4j.Logger;
 public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> {
   private static final Logger log = Logger.getLogger(AccumuloOutputFormat.class);
   
-  private static final Charset utf8 = Charset.forName("UTF8");
-  
   private static final String PREFIX = AccumuloOutputFormat.class.getSimpleName();
   private static final String OUTPUT_INFO_HAS_BEEN_SET = PREFIX + ".configured";
   private static final String INSTANCE_HAS_BEEN_SET = PREFIX + ".instanceConfigured";
@@ -187,7 +184,7 @@ public class AccumuloOutputFormat extend
    * string, and is not intended to be secure.
    */
   protected static byte[] getPassword(Configuration conf) {
-    return Base64.decodeBase64(conf.get(PASSWORD, "").getBytes(utf8));
+    return Base64.decodeBase64(conf.get(PASSWORD, "").getBytes());
   }
   
   protected static boolean canCreateTables(Configuration conf) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Fri Nov  2 22:49:59 2012
@@ -26,7 +26,6 @@ import java.io.IOException;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -105,8 +104,6 @@ import org.apache.log4j.Logger;
 public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
   protected static final Logger log = Logger.getLogger(InputFormatBase.class);
   
-  private static final Charset utf8 = Charset.forName("UTF8");
-
   private static final String PREFIX = AccumuloInputFormat.class.getSimpleName();
   private static final String INPUT_INFO_HAS_BEEN_SET = PREFIX + ".configured";
   private static final String INSTANCE_HAS_BEEN_SET = PREFIX + ".instanceConfigured";
@@ -423,7 +420,7 @@ public abstract class InputFormatBase<K,
    * @see #setInputInfo(Configuration, String, byte[], String, Authorizations)
    */
   protected static byte[] getPassword(Configuration conf) {
-    return Base64.decodeBase64(conf.get(PASSWORD, "").getBytes(utf8));
+    return Base64.decodeBase64(conf.get(PASSWORD, "").getBytes());
   }
   
   /**
@@ -448,7 +445,7 @@ public abstract class InputFormatBase<K,
    */
   protected static Authorizations getAuthorizations(Configuration conf) {
     String authString = conf.get(AUTHORIZATIONS);
-    return authString == null ? Constants.NO_AUTHS : new Authorizations(authString.getBytes(utf8));
+    return authString == null ? Constants.NO_AUTHS : new Authorizations(authString.getBytes());
   }
   
   /**
@@ -499,7 +496,7 @@ public abstract class InputFormatBase<K,
   protected static List<Range> getRanges(Configuration conf) throws IOException {
     ArrayList<Range> ranges = new ArrayList<Range>();
     for (String rangeString : conf.getStringCollection(RANGES)) {
-      ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(rangeString.getBytes(utf8)));
+      ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(rangeString.getBytes()));
       Range range = new Range();
       range.readFields(new DataInputStream(bais));
       ranges.add(range);
@@ -519,8 +516,8 @@ public abstract class InputFormatBase<K,
     Set<Pair<Text,Text>> columns = new HashSet<Pair<Text,Text>>();
     for (String col : conf.getStringCollection(COLUMNS)) {
       int idx = col.indexOf(":");
-      Text cf = new Text(idx < 0 ? Base64.decodeBase64(col.getBytes(utf8)) : Base64.decodeBase64(col.substring(0, idx).getBytes(utf8)));
-      Text cq = idx < 0 ? null : new Text(Base64.decodeBase64(col.substring(idx + 1).getBytes(utf8)));
+      Text cf = new Text(idx < 0 ? Base64.decodeBase64(col.getBytes()) : Base64.decodeBase64(col.substring(0, idx).getBytes()));
+      Text cq = idx < 0 ? null : new Text(Base64.decodeBase64(col.substring(idx + 1).getBytes()));
       columns.add(new Pair<Text,Text>(cf, cq));
     }
     return columns;
@@ -627,7 +624,7 @@ public abstract class InputFormatBase<K,
     try {
       while (tokens.hasMoreTokens()) {
         String itstring = tokens.nextToken();
-        ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(itstring.getBytes(utf8)));
+        ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(itstring.getBytes()));
         list.add(new IteratorSetting(new DataInputStream(bais)));
         bais.close();
       }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java Fri Nov  2 22:49:59 2012
@@ -21,7 +21,6 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.net.URI;
-import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Scanner;
 import java.util.TreeSet;
@@ -45,8 +44,6 @@ public class RangePartitioner extends Pa
   private static final String NUM_SUBBINS = PREFIX + ".subBins";
   
   private Configuration conf;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public int getPartition(Text key, Writable value, int numPartitions) {
     try {
@@ -92,7 +89,7 @@ public class RangePartitioner extends Pa
             Scanner in = new Scanner(new BufferedReader(new FileReader(path.toString())));
             try {
               while (in.hasNextLine())
-                cutPoints.add(new Text(Base64.decodeBase64(in.nextLine().getBytes(utf8))));
+                cutPoints.add(new Text(Base64.decodeBase64(in.nextLine().getBytes())));
             } finally {
               in.close();
             }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java Fri Nov  2 22:49:59 2012
@@ -21,7 +21,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Writer;
-import java.nio.charset.Charset;
 
 import jline.ConsoleReader;
 
@@ -36,8 +35,6 @@ public class MockShell extends Shell {
   
   protected InputStream in;
   protected Writer writer;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public MockShell(InputStream in, Writer writer) throws IOException {
     super();
@@ -135,6 +132,6 @@ public class MockShell extends Shell {
       sb.append(command).append(NEWLINE);
     }
     
-    return new ByteArrayInputStream(sb.toString().getBytes(utf8));
+    return new ByteArrayInputStream(sb.toString().getBytes());
   }
 }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java Fri Nov  2 22:49:59 2012
@@ -17,14 +17,11 @@
 package org.apache.accumulo.core.data;
 
 import java.io.Serializable;
-import java.nio.charset.Charset;
 
 public class ArrayByteSequence extends ByteSequence implements Serializable {
   
   private static final long serialVersionUID = 1L;
 
-  private static final Charset utf8 = Charset.forName("UTF8");
-  
   protected byte data[];
   protected int offset;
   protected int length;
@@ -48,7 +45,7 @@ public class ArrayByteSequence extends B
   }
   
   public ArrayByteSequence(String s) {
-    this(s.getBytes(utf8));
+    this(s.getBytes());
   }
   
   @Override

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java Fri Nov  2 22:49:59 2012
@@ -22,7 +22,6 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -402,8 +401,6 @@ public class BloomFilterLayer {
   }
   
   public static void main(String[] args) throws IOException {
-    final Charset utf8 = Charset.forName("UTF8");
-
     PrintStream out = System.out;
     
     Random r = new Random();
@@ -437,8 +434,8 @@ public class BloomFilterLayer {
     
     for (Integer i : vals) {
       String fi = String.format("%010d", i);
-      bmfw.append(new org.apache.accumulo.core.data.Key(new Text("r" + fi), new Text("cf1")), new Value(("v" + fi).getBytes(utf8)));
-      bmfw.append(new org.apache.accumulo.core.data.Key(new Text("r" + fi), new Text("cf2")), new Value(("v" + fi).getBytes(utf8)));
+      bmfw.append(new org.apache.accumulo.core.data.Key(new Text("r" + fi), new Text("cf1")), new Value(("v" + fi).getBytes()));
+      bmfw.append(new org.apache.accumulo.core.data.Key(new Text("r" + fi), new Text("cf2")), new Value(("v" + fi).getBytes()));
     }
     
     long t2 = System.currentTimeMillis();

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java Fri Nov  2 22:49:59 2012
@@ -22,7 +22,6 @@ import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -1100,8 +1099,6 @@ public class RFile {
     int max_row = 10000;
     int max_cf = 10;
     int max_cq = 10;
-
-    Charset utf8 = Charset.forName("UTF8");
     
     // FSDataOutputStream fsout = fs.create(new Path("/tmp/test.rf"));
     
@@ -1119,7 +1116,7 @@ public class RFile {
         Text cf = new Text(String.format("CF%06d", j));
         for (int k = 0; k < max_cq; k++) {
           Text cq = new Text(String.format("CQ%06d", k));
-          w.append(new Key(row, cf, cq), new Value((c++ + "").getBytes(utf8)));
+          w.append(new Key(row, cf, cq), new Value((c++ + "").getBytes()));
         }
       }
     }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/ColumnFamilyCounter.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.iterators;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Map;
 
@@ -31,8 +30,6 @@ public class ColumnFamilyCounter impleme
   private SortedKeyValueIterator<Key,Value> source;
   private Key key;
   private Value value;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   @Override
   public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
@@ -61,7 +58,7 @@ public class ColumnFamilyCounter impleme
       }
       
       this.key = new Key(currentRow.toArray(), currentColf.toArray(), new byte[0], new byte[0], ts);
-      this.value = new Value(Integer.toString(count).getBytes(utf8));
+      this.value = new Value(Integer.toString(count).getBytes());
       
     } else {
       this.key = null;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java Fri Nov  2 22:49:59 2012
@@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.Map;
 
 import org.apache.accumulo.core.client.IteratorSetting;
@@ -46,8 +45,6 @@ public abstract class LongCombiner exten
   
   protected static final String TYPE = "type";
   protected static final String CLASS_PREFIX = "class:";
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public static enum Type {
     /**
@@ -176,7 +173,7 @@ public abstract class LongCombiner exten
   public static class StringEncoder implements Encoder<Long> {
     @Override
     public byte[] encode(Long v) {
-      return Long.toString(v).getBytes(utf8);
+      return Long.toString(v).getBytes();
     }
     
     @Override

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java Fri Nov  2 22:49:59 2012
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.iterators.aggregation;
 
-import java.nio.charset.Charset;
-
 import org.apache.accumulo.core.data.Value;
 
 /**
@@ -28,10 +26,8 @@ public class StringMax implements Aggreg
   
   long max = Long.MIN_VALUE;
   
-  private static final Charset utf8 = Charset.forName("UTF8");
-  
   public Value aggregate() {
-    return new Value(Long.toString(max).getBytes(utf8));
+    return new Value(Long.toString(max).getBytes());
   }
   
   public void collect(Value value) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java Fri Nov  2 22:49:59 2012
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.iterators.aggregation;
 
-import java.nio.charset.Charset;
-
 import org.apache.accumulo.core.data.Value;
 
 /**
@@ -28,10 +26,8 @@ public class StringMin implements Aggreg
   
   long min = Long.MAX_VALUE;
   
-  private static final Charset utf8 = Charset.forName("UTF8");
-  
   public Value aggregate() {
-    return new Value(Long.toString(min).getBytes(utf8));
+    return new Value(Long.toString(min).getBytes());
   }
   
   public void collect(Value value) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java Fri Nov  2 22:49:59 2012
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.iterators.aggregation;
 
-import java.nio.charset.Charset;
-
 import org.apache.accumulo.core.data.Value;
 
 /**
@@ -28,10 +26,8 @@ public class StringSummation implements 
   
   long sum = 0;
   
-  private static final Charset utf8 = Charset.forName("UTF8");
-  
   public Value aggregate() {
-    return new Value(Long.toString(sum).getBytes(utf8));
+    return new Value(Long.toString(sum).getBytes());
   }
   
   public void collect(Value value) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java Fri Nov  2 22:49:59 2012
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.core.iterators.conf;
 
-import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -33,8 +32,6 @@ public class ColumnSet {
   
   private ColHashKey lookupCol = new ColHashKey();
   private ColFamHashKey lookupCF = new ColFamHashKey();
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public ColumnSet() {
     objectsCF = new HashSet<ColFamHashKey>();
@@ -138,7 +135,7 @@ public class ColumnSet {
   static Text decode(String s) {
     Text t = new Text();
     
-    byte[] sb = s.getBytes(utf8);
+    byte[] sb = s.getBytes();
     
     // very inefficient code
     for (int i = 0; i < sb.length; i++) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.iterators.user;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Map;
 
@@ -36,8 +35,6 @@ public class GrepIterator extends Filter
   
   private byte term[];
   
-  private static final Charset utf8 = Charset.forName("UTF8");
-    
   @Override
   public boolean accept(Key k, Value v) {
     return match(v.get()) || match(k.getRowData()) || match(k.getColumnFamilyData()) || match(k.getColumnQualifierData());
@@ -91,7 +88,7 @@ public class GrepIterator extends Filter
   @Override
   public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
     super.init(source, options, env);
-    term = options.get("term").getBytes(utf8);
+    term = options.get("term").getBytes();
   }
   
   /**

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.iterators.user;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
@@ -61,8 +60,6 @@ public class IntersectingIterator implem
   
   protected Text nullText = new Text();
   
-  private static final Charset utf8 = Charset.forName("UTF8");
-  
   protected Text getPartition(Key key) {
     return key.getRow();
   }
@@ -420,7 +417,7 @@ public class IntersectingIterator implem
     String[] columnStrings = columns.split("\n");
     Text[] columnTexts = new Text[columnStrings.length];
     for (int i = 0; i < columnStrings.length; i++) {
-      columnTexts[i] = new Text(Base64.decodeBase64(columnStrings[i].getBytes(utf8)));
+      columnTexts[i] = new Text(Base64.decodeBase64(columnStrings[i].getBytes()));
     }
     return columnTexts;
   }
@@ -434,7 +431,7 @@ public class IntersectingIterator implem
     if (flags == null)
       return null;
     
-    byte[] bytes = Base64.decodeBase64(flags.getBytes(utf8));
+    byte[] bytes = Base64.decodeBase64(flags.getBytes());
     boolean[] bFlags = new boolean[bytes.length];
     for (int i = 0; i < bytes.length; i++) {
       if (bytes[i] == 1)

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.iterators.user;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -44,10 +43,8 @@ import org.apache.hadoop.io.Text;
  * This iterator works in a similar way to the RowDeletingIterator. See its javadoc about locality groups.
  */
 public class LargeRowFilter implements SortedKeyValueIterator<Key,Value>, OptionDescriber {
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
-  public static final Value SUPPRESS_ROW_VALUE = new Value("SUPPRESS_ROW".getBytes(utf8));
+  public static final Value SUPPRESS_ROW_VALUE = new Value("SUPPRESS_ROW".getBytes());
   
   private static final ByteSequence EMPTY = new ArrayByteSequence(new byte[] {});
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java Fri Nov  2 22:49:59 2012
@@ -18,7 +18,6 @@ package org.apache.accumulo.core.iterato
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -35,8 +34,6 @@ import org.apache.accumulo.core.iterator
  * A Filter that matches entries based on Java regular expressions.
  */
 public class RegExFilter extends Filter {
-
-  private static final Charset utf8 = Charset.forName("UTF8");  
   
   @Override
   public SortedKeyValueIterator<Key,Value> deepCopy(IteratorEnvironment env) {
@@ -196,7 +193,7 @@ public class RegExFilter extends Filter 
       try {
         this.encoding = options.get(ENCODING);
         @SuppressWarnings("unused")
-        String test = new String("test".getBytes(utf8), encoding);
+        String test = new String("test".getBytes(), encoding);
       } catch (UnsupportedEncodingException e) {
         e.printStackTrace();
         return false;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.iterators.user;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
@@ -49,9 +48,7 @@ import org.apache.accumulo.core.iterator
 
 public class RowDeletingIterator implements SortedKeyValueIterator<Key,Value> {
   
-  private static final Charset utf8 = Charset.forName("UTF8");
-	  
-  public static final Value DELETE_ROW_VALUE = new Value("DEL_ROW".getBytes(utf8));
+  public static final Value DELETE_ROW_VALUE = new Value("DEL_ROW".getBytes());
   private SortedKeyValueIterator<Key,Value> source;
   private boolean propogateDeletes;
   private ByteSequence currentRow;
@@ -61,7 +58,7 @@ public class RowDeletingIterator impleme
   private boolean dropEmptyColFams;
   
   private static final ByteSequence EMPTY = new ArrayByteSequence(new byte[] {});
-
+  
   private RowDeletingIterator(SortedKeyValueIterator<Key,Value> source, boolean propogateDeletes2) {
     this.source = source;
     this.propogateDeletes = propogateDeletes2;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java Fri Nov  2 22:49:59 2012
@@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -49,8 +48,6 @@ public class SummingArrayCombiner extend
   private static final String TYPE = "type";
   private static final String CLASS_PREFIX = "class:";
   
-  private static final Charset utf8 = Charset.forName("UTF8");
-  
   public static enum Type {
     /**
      * indicates a variable-length encoding of a list of Longs using {@link SummingArrayCombiner.VarLongArrayEncoder}
@@ -205,7 +202,7 @@ public class SummingArrayCombiner extend
         sb.append(",");
         sb.append(Long.toString(la.get(i)));
       }
-      return sb.toString().getBytes(utf8);
+      return sb.toString().getBytes();
     }
     
     @Override

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java Fri Nov  2 22:49:59 2012
@@ -40,8 +40,6 @@ public class Authorizations implements I
   private HashSet<ByteSequence> auths = new HashSet<ByteSequence>();
   private List<byte[]> authsList = new ArrayList<byte[]>();
   private List<byte[]> immutableList = Collections.unmodifiableList(authsList);
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   private static final boolean[] validAuthChars = new boolean[256];
   
@@ -116,7 +114,7 @@ public class Authorizations implements I
       authsString = authsString.substring(HEADER.length());
       if (authsString.length() > 0) {
         for (String encAuth : authsString.split(",")) {
-          byte[] auth = Base64.decodeBase64(encAuth.getBytes(utf8));
+          byte[] auth = Base64.decodeBase64(encAuth.getBytes());
           auths.add(new ArrayByteSequence(auth));
         }
         checkAuths();
@@ -167,7 +165,7 @@ public class Authorizations implements I
   }
   
   public byte[] getAuthorizationsArray() {
-    return serialize().getBytes(utf8);
+    return serialize().getBytes();
   }
   
   public List<byte[]> getAuthorizations() {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.security;
 
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -39,8 +38,6 @@ public class ColumnVisibility {
   
   Node node = null;
   private byte[] expression;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   /**
    * Accessor for the underlying byte string.
@@ -163,7 +160,7 @@ public class ColumnVisibility {
   public byte[] flatten() {
     StringBuilder builder = new StringBuilder();
     flatten(node, expression, builder);
-    return builder.toString().getBytes(utf8);
+    return builder.toString().getBytes();
   }
   
   private static class ColumnVisibilityParser {
@@ -325,7 +322,7 @@ public class ColumnVisibility {
    * @param expression
    */
   public ColumnVisibility(String expression) {
-    this(expression.getBytes(utf8));
+    this(expression.getBytes());
   }
   
   /**

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/InstanceUserPassword.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/InstanceUserPassword.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/InstanceUserPassword.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/trace/InstanceUserPassword.java Fri Nov  2 22:49:59 2012
@@ -16,20 +16,16 @@
  */
 package org.apache.accumulo.core.trace;
 
-import java.nio.charset.Charset;
-
 import org.apache.accumulo.core.client.Instance;
 
 public class InstanceUserPassword {
   public Instance instance;
   public String username;
   public byte[] password;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public InstanceUserPassword(Instance instance, String username, String password) {
     this.instance = instance;
     this.username = username;
-    this.password = password.getBytes(utf8);
+    this.password = password.getBytes();
   }
 }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ByteArraySet.java Fri Nov  2 22:49:59 2012
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.core.util;
 
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,8 +25,6 @@ import java.util.TreeSet;
 public class ByteArraySet extends TreeSet<byte[]> {
   
   private static final long serialVersionUID = 1L;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public ByteArraySet() {
     super(new ByteArrayComparator());
@@ -41,7 +38,7 @@ public class ByteArraySet extends TreeSe
   public static ByteArraySet fromStrings(Collection<String> c) {
     List<byte[]> lst = new ArrayList<byte[]>();
     for (String s : c)
-      lst.add(s.getBytes(utf8));
+      lst.add(s.getBytes());
     return new ByteArraySet(lst);
   }
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Encoding.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Encoding.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Encoding.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Encoding.java Fri Nov  2 22:49:59 2012
@@ -16,14 +16,10 @@
  */
 package org.apache.accumulo.core.util;
 
-import java.nio.charset.Charset;
-
 import org.apache.commons.codec.binary.Base64;
 import org.apache.hadoop.io.Text;
 
 public class Encoding {
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public static String encodeAsBase64FileName(Text data) {
     String encodedRow = new String(Base64.encodeBase64(TextUtil.getBytes(data)));
@@ -43,7 +39,7 @@ public class Encoding {
     
     node = node.replace('_', '/').replace('-', '+');
     
-    return Base64.decodeBase64(node.getBytes(utf8));
+    return Base64.decodeBase64(node.getBytes());
   }
   
 }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Merge.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Merge.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Merge.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Merge.java Fri Nov  2 22:49:59 2012
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.core.util;
 
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -53,8 +52,6 @@ public class Merge {
   
   private static final Logger log = Logger.getLogger(Merge.class);
   
-  private static final Charset utf8 = Charset.forName("UTF8");
-  
   protected void message(String format, Object... args) {
     log.info(String.format(format, args));
   }
@@ -65,7 +62,7 @@ public class Merge {
     String table = null;
     long goalSize = -1;
     String user = "root";
-    byte[] password = "secret".getBytes(utf8);
+    byte[] password = "secret".getBytes();
     boolean force = false;
     Text begin = null;
     Text end = null;
@@ -97,7 +94,7 @@ public class Merge {
     	table = commandLine.getOptionValue("u");
     }
     if (commandLine.hasOption("p")) {
-        password = commandLine.getOptionValue("p").getBytes(utf8);
+        password = commandLine.getOptionValue("p").getBytes();
     }
     if (commandLine.hasOption("f")) {
       force = true;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java Fri Nov  2 22:49:59 2012
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.core.util;
 
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -48,8 +47,6 @@ public class MetadataTable {
     private long size;
     private long numEntries;
     private long time = -1;
-
-    private static final Charset utf8 = Charset.forName("UTF8");
     
     public DataFileValue(long size, long numEntries, long time) {
       this.size = size;
@@ -93,8 +90,8 @@ public class MetadataTable {
     
     public byte[] encode() {
       if (time >= 0)
-        return ("" + size + "," + numEntries + "," + time).getBytes(utf8);
-      return ("" + size + "," + numEntries).getBytes(utf8);
+        return ("" + size + "," + numEntries + "," + time).getBytes();
+      return ("" + size + "," + numEntries).getBytes();
     }
     
     public boolean equals(Object o) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TextUtil.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TextUtil.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TextUtil.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/TextUtil.java Fri Nov  2 22:49:59 2012
@@ -17,15 +17,11 @@
 package org.apache.accumulo.core.util;
 
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.hadoop.io.Text;
 
 public final class TextUtil {
-
-  private static final Charset utf8 = Charset.forName("UTF8");
-  
   public static byte[] getBytes(Text text) {
     byte[] bytes = text.getBytes();
     if (bytes.length != text.getLength()) {
@@ -47,7 +43,7 @@ public final class TextUtil {
       Text newText = new Text();
       newText.append(text.getBytes(), 0, maxLen);
       String suffix = "... TRUNCATED";
-      newText.append(suffix.getBytes(utf8), 0, suffix.length());
+      newText.append(suffix.getBytes(), 0, suffix.length());
       return newText;
     }
     

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Fri Nov  2 22:49:59 2012
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -152,8 +151,6 @@ import org.apache.log4j.Logger;
 public class Shell extends ShellOptions {
   public static final Logger log = Logger.getLogger(Shell.class);
   private static final Logger audit = Logger.getLogger(Shell.class.getName() + ".audit");
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public static final String CHARSET = "ISO-8859-1";
   public static final int NO_FIXED_ARG_LENGTH_CHECK = -1;
@@ -270,7 +267,7 @@ public class Shell extends ShellOptions 
         return true;
       } // user canceled
       
-      pass = passw.getBytes(utf8);
+      pass = passw.getBytes();
       this.setTableName("");
       connector = instance.getConnector(user, pass);
       this.credentials = new AuthInfo(user, ByteBuffer.wrap(pass), connector.getInstance().getInstanceID());
@@ -511,7 +508,7 @@ public class Shell extends ShellOptions 
             } // user canceled
             
             try {
-              authFailed = !connector.securityOperations().authenticateUser(connector.whoami(), pwd.getBytes(utf8));
+              authFailed = !connector.securityOperations().authenticateUser(connector.whoami(), pwd.getBytes());
             } catch (Exception e) {
               ++exitCode;
               printException(e);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.util.shell.commands;
 
 import java.io.File;
-import java.nio.charset.Charset;
 import java.util.TreeSet;
 
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -32,8 +31,6 @@ import org.apache.hadoop.io.Text;
 
 public class AddSplitsCommand extends Command {
   private Option optSplitsFile, base64Opt;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
     final String tableName = OptUtil.getTableOpt(cl, shellState);
@@ -49,7 +46,7 @@ public class AddSplitsCommand extends Co
       while (file.hasNextLine()) {
         line = file.nextLine();
         if (!line.isEmpty()) {
-          splits.add(decode ? new Text(Base64.decodeBase64(line.getBytes(utf8))) : new Text(line));
+          splits.add(decode ? new Text(Base64.decodeBase64(line.getBytes())) : new Text(line));
         }
       }
     } else {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.util.shell.commands;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.Set;
 
@@ -29,9 +28,6 @@ import org.apache.accumulo.core.util.she
 import org.apache.commons.cli.CommandLine;
 
 public class AuthenticateCommand extends Command {
-
-  private static final Charset utf8 = Charset.forName("UTF8");
-
   @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, IOException {
     final String user = cl.getArgs()[0];
@@ -40,7 +36,7 @@ public class AuthenticateCommand extends
       shellState.getReader().printNewline();
       return 0;
     } // user canceled
-    final byte[] password = p.getBytes(utf8);
+    final byte[] password = p.getBytes();
     final boolean valid = shellState.getConnector().securityOperations().authenticateUser(user, password);
     shellState.getReader().printString((valid ? "V" : "Not v") + "alid\n");
     return 0;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java Fri Nov  2 22:49:59 2012
@@ -18,7 +18,6 @@ package org.apache.accumulo.core.util.sh
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.Map.Entry;
 import java.util.Scanner;
 import java.util.SortedSet;
@@ -53,8 +52,6 @@ public class CreateTableCommand extends 
   private Option base64Opt;
   private Option createTableOptFormatter;
   public static String testTable;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, TableExistsException,
       TableNotFoundException, IOException, ClassNotFoundException {
@@ -81,7 +78,7 @@ public class CreateTableCommand extends 
       while (file.hasNextLine()) {
         line = file.nextLine();
         if (!line.isEmpty()) {
-          partitions.add(decode ? new Text(Base64.decodeBase64(line.getBytes(utf8))) : new Text(line));
+          partitions.add(decode ? new Text(Base64.decodeBase64(line.getBytes())) : new Text(line));
         }
       }
     } else if (cl.hasOption(createTableOptCopySplits.getOpt())) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateUserCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateUserCommand.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateUserCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateUserCommand.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.util.shell.commands;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
@@ -34,8 +33,6 @@ import org.apache.commons.cli.Options;
 public class CreateUserCommand extends Command {
   private Option scanOptAuths;
   
-  private static final Charset utf8 = Charset.forName("UTF8");
-  
   static Authorizations parseAuthorizations(final String field) {
     if (field == null || field.isEmpty()) {
       return Constants.NO_AUTHS;
@@ -63,7 +60,7 @@ public class CreateUserCommand extends C
       throw new IllegalArgumentException("Passwords do not match");
     }
     final Authorizations authorizations = parseAuthorizations(cl.hasOption(scanOptAuths.getOpt()) ? cl.getOptionValue(scanOptAuths.getOpt()) : "");
-    shellState.getConnector().securityOperations().createUser(user, password.getBytes(utf8), authorizations);
+    shellState.getConnector().securityOperations().createUser(user, password.getBytes(), authorizations);
     Shell.log.debug("Created user " + user + " with" + (authorizations.isEmpty() ? " no" : "") + " initial scan authorizations"
         + (!authorizations.isEmpty() ? " " + authorizations : ""));
     return 0;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java Fri Nov  2 22:49:59 2012
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.core.util.shell.commands;
 
-import java.nio.charset.Charset;
 import java.security.SecureRandom;
 import java.util.Random;
 
@@ -29,8 +28,6 @@ import org.apache.commons.codec.binary.B
 
 public class HiddenCommand extends Command {
   private static Random rand = new SecureRandom();
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   @Override
   public String description() {
@@ -45,7 +42,7 @@ public class HiddenCommand extends Comma
       shellState.getReader().printString(
           new String(Base64.decodeBase64(("ICAgICAgIC4tLS4KICAgICAgLyAvXCBcCiAgICAgKCAvLS1cICkKICAgICAuPl8gIF88LgogICAgLyB8ICd8ICcgXAog"
               + "ICAvICB8Xy58Xy4gIFwKICAvIC98ICAgICAgfFwgXAogfCB8IHwgfFwvfCB8IHwgfAogfF98IHwgfCAgfCB8IHxffAogICAgIC8gIF9fICBcCiAgICAvICAv"
-              + "ICBcICBcCiAgIC8gIC8gICAgXCAgXF8KIHwvICAvICAgICAgXCB8IHwKIHxfXy8gICAgICAgIFx8X3wK").getBytes(utf8))));
+              + "ICBcICBcCiAgIC8gIC8gICAgXCAgXF8KIHwvICAvICAgICAgXCB8IHwKIHxfXy8gICAgICAgIFx8X3wK").getBytes())));
       shellState.getReader().printNewline();
     } else {
       throw new ShellCommandException(ErrorCode.UNRECOGNIZED_COMMAND, getName());

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/PasswdCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/PasswdCommand.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/PasswdCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/PasswdCommand.java Fri Nov  2 22:49:59 2012
@@ -18,7 +18,6 @@ package org.apache.accumulo.core.util.sh
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -32,8 +31,6 @@ import org.apache.commons.cli.Options;
 
 public class PasswdCommand extends Command {
   private Option userOpt;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   @Override
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, IOException {
@@ -50,7 +47,7 @@ public class PasswdCommand extends Comma
       return 0;
     } // user canceled
     
-    if (!shellState.getConnector().securityOperations().authenticateUser(currentUser, oldPassword.getBytes(utf8)))
+    if (!shellState.getConnector().securityOperations().authenticateUser(currentUser, oldPassword.getBytes()))
       throw new AccumuloSecurityException(user, SecurityErrorCode.BAD_CREDENTIALS);
     
     password = shellState.readMaskedLine("Enter new password for '" + user + "': ", '*');
@@ -67,7 +64,7 @@ public class PasswdCommand extends Comma
     if (!password.equals(passwordConfirm)) {
       throw new IllegalArgumentException("Passwords do not match");
     }
-    byte[] pass = password.getBytes(utf8);
+    byte[] pass = password.getBytes();
     shellState.getConnector().securityOperations().changeUserPassword(user, pass);
     // update the current credentials if the password changed was for
     // the current user

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/QuotedStringTokenizer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/QuotedStringTokenizer.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/QuotedStringTokenizer.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/QuotedStringTokenizer.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.core.util.shell.commands;
 
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Iterator;
 
@@ -35,8 +34,6 @@ import org.apache.accumulo.core.util.she
 public class QuotedStringTokenizer implements Iterable<String> {
   private ArrayList<String> tokens;
   private String input;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public QuotedStringTokenizer(final String t) throws BadArgumentException {
     tokens = new ArrayList<String>();
@@ -60,7 +57,7 @@ public class QuotedStringTokenizer imple
     
     final byte[] token = new byte[input.length()];
     int tokenLength = 0;
-    final byte[] inputBytes = input.getBytes(utf8);
+    final byte[] inputBytes = input.getBytes();
     for (int i = 0; i < input.length(); ++i) {
       final char ch = input.charAt(i);
       

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java Fri Nov  2 22:49:59 2012
@@ -18,7 +18,6 @@ package org.apache.accumulo.core.util.sh
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.Set;
 
@@ -31,9 +30,6 @@ import org.apache.accumulo.core.util.she
 import org.apache.commons.cli.CommandLine;
 
 public class UserCommand extends Command {
-
-  private static final Charset utf8 = Charset.forName("UTF8");
-
   public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, IOException {
     // save old credentials and connection in case of failure
     String user = cl.getArgs()[0];
@@ -47,7 +43,7 @@ public class UserCommand extends Command
       shellState.getReader().printNewline();
       return 0;
     } // user canceled
-    pass = p.getBytes(utf8);
+    pass = p.getBytes();
     shellState.updateUser(new AuthInfo(user, ByteBuffer.wrap(pass), shellState.getConnector().getInstance().getInstanceID()));
     return 0;
   }

Modified: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (original)
+++ accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java Fri Nov  2 22:49:59 2012
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import java.nio.charset.Charset;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -54,8 +53,6 @@ public class ZooStore<T> implements TSto
   private SecureRandom idgenerator;
   private long statusChangeEvents = 0;
   private int reservationsWaiting = 0;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   private byte[] serialize(Object o) {
     
@@ -107,7 +104,7 @@ public class ZooStore<T> implements TSto
       try {
         // looking at the code for SecureRandom, it appears to be thread safe
         long tid = Math.abs(idgenerator.nextLong());
-        zk.putPersistentData(getTXPath(tid), TStatus.NEW.name().getBytes(utf8), NodeExistsPolicy.FAIL);
+        zk.putPersistentData(getTXPath(tid), TStatus.NEW.name().getBytes(), NodeExistsPolicy.FAIL);
         return tid;
       } catch (NodeExistsException nee) {
         // exist, so just try another random #
@@ -362,7 +359,7 @@ public class ZooStore<T> implements TSto
     verifyReserved(tid);
     
     try {
-      zk.putPersistentData(getTXPath(tid), status.name().getBytes(utf8), NodeExistsPolicy.OVERWRITE);
+      zk.putPersistentData(getTXPath(tid), status.name().getBytes(), NodeExistsPolicy.OVERWRITE);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
@@ -390,7 +387,7 @@ public class ZooStore<T> implements TSto
     
     try {
       if (so instanceof String) {
-        zk.putPersistentData(getTXPath(tid) + "/prop_" + prop, ("S " + so).getBytes(utf8), NodeExistsPolicy.OVERWRITE);
+        zk.putPersistentData(getTXPath(tid) + "/prop_" + prop, ("S " + so).getBytes(), NodeExistsPolicy.OVERWRITE);
       } else {
         byte[] sera = serialize(so);
         byte[] data = new byte[sera.length + 2];

Modified: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java (original)
+++ accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java Fri Nov  2 22:49:59 2012
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.fate.zookeeper;
 
-import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Map.Entry;
@@ -32,8 +31,6 @@ import org.apache.log4j.Logger;
 // A ReadWriteLock that can be implemented in ZooKeeper.  Features the ability to store data
 // with the lock, and recover the lock using that data to find the lock.
 public class DistributedReadWriteLock implements java.util.concurrent.locks.ReadWriteLock {
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   static enum LockType {
     READ, WRITE,
@@ -74,7 +71,7 @@ public class DistributedReadWriteLock im
     }
     
     public byte[] getLockData() {
-      byte typeBytes[] = type.name().getBytes(utf8);
+      byte typeBytes[] = type.name().getBytes();
       byte[] result = new byte[userData.length + 1 + typeBytes.length];
       System.arraycopy(typeBytes, 0, result, 0, typeBytes.length);
       result[typeBytes.length] = ':';

Modified: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java (original)
+++ accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java Fri Nov  2 22:49:59 2012
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.fate.zookeeper;
 
-import java.nio.charset.Charset;
-
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
 import org.apache.log4j.Logger;
@@ -27,8 +25,6 @@ import org.apache.zookeeper.KeeperExcept
 import org.apache.zookeeper.data.Stat;
 
 public class ZooReservation {
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public static boolean attempt(IZooReaderWriter zk, String path, String reservationID, String debugInfo) throws KeeperException, InterruptedException {
     if (reservationID.contains(":"))
@@ -36,7 +32,7 @@ public class ZooReservation {
     
     while (true) {
       try {
-        zk.putPersistentData(path, (reservationID + ":" + debugInfo).getBytes(utf8), NodeExistsPolicy.FAIL);
+        zk.putPersistentData(path, (reservationID + ":" + debugInfo).getBytes(), NodeExistsPolicy.FAIL);
         return true;
       } catch (NodeExistsException nee) {
         Stat stat = new Stat();

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Fri Nov  2 22:49:59 2012
@@ -19,7 +19,6 @@ package org.apache.accumulo.server.gc;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
-import java.nio.charset.Charset;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Locale;
@@ -99,8 +98,6 @@ import org.apache.zookeeper.KeeperExcept
 
 public class SimpleGarbageCollector implements Iface {
   private static final Text EMPTY_TEXT = new Text();
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   static final Options OPTS = new Options();
   static final Option OPT_VERBOSE_MODE = new Option("v", "verbose", false, "extra information will get printed to stdout also");
@@ -370,7 +367,7 @@ public class SimpleGarbageCollector impl
     
     while (true) {
       lock = new ZooLock(path);
-      if (lock.tryLock(lockWatcher, new ServerServices(address, Service.GC_CLIENT).toString().getBytes(utf8))) {
+      if (lock.tryLock(lockWatcher, new ServerServices(address, Service.GC_CLIENT).toString().getBytes())) {
         break;
       }
       UtilWaitThread.sleep(1000);

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java Fri Nov  2 22:49:59 2012
@@ -21,7 +21,6 @@ import static java.lang.Math.min;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -217,8 +216,6 @@ public class Master implements LiveTServ
   private MasterState state = MasterState.INITIAL;
   
   private Fate<Master> fate;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   volatile private SortedMap<TServerInstance,TabletServerStatus> tserverStatus = Collections
       .unmodifiableSortedMap(new TreeMap<TServerInstance,TabletServerStatus>());
@@ -295,8 +292,8 @@ public class Master implements LiveTServ
         String[] tablePropsToDelete = new String[] {"table.scan.cache.size", "table.scan.cache.enable"};
 
         for (String id : Tables.getIdToNameMap(instance).keySet()) {
-          zoo.putPersistentData(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + id + Constants.ZTABLE_FLUSH_ID, "0".getBytes(utf8), NodeExistsPolicy.SKIP);
-          zoo.putPersistentData(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + id + Constants.ZTABLE_COMPACT_ID, "0".getBytes(utf8), NodeExistsPolicy.SKIP);
+          zoo.putPersistentData(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + id + Constants.ZTABLE_FLUSH_ID, "0".getBytes(), NodeExistsPolicy.SKIP);
+          zoo.putPersistentData(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + id + Constants.ZTABLE_COMPACT_ID, "0".getBytes(), NodeExistsPolicy.SKIP);
           
           for (String prop : tablePropsToDelete) {
             String propPath = ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + id + Constants.ZTABLE_CONF + "/" + prop;
@@ -578,7 +575,7 @@ public class Master implements LiveTServ
           public byte[] mutate(byte[] currentValue) throws Exception {
             long flushID = Long.parseLong(new String(currentValue));
             flushID++;
-            return ("" + flushID).getBytes(utf8);
+            return ("" + flushID).getBytes();
           }
         });
       } catch (NoNodeException nne) {
@@ -1154,7 +1151,7 @@ public class Master implements LiveTServ
   
   private void setMasterGoalState(MasterGoalState state) {
     try {
-      ZooReaderWriter.getInstance().putPersistentData(ZooUtil.getRoot(instance) + Constants.ZMASTER_GOAL_STATE, state.name().getBytes(utf8),
+      ZooReaderWriter.getInstance().putPersistentData(ZooUtil.getRoot(instance) + Constants.ZMASTER_GOAL_STATE, state.name().getBytes(),
           NodeExistsPolicy.OVERWRITE);
     } catch (Exception ex) {
       log.error("Unable to set master goal state in zookeeper");
@@ -1728,7 +1725,7 @@ public class Master implements LiveTServ
         }
         
         if (maxLogicalTime != null)
-          Constants.METADATA_TIME_COLUMN.put(m, new Value(maxLogicalTime.getBytes(utf8)));
+          Constants.METADATA_TIME_COLUMN.put(m, new Value(maxLogicalTime.getBytes()));
         
         if (!m.getUpdates().isEmpty()) {
           bw.addMutation(m);
@@ -2198,7 +2195,7 @@ public class Master implements LiveTServ
     boolean locked = false;
     while (System.currentTimeMillis() - current < waitTime) {
       masterLock = new ZooLock(zMasterLoc);
-      if (masterLock.tryLock(masterLockWatcher, masterClientAddress.getBytes(utf8))) {
+      if (masterLock.tryLock(masterLockWatcher, masterClientAddress.getBytes())) {
         locked = true;
         break;
       }
@@ -2208,7 +2205,7 @@ public class Master implements LiveTServ
       log.info("Failed to get master lock, even after waiting for session timeout, becoming back-up server");
       while (true) {
         masterLock = new ZooLock(zMasterLoc);
-        if (masterLock.tryLock(masterLockWatcher, masterClientAddress.getBytes(utf8))) {
+        if (masterLock.tryLock(masterLockWatcher, masterClientAddress.getBytes())) {
           break;
         }
         UtilWaitThread.sleep(TIME_TO_WAIT_BETWEEN_LOCK_CHECKS);

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java Fri Nov  2 22:49:59 2012
@@ -17,7 +17,6 @@
 package org.apache.accumulo.server.master.recovery;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -39,8 +38,6 @@ public class SubmitFileForRecovery exten
   private static final long serialVersionUID = 1L;
   String server;
   String file;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   SubmitFileForRecovery(String server, String file) {
     this.server = server;
@@ -51,7 +48,7 @@ public class SubmitFileForRecovery exten
   public Repo<Master> call(long tid, final Master master) throws Exception {
     master.updateRecoveryInProgress(file);
     String source = RecoverLease.getSource(master, server, file).toString();
-    new DistributedWorkQueue(ZooUtil.getRoot(master.getInstance()) + Constants.ZRECOVERY).addWork(file, source.getBytes(utf8));
+    new DistributedWorkQueue(ZooUtil.getRoot(master.getInstance()) + Constants.ZRECOVERY).addWork(file, source.getBytes());
     
     ZooReaderWriter zoo = ZooReaderWriter.getInstance();
     final String path = ZooUtil.getRoot(master.getInstance()) + Constants.ZRECOVERY + "/" + file;

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java?rev=1405202&r1=1405201&r2=1405202&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java Fri Nov  2 22:49:59 2012
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.server.master.state;
 
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,8 +30,6 @@ import org.apache.zookeeper.data.Stat;
 public class DeadServerList {
   private static final Logger log = Logger.getLogger(DeadServerList.class);
   private final String path;
-
-  private static final Charset utf8 = Charset.forName("UTF8");
   
   public DeadServerList(String path) {
     this.path = path;
@@ -75,7 +72,7 @@ public class DeadServerList {
   public void post(String server, String cause) {
     IZooReaderWriter zoo = ZooReaderWriter.getInstance();
     try {
-      zoo.putPersistentData(path + "/" + server, cause.getBytes(utf8), NodeExistsPolicy.SKIP);
+      zoo.putPersistentData(path + "/" + server, cause.getBytes(), NodeExistsPolicy.SKIP);
     } catch (Exception ex) {
       log.error(ex, ex);
     }



Mime
View raw message