From b549ab6d3dc7535177b209297be497e36e02f716 Mon Sep 17 00:00:00 2001
From: Sean Busbey <busbey@cloudera.com>
Date: Sun, 4 Oct 2015 21:06:54 -0500
Subject: [PATCH] [accumulo] move accumulo into a dedicated package.

---
 .../db/{ => accumulo}/AccumuloClient.java     |  2 +-
 .../db/{ => accumulo}/ZKProducerConsumer.java |  0
 .../yahoo/ycsb/db/accumulo/package-info.java  | 22 +++++++++++++++++++
 bin/ycsb                                      |  2 +-
 4 files changed, 24 insertions(+), 2 deletions(-)
 rename accumulo/src/main/java/com/yahoo/ycsb/db/{ => accumulo}/AccumuloClient.java (99%)
 rename accumulo/src/main/java/com/yahoo/ycsb/db/{ => accumulo}/ZKProducerConsumer.java (100%)
 create mode 100644 accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/package-info.java

diff --git a/accumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java
similarity index 99%
rename from accumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java
rename to accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java
index 6886307c..51dcd5e5 100644
--- a/accumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java
+++ b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java
@@ -16,7 +16,7 @@
  * LICENSE file.
  */
 
-package com.yahoo.ycsb.db;
+package com.yahoo.ycsb.db.accumulo;
 
 import com.yahoo.ycsb.ByteArrayByteIterator;
 import com.yahoo.ycsb.ByteIterator;
diff --git a/accumulo/src/main/java/com/yahoo/ycsb/db/ZKProducerConsumer.java b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/ZKProducerConsumer.java
similarity index 100%
rename from accumulo/src/main/java/com/yahoo/ycsb/db/ZKProducerConsumer.java
rename to accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/ZKProducerConsumer.java
diff --git a/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/package-info.java b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/package-info.java
new file mode 100644
index 00000000..7c85b6ac
--- /dev/null
+++ b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2015, YCSB contributors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you
+ * may not use this file except in compliance with the License. You
+ * may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License. See accompanying
+ * LICENSE file.
+ */
+
+/**
+ * The YCSB binding for <a href="https://accumulo.apache.org/">Apache Accumulo</a>.
+ */
+package com.yahoo.ycsb.db.accumulo;
+
diff --git a/bin/ycsb b/bin/ycsb
index 1f0834d1..90010a7d 100755
--- a/bin/ycsb
+++ b/bin/ycsb
@@ -49,7 +49,7 @@ COMMANDS = {
 }
 
 DATABASES = {
-    "accumulo"     : "com.yahoo.ycsb.db.AccumuloClient",
+    "accumulo"     : "com.yahoo.ycsb.db.accumulo.AccumuloClient",
     "aerospike"    : "com.yahoo.ycsb.db.AerospikeClient",
     "basic"        : "com.yahoo.ycsb.BasicDB",
     "cassandra-7"  : "com.yahoo.ycsb.db.CassandraClient7",
-- 
GitLab