You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/04/03 00:54:29 UTC
[2/5] ACCUMULO-1545 Replace UTF8 constant with built-in one
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
index 577f5d5..5f036e0 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/Utils.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.master.tableOps;
import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -59,12 +60,12 @@ public class Utils {
byte[] nid = zoo.mutate(ntp, ZERO_BYTE, ZooUtil.PUBLIC, new Mutator() {
@Override
public byte[] mutate(byte[] currentValue) throws Exception {
- BigInteger nextId = new BigInteger(new String(currentValue, Constants.UTF8), Character.MAX_RADIX);
+ BigInteger nextId = new BigInteger(new String(currentValue, StandardCharsets.UTF_8), Character.MAX_RADIX);
nextId = nextId.add(BigInteger.ONE);
- return nextId.toString(Character.MAX_RADIX).getBytes(Constants.UTF8);
+ return nextId.toString(Character.MAX_RADIX).getBytes(StandardCharsets.UTF_8);
}
});
- return new String(nid, Constants.UTF8);
+ return new String(nid, StandardCharsets.UTF_8);
} catch (Exception e1) {
Logger.getLogger(CreateTable.class).error("Failed to assign tableId to " + tableName, e1);
throw new ThriftTableOperationException(tableId, tableName, TableOperation.CREATE, TableOperationExceptionType.OTHER, e1.getMessage());
@@ -117,7 +118,7 @@ public class Utils {
Instance instance = HdfsZooInstance.getInstance();
String resvPath = ZooUtil.getRoot(instance) + Constants.ZHDFS_RESERVATIONS + "/"
- + new String(Base64.encodeBase64(directory.getBytes(Constants.UTF8)), Constants.UTF8);
+ + new String(Base64.encodeBase64(directory.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
IZooReaderWriter zk = ZooReaderWriter.getRetryingInstance();
@@ -130,12 +131,12 @@ public class Utils {
public static void unreserveHdfsDirectory(String directory, long tid) throws KeeperException, InterruptedException {
Instance instance = HdfsZooInstance.getInstance();
String resvPath = ZooUtil.getRoot(instance) + Constants.ZHDFS_RESERVATIONS + "/"
- + new String(Base64.encodeBase64(directory.getBytes(Constants.UTF8)), Constants.UTF8);
+ + new String(Base64.encodeBase64(directory.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
ZooReservation.release(ZooReaderWriter.getRetryingInstance(), resvPath, String.format("%016x", tid));
}
private static Lock getLock(String tableId, long tid, boolean writeLock) throws Exception {
- byte[] lockData = String.format("%016x", tid).getBytes(Constants.UTF8);
+ byte[] lockData = String.format("%016x", tid).getBytes(StandardCharsets.UTF_8);
ZooQueueLock qlock = new ZooQueueLock(ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZTABLE_LOCKS + "/" + tableId, false);
Lock lock = DistributedReadWriteLock.recoverLock(qlock, lockData);
if (lock == null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java b/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
index 20b7328..aeb07e2 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tserverOps/ShutdownTServer.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.master.tserverOps;
+import java.nio.charset.StandardCharsets;
+
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -57,7 +59,7 @@ public class ShutdownTServer extends MasterRepo {
ZooLock.deleteLock(path);
path = ZooUtil.getRoot(master.getInstance()) + Constants.ZDEADTSERVERS + "/" + server.getLocation();
IZooReaderWriter zoo = ZooReaderWriter.getInstance();
- zoo.putPersistentData(path, "forced down".getBytes(Constants.UTF8), NodeExistsPolicy.OVERWRITE);
+ zoo.putPersistentData(path, "forced down".getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.OVERWRITE);
return null;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 0e6b37f..e6617d0 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.monitor;
import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -375,7 +376,7 @@ public class Monitor {
List<String> locks = zk.getChildren(path, null);
if (locks != null && locks.size() > 0) {
Collections.sort(locks);
- address = new ServerServices(new String(zk.getData(path + "/" + locks.get(0), null), Constants.UTF8)).getAddress(Service.GC_CLIENT);
+ address = new ServerServices(new String(zk.getData(path + "/" + locks.get(0), null), StandardCharsets.UTF_8)).getAddress(Service.GC_CLIENT);
GCMonitorService.Client client = ThriftUtil.getClient(new GCMonitorService.Client.Factory(), address, config.getConfiguration());
try {
result = client.getStatus(Tracer.traceInfo(), SystemCredentials.get().toThrift(instance));
@@ -450,7 +451,7 @@ public class Monitor {
String monitorAddress = HostAndPort.fromParts(hostname, server.getPort()).toString();
- ZooReaderWriter.getInstance().putPersistentData(ZooUtil.getRoot(instance) + Constants.ZMONITOR_HTTP_ADDR, monitorAddress.getBytes(Constants.UTF8),
+ ZooReaderWriter.getInstance().putPersistentData(ZooUtil.getRoot(instance) + Constants.ZMONITOR_HTTP_ADDR, monitorAddress.getBytes(StandardCharsets.UTF_8),
NodeExistsPolicy.OVERWRITE);
log.info("Set monitor address in zookeeper to " + monitorAddress);
} catch (Exception ex) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
index 5e3e475..edf7c74 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/ZooKeeperStatus.java
@@ -16,11 +16,11 @@
*/
package org.apache.accumulo.monitor;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.util.TTimeoutTransport;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -100,14 +100,14 @@ public class ZooKeeperStatus implements Runnable {
addr = HostAndPort.fromParts(parts[0], 2181);
transport = TTimeoutTransport.create(addr, 10 * 1000l);
- transport.write("stat\n".getBytes(Constants.UTF8), 0, 5);
+ transport.write("stat\n".getBytes(StandardCharsets.UTF_8), 0, 5);
StringBuilder response = new StringBuilder();
try {
transport.flush();
byte[] buffer = new byte[1024 * 100];
int n = 0;
while ((n = transport.read(buffer, 0, buffer.length)) > 0) {
- response.append(new String(buffer, 0, n, Constants.UTF8));
+ response.append(new String(buffer, 0, n, StandardCharsets.UTF_8));
}
} catch (TTransportException ex) {
// happens at EOF
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
index 66a1ca2..7d1069b 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
@@ -21,6 +21,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
import java.util.TimerTask;
@@ -243,9 +244,9 @@ abstract public class BasicServlet extends HttpServlet {
public static String encode(String s) {
try {
- return URLEncoder.encode(s, Constants.UTF8.name());
+ return URLEncoder.encode(s, StandardCharsets.UTF_8.name());
} catch (UnsupportedEncodingException e) {
- Logger.getLogger(BasicServlet.class).fatal(Constants.UTF8.name() + " is not a recognized encoding", e);
+ Logger.getLogger(BasicServlet.class).fatal(StandardCharsets.UTF_8.name() + " is not a recognized encoding", e);
throw new RuntimeException(e);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java
index d88bd7c..5f81a74 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/DefaultServlet.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.monitor.servlets;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
@@ -30,7 +31,6 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
import org.apache.accumulo.core.util.Duration;
import org.apache.accumulo.core.util.NumUtil;
@@ -76,7 +76,7 @@ public class DefaultServlet extends BasicServlet {
while ((n = data.read(buffer)) > 0)
out.write(buffer, 0, n);
} else {
- out.write(("could not get resource " + path + "").getBytes(Constants.UTF8));
+ out.write(("could not get resource " + path + "").getBytes(StandardCharsets.UTF_8));
}
} finally {
if (data != null)
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
index 03f6831..1824840 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ShellServlet.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutorService;
@@ -33,7 +34,6 @@ import javax.servlet.http.HttpSession;
import jline.console.ConsoleReader;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.util.shell.Shell;
public class ShellServlet extends BasicServlet {
@@ -228,7 +228,7 @@ public class ShellServlet extends BasicServlet {
this.readWait = false;
this.output = new StringBuilderOutputStream();
ConsoleReader reader = new ConsoleReader(this, output);
- this.shell = new Shell(reader, new PrintWriter(new OutputStreamWriter(output, Constants.UTF8)));
+ this.shell = new Shell(reader, new PrintWriter(new OutputStreamWriter(output, StandardCharsets.UTF_8)));
shell.setLogErrorsToConsole();
if (mock != null) {
if (shell.config("--fake", "-u", username, "-p", password))
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
index 9f1bd1f..013df51 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TServersServlet.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.monitor.servlets;
import java.lang.management.ManagementFactory;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.text.DateFormat;
import java.util.ArrayList;
@@ -26,7 +27,6 @@ import java.util.Map.Entry;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.master.thrift.DeadServer;
import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
@@ -169,7 +169,7 @@ public class TServersServlet extends BasicServlet {
if (extent.getEndRow() != null && extent.getEndRow().getLength() > 0) {
digester.update(extent.getEndRow().getBytes(), 0, extent.getEndRow().getLength());
}
- String obscuredExtent = new String(Base64.encodeBase64(digester.digest()), Constants.UTF8);
+ String obscuredExtent = new String(Base64.encodeBase64(digester.digest()), StandardCharsets.UTF_8);
String displayExtent = String.format("<code>[%s]</code>", obscuredExtent);
TableRow row = perTabletResults.prepareRow();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
index 0cbf957..b639226 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/XMLServlet.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.monitor.servlets;
+import java.nio.charset.StandardCharsets;
import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -23,7 +24,6 @@ import java.util.TreeMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.core.master.thrift.Compacting;
@@ -46,8 +46,8 @@ public class XMLServlet extends BasicServlet {
@Override
protected void pageStart(HttpServletRequest req, HttpServletResponse resp, StringBuilder sb) {
- resp.setContentType("text/xml;charset=" + Constants.UTF8.name());
- sb.append("<?xml version=\"1.0\" encoding=\"" + Constants.UTF8.name() + "\"?>\n");
+ resp.setContentType("text/xml;charset=" + StandardCharsets.UTF_8.name());
+ sb.append("<?xml version=\"1.0\" encoding=\"" + StandardCharsets.UTF_8.name() + "\"?>\n");
sb.append("<stats>\n");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
index 90bb0d4..c1531cb 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
@@ -16,13 +16,13 @@
*/
package org.apache.accumulo.monitor.servlets.trace;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.Map;
import java.util.Map.Entry;
import javax.servlet.http.HttpServletRequest;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Connector;
@@ -74,7 +74,7 @@ abstract class Basic extends BasicServlet {
Map<String,String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_TOKEN_PROPERTY_PREFIX);
if (loginMap.isEmpty()) {
Property p = Property.TRACE_PASSWORD;
- at = new PasswordToken(conf.get(p).getBytes(Constants.UTF8));
+ at = new PasswordToken(conf.get(p).getBytes(StandardCharsets.UTF_8));
} else {
Properties props = new Properties();
int prefixLength = Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey().length();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index ed10582..1aad533 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.tracer;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.nio.channels.ServerSocketChannel;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
@@ -127,7 +128,7 @@ public class TraceServer implements Watcher {
Mutation spanMutation = new Mutation(new Text(idString));
Mutation indexMutation = new Mutation(new Text("idx:" + s.svc + ":" + startString));
long diff = s.stop - s.start;
- indexMutation.put(new Text(s.description), new Text(s.sender), new Value((idString + ":" + Long.toHexString(diff)).getBytes(Constants.UTF8)));
+ indexMutation.put(new Text(s.description), new Text(s.sender), new Value((idString + ":" + Long.toHexString(diff)).getBytes(StandardCharsets.UTF_8)));
ByteArrayTransport transport = new ByteArrayTransport();
TCompactProtocol protocol = new TCompactProtocol(transport);
s.write(protocol);
@@ -180,7 +181,7 @@ public class TraceServer implements Watcher {
Map<String,String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_TOKEN_PROPERTY_PREFIX);
if (loginMap.isEmpty()) {
Property p = Property.TRACE_PASSWORD;
- at = new PasswordToken(conf.get(p).getBytes(Constants.UTF8));
+ at = new PasswordToken(conf.get(p).getBytes(StandardCharsets.UTF_8));
} else {
Properties props = new Properties();
AuthenticationToken token = AccumuloClassLoader.getClassLoader().loadClass(conf.get(Property.TRACE_TOKEN_TYPE)).asSubclass(AuthenticationToken.class)
@@ -278,7 +279,7 @@ public class TraceServer implements Watcher {
private void registerInZooKeeper(String name) throws Exception {
String root = ZooUtil.getRoot(serverConfiguration.getInstance()) + Constants.ZTRACERS;
IZooReaderWriter zoo = ZooReaderWriter.getInstance();
- String path = zoo.putEphemeralSequential(root + "/trace-", name.getBytes(Constants.UTF8));
+ String path = zoo.putEphemeralSequential(root + "/trace-", name.getBytes(StandardCharsets.UTF_8));
zoo.exists(path, this);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
index 39bf81e..c6a50fe 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/BulkFailedCopyProcessor.java
@@ -17,8 +17,8 @@
package org.apache.accumulo.tserver;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.fs.VolumeManager;
@@ -45,7 +45,7 @@ public class BulkFailedCopyProcessor implements Processor {
@Override
public void process(String workID, byte[] data) {
- String paths[] = new String(data, Constants.UTF8).split(",");
+ String paths[] = new String(data, StandardCharsets.UTF_8).split(",");
Path orig = new Path(paths[0]);
Path dest = new Path(paths[1]);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index ddd3e32..fadf4ed 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@ -20,6 +20,7 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -2294,7 +2295,7 @@ public class Tablet {
try {
String zTablePath = Constants.ZROOT + "/" + HdfsZooInstance.getInstance().getInstanceID() + Constants.ZTABLES + "/" + extent.getTableId()
+ Constants.ZTABLE_FLUSH_ID;
- return Long.parseLong(new String(ZooReaderWriter.getRetryingInstance().getData(zTablePath, null), Constants.UTF8));
+ return Long.parseLong(new String(ZooReaderWriter.getRetryingInstance().getData(zTablePath, null), StandardCharsets.UTF_8));
} catch (InterruptedException e) {
throw new RuntimeException(e);
} catch (NumberFormatException nfe) {
@@ -2313,7 +2314,7 @@ public class Tablet {
+ Constants.ZTABLE_COMPACT_CANCEL_ID;
try {
- return Long.parseLong(new String(ZooReaderWriter.getRetryingInstance().getData(zTablePath, null), Constants.UTF8));
+ return Long.parseLong(new String(ZooReaderWriter.getRetryingInstance().getData(zTablePath, null), StandardCharsets.UTF_8));
} catch (KeeperException e) {
throw new RuntimeException(e);
} catch (InterruptedException e) {
@@ -2326,14 +2327,14 @@ public class Tablet {
String zTablePath = Constants.ZROOT + "/" + HdfsZooInstance.getInstance().getInstanceID() + Constants.ZTABLES + "/" + extent.getTableId()
+ Constants.ZTABLE_COMPACT_ID;
- String[] tokens = new String(ZooReaderWriter.getRetryingInstance().getData(zTablePath, null), Constants.UTF8).split(",");
+ String[] tokens = new String(ZooReaderWriter.getRetryingInstance().getData(zTablePath, null), StandardCharsets.UTF_8).split(",");
long compactID = Long.parseLong(tokens[0]);
CompactionIterators iters = new CompactionIterators();
if (tokens.length > 1) {
Hex hex = new Hex();
- ByteArrayInputStream bais = new ByteArrayInputStream(hex.decode(tokens[1].split("=")[1].getBytes(Constants.UTF8)));
+ ByteArrayInputStream bais = new ByteArrayInputStream(hex.decode(tokens[1].split("=")[1].getBytes(StandardCharsets.UTF_8)));
DataInputStream dis = new DataInputStream(bais);
try {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 3498eab..9a4b46f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -25,6 +25,7 @@ import java.lang.management.ManagementFactory;
import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Arrays;
@@ -1187,7 +1188,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
List<IterInfo> ssiList, Map<String,Map<String,String>> ssio, List<ByteBuffer> authorizations, boolean waitForWrites, boolean isolated,
long readaheadThreshold) throws NotServingTabletException, ThriftSecurityException, org.apache.accumulo.core.tabletserver.thrift.TooManyFilesException {
- String tableId = new String(textent.getTable(), Constants.UTF8);
+ String tableId = new String(textent.getTable(), StandardCharsets.UTF_8);
if (!security.canScan(credentials, tableId, Tables.getNamespaceId(instance, tableId), range, columns, ssiList, ssio, authorizations))
throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
@@ -1338,7 +1339,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
// find all of the tables that need to be scanned
HashSet<String> tables = new HashSet<String>();
for (TKeyExtent keyExtent : tbatch.keySet()) {
- tables.add(new String(keyExtent.getTable(), Constants.UTF8));
+ tables.add(new String(keyExtent.getTable(), StandardCharsets.UTF_8));
}
if (tables.size() != 1)
@@ -1747,7 +1748,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
public void update(TInfo tinfo, TCredentials credentials, TKeyExtent tkeyExtent, TMutation tmutation) throws NotServingTabletException,
ConstraintViolationException, ThriftSecurityException {
- String tableId = new String(tkeyExtent.getTable(), Constants.UTF8);
+ String tableId = new String(tkeyExtent.getTable(), StandardCharsets.UTF_8);
if (!security.canWrite(credentials, tableId, Tables.getNamespaceId(instance, tableId)))
throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
KeyExtent keyExtent = new KeyExtent(tkeyExtent);
@@ -3136,7 +3137,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
}
};
- byte[] lockContent = new ServerServices(getClientAddressString(), Service.TSERV_CLIENT).toString().getBytes(Constants.UTF8);
+ byte[] lockContent = new ServerServices(getClientAddressString(), Service.TSERV_CLIENT).toString().getBytes(StandardCharsets.UTF_8);
for (int i = 0; i < 120 / 5; i++) {
zoo.putPersistentData(zPath, new byte[0], NodeExistsPolicy.SKIP);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 1504c94..571d46e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.lang.reflect.Method;
import java.nio.channels.ClosedChannelException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -39,7 +40,6 @@ import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.KeyExtent;
@@ -364,7 +364,7 @@ public class DfsLogger {
.getConfiguration().get(Property.CRYPTO_MODULE_CLASS));
// Initialize the log file with a header and the crypto params used to set up this log file.
- logFile.write(LOG_FILE_HEADER_V3.getBytes(Constants.UTF8));
+ logFile.write(LOG_FILE_HEADER_V3.getBytes(StandardCharsets.UTF_8));
CryptoModuleParameters params = CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf.getConfiguration());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
index 997f71b..1468fec 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogFileValue.java
@@ -19,11 +19,11 @@ package org.apache.accumulo.tserver.logger;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.ColumnUpdate;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.server.data.ServerMutation;
@@ -59,7 +59,7 @@ public class LogFileValue implements Writable {
}
private static String displayLabels(byte[] labels) {
- String s = new String(labels, Constants.UTF8);
+ String s = new String(labels, StandardCharsets.UTF_8);
s = s.replace("&", " & ");
s = s.replace("|", " | ");
return s;
@@ -76,11 +76,11 @@ public class LogFileValue implements Writable {
builder.append("...");
break;
}
- builder.append(" ").append(new String(m.getRow(), Constants.UTF8)).append("\n");
+ builder.append(" ").append(new String(m.getRow(), StandardCharsets.UTF_8)).append("\n");
for (ColumnUpdate update : m.getUpdates()) {
String value = new String(update.getValue());
- builder.append(" ").append(new String(update.getColumnFamily(), Constants.UTF8)).append(":")
- .append(new String(update.getColumnQualifier(), Constants.UTF8)).append(" ").append(update.hasTimestamp() ? "[user]:" : "[system]:")
+ builder.append(" ").append(new String(update.getColumnFamily(), StandardCharsets.UTF_8)).append(":")
+ .append(new String(update.getColumnQualifier(), StandardCharsets.UTF_8)).append(" ").append(update.hasTimestamp() ? "[user]:" : "[system]:")
.append(update.getTimestamp()).append(" [").append(displayLabels(update.getColumnVisibility())).append("] ")
.append(update.isDeleted() ? "<deleted>" : value).append("\n");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
index 25b8043..575e49e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/logger/LogReader.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.tserver.logger;
import java.io.DataInputStream;
import java.io.EOFException;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -26,7 +27,6 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.Help;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Mutation;
@@ -147,7 +147,7 @@ public class LogReader {
}
if (rowMatcher != null) {
- rowMatcher.reset(new String(m.getRow(), Constants.UTF8));
+ rowMatcher.reset(new String(m.getRow(), StandardCharsets.UTF_8));
if (rowMatcher.matches()) {
found = true;
break;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java b/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
index 3807625..42a8041 100644
--- a/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
+++ b/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java
@@ -17,10 +17,10 @@
package org.apache.accumulo.test;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.TableNotFoundException;
@@ -50,7 +50,7 @@ public class BulkImportDirectory {
if (args.length == 5) {
System.err.println("Deprecated syntax for BulkImportDirectory, please use the new style (see --help)");
final String user = args[0];
- final byte[] pass = args[1].getBytes(Constants.UTF8);
+ final byte[] pass = args[1].getBytes(StandardCharsets.UTF_8);
final String tableName = args[2];
final String dir = args[3];
final String failureDir = args[4];
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java b/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java
index 7eedbf0..5f51830 100644
--- a/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.accumulo.test;
+import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.Map.Entry;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
@@ -61,7 +61,7 @@ public class NativeMapConcurrencyTest {
for (int i = 0; i < numRows; i++) {
Mutation m = nm(i + start);
for (int j = 0; j < numCols; j++) {
- Value val = new Value("test".getBytes(Constants.UTF8));
+ Value val = new Value("test".getBytes(StandardCharsets.UTF_8));
pc(m, j, val);
}
nm.mutate(m, mc++);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java b/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java
index 6d161a9..9266ea0 100644
--- a/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.test;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Iterator;
import java.util.Map.Entry;
@@ -24,7 +25,6 @@ import java.util.SortedMap;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentSkipListMap;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
@@ -77,7 +77,7 @@ public class NativeMapPerformanceTest {
Mutation m = nm(row);
for (int j = 0; j < numCols; j++) {
int col = rand.nextInt(1000000);
- Value val = new Value("test".getBytes(Constants.UTF8));
+ Value val = new Value("test".getBytes(StandardCharsets.UTF_8));
pc(m, col, val);
}
nm.mutate(m, i);
@@ -88,7 +88,7 @@ public class NativeMapPerformanceTest {
for (int j = 0; j < numCols; j++) {
int col = rand.nextInt(1000000);
Key key = nk(row, col);
- Value val = new Value("test".getBytes(Constants.UTF8));
+ Value val = new Value("test".getBytes(StandardCharsets.UTF_8));
tm.put(key, val);
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java b/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java
index 8acf1af..e5ce63e 100644
--- a/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.test;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -24,7 +25,6 @@ import java.util.Map.Entry;
import java.util.Random;
import java.util.Set;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
@@ -50,7 +50,7 @@ public class NativeMapStressTest {
private static void put(NativeMap nm, String row, String val, int mc) {
Mutation m = new Mutation(new Text(row));
- m.put(new Text(), new Text(), Long.MAX_VALUE, new Value(val.getBytes(Constants.UTF8)));
+ m.put(new Text(), new Text(), Long.MAX_VALUE, new Value(val.getBytes(StandardCharsets.UTF_8)));
nm.mutate(m, mc);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java b/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
index a679c48..c2af60c 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java
@@ -16,12 +16,12 @@
*/
package org.apache.accumulo.test;
+import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.Random;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.BatchWriter;
@@ -83,7 +83,7 @@ public class TestBinaryRows {
public static void runTest(Connector connector, Opts opts, BatchWriterOpts bwOpts, ScannerOpts scanOpts) throws Exception {
final Text CF = new Text("cf"), CQ = new Text("cq");
- final byte[] CF_BYTES = "cf".getBytes(Constants.UTF8), CQ_BYTES = "cq".getBytes(Constants.UTF8);
+ final byte[] CF_BYTES = "cf".getBytes(StandardCharsets.UTF_8), CQ_BYTES = "cq".getBytes(StandardCharsets.UTF_8);
if (opts.mode.equals("ingest") || opts.mode.equals("delete")) {
BatchWriter bw = connector.createBatchWriter(opts.tableName, bwOpts.getBatchWriterConfig());
boolean delete = opts.mode.equals("delete");
@@ -96,7 +96,7 @@ public class TestBinaryRows {
if (delete) {
m.putDelete(CF, CQ);
} else {
- m.put(CF, CQ, new Value(value.getBytes(Constants.UTF8)));
+ m.put(CF, CQ, new Value(value.getBytes(StandardCharsets.UTF_8)));
}
bw.addMutation(m);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/TestIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TestIngest.java b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
index bc3ff05..0548f4c 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestIngest.java
@@ -17,12 +17,12 @@
package org.apache.accumulo.test;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Map.Entry;
import java.util.Random;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -153,8 +153,8 @@ public class TestIngest {
return bytevals;
}
- private static byte ROW_PREFIX[] = "row_".getBytes(Constants.UTF8);
- private static byte COL_PREFIX[] = "col_".getBytes(Constants.UTF8);
+ private static byte ROW_PREFIX[] = "row_".getBytes(StandardCharsets.UTF_8);
+ private static byte COL_PREFIX[] = "col_".getBytes(StandardCharsets.UTF_8);
public static Text generateRow(int rowid, int startRow) {
return new Text(FastFormat.toZeroPaddedString(rowid + startRow, 10, 10, ROW_PREFIX));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java b/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
index 2a6d9ae..b0e02f5 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
@@ -16,11 +16,11 @@
*/
package org.apache.accumulo.test;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.AccumuloException;
@@ -98,7 +98,7 @@ public class TestMultiTableIngest {
// populate
for (int i = 0; i < opts.count; i++) {
Mutation m = new Mutation(new Text(String.format("%06d", i)));
- m.put(new Text("col" + Integer.toString((i % 3) + 1)), new Text("qual"), new Value("junk".getBytes(Constants.UTF8)));
+ m.put(new Text("col" + Integer.toString((i % 3) + 1)), new Text("qual"), new Value("junk".getBytes(StandardCharsets.UTF_8)));
b.getBatchWriter(tableNames.get(i % tableNames.size())).addMutation(m);
}
try {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
index e3f0485..2aca579 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.test.continuous;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -120,7 +121,7 @@ public class ContinuousIngest {
visibilities = new ArrayList<ColumnVisibility>();
FileSystem fs = FileSystem.get(new Configuration());
- BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(opts.visFile)), Constants.UTF8));
+ BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(opts.visFile)), StandardCharsets.UTF_8));
String line;
@@ -157,9 +158,9 @@ public class ContinuousIngest {
Random r = new Random();
- byte[] ingestInstanceId = UUID.randomUUID().toString().getBytes(Constants.UTF8);
+ byte[] ingestInstanceId = UUID.randomUUID().toString().getBytes(StandardCharsets.UTF_8);
- System.out.printf("UUID %d %s%n", System.currentTimeMillis(), new String(ingestInstanceId, Constants.UTF8));
+ System.out.printf("UUID %d %s%n", System.currentTimeMillis(), new String(ingestInstanceId, StandardCharsets.UTF_8));
long count = 0;
final int flushInterval = 1000000;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
index dc43445..356d7ce 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
@@ -17,11 +17,11 @@
package org.apache.accumulo.test.continuous;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Random;
import java.util.Set;
import java.util.UUID;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
@@ -87,7 +87,7 @@ public class ContinuousMoru extends Configured implements Tool {
random = new Random();
ingestInstanceId = context.getConfiguration().get(CI_ID);
- iiId = ingestInstanceId.getBytes(Constants.UTF8);
+ iiId = ingestInstanceId.getBytes(StandardCharsets.UTF_8);
count = 0;
}
@@ -103,7 +103,7 @@ public class ContinuousMoru extends Configured implements Tool {
int offset = ContinuousWalk.getPrevRowOffset(val);
if (offset > 0) {
- long rowLong = Long.parseLong(new String(val, offset, 16, Constants.UTF8), 16);
+ long rowLong = Long.parseLong(new String(val, offset, 16, StandardCharsets.UTF_8), 16);
Mutation m = ContinuousIngest.genMutation(rowLong, random.nextInt(max_cf), random.nextInt(max_cq), EMPTY_VIS, iiId, count++, key.getRowData()
.toArray(), random, true);
context.write(null, m);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousQuery.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousQuery.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousQuery.java
index 4bbc85f..f7393d9 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousQuery.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousQuery.java
@@ -16,10 +16,10 @@
*/
package org.apache.accumulo.test.continuous;
+import java.nio.charset.StandardCharsets;
import java.util.Map.Entry;
import java.util.Random;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Scanner;
@@ -62,7 +62,7 @@ public class ContinuousQuery {
}
long t2 = System.currentTimeMillis();
- System.out.printf("SRQ %d %s %d %d%n", t1, new String(row, Constants.UTF8), (t2 - t1), count);
+ System.out.printf("SRQ %d %s %d %d%n", t1, new String(row, StandardCharsets.UTF_8), (t2 - t1), count);
if (opts.sleepTime > 0)
Thread.sleep(opts.sleepTime);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java
index fcc8fec..77f74da 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java
@@ -16,11 +16,11 @@
*/
package org.apache.accumulo.test.continuous;
+import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.Random;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Scanner;
@@ -94,7 +94,7 @@ public class ContinuousScanner {
// System.out.println("P2 "+delta +" "+numToScan+" "+distance+" "+((double)numToScan/count ));
}
- System.out.printf("SCN %d %s %d %d%n", t1, new String(scanStart, Constants.UTF8), (t2 - t1), count);
+ System.out.printf("SCN %d %s %d %d%n", t1, new String(scanStart, StandardCharsets.UTF_8), (t2 - t1), count);
if (opts.sleepTime > 0)
UtilWaitThread.sleep(opts.sleepTime);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index 2e62d75..623d3e6 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@ -18,13 +18,13 @@ package org.apache.accumulo.test.continuous;
import java.io.IOException;
import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Random;
import java.util.Set;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.ClientOnDefaultTable;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
@@ -109,7 +109,7 @@ public class ContinuousVerify extends Configured implements Tool {
int offset = ContinuousWalk.getPrevRowOffset(val);
if (offset > 0) {
- ref.set(Long.parseLong(new String(val, offset, 16, Constants.UTF8), 16));
+ ref.set(Long.parseLong(new String(val, offset, 16, StandardCharsets.UTF_8), 16));
vrow.set(r);
context.write(ref, vrow);
}
@@ -143,7 +143,7 @@ public class ContinuousVerify extends Configured implements Tool {
for (Long ref : refs) {
sb.append(comma);
comma = ",";
- sb.append(new String(ContinuousIngest.genRow(ref), Constants.UTF8));
+ sb.append(new String(ContinuousIngest.genRow(ref), StandardCharsets.UTF_8));
}
context.write(new Text(ContinuousIngest.genRow(key.get())), new Text(sb.toString()));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
index 6082ebe..262f7b0 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.test.continuous;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -26,7 +27,6 @@ import java.util.Map.Entry;
import java.util.Random;
import java.util.zip.CRC32;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
@@ -86,7 +86,7 @@ public class ContinuousWalk {
auths = new ArrayList<Authorizations>();
FileSystem fs = FileSystem.get(new Configuration());
- BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(file)), Constants.UTF8));
+ BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(file)), StandardCharsets.UTF_8));
try {
String line;
while ((line = in.readLine()) != null) {
@@ -173,7 +173,7 @@ public class ContinuousWalk {
long t2 = System.currentTimeMillis();
- System.out.printf("FSR %d %s %d %d%n", t1, new String(scanStart, Constants.UTF8), (t2 - t1), count);
+ System.out.printf("FSR %d %s %d %d%n", t1, new String(scanStart, StandardCharsets.UTF_8), (t2 - t1), count);
return pr;
}
@@ -182,12 +182,12 @@ public class ContinuousWalk {
if (val.length == 0)
throw new IllegalArgumentException();
if (val[53] != ':')
- throw new IllegalArgumentException(new String(val, Constants.UTF8));
+ throw new IllegalArgumentException(new String(val, StandardCharsets.UTF_8));
// prev row starts at 54
if (val[54] != ':') {
if (val[54 + 16] != ':')
- throw new IllegalArgumentException(new String(val, Constants.UTF8));
+ throw new IllegalArgumentException(new String(val, StandardCharsets.UTF_8));
return 54;
}
@@ -199,7 +199,7 @@ public class ContinuousWalk {
byte[] val = value.get();
int offset = getPrevRowOffset(val);
if (offset > 0) {
- return new String(val, offset, 16, Constants.UTF8);
+ return new String(val, offset, 16, StandardCharsets.UTF_8);
}
return null;
@@ -208,7 +208,7 @@ public class ContinuousWalk {
static int getChecksumOffset(byte val[]) {
if (val[val.length - 1] != ':') {
if (val[val.length - 9] != ':')
- throw new IllegalArgumentException(new String(val, Constants.UTF8));
+ throw new IllegalArgumentException(new String(val, StandardCharsets.UTF_8));
return val.length - 8;
}
@@ -220,7 +220,7 @@ public class ContinuousWalk {
if (ckOff < 0)
return;
- long storedCksum = Long.parseLong(new String(value.get(), ckOff, 8, Constants.UTF8), 16);
+ long storedCksum = Long.parseLong(new String(value.get(), ckOff, 8, StandardCharsets.UTF_8), 16);
CRC32 cksum = new CRC32();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java b/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java
index f1657b7..bb91834 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java
@@ -21,6 +21,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -30,8 +31,6 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
-
class HistData<T> implements Comparable<HistData<T>>, Serializable {
private static final long serialVersionUID = 1L;
@@ -149,7 +148,7 @@ public class Histogram<T> implements Serializable {
FileOutputStream fos = new FileOutputStream(file);
BufferedOutputStream bos = new BufferedOutputStream(fos);
- PrintStream ps = new PrintStream(bos, false, Constants.UTF8.name());
+ PrintStream ps = new PrintStream(bos, false, StandardCharsets.UTF_8.name());
TreeSet<HistData<T>> sortedCounts = new TreeSet<HistData<T>>(counts.values());
for (Iterator<HistData<T>> iter = sortedCounts.iterator(); iter.hasNext();) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java b/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
index fc5262b..eebc425 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java
@@ -21,8 +21,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-
-import org.apache.accumulo.core.Constants;
+import java.nio.charset.StandardCharsets;
public class PrintScanTimeHistogram {
@@ -45,7 +44,7 @@ public class PrintScanTimeHistogram {
private static void processFile(InputStream ins, Histogram<String> srqHist, Histogram<String> fsrHist) throws FileNotFoundException, IOException {
String line;
- BufferedReader in = new BufferedReader(new InputStreamReader(ins, Constants.UTF8));
+ BufferedReader in = new BufferedReader(new InputStreamReader(ins, StandardCharsets.UTF_8));
while ((line = in.readLine()) != null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java b/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java
index 2f22f36..29800b6 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.test.continuous;
import java.io.BufferedReader;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -25,7 +26,6 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.ClientOpts.TimeConverter;
import org.apache.accumulo.core.cli.Help;
@@ -72,7 +72,7 @@ public class TimeBinner {
Operation operation = Operation.valueOf(opts.operation);
SimpleDateFormat sdf = new SimpleDateFormat(opts.dateFormat);
- BufferedReader in = new BufferedReader(new InputStreamReader(System.in, Constants.UTF8));
+ BufferedReader in = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
String line = null;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java b/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
index ab75632..efcdcf1 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -34,7 +35,6 @@ import java.util.Map.Entry;
import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.BatchScannerOpts;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.Connector;
@@ -84,7 +84,7 @@ public class UndefinedAnalyzer {
}
private void parseLog(File log) throws Exception {
- BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(log), Constants.UTF8));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(log), StandardCharsets.UTF_8));
String line;
TreeMap<Long,Long> tm = null;
try {
@@ -176,7 +176,7 @@ public class UndefinedAnalyzer {
for (File masterLog : masterLogs) {
- BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(masterLog), Constants.UTF8));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(masterLog), StandardCharsets.UTF_8));
String line;
try {
while ((line = reader.readLine()) != null) {
@@ -260,7 +260,7 @@ public class UndefinedAnalyzer {
List<UndefinedNode> undefs = new ArrayList<UndefinedNode>();
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in, Constants.UTF8));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
String line;
while ((line = reader.readLine()) != null) {
String[] tokens = line.split("\\s");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java
index cbda17d..8d5cc16 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java
@@ -19,12 +19,12 @@ package org.apache.accumulo.test.functional;
import java.io.File;
import java.io.FileOutputStream;
import java.io.ObjectOutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.UUID;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.fate.zookeeper.ZooCache;
@@ -53,12 +53,12 @@ public class CacheTestReader {
for (int i = 0; i < numData; i++) {
byte[] v = zc.get(rootDir + "/data" + i);
if (v != null)
- readData.put(rootDir + "/data" + i, new String(v, Constants.UTF8));
+ readData.put(rootDir + "/data" + i, new String(v, StandardCharsets.UTF_8));
}
byte[] v = zc.get(rootDir + "/dataS");
if (v != null)
- readData.put(rootDir + "/dataS", new String(v, Constants.UTF8));
+ readData.put(rootDir + "/dataS", new String(v, StandardCharsets.UTF_8));
List<String> children = zc.getChildren(rootDir + "/dir");
if (children != null)
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java
index 20ea55f..5954171 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java
@@ -20,13 +20,13 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Map;
import java.util.Random;
import java.util.TreeMap;
import java.util.UUID;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -84,15 +84,15 @@ public class CacheTestWriter {
// change values
for (int i = 0; i < numData; i++) {
- byte data[] = Long.toString(r.nextLong(), 16).getBytes(Constants.UTF8);
+ byte data[] = Long.toString(r.nextLong(), 16).getBytes(StandardCharsets.UTF_8);
zk.putPersistentData(rootDir + "/data" + i, data, NodeExistsPolicy.OVERWRITE);
- expectedData.put(rootDir + "/data" + i, new String(data, Constants.UTF8));
+ expectedData.put(rootDir + "/data" + i, new String(data, StandardCharsets.UTF_8));
}
// test a data node that does not always exists...
if (r.nextFloat() < .5) {
- byte data[] = Long.toString(r.nextLong(), 16).getBytes(Constants.UTF8);
+ byte data[] = Long.toString(r.nextLong(), 16).getBytes(StandardCharsets.UTF_8);
if (!dataSExists) {
zk.putPersistentData(rootDir + "/dataS", data, NodeExistsPolicy.SKIP);
@@ -101,7 +101,7 @@ public class CacheTestWriter {
zk.putPersistentData(rootDir + "/dataS", data, NodeExistsPolicy.OVERWRITE);
}
- expectedData.put(rootDir + "/dataS", new String(data, Constants.UTF8));
+ expectedData.put(rootDir + "/dataS", new String(data, StandardCharsets.UTF_8));
} else {
if (dataSExists) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index 9b3eec7..cda7399 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.test.functional;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Random;
@@ -130,7 +131,7 @@ public class ZombieTServer {
}
};
- byte[] lockContent = new ServerServices(addressString, Service.TSERV_CLIENT).toString().getBytes(Constants.UTF8);
+ byte[] lockContent = new ServerServices(addressString, Service.TSERV_CLIENT).toString().getBytes(StandardCharsets.UTF_8);
if (zlock.tryLock(lw, lockContent)) {
log.debug("Obtained tablet server lock " + zlock.getLockPath());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
index cb17340..39659e2 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.test.performance.metadata;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -24,7 +25,6 @@ import java.util.Random;
import java.util.TreeSet;
import java.util.UUID;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -104,10 +104,10 @@ public class MetadataBatchScanTest {
String dir = "/t-" + UUID.randomUUID();
- TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(mut, new Value(dir.getBytes(Constants.UTF8)));
+ TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(mut, new Value(dir.getBytes(StandardCharsets.UTF_8)));
for (int i = 0; i < 5; i++) {
- mut.put(DataFileColumnFamily.NAME, new Text(dir + "/00000_0000" + i + ".map"), new Value("10000,1000000".getBytes(Constants.UTF8)));
+ mut.put(DataFileColumnFamily.NAME, new Text(dir + "/00000_0000" + i + ".map"), new Value("10000,1000000".getBytes(StandardCharsets.UTF_8)));
}
bw.addMutation(mut);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
index b7f64ba..0f59b7c 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.test.randomwalk;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -35,7 +36,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.log4j.Level;
import org.w3c.dom.Document;
@@ -274,9 +274,9 @@ public class Module extends Node {
else if (value instanceof String || value instanceof Map || value instanceof Collection || value instanceof Number)
logMsg += value;
else if (value instanceof byte[])
- logMsg += new String((byte[])value, Constants.UTF8);
+ logMsg += new String((byte[])value, StandardCharsets.UTF_8);
else if (value instanceof PasswordToken)
- logMsg += new String(((PasswordToken) value).getPassword(), Constants.UTF8);
+ logMsg += new String(((PasswordToken) value).getPassword(), StandardCharsets.UTF_8);
else
logMsg += value.getClass()+ " - " + value;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java
index 511cb1d..f6f2e87 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java
@@ -16,14 +16,15 @@
*/
package org.apache.accumulo.test.randomwalk.bulk;
-import org.apache.accumulo.core.Constants;
+import java.nio.charset.StandardCharsets;
+
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.test.randomwalk.Environment;
import org.apache.accumulo.test.randomwalk.State;
public class BulkMinusOne extends BulkTest {
- private static final Value negOne = new Value("-1".getBytes(Constants.UTF8));
+ private static final Value negOne = new Value("-1".getBytes(StandardCharsets.UTF_8));
@Override
protected void runLater(State state, Environment env) throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
index 93bc596..c36e4a0 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.test.randomwalk.bulk;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Iterator;
import java.util.Map.Entry;
@@ -23,7 +24,6 @@ import java.util.Properties;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.ClientOnRequiredTable;
import org.apache.accumulo.core.client.RowIterator;
import org.apache.accumulo.core.client.Scanner;
@@ -144,7 +144,7 @@ public class Verify extends Test {
* @param lastBadEntry
*/
private static void report(Text startBadRow, Text lastBadRow, Value value) {
- System.out.println("Bad value " + new String(value.get(), Constants.UTF8));
+ System.out.println("Bad value " + new String(value.get(), StandardCharsets.UTF_8));
System.out.println(" Range [" + startBadRow + " -> " + lastBadRow + "]");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchWrite.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchWrite.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchWrite.java
index 59e0500..9e50b61 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchWrite.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchWrite.java
@@ -16,11 +16,11 @@
*/
package org.apache.accumulo.test.randomwalk.concurrent;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Properties;
import java.util.Random;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
@@ -55,7 +55,7 @@ public class BatchWrite extends Test {
Mutation m = new Mutation(String.format("%016x", rand.nextLong() & 0x7fffffffffffffffl));
long val = rand.nextLong() & 0x7fffffffffffffffl;
for (int j = 0; j < 10; j++) {
- m.put("cf", "cq" + j, new Value(String.format("%016x", val).getBytes(Constants.UTF8)));
+ m.put("cf", "cq" + j, new Value(String.format("%016x", val).getBytes(StandardCharsets.UTF_8)));
}
bw.addMutation(m);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
index 79a2640..eb60971 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java
@@ -17,12 +17,12 @@
package org.apache.accumulo.test.randomwalk.concurrent;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Properties;
import java.util.Random;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.MutationsRejectedException;
@@ -124,7 +124,7 @@ public class BulkImport extends Test {
Mutation m = new Mutation(String.format("%016x", row));
long val = rand.nextLong() & 0x7fffffffffffffffl;
for (int j = 0; j < 10; j++) {
- m.put("cf", "cq" + j, new Value(String.format("%016x", val).getBytes(Constants.UTF8)));
+ m.put("cf", "cq" + j, new Value(String.format("%016x", val).getBytes(StandardCharsets.UTF_8)));
}
bw.addMutation(m);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
index 47b6ef1..28da4f1 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java
@@ -16,12 +16,12 @@
*/
package org.apache.accumulo.test.randomwalk.concurrent;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.Random;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.security.Authorizations;
@@ -47,10 +47,10 @@ public class ChangeAuthorizations extends Test {
if (rand.nextBoolean()) {
String authorization = String.format("a%d", rand.nextInt(5000));
log.debug("adding authorization " + authorization);
- auths.add(authorization.getBytes(Constants.UTF8));
+ auths.add(authorization.getBytes(StandardCharsets.UTF_8));
} else {
if (auths.size() > 0) {
- log.debug("removing authorization " + new String(auths.remove(0), Constants.UTF8));
+ log.debug("removing authorization " + new String(auths.remove(0), StandardCharsets.UTF_8));
}
}
conn.securityOperations().changeUserAuthorizations(userName, new Authorizations(auths));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
index f42241f..85340f5 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.test.randomwalk.concurrent;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -48,7 +49,7 @@ public class StopTabletServer extends Test {
Collections.sort(children);
Stat stat = new Stat();
byte[] data = rdr.getData(base + "/" + child + "/" + children.get(0), stat);
- if (!"master".equals(new String(data, Constants.UTF8))) {
+ if (!"master".equals(new String(data, StandardCharsets.UTF_8))) {
result.add(new TServerInstance(AddressUtil.parseAddress(child, false), stat.getEphemeralOwner()));
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Verify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Verify.java
index 08b306c..a7669f8 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Verify.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.test.randomwalk.image;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.Iterator;
import java.util.Map.Entry;
@@ -23,7 +24,6 @@ import java.util.Properties;
import java.util.Random;
import java.util.UUID;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
@@ -59,7 +59,7 @@ public class Verify extends Test {
String uuid = UUID.randomUUID().toString();
MessageDigest alg = MessageDigest.getInstance("SHA-1");
- alg.update(uuid.getBytes(Constants.UTF8));
+ alg.update(uuid.getBytes(StandardCharsets.UTF_8));
indexScanner.setRange(new Range(new Text(alg.digest()), null));
indexScanner.setBatchSize(numVerifications);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Write.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Write.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Write.java
index cb7281a..a1731d1 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Write.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Write.java
@@ -16,12 +16,12 @@
*/
package org.apache.accumulo.test.randomwalk.image;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.Properties;
import java.util.Random;
import java.util.UUID;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
import org.apache.accumulo.core.data.Mutation;
@@ -62,7 +62,7 @@ public class Write extends Test {
m.put(CONTENT_COLUMN_FAMILY, IMAGE_COLUMN_QUALIFIER, new Value(imageBytes));
// store size
- m.put(META_COLUMN_FAMILY, new Text("size"), new Value(String.format("%d", numBytes).getBytes(Constants.UTF8)));
+ m.put(META_COLUMN_FAMILY, new Text("size"), new Value(String.format("%d", numBytes).getBytes(StandardCharsets.UTF_8)));
// store hash
MessageDigest alg = MessageDigest.getInstance("SHA-1");
@@ -76,7 +76,7 @@ public class Write extends Test {
state.set("totalWrites", totalWrites);
// set count
- m.put(META_COLUMN_FAMILY, COUNT_COLUMN_QUALIFIER, new Value(String.format("%d", totalWrites).getBytes(Constants.UTF8)));
+ m.put(META_COLUMN_FAMILY, COUNT_COLUMN_QUALIFIER, new Value(String.format("%d", totalWrites).getBytes(StandardCharsets.UTF_8)));
// add mutation
imagesBW.addMutation(m);
@@ -84,7 +84,7 @@ public class Write extends Test {
// now add mutation to index
Text row = new Text(hash);
m = new Mutation(row);
- m.put(META_COLUMN_FAMILY, UUID_COLUMN_QUALIFIER, new Value(uuid.getBytes(Constants.UTF8)));
+ m.put(META_COLUMN_FAMILY, UUID_COLUMN_QUALIFIER, new Value(uuid.getBytes(StandardCharsets.UTF_8)));
indexBW.addMutation(m);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Write.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Write.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Write.java
index 4761d2a..4a0515c 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Write.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Write.java
@@ -16,13 +16,13 @@
*/
package org.apache.accumulo.test.randomwalk.multitable;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.Properties;
import java.util.Random;
import java.util.UUID;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.TableOfflineException;
@@ -72,7 +72,7 @@ public class Write extends Test {
m.put(meta, new Text("payload"), new Value(payloadBytes));
// store size
- m.put(meta, new Text("size"), new Value(String.format("%d", numBytes).getBytes(Constants.UTF8)));
+ m.put(meta, new Text("size"), new Value(String.format("%d", numBytes).getBytes(StandardCharsets.UTF_8)));
// store hash
MessageDigest alg = MessageDigest.getInstance("SHA-1");