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/01/07 03:49:58 UTC
[1/2] git commit: ACCUMULO-2128 Remove warnings introduced by merge
Updated Branches:
refs/heads/1.6.0-SNAPSHOT da9e0f40a -> 98211f581
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.6.0-SNAPSHOT
Commit: 21b1b1108b6094d9706d1a01125d8e36041b484c
Parents: 400b991
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jan 6 21:38:20 2014 -0500
Committer: Christopher Tubbs <ct...@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");
[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by ct...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/98211f58
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/98211f58
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/98211f58
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 98211f5812c3900963953b38f231827af7ea6397
Parents: da9e0f4 21b1b11
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jan 6 21:49:41 2014 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jan 6 21:49:41 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/98211f58/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index 1497153,18d55a6..8b0546a
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@@ -28,17 -28,20 +28,16 @@@ import org.apache.accumulo.core.client.
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.file.FileUtil;
-import org.apache.accumulo.core.security.CredentialHelper;
-import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.conf.DefaultConfiguration;
+import org.apache.accumulo.core.metadata.RootTable;
+import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.util.ArgumentChecker;
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;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
+import org.apache.commons.configuration.Configuration;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;