You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by uj...@apache.org on 2013/11/19 00:41:21 UTC
[10/11] git commit: Merge remote-tracking branch
'apache-committers/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge remote-tracking branch 'apache-committers/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Did a merge for ACCUMULO-1858 and picked some "Elser" slack.
Conflicts:
core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c10ccf37
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c10ccf37
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c10ccf37
Branch: refs/heads/master
Commit: c10ccf375b97c1882d5b89decd701bbdae7f71ef
Parents: 515cd9d 404e955
Author: Bill Slacum <uj...@apache.org>
Authored: Mon Nov 18 18:31:51 2013 -0500
Committer: Bill Slacum <uj...@apache.org>
Committed: Mon Nov 18 18:31:51 2013 -0500
----------------------------------------------------------------------
.../apache/accumulo/core/client/Instance.java | 14 +++---
.../accumulo/core/client/ZooKeeperInstance.java | 6 ++-
.../simple/client/RandomBatchWriter.java | 20 ++++----
.../test/MultiTableBatchWriterTest.java | 50 ++++++++++++++++----
4 files changed, 63 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c10ccf37/core/src/main/java/org/apache/accumulo/core/client/Instance.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/Instance.java
index 95fc933,612301e..27d502f
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@@ -147,11 -169,5 +154,4 @@@ public interface Instance
* @since 1.5.0
*/
public abstract Connector getConnector(String principal, AuthenticationToken token) throws AccumuloException, AccumuloSecurityException;
--
- /**
- * Closes up the instance to free up all associated resources. You should try to reuse an Instance as much as you can because there is some location caching
- * stored which will enhance performance.
- * @throws AccumuloException
- */
- public abstract void close() throws AccumuloException;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c10ccf37/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c10ccf37/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
index 8c6bcc6,9ee1e6e..f7e1146
--- a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
@@@ -339,9 -338,10 +339,10 @@@ public class MultiTableBatchWriterTest
BatchWriterConfig config = new BatchWriterConfig();
- TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID());
+ Credentials creds = new Credentials("root", password);
MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 60, TimeUnit.SECONDS);
-
+ boolean mutationsRejected = false;
+
try {
final String table1 = "testTableDelete_table1", table2 = "testTableDelete_table2";
@@@ -388,8 -396,9 +397,9 @@@
BatchWriterConfig config = new BatchWriterConfig();
- TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID());
+ Credentials creds = new Credentials("root", password);
MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 60, TimeUnit.SECONDS);
+ boolean mutationsRejected = false;
try {
final String table1 = "testOfflineTable_table1", table2 = "testOfflineTable_table2";
@@@ -437,8 -453,9 +454,9 @@@
BatchWriterConfig config = new BatchWriterConfig();
- TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID());
+ Credentials creds = new Credentials("root", password);
MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 60, TimeUnit.SECONDS);
+ boolean mutationsRejected = false;
try {
final String table1 = "testOfflineTableWithCache_table1", table2 = "testOfflineTableWithCache_table2";
@@@ -491,8 -513,9 +514,9 @@@
BatchWriterConfig config = new BatchWriterConfig();
- TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID());
+ Credentials creds = new Credentials("root", password);
MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 0, TimeUnit.SECONDS);
+ boolean mutationsRejected = false;
try {
final String table1 = "testOfflineTableWithoutCache_table1", table2 = "testOfflineTableWithoutCache_table2";