From 886ef9c37982cd18918cd63ede697b60130cbe2a Mon Sep 17 00:00:00 2001
From: Sean Busbey <sean.busbey@gmail.com>
Date: Tue, 19 Jul 2016 10:30:38 -0500
Subject: [PATCH] [cassandra, cassandra2] rename the cassandra2-cql client to
cassandra-cql.
---
bin/bindings.properties | 1 +
bin/ycsb | 7 +++++++
bin/ycsb.bat | 6 ++++++
bin/ycsb.sh | 8 ++++++++
{cassandra2 => cassandra}/README.md | 0
{cassandra2 => cassandra}/pom.xml | 4 ++--
.../main/java/com/yahoo/ycsb/db/CassandraCQLClient.java | 0
.../src/main/java/com/yahoo/ycsb/db/package-info.java | 0
.../java/com/yahoo/ycsb/db/CassandraCQLClientTest.java | 0
{cassandra2 => cassandra}/src/test/resources/ycsb.cql | 0
distribution/pom.xml | 2 +-
pom.xml | 4 ++--
12 files changed, 27 insertions(+), 5 deletions(-)
rename {cassandra2 => cassandra}/README.md (100%)
rename {cassandra2 => cassandra}/pom.xml (96%)
rename {cassandra2 => cassandra}/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java (100%)
rename {cassandra2 => cassandra}/src/main/java/com/yahoo/ycsb/db/package-info.java (100%)
rename {cassandra2 => cassandra}/src/test/java/com/yahoo/ycsb/db/CassandraCQLClientTest.java (100%)
rename {cassandra2 => cassandra}/src/test/resources/ycsb.cql (100%)
diff --git a/bin/bindings.properties b/bin/bindings.properties
index f3a24b46..9c862724 100644
--- a/bin/bindings.properties
+++ b/bin/bindings.properties
@@ -29,6 +29,7 @@ accumulo:com.yahoo.ycsb.db.accumulo.AccumuloClient
aerospike:com.yahoo.ycsb.db.AerospikeClient
asynchbase:com.yahoo.ycsb.db.AsyncHBaseClient
basic:com.yahoo.ycsb.BasicDB
+cassandra-cql:com.yahoo.ycsb.db.CassandraCQLClient
cassandra2-cql:com.yahoo.ycsb.db.CassandraCQLClient
couchbase:com.yahoo.ycsb.db.CouchbaseClient
couchbase2:com.yahoo.ycsb.db.couchbase2.Couchbase2Client
diff --git a/bin/ycsb b/bin/ycsb
index 1e051f1e..292cc1e4 100755
--- a/bin/ycsb
+++ b/bin/ycsb
@@ -55,6 +55,7 @@ DATABASES = {
"aerospike" : "com.yahoo.ycsb.db.AerospikeClient",
"asynchbase" : "com.yahoo.ycsb.db.AsyncHBaseClient",
"basic" : "com.yahoo.ycsb.BasicDB",
+ "cassandra-cql": "com.yahoo.ycsb.db.CassandraCQLClient",
"cassandra2-cql": "com.yahoo.ycsb.db.CassandraCQLClient",
"couchbase" : "com.yahoo.ycsb.db.CouchbaseClient",
"couchbase2" : "com.yahoo.ycsb.db.couchbase2.Couchbase2Client",
@@ -239,6 +240,12 @@ def main():
# Classpath set up
binding = args.database.split("-")[0]
+ if binding == "cassandra2":
+ warn("The 'cassandra2-cql' client has been deprecated. It has been "
+ "renamed to simply 'cassandra-cql'. This alias will be removed"
+ " in the next YCSB release.")
+ binding = "cassandra"
+
if binding == "couchbase":
warn("The 'couchbase' client has been deprecated. If you are using "
"Couchbase 4.0+ try using the 'couchbase2' client instead.")
diff --git a/bin/ycsb.bat b/bin/ycsb.bat
index ce022f64..f8ea7b4e 100644
--- a/bin/ycsb.bat
+++ b/bin/ycsb.bat
@@ -117,6 +117,12 @@ GOTO confAdded
SET CLASSPATH=%YCSB_HOME%\conf
:confAdded
+@REM Cassandra2 deprecation message
+IF NOT "%BINDING_DIR%" == "cassandra2" GOTO notAliasCassandra
+echo [WARN] The 'cassandra2-cql' client has been deprecated. It has been renamed to simply 'cassandra-cql'. This alias will be removed in the next YCSB release.
+SET BINDING_DIR=cassandra
+:notAliasCassandra
+
@REM Build classpath according to source checkout or release distribution
IF EXIST "%YCSB_HOME%\pom.xml" GOTO gotSource
diff --git a/bin/ycsb.sh b/bin/ycsb.sh
index 24e320c5..d62c22a4 100755
--- a/bin/ycsb.sh
+++ b/bin/ycsb.sh
@@ -133,6 +133,14 @@ else
CLASSPATH="$CLASSPATH:$YCSB_HOME/conf"
fi
+# Cassandra2 deprecation message
+if [ "${BINDING_DIR}" = "cassandra2" ] ; then
+ echo "[WARN] The 'cassandra2-cql' client has been deprecated. It has been \
+renamed to simply 'cassandra-cql'. This alias will be removed in the next \
+YCSB release."
+ BINDING_DIR="cassandra"
+fi
+
# Build classpath
# The "if" check after the "for" is because glob may just return the pattern
# when no files are found. The "if" makes sure the file is really there.
diff --git a/cassandra2/README.md b/cassandra/README.md
similarity index 100%
rename from cassandra2/README.md
rename to cassandra/README.md
diff --git a/cassandra2/pom.xml b/cassandra/pom.xml
similarity index 96%
rename from cassandra2/pom.xml
rename to cassandra/pom.xml
index 28a843bc..67ae9fd0 100644
--- a/cassandra2/pom.xml
+++ b/cassandra/pom.xml
@@ -27,7 +27,7 @@ LICENSE file.
<relativePath>../binding-parent</relativePath>
</parent>
- <artifactId>cassandra2-binding</artifactId>
+ <artifactId>cassandra-binding</artifactId>
<name>Cassandra 2.1+ DB Binding</name>
<packaging>jar</packaging>
@@ -41,7 +41,7 @@ LICENSE file.
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
- <version>${cassandra2.cql.version}</version>
+ <version>${cassandra.cql.version}</version>
</dependency>
<dependency>
<groupId>com.yahoo.ycsb</groupId>
diff --git a/cassandra2/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java b/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
similarity index 100%
rename from cassandra2/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
rename to cassandra/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
diff --git a/cassandra2/src/main/java/com/yahoo/ycsb/db/package-info.java b/cassandra/src/main/java/com/yahoo/ycsb/db/package-info.java
similarity index 100%
rename from cassandra2/src/main/java/com/yahoo/ycsb/db/package-info.java
rename to cassandra/src/main/java/com/yahoo/ycsb/db/package-info.java
diff --git a/cassandra2/src/test/java/com/yahoo/ycsb/db/CassandraCQLClientTest.java b/cassandra/src/test/java/com/yahoo/ycsb/db/CassandraCQLClientTest.java
similarity index 100%
rename from cassandra2/src/test/java/com/yahoo/ycsb/db/CassandraCQLClientTest.java
rename to cassandra/src/test/java/com/yahoo/ycsb/db/CassandraCQLClientTest.java
diff --git a/cassandra2/src/test/resources/ycsb.cql b/cassandra/src/test/resources/ycsb.cql
similarity index 100%
rename from cassandra2/src/test/resources/ycsb.cql
rename to cassandra/src/test/resources/ycsb.cql
diff --git a/distribution/pom.xml b/distribution/pom.xml
index df89c1fb..5f04b4a5 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -56,7 +56,7 @@ LICENSE file.
</dependency>
<dependency>
<groupId>com.yahoo.ycsb</groupId>
- <artifactId>cassandra2-binding</artifactId>
+ <artifactId>cassandra-binding</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index dd25d8e7..b3028f59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@ LICENSE file.
<hbase098.version>0.98.14-hadoop2</hbase098.version>
<hbase10.version>1.0.2</hbase10.version>
<accumulo.version>1.6.0</accumulo.version>
- <cassandra2.cql.version>3.0.0</cassandra2.cql.version>
+ <cassandra.cql.version>3.0.0</cassandra.cql.version>
<geode.version>1.0.0-incubating.M2</geode.version>
<googlebigtable.version>0.2.3</googlebigtable.version>
<infinispan.version>7.2.2.Final</infinispan.version>
@@ -105,7 +105,7 @@ LICENSE file.
<module>accumulo</module>
<module>aerospike</module>
<module>asynchbase</module>
- <module>cassandra2</module>
+ <module>cassandra</module>
<module>couchbase</module>
<module>couchbase2</module>
<module>distribution</module>
--
GitLab