accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [12/12] git commit: ACCUMULO-3213 Fix up merge issues.
Date Fri, 31 Oct 2014 21:27:11 GMT
ACCUMULO-3213 Fix up merge issues.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c51290b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c51290b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c51290b

Branch: refs/heads/master
Commit: 0c51290bce812e5d98462099f335d855ed2b91bc
Parents: 84d3b95
Author: Josh Elser <elserj@apache.org>
Authored: Fri Oct 31 17:00:17 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Oct 31 17:00:17 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/util/RandomizeVolumes.java    | 3 ++-
 .../java/org/apache/accumulo/master/tableOps/DeleteTable.java     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c51290b/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java
b/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java
index 088d16b..4c5326e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RandomizeVolumes.java
@@ -17,6 +17,7 @@
 package org.apache.accumulo.server.util;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map.Entry;
 
 import org.apache.accumulo.core.Constants;
@@ -107,7 +108,7 @@ public class RandomizeVolumes {
       Mutation m = new Mutation(key.getRow());
       
       String newLocation = vm.choose(ServerConstants.getBaseUris()) + Path.SEPARATOR + ServerConstants.TABLE_DIR
+ Path.SEPARATOR + tableId + Path.SEPARATOR + directory;
-      m.put(key.getColumnFamily(), key.getColumnQualifier(), new Value(newLocation.getBytes(Constants.UTF8)));
+      m.put(key.getColumnFamily(), key.getColumnQualifier(), new Value(newLocation.getBytes(StandardCharsets.UTF_8)));
       if (log.isTraceEnabled()) {
         log.trace("Replacing " + oldLocation + " with " + newLocation);
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c51290b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
index f6db45b..2ad3f7b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
@@ -180,7 +180,7 @@ class CleanUp extends MasterRepo {
     }
 
     if (refCount == 0) {
-      final AccumuloConfiguration conf = master.getConfiguration().getConfiguration();
+      final AccumuloConfiguration conf = master.getConfiguration();
       boolean archiveFiles = conf.getBoolean(Property.GC_FILE_ARCHIVE);
 
       // delete the map files


Mime
View raw message