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:30 UTC
[3/5] ACCUMULO-1545 Replace UTF8 constant with built-in one
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index 5cbffc3..10cdce6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.server.init;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
@@ -354,12 +355,12 @@ public class Initialize {
// table tablet's directory
Key tableDirKey = new Key(tableExtent, TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnFamily(),
TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnQualifier(), 0);
- mfw.append(tableDirKey, new Value(tableMetadataTabletDir.getBytes(Constants.UTF8)));
+ mfw.append(tableDirKey, new Value(tableMetadataTabletDir.getBytes(StandardCharsets.UTF_8)));
// table tablet time
Key tableTimeKey = new Key(tableExtent, TabletsSection.ServerColumnFamily.TIME_COLUMN.getColumnFamily(),
TabletsSection.ServerColumnFamily.TIME_COLUMN.getColumnQualifier(), 0);
- mfw.append(tableTimeKey, new Value((TabletTime.LOGICAL_TIME_ID + "0").getBytes(Constants.UTF8)));
+ mfw.append(tableTimeKey, new Value((TabletTime.LOGICAL_TIME_ID + "0").getBytes(StandardCharsets.UTF_8)));
// table tablet's prevrow
Key tablePrevRowKey = new Key(tableExtent, TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.getColumnFamily(),
@@ -372,12 +373,12 @@ public class Initialize {
// default's directory
Key defaultDirKey = new Key(defaultExtent, TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnFamily(),
TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnQualifier(), 0);
- mfw.append(defaultDirKey, new Value(defaultMetadataTabletDir.getBytes(Constants.UTF8)));
+ mfw.append(defaultDirKey, new Value(defaultMetadataTabletDir.getBytes(StandardCharsets.UTF_8)));
// default's time
Key defaultTimeKey = new Key(defaultExtent, TabletsSection.ServerColumnFamily.TIME_COLUMN.getColumnFamily(),
TabletsSection.ServerColumnFamily.TIME_COLUMN.getColumnQualifier(), 0);
- mfw.append(defaultTimeKey, new Value((TabletTime.LOGICAL_TIME_ID + "0").getBytes(Constants.UTF8)));
+ mfw.append(defaultTimeKey, new Value((TabletTime.LOGICAL_TIME_ID + "0").getBytes(StandardCharsets.UTF_8)));
// default's prevrow
Key defaultPrevRowKey = new Key(defaultExtent, TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.getColumnFamily(),
@@ -427,7 +428,7 @@ public class Initialize {
// setup instance name
if (opts.clearInstanceName)
zoo.recursiveDelete(instanceNamePath, NodeMissingPolicy.SKIP);
- zoo.putPersistentData(instanceNamePath, uuid.getBytes(Constants.UTF8), NodeExistsPolicy.FAIL);
+ zoo.putPersistentData(instanceNamePath, uuid.getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.FAIL);
final byte[] EMPTY_BYTE_ARRAY = new byte[0], ZERO_CHAR_ARRAY = new byte[] {'0'};
@@ -448,7 +449,7 @@ public class Initialize {
zoo.putPersistentData(zkInstanceRoot + Constants.ZTRACERS, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZMASTERS, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZMASTER_LOCK, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
- zoo.putPersistentData(zkInstanceRoot + Constants.ZMASTER_GOAL_STATE, MasterGoalState.NORMAL.toString().getBytes(Constants.UTF8), NodeExistsPolicy.FAIL);
+ zoo.putPersistentData(zkInstanceRoot + Constants.ZMASTER_GOAL_STATE, MasterGoalState.NORMAL.toString().getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZGC, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZGC_LOCK, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZCONFIG, EMPTY_BYTE_ARRAY, NodeExistsPolicy.FAIL);
@@ -494,7 +495,7 @@ public class Initialize {
private static byte[] getRootPassword(Opts opts) throws IOException {
if (opts.cliPassword != null) {
- return opts.cliPassword.getBytes(Constants.UTF8);
+ return opts.cliPassword.getBytes(StandardCharsets.UTF_8);
}
String rootpass;
String confirmpass;
@@ -509,7 +510,7 @@ public class Initialize {
if (!rootpass.equals(confirmpass))
log.error("Passwords do not match");
} while (!rootpass.equals(confirmpass));
- return rootpass.getBytes(Constants.UTF8);
+ return rootpass.getBytes(StandardCharsets.UTF_8);
}
private static void initSecurity(Opts opts, String iid) throws AccumuloSecurityException, ThriftSecurityException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
index f0fea77..3dbc6ba 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.server.master;
import static org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy.SKIP;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -293,7 +294,7 @@ public class LiveTServerSet implements Watcher {
}
} else {
locklessServers.remove(zPath);
- ServerServices services = new ServerServices(new String(lockData, Constants.UTF8));
+ ServerServices services = new ServerServices(new String(lockData, StandardCharsets.UTF_8));
HostAndPort client = services.getAddress(ServerServices.Service.TSERV_CLIENT);
TServerInstance instance = new TServerInstance(client, stat.getEphemeralOwner());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
index 2f657c4..0e1f5ee 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
@@ -16,10 +16,10 @@
*/
package org.apache.accumulo.server.master.state;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.master.thrift.DeadServer;
import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -60,7 +60,7 @@ public class DeadServerList {
// in the dead server list.
continue;
}
- DeadServer server = new DeadServer(child, stat.getMtime(), new String(data, Constants.UTF8));
+ DeadServer server = new DeadServer(child, stat.getMtime(), new String(data, StandardCharsets.UTF_8));
result.add(server);
}
}
@@ -82,7 +82,7 @@ public class DeadServerList {
public void post(String server, String cause) {
IZooReaderWriter zoo = ZooReaderWriter.getInstance();
try {
- zoo.putPersistentData(path + "/" + server, cause.getBytes(Constants.UTF8), NodeExistsPolicy.SKIP);
+ zoo.putPersistentData(path + "/" + server, cause.getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.SKIP);
} catch (Exception ex) {
log.error(ex, ex);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
index 400d0ac..a692514 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
@@ -59,7 +59,7 @@ public class TServerInstance implements Comparable<TServerInstance>, Serializabl
}
public TServerInstance(Value address, Text session) {
- this(AddressUtil.parseAddress(new String(address.get(), Constants.UTF8), false), session.toString());
+ this(AddressUtil.parseAddress(new String(address.get(), StandardCharsets.UTF_8), false), session.toString());
}
public void putLocation(Mutation m) {
@@ -120,7 +120,7 @@ public class TServerInstance implements Comparable<TServerInstance>, Serializabl
}
public Value asMutationValue() {
- return new Value(getLocation().toString().getBytes(Constants.UTF8));
+ return new Value(getLocation().toString().getBytes(StandardCharsets.UTF_8));
}
public HostAndPort getLocation() {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
index d5ec5d0..6c94756 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.server.master.state;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -26,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.KeyExtent;
@@ -95,7 +95,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
try {
Map<Text,MergeInfo> result = new HashMap<Text,MergeInfo>();
DataInputBuffer buffer = new DataInputBuffer();
- byte[] data = Base64.decodeBase64(merges.getBytes(Constants.UTF8));
+ byte[] data = Base64.decodeBase64(merges.getBytes(StandardCharsets.UTF_8));
buffer.reset(data, data.length);
while (buffer.available() > 0) {
MergeInfo mergeInfo = new MergeInfo();
@@ -183,7 +183,7 @@ public class TabletStateChangeIterator extends SkippingIterator {
} catch (Exception ex) {
throw new RuntimeException(ex);
}
- String encoded = new String(Base64.encodeBase64(Arrays.copyOf(buffer.getData(), buffer.getLength())), Constants.UTF8);
+ String encoded = new String(Base64.encodeBase64(Arrays.copyOf(buffer.getData(), buffer.getLength())), StandardCharsets.UTF_8);
cfg.addOption(MERGES_OPTION, encoded);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java
index b0ed03f..6ab4683 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java
@@ -17,9 +17,9 @@
package org.apache.accumulo.server.master.state;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.List;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -75,7 +75,7 @@ public class ZooStore implements DistributedStore {
path = relative(path);
ZooReaderWriter.getInstance().putPersistentData(path, bs, NodeExistsPolicy.OVERWRITE);
cache.clear();
- log.debug("Wrote " + new String(bs, Constants.UTF8) + " to " + path);
+ log.debug("Wrote " + new String(bs, StandardCharsets.UTF_8) + " to " + path);
} catch (Exception ex) {
throw new DistributedStoreException(ex);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
index 0a0e1ee..e7f06dc 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
@@ -17,12 +17,12 @@
package org.apache.accumulo.server.master.state;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.commons.lang.NotImplementedException;
@@ -109,7 +109,7 @@ public class ZooTabletStateStore extends TabletStateStore {
}
protected TServerInstance parse(byte[] current) {
- String str = new String(current, Constants.UTF8);
+ String str = new String(current, StandardCharsets.UTF_8);
String[] parts = str.split("[|]", 2);
HostAndPort address = HostAndPort.fromString(parts[0]);
if (parts.length > 1 && parts[1] != null && parts[1].length() > 0) {
@@ -133,7 +133,7 @@ public class ZooTabletStateStore extends TabletStateStore {
if (current.current != null) {
throw new DistributedStoreException("Trying to set the root tablet location: it is already set to " + current.current);
}
- store.put(RootTable.ZROOT_TABLET_FUTURE_LOCATION, value.getBytes(Constants.UTF8));
+ store.put(RootTable.ZROOT_TABLET_FUTURE_LOCATION, value.getBytes(StandardCharsets.UTF_8));
}
@Override
@@ -152,8 +152,8 @@ public class ZooTabletStateStore extends TabletStateStore {
if (!current.future.equals(assignment.server)) {
throw new DistributedStoreException("Root tablet is already assigned to " + current.future);
}
- store.put(RootTable.ZROOT_TABLET_LOCATION, value.getBytes(Constants.UTF8));
- store.put(RootTable.ZROOT_TABLET_LAST_LOCATION, value.getBytes(Constants.UTF8));
+ store.put(RootTable.ZROOT_TABLET_LOCATION, value.getBytes(StandardCharsets.UTF_8));
+ store.put(RootTable.ZROOT_TABLET_LAST_LOCATION, value.getBytes(StandardCharsets.UTF_8));
// Make the following unnecessary by making the entire update atomic
store.remove(RootTable.ZROOT_TABLET_FUTURE_LOCATION);
log.debug("Put down root tablet location");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
index cdcdfba..d0a8a9a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metrics/AbstractMetricsImpl.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.lang.management.ManagementFactory;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.concurrent.ConcurrentHashMap;
@@ -30,7 +31,6 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import org.apache.accumulo.core.Constants;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.time.DateUtils;
@@ -201,7 +201,7 @@ public abstract class AbstractMetricsImpl {
return;
}
}
- logWriter = new OutputStreamWriter(new FileOutputStream(logFile, true), Constants.UTF8);
+ logWriter = new OutputStreamWriter(new FileOutputStream(logFile, true), StandardCharsets.UTF_8);
}
private void writeToLog(String name) throws IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
index 0a5341a..902c063 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.server.monitor;
import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -111,7 +112,7 @@ public class LogService extends org.apache.log4j.AppenderSkeleton {
}
}
- zoo.putEphemeralData(path, logForwardingAddr.getBytes(Constants.UTF8));
+ zoo.putEphemeralData(path, logForwardingAddr.getBytes(StandardCharsets.UTF_8));
new Daemon(server).start();
} catch (Throwable t) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
index f8b1702..c797dc0 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.server.security;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -142,7 +143,7 @@ public class SecurityOperation {
public synchronized String getRootUsername() {
if (rootUserName == null)
- rootUserName = new String(zooCache.get(ZKUserPath), Constants.UTF8);
+ rootUserName = new String(zooCache.get(ZKUserPath), StandardCharsets.UTF_8);
return rootUserName;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java b/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
index 9b4931d..d99f104 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.server.security;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecurityPermission;
@@ -101,20 +102,20 @@ public final class SystemCredentials extends Credentials {
}
// seed the config with the version and instance id, so at least it's not empty
- md.update(ServerConstants.WIRE_VERSION.toString().getBytes(Constants.UTF8));
- md.update(HdfsZooInstance.getInstance().getInstanceID().getBytes(Constants.UTF8));
+ md.update(ServerConstants.WIRE_VERSION.toString().getBytes(StandardCharsets.UTF_8));
+ md.update(HdfsZooInstance.getInstance().getInstanceID().getBytes(StandardCharsets.UTF_8));
for (Entry<String,String> entry : ServerConfiguration.getSiteConfiguration()) {
// only include instance properties
if (entry.getKey().startsWith(Property.INSTANCE_PREFIX.toString())) {
- md.update(entry.getKey().getBytes(Constants.UTF8));
- md.update(entry.getValue().getBytes(Constants.UTF8));
+ md.update(entry.getKey().getBytes(StandardCharsets.UTF_8));
+ md.update(entry.getValue().getBytes(StandardCharsets.UTF_8));
}
}
confChecksum = md.digest();
int wireVersion = ServerConstants.WIRE_VERSION;
- byte[] inst = HdfsZooInstance.getInstance().getInstanceID().getBytes(Constants.UTF8);
+ byte[] inst = HdfsZooInstance.getInstance().getInstanceID().getBytes(StandardCharsets.UTF_8);
ByteArrayOutputStream bytes = new ByteArrayOutputStream(3 * (Integer.SIZE / Byte.SIZE) + inst.length + confChecksum.length);
DataOutputStream out = new DataOutputStream(bytes);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
index 1646a28..8fd26e2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.server.security.handler;
+import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Set;
import java.util.TreeSet;
@@ -71,7 +72,7 @@ public final class ZKAuthenticator implements Authenticator {
}
// prep parent node of users with root username
- zoo.putPersistentData(ZKUserPath, principal.getBytes(Constants.UTF8), NodeExistsPolicy.FAIL);
+ zoo.putPersistentData(ZKUserPath, principal.getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.FAIL);
constructUser(principal, ZKSecurityTool.createPass(token));
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
index 34d43f2..1218a07 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.server.security.handler;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -25,7 +26,6 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
import org.apache.accumulo.core.metadata.MetadataTable;
@@ -95,7 +95,7 @@ public class ZKAuthorizor implements Authorizor {
try {
// prep parent node of users with root username
if (!zoo.exists(ZKUserPath))
- zoo.putPersistentData(ZKUserPath, rootuser.getBytes(Constants.UTF8), NodeExistsPolicy.FAIL);
+ zoo.putPersistentData(ZKUserPath, rootuser.getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.FAIL);
initUser(rootuser);
zoo.putPersistentData(ZKUserPath + "/" + rootuser + ZKUserAuths, ZKSecurityTool.convertAuthorizations(Authorizations.EMPTY), NodeExistsPolicy.FAIL);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
index 6319653..2fc9dc9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.server.security.handler;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -23,7 +24,6 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.NamespaceNotFoundException;
import org.apache.accumulo.core.client.TableNotFoundException;
@@ -393,7 +393,7 @@ public class ZKPermHandler implements PermissionHandler {
try {
// prep parent node of users with root username
if (!zoo.exists(ZKUserPath))
- zoo.putPersistentData(ZKUserPath, rootuser.getBytes(Constants.UTF8), NodeExistsPolicy.FAIL);
+ zoo.putPersistentData(ZKUserPath, rootuser.getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.FAIL);
initUser(rootuser);
zoo.putPersistentData(ZKUserPath + "/" + rootuser + ZKUserSysPerms, ZKSecurityTool.convertSystemPermissions(rootPerms), NodeExistsPolicy.FAIL);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
index 7a61eb6..25dbcce 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.server.tables;
+import java.nio.charset.StandardCharsets;
import java.security.SecurityPermission;
import java.util.Collections;
import java.util.HashMap;
@@ -65,7 +66,7 @@ public class TableManager {
IZooReaderWriter zoo = ZooReaderWriter.getRetryingInstance();
zoo.putPersistentData(zPath, new byte[0], existsPolicy);
- zoo.putPersistentData(zPath + Constants.ZNAMESPACE_NAME, namespace.getBytes(Constants.UTF8), existsPolicy);
+ zoo.putPersistentData(zPath + Constants.ZNAMESPACE_NAME, namespace.getBytes(StandardCharsets.UTF_8), existsPolicy);
zoo.putPersistentData(zPath + Constants.ZNAMESPACE_CONF, new byte[0], existsPolicy);
}
@@ -79,12 +80,12 @@ public class TableManager {
IZooReaderWriter zoo = ZooReaderWriter.getRetryingInstance();
zoo.putPersistentData(zTablePath, new byte[0], existsPolicy);
zoo.putPersistentData(zTablePath + Constants.ZTABLE_CONF, new byte[0], existsPolicy);
- zoo.putPersistentData(zTablePath + Constants.ZTABLE_NAMESPACE, namespaceId.getBytes(Constants.UTF8), existsPolicy);
- zoo.putPersistentData(zTablePath + Constants.ZTABLE_NAME, tableName.getBytes(Constants.UTF8), existsPolicy);
+ zoo.putPersistentData(zTablePath + Constants.ZTABLE_NAMESPACE, namespaceId.getBytes(StandardCharsets.UTF_8), existsPolicy);
+ zoo.putPersistentData(zTablePath + Constants.ZTABLE_NAME, tableName.getBytes(StandardCharsets.UTF_8), existsPolicy);
zoo.putPersistentData(zTablePath + Constants.ZTABLE_FLUSH_ID, ZERO_BYTE, existsPolicy);
zoo.putPersistentData(zTablePath + Constants.ZTABLE_COMPACT_ID, ZERO_BYTE, existsPolicy);
zoo.putPersistentData(zTablePath + Constants.ZTABLE_COMPACT_CANCEL_ID, ZERO_BYTE, existsPolicy);
- zoo.putPersistentData(zTablePath + Constants.ZTABLE_STATE, state.name().getBytes(Constants.UTF8), existsPolicy);
+ zoo.putPersistentData(zTablePath + Constants.ZTABLE_STATE, state.name().getBytes(StandardCharsets.UTF_8), existsPolicy);
}
public synchronized static TableManager getInstance() {
@@ -132,12 +133,12 @@ public class TableManager {
String statePath = ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZTABLES + "/" + tableId + Constants.ZTABLE_STATE;
try {
- ZooReaderWriter.getRetryingInstance().mutate(statePath, newState.name().getBytes(Constants.UTF8), ZooUtil.PUBLIC, new Mutator() {
+ ZooReaderWriter.getRetryingInstance().mutate(statePath, newState.name().getBytes(StandardCharsets.UTF_8), ZooUtil.PUBLIC, new Mutator() {
@Override
public byte[] mutate(byte[] oldData) throws Exception {
TableState oldState = TableState.UNKNOWN;
if (oldData != null)
- oldState = TableState.valueOf(new String(oldData, Constants.UTF8));
+ oldState = TableState.valueOf(new String(oldData, StandardCharsets.UTF_8));
boolean transition = true;
// +--------+
// v |
@@ -159,7 +160,7 @@ public class TableManager {
if (!transition)
throw new IllegalTableTransitionException(oldState, newState);
log.debug("Transitioning state for table " + tableId + " from " + oldState + " to " + newState);
- return newState.name().getBytes(Constants.UTF8);
+ return newState.name().getBytes(StandardCharsets.UTF_8);
}
});
} catch (Exception e) {
@@ -181,7 +182,7 @@ public class TableManager {
TableState tState = TableState.UNKNOWN;
byte[] data = zooStateCache.get(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + tableId + Constants.ZTABLE_STATE);
if (data != null) {
- String sState = new String(data, Constants.UTF8);
+ String sState = new String(data, StandardCharsets.UTF_8);
try {
tState = TableState.valueOf(sState);
} catch (IllegalArgumentException e) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
index 4ae8335..1c1ee62 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.server.tablets;
+import java.nio.charset.StandardCharsets;
import java.util.Random;
import org.apache.accumulo.core.Constants;
@@ -50,13 +51,13 @@ public class UniqueNameAllocator {
try {
byte[] max = ZooReaderWriter.getRetryingInstance().mutate(nextNamePath, null, ZooUtil.PRIVATE, new ZooReaderWriter.Mutator() {
public byte[] mutate(byte[] currentValue) throws Exception {
- long l = Long.parseLong(new String(currentValue, Constants.UTF8), Character.MAX_RADIX);
+ long l = Long.parseLong(new String(currentValue, StandardCharsets.UTF_8), Character.MAX_RADIX);
l += allocate;
- return Long.toString(l, Character.MAX_RADIX).getBytes(Constants.UTF8);
+ return Long.toString(l, Character.MAX_RADIX).getBytes(StandardCharsets.UTF_8);
}
});
- maxAllocated = Long.parseLong(new String(max, Constants.UTF8), Character.MAX_RADIX);
+ maxAllocated = Long.parseLong(new String(max, StandardCharsets.UTF_8), Character.MAX_RADIX);
next = maxAllocated - allocate;
} catch (Exception e) {
@@ -64,7 +65,7 @@ public class UniqueNameAllocator {
}
}
- return new String(FastFormat.toZeroPaddedString(next++, 7, Character.MAX_RADIX, new byte[0]), Constants.UTF8);
+ return new String(FastFormat.toZeroPaddedString(next++, 7, Character.MAX_RADIX, new byte[0]), StandardCharsets.UTF_8);
}
private static UniqueNameAllocator instance = null;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java b/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
index cdff21d..bd5d31c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
@@ -16,11 +16,11 @@
*/
package org.apache.accumulo.server.util;
+import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
import org.apache.accumulo.core.client.Scanner;
@@ -123,7 +123,7 @@ public class AddFilesWithMissingEntries {
String size = Long.toString(file.getLen());
String entries = "1"; // lie
String value = size + "," + entries;
- m.put(DataFileColumnFamily.NAME, new Text(filename), new Value(value.getBytes(Constants.UTF8)));
+ m.put(DataFileColumnFamily.NAME, new Text(filename), new Value(value.getBytes(StandardCharsets.UTF_8)));
if (update) {
writer.getBatchWriter(MetadataTable.NAME).addMutation(m);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
index 2926a3f..7f2048b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
@@ -17,12 +17,12 @@
package org.apache.accumulo.server.util;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.volume.Volume;
import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -139,7 +139,7 @@ public class ChangeSecret {
});
String path = "/accumulo/instances/" + inst.getInstanceName();
orig.recursiveDelete(path, NodeMissingPolicy.SKIP);
- new_.putPersistentData(path, newInstanceId.getBytes(Constants.UTF8), NodeExistsPolicy.OVERWRITE);
+ new_.putPersistentData(path, newInstanceId.getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.OVERWRITE);
return newInstanceId;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
index f2074a1..3543a16 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.server.util;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.Help;
@@ -53,7 +54,7 @@ public class CleanZookeeper {
String root = Constants.ZROOT;
IZooReaderWriter zk = ZooReaderWriter.getInstance();
if (opts.auth != null) {
- zk.getZooKeeper().addAuthInfo("digest", ("accumulo:"+opts.auth).getBytes(Constants.UTF8));
+ zk.getZooKeeper().addAuthInfo("digest", ("accumulo:"+opts.auth).getBytes(StandardCharsets.UTF_8));
}
try {
@@ -62,7 +63,7 @@ public class CleanZookeeper {
for (String instanceName : zk.getChildren(root + Constants.ZINSTANCES)) {
String instanceNamePath = root + Constants.ZINSTANCES + "/" + instanceName;
byte[] id = zk.getData(instanceNamePath, null);
- if (id != null && !new String(id, Constants.UTF8).equals(HdfsZooInstance.getInstance().getInstanceID())) {
+ if (id != null && !new String(id, StandardCharsets.UTF_8).equals(HdfsZooInstance.getInstance().getInstanceID())) {
try {
zk.recursiveDelete(instanceNamePath, NodeMissingPolicy.SKIP);
} catch (KeeperException.NoAuthException ex) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java b/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
index 448da86..f728fec 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.server.util;
+import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Set;
@@ -65,13 +66,13 @@ public class DeleteZooInstance {
String path = Constants.ZROOT + Constants.ZINSTANCES + "/" + opts.instance;
byte[] data = zk.getData(path, null);
deleteRetry(zk, path);
- deleteRetry(zk, Constants.ZROOT + "/" + new String(data, Constants.UTF8));
+ deleteRetry(zk, Constants.ZROOT + "/" + new String(data, StandardCharsets.UTF_8));
} else if (uuids.contains(opts.instance)) {
// look for the real instance name
for (String instance : instances) {
String path = Constants.ZROOT + Constants.ZINSTANCES + "/" + instance;
byte[] data = zk.getData(path, null);
- if (opts.instance.equals(new String(data, Constants.UTF8)))
+ if (opts.instance.equals(new String(data, StandardCharsets.UTF_8)))
deleteRetry(zk, path);
}
deleteRetry(zk, Constants.ZROOT + "/" + opts.instance);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
index 30aa2eb..289923e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
@@ -18,8 +18,8 @@ package org.apache.accumulo.server.util;
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.Help;
import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
@@ -108,9 +108,9 @@ public class DumpZookeeper {
for (int i = 0; i < data.length; i++) {
// does this look like simple ascii?
if (data[i] < ' ' || data[i] > '~')
- return new Encoded("base64", new String(Base64.encodeBase64(data), Constants.UTF8));
+ return new Encoded("base64", new String(Base64.encodeBase64(data), StandardCharsets.UTF_8));
}
- return new Encoded(Constants.UTF8.name(), new String(data, Constants.UTF8));
+ return new Encoded(StandardCharsets.UTF_8.name(), new String(data, StandardCharsets.UTF_8));
}
private static void write(PrintStream out, int indent, String fmt, Object... args) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
index f4655dc..78a2947 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.server.util;
+import java.nio.charset.StandardCharsets;
import java.util.Formattable;
import java.util.Formatter;
import java.util.List;
@@ -157,7 +158,7 @@ public class ListInstances {
if (master == null) {
return null;
}
- return new String(master, Constants.UTF8);
+ return new String(master, StandardCharsets.UTF_8);
} catch (Exception e) {
handleException(e, printErrors);
return null;
@@ -182,7 +183,7 @@ public class ListInstances {
for (String name : names) {
String instanceNamePath = Constants.ZROOT + Constants.ZINSTANCES + "/" + name;
try {
- UUID iid = UUID.fromString(new String(zk.getData(instanceNamePath, null), Constants.UTF8));
+ UUID iid = UUID.fromString(new String(zk.getData(instanceNamePath, null), StandardCharsets.UTF_8));
tm.put(name, iid);
} catch (Exception e) {
handleException(e, printErrors);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 760d57f..f34e716 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.server.util;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -31,7 +32,6 @@ import java.util.SortedMap;
import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
@@ -120,7 +120,7 @@ public class MetadataTableUtil {
private static void putLockID(ZooLock zooLock, Mutation m) {
TabletsSection.ServerColumnFamily.LOCK_COLUMN.put(m, new Value(zooLock.getLockID().serialize(ZooUtil.getRoot(HdfsZooInstance.getInstance()) + "/")
- .getBytes(Constants.UTF8)));
+ .getBytes(StandardCharsets.UTF_8)));
}
private static void update(Credentials credentials, Mutation m, KeyExtent extent) {
@@ -152,7 +152,7 @@ public class MetadataTableUtil {
public static void updateTabletFlushID(KeyExtent extent, long flushID, Credentials credentials, ZooLock zooLock) {
if (!extent.isRootTablet()) {
Mutation m = new Mutation(extent.getMetadataEntry());
- TabletsSection.ServerColumnFamily.FLUSH_COLUMN.put(m, new Value((flushID + "").getBytes(Constants.UTF8)));
+ TabletsSection.ServerColumnFamily.FLUSH_COLUMN.put(m, new Value((flushID + "").getBytes(StandardCharsets.UTF_8)));
update(credentials, zooLock, m, extent);
}
}
@@ -160,35 +160,35 @@ public class MetadataTableUtil {
public static void updateTabletCompactID(KeyExtent extent, long compactID, Credentials credentials, ZooLock zooLock) {
if (!extent.isRootTablet()) {
Mutation m = new Mutation(extent.getMetadataEntry());
- TabletsSection.ServerColumnFamily.COMPACT_COLUMN.put(m, new Value((compactID + "").getBytes(Constants.UTF8)));
+ TabletsSection.ServerColumnFamily.COMPACT_COLUMN.put(m, new Value((compactID + "").getBytes(StandardCharsets.UTF_8)));
update(credentials, zooLock, m, extent);
}
}
public static void updateTabletDataFile(long tid, KeyExtent extent, Map<FileRef,DataFileValue> estSizes, String time, Credentials credentials, ZooLock zooLock) {
Mutation m = new Mutation(extent.getMetadataEntry());
- byte[] tidBytes = Long.toString(tid).getBytes(Constants.UTF8);
+ byte[] tidBytes = Long.toString(tid).getBytes(StandardCharsets.UTF_8);
for (Entry<FileRef,DataFileValue> entry : estSizes.entrySet()) {
Text file = entry.getKey().meta();
m.put(DataFileColumnFamily.NAME, file, new Value(entry.getValue().encode()));
m.put(TabletsSection.BulkFileColumnFamily.NAME, file, new Value(tidBytes));
}
- TabletsSection.ServerColumnFamily.TIME_COLUMN.put(m, new Value(time.getBytes(Constants.UTF8)));
+ TabletsSection.ServerColumnFamily.TIME_COLUMN.put(m, new Value(time.getBytes(StandardCharsets.UTF_8)));
update(credentials, zooLock, m, extent);
}
public static void updateTabletDir(KeyExtent extent, String newDir, Credentials creds, ZooLock lock) {
Mutation m = new Mutation(extent.getMetadataEntry());
- TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(newDir.getBytes(Constants.UTF8)));
+ TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(newDir.getBytes(StandardCharsets.UTF_8)));
update(creds, lock, m, extent);
}
public static void addTablet(KeyExtent extent, String path, Credentials credentials, char timeType, ZooLock lock) {
Mutation m = extent.getPrevRowUpdateMutation();
- TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(path.getBytes(Constants.UTF8)));
- TabletsSection.ServerColumnFamily.TIME_COLUMN.put(m, new Value((timeType + "0").getBytes(Constants.UTF8)));
+ TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(path.getBytes(StandardCharsets.UTF_8)));
+ TabletsSection.ServerColumnFamily.TIME_COLUMN.put(m, new Value((timeType + "0").getBytes(StandardCharsets.UTF_8)));
update(credentials, lock, m, extent);
}
@@ -229,7 +229,7 @@ public class MetadataTableUtil {
m.put(DataFileColumnFamily.NAME, entry.getKey().meta(), new Value(entry.getValue().encode()));
if (newDir != null)
- ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(newDir.getBytes(Constants.UTF8)));
+ ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(newDir.getBytes(StandardCharsets.UTF_8)));
update(credentials, m, extent);
}
@@ -269,7 +269,7 @@ public class MetadataTableUtil {
public static void splitTablet(KeyExtent extent, Text oldPrevEndRow, double splitRatio, Credentials credentials, ZooLock zooLock) {
Mutation m = extent.getPrevRowUpdateMutation(); //
- TabletsSection.TabletColumnFamily.SPLIT_RATIO_COLUMN.put(m, new Value(Double.toString(splitRatio).getBytes(Constants.UTF8)));
+ TabletsSection.TabletColumnFamily.SPLIT_RATIO_COLUMN.put(m, new Value(Double.toString(splitRatio).getBytes(StandardCharsets.UTF_8)));
TabletsSection.TabletColumnFamily.OLD_PREV_ROW_COLUMN.put(m, KeyExtent.encodePrevEndRow(oldPrevEndRow));
ChoppedColumnFamily.CHOPPED_COLUMN.putDelete(m);
@@ -466,7 +466,7 @@ public class MetadataTableUtil {
IZooReaderWriter zoo = ZooReaderWriter.getInstance();
String zpath = ZooUtil.getRoot(HdfsZooInstance.getInstance()) + RootTable.ZROOT_TABLET_PATH;
try {
- zoo.putPersistentData(zpath, dir.getBytes(Constants.UTF8), -1, NodeExistsPolicy.OVERWRITE);
+ zoo.putPersistentData(zpath, dir.getBytes(StandardCharsets.UTF_8), -1, NodeExistsPolicy.OVERWRITE);
} catch (KeeperException e) {
throw new IOException(e);
} catch (InterruptedException e) {
@@ -479,7 +479,7 @@ public class MetadataTableUtil {
IZooReaderWriter zoo = ZooReaderWriter.getInstance();
String zpath = ZooUtil.getRoot(HdfsZooInstance.getInstance()) + RootTable.ZROOT_TABLET_PATH;
try {
- return new String(zoo.getData(zpath, null), Constants.UTF8);
+ return new String(zoo.getData(zpath, null), StandardCharsets.UTF_8);
} catch (KeeperException e) {
throw new IOException(e);
} catch (InterruptedException e) {
@@ -819,7 +819,7 @@ public class MetadataTableUtil {
} else {
// write out marker that this tablet was successfully cloned
Mutation m = new Mutation(cloneTablet.keySet().iterator().next().getRow());
- m.put(ClonedColumnFamily.NAME, new Text(""), new Value("OK".getBytes(Constants.UTF8)));
+ m.put(ClonedColumnFamily.NAME, new Text(""), new Value("OK".getBytes(StandardCharsets.UTF_8)));
bw.addMutation(m);
}
}
@@ -875,8 +875,8 @@ public class MetadataTableUtil {
Mutation m = new Mutation(k.getRow());
m.putDelete(k.getColumnFamily(), k.getColumnQualifier());
String dir = volumeManager.choose(ServerConstants.getTablesDirs()) + "/" + tableId
- + new String(FastFormat.toZeroPaddedString(dirCount++, 8, 16, "/c-".getBytes(Constants.UTF8)));
- TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(dir.getBytes(Constants.UTF8)));
+ + new String(FastFormat.toZeroPaddedString(dirCount++, 8, 16, "/c-".getBytes(StandardCharsets.UTF_8)));
+ TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(dir.getBytes(StandardCharsets.UTF_8)));
bw.addMutation(m);
}
@@ -886,7 +886,7 @@ public class MetadataTableUtil {
public static void chopped(KeyExtent extent, ZooLock zooLock) {
Mutation m = new Mutation(extent.getMetadataEntry());
- ChoppedColumnFamily.CHOPPED_COLUMN.put(m, new Value("chopped".getBytes(Constants.UTF8)));
+ ChoppedColumnFamily.CHOPPED_COLUMN.put(m, new Value("chopped".getBytes(StandardCharsets.UTF_8)));
update(SystemCredentials.get(), zooLock, m, extent);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/NamespacePropUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/NamespacePropUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/NamespacePropUtil.java
index 4e5df9e..3bd7b8e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/NamespacePropUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/NamespacePropUtil.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.server.util;
+import java.nio.charset.StandardCharsets;
+
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -36,7 +38,7 @@ public class NamespacePropUtil {
// create the zk node for this property and set it's data to the specified value
String zPath = zkNamespacePath + "/" + property;
- ZooReaderWriter.getInstance().putPersistentData(zPath, value.getBytes(Constants.UTF8), NodeExistsPolicy.OVERWRITE);
+ ZooReaderWriter.getInstance().putPersistentData(zPath, value.getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.OVERWRITE);
return true;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
index 6e5607e..e2faf3c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
@@ -18,12 +18,12 @@ package org.apache.accumulo.server.util;
import java.io.FileInputStream;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Stack;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.Help;
import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -69,7 +69,7 @@ public class RestoreZookeeper {
cwd.push("");
else
cwd.push(root);
- create(root, "", Constants.UTF8.name());
+ create(root, "", StandardCharsets.UTF_8.name());
}
}
@@ -80,7 +80,7 @@ public class RestoreZookeeper {
// assume UTF-8 if not "base64"
private void create(String path, String value, String encoding) {
- byte[] data = value.getBytes(Constants.UTF8);
+ byte[] data = value.getBytes(StandardCharsets.UTF_8);
if ("base64".equals(encoding))
data = Base64.decodeBase64(data);
try {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java b/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
index 85f29ba..ee01bb2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/SendLogToChainsaw.java
@@ -26,6 +26,7 @@ import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.Socket;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -36,7 +37,6 @@ import java.util.regex.Pattern;
import javax.net.SocketFactory;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.Help;
import org.apache.commons.io.filefilter.WildcardFileFilter;
import org.apache.commons.lang.math.LongRange;
@@ -123,7 +123,7 @@ public class SendLogToChainsaw extends XMLLayout {
// Parse the server type and name from the log file name
String threadName = log.getName().substring(0, log.getName().indexOf("."));
try {
- isReader = new InputStreamReader(new FileInputStream(log), Constants.UTF8);
+ isReader = new InputStreamReader(new FileInputStream(log), StandardCharsets.UTF_8);
} catch (FileNotFoundException e) {
System.out.println("Unable to find file: " + log.getAbsolutePath());
throw e;
@@ -136,7 +136,7 @@ public class SendLogToChainsaw extends XMLLayout {
out = convertLine(line, threadName);
if (null != out) {
if (socket != null && socket.isConnected())
- socket.getOutputStream().write(out.getBytes(Constants.UTF8));
+ socket.getOutputStream().write(out.getBytes(StandardCharsets.UTF_8));
else
System.err.println("Unable to send data to transport");
}
@@ -183,7 +183,7 @@ public class SendLogToChainsaw extends XMLLayout {
return null;
}
// URL encode the message
- message = URLEncoder.encode(message, Constants.UTF8.name());
+ message = URLEncoder.encode(message, StandardCharsets.UTF_8.name());
// Assume that we are processing logs from today.
// If the date in the line is greater than today, then it must be
// from the previous month.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
index b6ca527..1d93f90 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.server.util;
+import java.nio.charset.StandardCharsets;
+
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -33,7 +35,7 @@ public class SystemPropUtil {
// create the zk node for this property and set it's data to the specified value
String zPath = ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZCONFIG + "/" + property;
- ZooReaderWriter.getInstance().putPersistentData(zPath, value.getBytes(Constants.UTF8), NodeExistsPolicy.OVERWRITE);
+ ZooReaderWriter.getInstance().putPersistentData(zPath, value.getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.OVERWRITE);
return true;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/TablePropUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TablePropUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/TablePropUtil.java
index bcaf9b0..a755c0a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TablePropUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TablePropUtil.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.server.util;
+import java.nio.charset.StandardCharsets;
+
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -36,7 +38,7 @@ public class TablePropUtil {
// create the zk node for this property and set it's data to the specified value
String zPath = zkTablePath + "/" + property;
- ZooReaderWriter.getInstance().putPersistentData(zPath, value.getBytes(Constants.UTF8), NodeExistsPolicy.OVERWRITE);
+ ZooReaderWriter.getInstance().putPersistentData(zPath, value.getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.OVERWRITE);
return true;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java b/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
index 2fc0bd3..ddfaeee 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.server.util;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import org.apache.accumulo.core.Constants;
@@ -59,7 +60,7 @@ public class TabletServerLocks {
byte[] lockData = ZooLock.getLockData(cache, tserverPath + "/" + tabletServer, null);
String holder = null;
if (lockData != null) {
- holder = new String(lockData, Constants.UTF8);
+ holder = new String(lockData, StandardCharsets.UTF_8);
}
System.out.printf("%32s %16s%n", tabletServer, holder);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java b/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
index ac3426e..e8f572c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.server.watcher;
+import java.nio.charset.StandardCharsets;
+
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
@@ -107,7 +109,7 @@ public class MonitorLog4jWatcher extends FileWatchdog implements Watcher {
*/
protected void updateMonitorLog4jLocation() {
try {
- String hostPortString = new String(ZooReaderWriter.getInstance().getData(path, null), Constants.UTF8);
+ String hostPortString = new String(ZooReaderWriter.getInstance().getData(path, null), StandardCharsets.UTF_8);
HostAndPort hostAndPort = HostAndPort.fromString(hostPortString);
System.setProperty(HOST_PROPERTY_NAME, hostAndPort.getHostText());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooQueueLock.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooQueueLock.java b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooQueueLock.java
index f7c1e68..53cf1c4 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooQueueLock.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooQueueLock.java
@@ -16,10 +16,10 @@
*/
package org.apache.accumulo.server.zookeeper;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock;
import org.apache.zookeeper.KeeperException;
@@ -31,8 +31,8 @@ public class ZooQueueLock extends org.apache.accumulo.fate.zookeeper.ZooQueueLoc
public static void main(String args[]) throws InterruptedException, KeeperException {
ZooQueueLock lock = new ZooQueueLock("/lock", true);
- DistributedReadWriteLock rlocker = new DistributedReadWriteLock(lock, "reader".getBytes(Constants.UTF8));
- DistributedReadWriteLock wlocker = new DistributedReadWriteLock(lock, "wlocker".getBytes(Constants.UTF8));
+ DistributedReadWriteLock rlocker = new DistributedReadWriteLock(lock, "reader".getBytes(StandardCharsets.UTF_8));
+ DistributedReadWriteLock wlocker = new DistributedReadWriteLock(lock, "wlocker".getBytes(StandardCharsets.UTF_8));
final Lock readLock = rlocker.readLock();
readLock.lock();
final Lock readLock2 = rlocker.readLock();
@@ -45,7 +45,7 @@ public class ZooQueueLock extends org.apache.accumulo.fate.zookeeper.ZooQueueLoc
writeLock.lock();
if (readLock.tryLock(100, TimeUnit.MILLISECONDS))
throw new RuntimeException("Read lock achieved during write lock!");
- final Lock writeLock2 = DistributedReadWriteLock.recoverLock(lock, "wlocker".getBytes(Constants.UTF8));
+ final Lock writeLock2 = DistributedReadWriteLock.recoverLock(lock, "wlocker".getBytes(StandardCharsets.UTF_8));
writeLock2.unlock();
readLock.lock();
System.out.println("success");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java
index f950077..a98e1f0 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java
@@ -20,8 +20,8 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import java.nio.charset.StandardCharsets;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.fate.util.UtilWaitThread;
@@ -37,7 +37,7 @@ public class ZooReaderWriter extends org.apache.accumulo.fate.zookeeper.ZooReade
private static IZooReaderWriter retryingInstance = null;
public ZooReaderWriter(String string, int timeInMillis, String secret) {
- super(string, timeInMillis, SCHEME, (USER + ":" + secret).getBytes(Constants.UTF8));
+ super(string, timeInMillis, SCHEME, (USER + ":" + secret).getBytes(StandardCharsets.UTF_8));
}
public static synchronized ZooReaderWriter getInstance() {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 4b4141b..e0ee23e 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.master;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -301,14 +302,14 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt
for (String tableId : zoo.getChildren(tables)) {
String targetNamespace = (MetadataTable.ID.equals(tableId) || RootTable.ID.equals(tableId)) ? Namespaces.ACCUMULO_NAMESPACE_ID
: Namespaces.DEFAULT_NAMESPACE_ID;
- log.debug("Upgrade moving table " + new String(zoo.getData(tables + "/" + tableId + Constants.ZTABLE_NAME, null), Constants.UTF8) + " (ID: "
+ log.debug("Upgrade moving table " + new String(zoo.getData(tables + "/" + tableId + Constants.ZTABLE_NAME, null), StandardCharsets.UTF_8) + " (ID: "
+ tableId + ") into namespace with ID " + targetNamespace);
- zoo.putPersistentData(tables + "/" + tableId + Constants.ZTABLE_NAMESPACE, targetNamespace.getBytes(Constants.UTF8), NodeExistsPolicy.SKIP);
+ zoo.putPersistentData(tables + "/" + tableId + Constants.ZTABLE_NAMESPACE, targetNamespace.getBytes(StandardCharsets.UTF_8), NodeExistsPolicy.SKIP);
}
// rename metadata table
log.debug("Upgrade renaming table " + MetadataTable.OLD_NAME + " (ID: " + MetadataTable.ID + ") to " + MetadataTable.NAME);
- zoo.putPersistentData(tables + "/" + MetadataTable.ID + Constants.ZTABLE_NAME, Tables.qualify(MetadataTable.NAME).getSecond().getBytes(Constants.UTF8),
+ zoo.putPersistentData(tables + "/" + MetadataTable.ID + Constants.ZTABLE_NAME, Tables.qualify(MetadataTable.NAME).getSecond().getBytes(StandardCharsets.UTF_8),
NodeExistsPolicy.OVERWRITE);
moveRootTabletToRootTable(zoo);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
index a9adf8f..d4875e7 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/recovery/RecoveryManager.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.master.recovery;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -115,7 +116,7 @@ public class RecoveryManager {
private void initiateSort(String sortId, String source, final String destination, AccumuloConfiguration aconf)
throws KeeperException, InterruptedException, IOException {
String work = source + "|" + destination;
- new DistributedWorkQueue(ZooUtil.getRoot(master.getInstance()) + Constants.ZRECOVERY, aconf).addWork(sortId, work.getBytes(Constants.UTF8));
+ new DistributedWorkQueue(ZooUtil.getRoot(master.getInstance()) + Constants.ZRECOVERY, aconf).addWork(sortId, work.getBytes(StandardCharsets.UTF_8));
synchronized (this) {
sortsQueued.add(sortId);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/master/src/main/java/org/apache/accumulo/master/state/SetGoalState.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/state/SetGoalState.java b/server/master/src/main/java/org/apache/accumulo/master/state/SetGoalState.java
index f981bae..56875c2 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/state/SetGoalState.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/state/SetGoalState.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.master.state;
+import java.nio.charset.StandardCharsets;
+
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.master.thrift.MasterGoalState;
import org.apache.accumulo.core.security.SecurityUtil;
@@ -42,7 +44,7 @@ public class SetGoalState {
VolumeManager fs = VolumeManagerImpl.get();
Accumulo.waitForZookeeperAndHdfs(fs);
- ZooReaderWriter.getInstance().putPersistentData(ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZMASTER_GOAL_STATE, args[0].getBytes(Constants.UTF8),
+ ZooReaderWriter.getInstance().putPersistentData(ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZMASTER_GOAL_STATE, args[0].getBytes(StandardCharsets.UTF_8),
NodeExistsPolicy.OVERWRITE);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
index 82abf22..06ae7aa 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
@@ -22,6 +22,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -389,7 +390,7 @@ class CopyFailed extends MasterRepo {
HashMap<String,String> loadedFailures = new HashMap<String,String>();
FSDataInputStream failFile = fs.open(new Path(error, BulkImport.FAILURES_TXT));
- BufferedReader in = new BufferedReader(new InputStreamReader(failFile, Constants.UTF8));
+ BufferedReader in = new BufferedReader(new InputStreamReader(failFile, StandardCharsets.UTF_8));
try {
String line = null;
while ((line = in.readLine()) != null) {
@@ -443,7 +444,7 @@ class CopyFailed extends MasterRepo {
if (fs.exists(dest))
continue;
- bifCopyQueue.addWork(orig.getName(), (failure + "," + dest).getBytes(Constants.UTF8));
+ bifCopyQueue.addWork(orig.getName(), (failure + "," + dest).getBytes(StandardCharsets.UTF_8));
workIds.add(orig.getName());
log.debug("tid " + tid + " added to copyq: " + orig + " to " + dest + ": failed");
}
@@ -577,7 +578,7 @@ class LoadFiles extends MasterRepo {
}
FSDataOutputStream failFile = fs.create(new Path(errorDir, BulkImport.FAILURES_TXT), true);
- BufferedWriter out = new BufferedWriter(new OutputStreamWriter(failFile, Constants.UTF8));
+ BufferedWriter out = new BufferedWriter(new OutputStreamWriter(failFile, StandardCharsets.UTF_8));
try {
for (String f : filesToLoad) {
out.write(f);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/master/src/main/java/org/apache/accumulo/master/tableOps/CancelCompactions.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CancelCompactions.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CancelCompactions.java
index 49227ef..c6ead8c 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CancelCompactions.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CancelCompactions.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.master.tableOps;
+import java.nio.charset.StandardCharsets;
+
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.impl.Tables;
@@ -78,19 +80,19 @@ public class CancelCompactions extends MasterRepo {
byte[] currentValue = zoo.getData(zCompactID, null);
- String cvs = new String(currentValue, Constants.UTF8);
+ String cvs = new String(currentValue, StandardCharsets.UTF_8);
String[] tokens = cvs.split(",");
final long flushID = Long.parseLong(tokens[0]);
zoo.mutate(zCancelID, null, null, new Mutator() {
@Override
public byte[] mutate(byte[] currentValue) throws Exception {
- long cid = Long.parseLong(new String(currentValue, Constants.UTF8));
+ long cid = Long.parseLong(new String(currentValue, StandardCharsets.UTF_8));
if (cid < flushID)
- return Long.toString(flushID).getBytes(Constants.UTF8);
+ return Long.toString(flushID).getBytes(StandardCharsets.UTF_8);
else
- return Long.toString(cid).getBytes(Constants.UTF8);
+ return Long.toString(cid).getBytes(StandardCharsets.UTF_8);
}
});
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java
index e3b0405..dedfb97 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/CompactRange.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.master.tableOps;
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.Iterator;
@@ -323,7 +324,7 @@ public class CompactRange extends MasterRepo {
cid = zoo.mutate(zTablePath, null, null, new Mutator() {
@Override
public byte[] mutate(byte[] currentValue) throws Exception {
- String cvs = new String(currentValue, Constants.UTF8);
+ String cvs = new String(currentValue, StandardCharsets.UTF_8);
String[] tokens = cvs.split(",");
long flushID = Long.parseLong(tokens[0]);
flushID++;
@@ -345,14 +346,14 @@ public class CompactRange extends MasterRepo {
encodedIterators.append(",");
encodedIterators.append(txidString);
encodedIterators.append("=");
- encodedIterators.append(new String(hex.encode(iterators), Constants.UTF8));
+ encodedIterators.append(new String(hex.encode(iterators), StandardCharsets.UTF_8));
}
- return (Long.toString(flushID) + encodedIterators).getBytes(Constants.UTF8);
+ return (Long.toString(flushID) + encodedIterators).getBytes(StandardCharsets.UTF_8);
}
});
- return new CompactionDriver(Long.parseLong(new String(cid, Constants.UTF8).split(",")[0]), tableId, startRow, endRow);
+ return new CompactionDriver(Long.parseLong(new String(cid, StandardCharsets.UTF_8).split(",")[0]), tableId, startRow, endRow);
} catch (NoNodeException nne) {
throw new ThriftTableOperationException(tableId, null, TableOperation.COMPACT, TableOperationExceptionType.NOTFOUND, null);
}
@@ -367,7 +368,7 @@ public class CompactRange extends MasterRepo {
zoo.mutate(zTablePath, null, null, new Mutator() {
@Override
public byte[] mutate(byte[] currentValue) throws Exception {
- String cvs = new String(currentValue, Constants.UTF8);
+ String cvs = new String(currentValue, StandardCharsets.UTF_8);
String[] tokens = cvs.split(",");
long flushID = Long.parseLong(tokens[0]);
@@ -381,7 +382,7 @@ public class CompactRange extends MasterRepo {
encodedIterators.append(tokens[i]);
}
- return (Long.toString(flushID) + encodedIterators).getBytes(Constants.UTF8);
+ return (Long.toString(flushID) + encodedIterators).getBytes(StandardCharsets.UTF_8);
}
});
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportTable.java
index eeb9b16..1818fa5 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ExportTable.java
@@ -22,6 +22,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -162,7 +163,7 @@ class WriteExportFiles extends MasterRepo {
try {
zipOut.putNextEntry(new ZipEntry(Constants.EXPORT_INFO_FILE));
- OutputStreamWriter osw = new OutputStreamWriter(dataOut, Constants.UTF8);
+ OutputStreamWriter osw = new OutputStreamWriter(dataOut, StandardCharsets.UTF_8);
osw.append(ExportTable.EXPORT_VERSION_PROP + ":" + ExportTable.VERSION + "\n");
osw.append("srcInstanceName:" + conn.getInstance().getInstanceName() + "\n");
osw.append("srcInstanceID:" + conn.getInstance().getInstanceID() + "\n");
@@ -192,7 +193,7 @@ class WriteExportFiles extends MasterRepo {
}
private static void createDistcpFile(VolumeManager fs, String exportDir, Path exportMetaFilePath, Map<String,String> uniqueFiles) throws IOException {
- BufferedWriter distcpOut = new BufferedWriter(new OutputStreamWriter(fs.create(new Path(exportDir, "distcp.txt"), false), Constants.UTF8));
+ BufferedWriter distcpOut = new BufferedWriter(new OutputStreamWriter(fs.create(new Path(exportDir, "distcp.txt"), false), StandardCharsets.UTF_8));
try {
for (String file : uniqueFiles.values()) {
@@ -259,7 +260,7 @@ class WriteExportFiles extends MasterRepo {
TableConfiguration tableConfig = ServerConfiguration.getTableConfiguration(conn.getInstance(), tableID);
- OutputStreamWriter osw = new OutputStreamWriter(dataOut, Constants.UTF8);
+ OutputStreamWriter osw = new OutputStreamWriter(dataOut, StandardCharsets.UTF_8);
// only put props that are different than defaults and higher level configurations
zipOut.putNextEntry(new ZipEntry(Constants.EXPORT_TABLE_CONFIG_FILE));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
index cd59b78..f3d2804 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/ImportTable.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -183,7 +184,7 @@ class PopulateMetadataTable extends MasterRepo {
}
static Map<String,String> readMappingFile(VolumeManager fs, ImportedTableInfo tableInfo) throws Exception {
- BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(tableInfo.importDir, "mappings.txt")), Constants.UTF8));
+ BufferedReader in = new BufferedReader(new InputStreamReader(fs.open(new Path(tableInfo.importDir, "mappings.txt")), StandardCharsets.UTF_8));
try {
Map<String,String> map = new HashMap<String,String>();
@@ -257,14 +258,14 @@ class PopulateMetadataTable extends MasterRepo {
if (m == null) {
m = new Mutation(metadataRow);
- TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(FastFormat.toZeroPaddedString(dirCount++, 8, 16, "/c-".getBytes(Constants.UTF8))));
+ TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(FastFormat.toZeroPaddedString(dirCount++, 8, 16, "/c-".getBytes(StandardCharsets.UTF_8))));
currentRow = metadataRow;
}
if (!currentRow.equals(metadataRow)) {
mbw.addMutation(m);
m = new Mutation(metadataRow);
- TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(FastFormat.toZeroPaddedString(dirCount++, 8, 16, "/c-".getBytes(Constants.UTF8))));
+ TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.put(m, new Value(FastFormat.toZeroPaddedString(dirCount++, 8, 16, "/c-".getBytes(StandardCharsets.UTF_8))));
}
m.put(key.getColumnFamily(), cq, val);
@@ -331,7 +332,7 @@ class MapImportFileNames extends MasterRepo {
UniqueNameAllocator namer = UniqueNameAllocator.getInstance();
- mappingsWriter = new BufferedWriter(new OutputStreamWriter(fs.create(path), Constants.UTF8));
+ mappingsWriter = new BufferedWriter(new OutputStreamWriter(fs.create(path), StandardCharsets.UTF_8));
for (FileStatus fileStatus : files) {
String fileName = fileStatus.getPath().getName();
@@ -566,7 +567,7 @@ public class ImportTable extends MasterRepo {
ZipEntry zipEntry;
while ((zipEntry = zis.getNextEntry()) != null) {
if (zipEntry.getName().equals(Constants.EXPORT_INFO_FILE)) {
- BufferedReader in = new BufferedReader(new InputStreamReader(zis, Constants.UTF8));
+ BufferedReader in = new BufferedReader(new InputStreamReader(zis, StandardCharsets.UTF_8));
String line = null;
while ((line = in.readLine()) != null) {
String sa[] = line.split(":", 2);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8ca8d34/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java
index 8c5ed00..99cf0d6 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/RenameTable.java
@@ -16,6 +16,8 @@
*/
package org.apache.accumulo.master.tableOps;
+import java.nio.charset.StandardCharsets;
+
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.NamespaceNotFoundException;
@@ -81,14 +83,14 @@ public class RenameTable extends MasterRepo {
zoo.mutate(tap, null, null, new Mutator() {
@Override
public byte[] mutate(byte[] current) throws Exception {
- final String currentName = new String(current, Constants.UTF8);
+ final String currentName = new String(current, StandardCharsets.UTF_8);
if (currentName.equals(newName))
return null; // assume in this case the operation is running again, so we are done
if (!currentName.equals(oldName)) {
throw new ThriftTableOperationException(null, oldTableName, TableOperation.RENAME, TableOperationExceptionType.NOTFOUND,
"Name changed while processing");
}
- return newName.getBytes(Constants.UTF8);
+ return newName.getBytes(StandardCharsets.UTF_8);
}
});
Tables.clearCache(instance);