From 9d0af873d82a6b787ff4f1340a042879a6e8e21d Mon Sep 17 00:00:00 2001 From: Sean Busbey <sean.busbey@gmail.com> Date: Fri, 23 Mar 2018 14:11:36 -0500 Subject: [PATCH] [accumulo1.6, scripts] deprecate Accumulo 1.6 client, since Accumulo 1.6 is EOM. --- bin/ycsb | 5 +++++ bin/ycsb.bat | 5 +++++ bin/ycsb.sh | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/bin/ycsb b/bin/ycsb index ad80d53f..d3d95f7c 100755 --- a/bin/ycsb +++ b/bin/ycsb @@ -259,6 +259,11 @@ def main(): "be removed in a future YCSB release.") binding = "accumulo1.6" + if binding == "accumulo1.6": + warn("The 'accumulo1.6' client has been deprecated because Accumulo 1.6 " + "is EOM. If you are using Accumulo 1.7+ try using the 'accumulo1.7' " + "client instead.") + if binding == "cassandra2": warn("The 'cassandra2-cql' client has been deprecated. It has been " "renamed to simply 'cassandra-cql'. This alias will be removed" diff --git a/bin/ycsb.bat b/bin/ycsb.bat index 747e707a..ebf76e8e 100644 --- a/bin/ycsb.bat +++ b/bin/ycsb.bat @@ -123,6 +123,11 @@ echo [WARN] The 'accumulo' client has been deprecated in favor of version specif SET BINDING_DIR=accumulo1.6 :notAliasAccumulo +@REM Accumulo 1.6 deprecation message +IF NOT "%BINDING_DIR%" == "accumulo1.6" GOTO notAccumulo16 +echo [WARN] The 'accumulo1.6' client has been deprecated because Accumulo 1.6 is EOM. If you are using Accumulo 1.7+ try using the 'accumulo1.7' client instead. +:notAccumulo16 + @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. diff --git a/bin/ycsb.sh b/bin/ycsb.sh index 4da4062e..ab899fc0 100755 --- a/bin/ycsb.sh +++ b/bin/ycsb.sh @@ -142,6 +142,14 @@ be removed in a future YCSB release." BINDING_DIR="accumulo1.6" fi +# Accumulo 1.6 deprecation message +if [ "${BINDING_DIR}" = "accumulo1.6" ] ; then + echo "[WARN] The 'accumulo' client has been deprecated because Accumulo 1.6 \ +is EOM. If you are using Accumulo 1.7+ try using the 'accumulo1.7' client \ +instead." +fi + + # Cassandra2 deprecation message if [ "${BINDING_DIR}" = "cassandra2" ] ; then echo "[WARN] The 'cassandra2-cql' client has been deprecated. It has been \ -- GitLab