From 26972a164f48bfa53e488dc9220266026ab24a32 Mon Sep 17 00:00:00 2001
From: Bill Havanki <bhavanki@cloudera.com>
Date: Wed, 18 Dec 2013 12:39:47 -0500
Subject: [PATCH] Update Accumulo version to 1.4.5.
clean up dead code in client.
---
.../main/java/com/yahoo/ycsb/db/AccumuloClient.java | 12 +++++-------
pom.xml | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/accumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java b/accumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java
index 20a6ce93..9867ca4b 100644
--- a/accumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java
+++ b/accumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java
@@ -26,7 +26,7 @@ import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
-
+import org.apache.accumulo.core.util.CleanUp;
import org.apache.hadoop.io.Text;
import org.apache.zookeeper.KeeperException;
@@ -41,6 +41,7 @@ public class AccumuloClient extends DB {
public static final int HttpError = -2;
public static final int NoMatchingRecord = -3;
+ private ZooKeeperInstance _inst;
private Connector _connector;
private String _table = "";
private BatchWriter _bw = null;
@@ -61,10 +62,10 @@ public class AccumuloClient extends DB {
public void init() {
_colFam = new Text(getProperties().getProperty("accumulo.columnFamily"));
- Instance inst = new ZooKeeperInstance(getProperties().getProperty("accumulo.instanceName"),
+ _inst = new ZooKeeperInstance(getProperties().getProperty("accumulo.instanceName"),
getProperties().getProperty("accumulo.zooKeepers"));
try {
- _connector = inst.getConnector(getProperties().getProperty("accumulo.username"),
+ _connector = _inst.getConnector(getProperties().getProperty("accumulo.username"),
getProperties().getProperty("accumulo.password"));
} catch (AccumuloException e) {
// TODO Auto-generated catch block
@@ -97,15 +98,12 @@ public class AccumuloClient extends DB {
{
try {
if (_bw != null) {
- try {
- //Thread.sleep(60000);
- } catch (Exception e) {
- }
_bw.close();
}
} catch (MutationsRejectedException e) {
throw new DBException(e);
}
+ CleanUp.shutdownNow();
}
/**
diff --git a/pom.xml b/pom.xml
index 585485b8..f4ec5e10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<properties>
<maven.assembly.version>2.2.1</maven.assembly.version>
<hbase.version>0.92.1</hbase.version>
- <accumulo.version>1.4.4</accumulo.version>
+ <accumulo.version>1.4.5</accumulo.version>
<cassandra.version>0.7.0</cassandra.version>
<infinispan.version>7.1.0.CR1</infinispan.version>
<openjpa.jdbc.version>2.1.1</openjpa.jdbc.version>
--
GitLab