accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject git commit: ACCUMULO-2128 Remove warnings introduced by merge
Date Tue, 07 Jan 2014 02:46:09 GMT
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 400b991fb -> 21b1b1108


ACCUMULO-2128 Remove warnings introduced by merge


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 21b1b1108b6094d9706d1a01125d8e36041b484c
Parents: 400b991
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Jan 6 21:38:20 2014 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon Jan 6 21:38:20 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/client/ZooKeeperInstance.java   | 11 +++++------
 .../org/apache/accumulo/test/functional/CleanUpTest.java |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/21b1b110/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index ccfb328..18d55a6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@ -37,7 +37,6 @@ import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.core.util.OpTimer;
 import org.apache.accumulo.core.util.TextUtil;
-import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
 import org.apache.hadoop.fs.FileStatus;
@@ -222,12 +221,12 @@ public class ZooKeeperInstance implements Instance {
   public Connector getConnector(String principal, AuthenticationToken token) throws AccumuloException,
AccumuloSecurityException {
     return getConnector(CredentialHelper.create(principal, token, getInstanceID()));
   }
-  
+
   @SuppressWarnings("deprecation")
   private Connector getConnector(TCredentials credential) throws AccumuloException, AccumuloSecurityException
{
     return new ConnectorImpl(this, credential);
   }
-  
+
   @Override
   @Deprecated
   public Connector getConnector(String principal, byte[] pass) throws AccumuloException,
AccumuloSecurityException {
@@ -255,7 +254,7 @@ public class ZooKeeperInstance implements Instance {
   public static String lookupInstanceName(org.apache.accumulo.core.zookeeper.ZooCache zooCache,
UUID instanceId) {
     return lookupInstanceName((ZooCache) zooCache, instanceId);
   }
-  
+
   /**
    * Given a zooCache and instanceId, look up the instance name.
    * 
@@ -275,7 +274,7 @@ public class ZooKeeperInstance implements Instance {
     }
     return null;
   }
-  
+
   /**
    * To be moved to server code. Only lives here to support certain client side utilities
to minimize command-line options.
    */
@@ -304,7 +303,7 @@ public class ZooKeeperInstance implements Instance {
       throw new RuntimeException("Accumulo not initialized, there is no instance id at "
+ instanceDirectory, e);
     }
   }
-  
+
   @Deprecated
   @Override
   public Connector getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth) throws
AccumuloException, AccumuloSecurityException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/21b1b110/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java b/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
index 5a0ca26..e4cefbf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
@@ -24,6 +24,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.BatchWriterConfig;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
@@ -49,10 +50,9 @@ public class CleanUpTest extends FunctionalTest {
   @Override
   public void run() throws Exception {
 
-
     getConnector().tableOperations().create("test");
 
-    BatchWriter bw = getConnector().createBatchWriter("test", 1000000, 60000, 1);
+    BatchWriter bw = getConnector().createBatchWriter("test", new BatchWriterConfig());
 
     Mutation m1 = new Mutation("r1");
     m1.put("cf1", "cq1", 1, "5");


Mime
View raw message