This is an automated email from the ASF dual-hosted git repository.
jin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
The following commit(s) were added to refs/heads/master by this push:
new 70ab14e3e feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10
(#2300)
70ab14e3e is described below
commit 70ab14e3e6e5f9ed5c3b48be4494ae3a5d5baf57
Author: lzyxx <[email protected]>
AuthorDate: Sat Oct 28 23:58:17 2023 +0800
feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)
---
hugegraph-cassandra/pom.xml | 2 +-
.../backend/store/cassandra/CassandraMetrics.java | 12 +++---
.../backend/store/cassandra/CassandraShard.java | 4 +-
hugegraph-dist/release-docs/LICENSE | 2 +-
.../scripts/dependency/known-dependencies.txt | 50 +++++++++++++---------
.../src/assembly/travis/install-cassandra.sh | 2 +-
6 files changed, 41 insertions(+), 31 deletions(-)
diff --git a/hugegraph-cassandra/pom.xml b/hugegraph-cassandra/pom.xml
index 92ad5f6f5..6e12b8993 100644
--- a/hugegraph-cassandra/pom.xml
+++ b/hugegraph-cassandra/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
- <version>3.11.12</version>
+ <version>4.0.10</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git
a/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java
b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java
index 875934676..f2f2931c6 100644
---
a/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java
+++
b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java
@@ -112,7 +112,7 @@ public class CassandraMetrics implements BackendMetrics {
metrics.put(DISK_USAGE, UnitUtil.bytesToGB(diskSize));
metrics.put(DISK_USAGE + READABLE,
UnitUtil.bytesToReadableString(diskSize));
- metrics.put(DISK_USAGE + "_details", probe.getLoadMap());
+ metrics.put(DISK_USAGE + "_details", probe.getLoadMap(false));
metrics.put(DISK_UNIT, "GB");
// Uptime Metrics
@@ -125,11 +125,11 @@ public class CassandraMetrics implements BackendMetrics {
this.appendExtraMetrics(metrics, probe);
// Nodes Metrics
- metrics.put("live_nodes", probe.getLiveNodes());
- metrics.put("joining_nodes", probe.getJoiningNodes());
- metrics.put("moving_nodes", probe.getMovingNodes());
- metrics.put("leaving_nodes", probe.getLeavingNodes());
- metrics.put("unreachable_nodes", probe.getUnreachableNodes());
+ metrics.put("live_nodes", probe.getLiveNodes(false));
+ metrics.put("joining_nodes", probe.getJoiningNodes(false));
+ metrics.put("moving_nodes", probe.getMovingNodes(false));
+ metrics.put("leaving_nodes", probe.getLeavingNodes(false));
+ metrics.put("unreachable_nodes", probe.getUnreachableNodes(false));
// Others
metrics.put("keyspaces", probe.getKeyspaces());
diff --git
a/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java
b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java
index c5734f62e..9bcefb6aa 100644
---
a/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java
+++
b/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java
@@ -32,7 +32,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-import org.apache.cassandra.config.SchemaConstants;
+import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.dht.ByteOrderedPartitioner;
import org.apache.cassandra.dht.IPartitioner;
@@ -222,7 +222,7 @@ public class CassandraShard {
"WHERE keyspace_name = ? AND table_name = ? AND " +
"range_start = ? AND range_end = ?",
SchemaConstants.SYSTEM_KEYSPACE_NAME,
- SystemKeyspace.SIZE_ESTIMATES);
+ SystemKeyspace.LEGACY_SIZE_ESTIMATES);
ResultSet resultSet = session.execute(query, keyspace, table,
tokenRange.getStart().toString(),
diff --git a/hugegraph-dist/release-docs/LICENSE
b/hugegraph-dist/release-docs/LICENSE
index 25c50c2fb..b6306df6b 100644
--- a/hugegraph-dist/release-docs/LICENSE
+++ b/hugegraph-dist/release-docs/LICENSE
@@ -252,7 +252,7 @@ See licenses/ for text of these licenses.
(Apache License, Version 2.0) * jersey-media-json-jackson
(org.glassfish.jersey.media:jersey-media-json-jackson:3.0.3 -
https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-json-jackson)
(Apache License, Version 2.0) * ASM based accessors helper used by
json-smart (net.minidev:accessors-smart:1.2 - http://www.minidev.net/)
(Apache License, Version 2.0) * Annotations for Metrics
(io.dropwizard.metrics:metrics-annotation:4.2.4 -
https://metrics.dropwizard.io/metrics-annotation)
- (Apache License, Version 2.0) * Apache Cassandra
(org.apache.cassandra:cassandra-all:3.11.12 - https://cassandra.apache.org)
+ (Apache License, Version 2.0) * Apache Cassandra
(org.apache.cassandra:cassandra-all:4.0.10 - https://cassandra.apache.org)
(Apache License, Version 2.0) * Apache Commons BeanUtils
(commons-beanutils:commons-beanutils:1.9.4 -
https://commons.apache.org/proper/commons-beanutils/)
(Apache License, Version 2.0) * Apache Commons Codec
(commons-codec:commons-codec:1.11 -
http://commons.apache.org/proper/commons-codec/)
(Apache License, Version 2.0) * Apache Commons Codec
(commons-codec:commons-codec:1.15 -
https://commons.apache.org/proper/commons-codec/)
diff --git a/hugegraph-dist/scripts/dependency/known-dependencies.txt
b/hugegraph-dist/scripts/dependency/known-dependencies.txt
index b5f503661..f1388437c 100644
--- a/hugegraph-dist/scripts/dependency/known-dependencies.txt
+++ b/hugegraph-dist/scripts/dependency/known-dependencies.txt
@@ -1,7 +1,7 @@
HdrHistogram-2.1.9.jar
ST4-4.0.8.jar
accessors-smart-1.2.jar
-airline-0.6.jar
+airline-0.8.jar
animal-sniffer-annotations-1.14.jar
annotations-4.1.1.4.jar
ansj_seg-5.1.6.jar
@@ -9,8 +9,8 @@ antlr-runtime-3.5.2.jar
aopalliance-repackaged-3.0.1.jar
arthas-agent-attach-3.7.1.jar
arthas-packaging-3.7.1.jar
-asm-5.0.4.jar
asm-6.0.jar
+asm-7.1.jar
asm-analysis-5.0.3.jar
asm-commons-5.0.3.jar
asm-tree-5.0.3.jar
@@ -21,12 +21,17 @@ bolt-1.6.4.jar
byte-buddy-1.10.5.jar
byte-buddy-agent-1.10.5.jar
byte-buddy-agent-1.11.6.jar
-caffeine-2.2.6.jar
caffeine-2.3.1.jar
-cassandra-all-3.11.12.jar
+caffeine-2.5.6.jar
+cassandra-all-4.0.10.jar
cassandra-driver-core-3.6.0.jar
checker-qual-2.0.0.jar
checker-qual-3.5.0.jar
+chronicle-bytes-2.20.111.jar
+chronicle-core-2.20.126.jar
+chronicle-queue-5.20.123.jar
+chronicle-threads-2.20.111.jar
+chronicle-wire-2.20.117.jar
classgraph-4.8.95.jar
commons-beanutils-1.9.4.jar
commons-cli-1.1.jar
@@ -40,15 +45,12 @@ commons-configuration-1.10.jar
commons-configuration2-2.8.0.jar
commons-io-2.7.jar
commons-lang-2.6.jar
-commons-lang3-3.1.jar
commons-lang3-3.11.jar
commons-logging-1.1.1.jar
commons-logging-1.2.jar
commons-math3-3.2.jar
commons-text-1.10.0.jar
-compress-lzf-0.8.4.jar
concurrent-trees-2.4.0.jar
-concurrentlinkedhashmap-lru-1.4.jar
cypher-gremlin-extensions-1.0.4.jar
disruptor-3.3.7.jar
eclipse-collections-11.1.0.jar
@@ -98,18 +100,20 @@ hk2-api-3.0.1.jar
hk2-locator-3.0.1.jar
hk2-utils-3.0.1.jar
hppc-0.7.1.jar
+hppc-0.8.1.jar
htrace-core4-4.2.0-incubating.jar
httpclient-4.5.13.jar
httpcore-4.4.13.jar
ikanalyzer-2012_u6.jar
ivy-2.4.0.jar
j2objc-annotations-1.1.jar
-jackson-annotations-2.12.5.jar
+j2objc-annotations-1.3.jar
+jackson-annotations-2.13.2.jar
jackson-annotations-2.14.0-rc1.jar
-jackson-core-2.12.5.jar
+jackson-core-2.13.2.jar
jackson-core-2.14.0-rc1.jar
jackson-databind-2.12.1.jar
-jackson-databind-2.12.5.jar
+jackson-databind-2.13.2.2.jar
jackson-databind-2.14.0-rc1.jar
jackson-dataformat-yaml-2.9.3.jar
jackson-datatype-jsr310-2.12.1.jar
@@ -125,7 +129,9 @@ jakarta.servlet-api-5.0.0.jar
jakarta.validation-api-3.0.0.jar
jakarta.ws.rs-api-3.0.0.jar
jakarta.xml.bind-api-4.0.0-RC2.jar
-jamm-0.3.0.jar
+jamm-0.3.2.jar
+java-cup-runtime-11b-20160615.jar
+jcommander-1.30.jar
javapoet-1.8.0.jar
javassist-3.21.0-GA.jar
javatuples-1.2.jar
@@ -141,8 +147,8 @@ jcabi-manifests-1.1.jar
jcip-annotations-1.0-1.jar
jcl-over-slf4j-1.7.25.jar
jcseg-core-2.6.2.jar
-jctools-core-1.2.1.jar
jctools-core-2.1.1.jar
+jctools-core-3.1.0.jar
jersey-apache-connector-3.0.3.jar
jersey-client-3.0.3.jar
jersey-common-3.0.3.jar
@@ -159,7 +165,7 @@ jersey-test-framework-core-3.0.3.jar
jersey-test-framework-provider-grizzly2-3.0.3.jar
jffi-1.2.16-native.jar
jffi-1.2.16.jar
-jflex-1.6.0.jar
+jflex-1.8.2.jar
jieba-analysis-1.0.2.jar
jjwt-api-0.11.5.jar
jjwt-impl-0.11.5.jar
@@ -169,7 +175,7 @@ jna-5.12.1.jar
jnr-ffi-2.1.7.jar
jnr-x86asm-1.0.2.jar
joda-time-2.10.8.jar
-joda-time-2.4.jar
+jvm-attach-api-1.5.jar
jraft-core-1.3.11.jar
json-simple-1.1.jar
json-smart-2.3.jar
@@ -189,7 +195,6 @@ kerby-config-2.0.0.jar
kerby-pkix-2.0.0.jar
kerby-util-2.0.0.jar
kerby-xdr-2.0.0.jar
-libthrift-0.9.2.jar
log4j-api-2.17.1.jar
log4j-core-2.17.1.jar
log4j-slf4j-impl-2.17.1.jar
@@ -200,7 +205,6 @@ lucene-core-8.11.2.jar
lucene-queries-4.7.2.jar
lucene-queryparser-4.7.2.jar
lucene-sandbox-4.7.2.jar
-lz4-1.3.0.jar
lz4-java-1.8.0.jar
metrics-annotation-4.2.4.jar
metrics-core-3.0.2.jar
@@ -212,13 +216,15 @@ metrics-jvm-3.1.5.jar
metrics-logback-3.1.5.jar
mmseg4j-core-1.10.0.jar
mockito-core-3.3.3.jar
+mxdump-0.14.jar
netty-all-4.1.44.Final.jar
netty-all-4.1.61.Final.jar
+netty-tcnative-boringssl-static-2.0.36.Final.jar
nimbus-jose-jwt-4.41.2.jar
nlp-lang-1.7.7.jar
objenesis-2.6.jar
ohc-core-0.7.4.jar
-ohc-core-j8-0.4.4.jar
+ohc-core-j8-0.5.1.jar
opentracing-api-0.22.0.jar
opentracing-mock-0.22.0.jar
opentracing-noop-0.22.0.jar
@@ -231,6 +237,7 @@ perfmark-api-0.25.0.jar
picocli-4.3.2.jar
postgresql-42.4.1.jar
protobuf-java-3.21.7.jar
+psjava-0.1.19.jar
reporter-config-base-3.0.3.jar
reporter-config3-3.0.3.jar
rewriting-9.0-9.0.20190305.jar
@@ -238,12 +245,15 @@ rocksdbjni-7.2.2.jar
scala-java8-compat_2.12-0.8.0.jar
scala-library-2.12.7.jar
scala-reflect-2.12.7.jar
+sjk-cli-0.14.jar
+sjk-core-0.14.jar
+sjk-json-0.14.jar
+sjk-stacktrace-0.14.jar
sigar-1.6.4.jar
slf4j-api-1.7.25.jar
-slf4j-api-1.7.7.jar
snakeyaml-1.26.jar
snakeyaml-1.27.jar
-snappy-java-1.1.1.7.jar
+snappy-java-1.1.2.6.jar
snowball-stemmer-1.3.0.581.1.jar
sofa-common-tools-1.0.12.jar
sofa-rpc-all-5.7.6.jar
@@ -257,7 +267,6 @@ swagger-integration-jakarta-2.1.9.jar
swagger-jaxrs2-jakarta-2.1.9.jar
swagger-models-1.5.18.jar
swagger-models-jakarta-2.1.9.jar
-thrift-server-0.3.7.jar
tinkergraph-gremlin-3.5.1.jar
token-provider-2.0.0.jar
tracer-core-3.0.8.jar
@@ -265,3 +274,4 @@ translation-1.0.4.jar
util-9.0-9.0.20190305.jar
validation-api-1.1.0.Final.jar
zt-zip-1.14.jar
+zstd-jni-1.5.5-1.jar
diff --git a/hugegraph-dist/src/assembly/travis/install-cassandra.sh
b/hugegraph-dist/src/assembly/travis/install-cassandra.sh
index 367259d14..2bdfe0bf6 100755
--- a/hugegraph-dist/src/assembly/travis/install-cassandra.sh
+++ b/hugegraph-dist/src/assembly/travis/install-cassandra.sh
@@ -19,7 +19,7 @@ set -ev
TRAVIS_DIR=`dirname $0`
CASS_DOWNLOAD_ADDRESS="http://archive.apache.org/dist/cassandra";
-CASS_VERSION="3.10"
+CASS_VERSION="4.0.10"
CASS_PACKAGE="apache-cassandra-${CASS_VERSION}"
CASS_TAR="${CASS_PACKAGE}-bin.tar.gz"
CASS_CONF="${CASS_PACKAGE}/conf/cassandra.yaml"
