From 7c4fcb2e9dca80b3717cfbc45fc4c8771b7ddb6b Mon Sep 17 00:00:00 2001 From: Zhangmei Li Date: Thu, 18 Apr 2019 11:58:28 +0800 Subject: [PATCH] Reduce the version of Cassandra to 3.10 for ci C* 3.11 can not pass the tinkerpop tests, it may be a bug. also set ScyllaDB.VERSION public access. Change-Id: I23c0ed924ee7c7cdb58416b0160fa319959b90af related: #463 --- hugegraph-dist/src/assembly/travis/install-cassandra.sh | 2 +- .../backend/store/scylladb/ScyllaDBStoreProvider.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hugegraph-dist/src/assembly/travis/install-cassandra.sh b/hugegraph-dist/src/assembly/travis/install-cassandra.sh index 7df6f5d424..301dd868ea 100755 --- a/hugegraph-dist/src/assembly/travis/install-cassandra.sh +++ b/hugegraph-dist/src/assembly/travis/install-cassandra.sh @@ -4,7 +4,7 @@ set -ev TRAVIS_DIR=`dirname $0` CASSA_DOWNLOAD_ADDRESS="http://archive.apache.org/dist/cassandra" -CASSA_VERSION="3.11.3" +CASSA_VERSION="3.10" CASSA_PACKAGE="apache-cassandra-${CASSA_VERSION}" CASSA_TAR="${CASSA_PACKAGE}-bin.tar.gz" diff --git a/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBStoreProvider.java b/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBStoreProvider.java index 0aca4393e2..aac2e79a5d 100644 --- a/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBStoreProvider.java +++ b/hugegraph-scylladb/src/main/java/com/baidu/hugegraph/backend/store/scylladb/ScyllaDBStoreProvider.java @@ -32,10 +32,10 @@ public class ScyllaDBStoreProvider extends CassandraStoreProvider { - private static final Logger LOG = Log.logger(CassandraStore.class); - // TODO: read ScyllaDB version from conf - private static final int VERSION = 20; + public static int VERSION = 20; + + private static final Logger LOG = Log.logger(CassandraStore.class); private static final BackendFeatures FEATURES = new ScyllaDBFeatures();