Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: rollback cassandra to 3.11.16 #2374

Closed
wants to merge 6 commits into from
Closed

chore: rollback cassandra to 3.11.16 #2374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
710e67c
revert Cassandra 3
Zony7 Dec 4, 2023
d8443d5
Update known-dependencies.txt
Zony7 Dec 4, 2023
add8e45
adapt Cassandra 3.11.12 to 3.11.16
Zony7 Dec 4, 2023
dabc6e6
Update known-dependencies.txt
Zony7 Dec 4, 2023
062bb3d
Update known-dependencies.txt
Zony7 Dec 4, 2023
07c3d8c
Update docker-compose-cassandra.yml
Zony7 Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hugegraph-server/hugegraph-cassandra/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
<version>4.0.10</version>
<version>3.11.16</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down
12 changes: 6 additions & 6 deletions ...assandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
metrics.put(DISK_USAGE, UnitUtil.bytesToGB(diskSize));
metrics.put(DISK_USAGE + READABLE,
UnitUtil.bytesToReadableString(diskSize));
metrics.put(DISK_USAGE + "_details", probe.getLoadMap(false));
metrics.put(DISK_USAGE + "_details", probe.getLoadMap());

Check warning on line 115 in hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java

View check run for this annotation

Codecov / codecov/patch

hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java#L115 

Added line #L115 was not covered by tests
metrics.put(DISK_UNIT, "GB");

// Uptime Metrics
Expand All @@ -125,11 +125,11 @@
this.appendExtraMetrics(metrics, probe);

// Nodes Metrics
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));
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());

Check warning on line 132 in hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java

View check run for this annotation

Codecov / codecov/patch

hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java#L128-L132 

Added lines #L128 - L132 were not covered by tests

// Others
metrics.put("keyspaces", probe.getKeyspaces());
Expand Down
4 changes: 2 additions & 2 deletions ...-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.config.SchemaConstants;
import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.dht.ByteOrderedPartitioner;
import org.apache.cassandra.dht.IPartitioner;
Expand Down Expand Up @@ -222,7 +222,7 @@ private static Map<TokenRange, Long> describeSplits(
"WHERE keyspace_name = ? AND table_name = ? AND " +
"range_start = ? AND range_end = ?",
SchemaConstants.SYSTEM_KEYSPACE_NAME,
SystemKeyspace.LEGACY_SIZE_ESTIMATES);
SystemKeyspace.SIZE_ESTIMATES);

ResultSet resultSet = session.execute(query, keyspace, table,
tokenRange.getStart().toString(),
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-server/hugegraph-dist/docker/example/docker-compose-cassandra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
retries: 3

cassandra:
image: cassandra:4
image: cassandra:3.11
container_name: cas-cassandra
ports:
- 7000:7000
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-server/hugegraph-dist/release-docs/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:4.0.10 - https://cassandra.apache.org)
(Apache License, Version 2.0) * Apache Cassandra (org.apache.cassandra:cassandra-all:3.11.16 - 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/)
Expand Down
43 changes: 16 additions & 27 deletions hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
accessors-smart-1.2.jar
airline-0.8.jar
airline-0.6.jar
animal-sniffer-annotations-1.19.jar
annotations-4.1.1.4.jar
ansj_seg-5.1.6.jar
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
Expand All @@ -19,18 +19,13 @@ 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
caffeine-2.5.6.jar
cassandra-all-4.0.10.jar
cassandra-all-3.11.16.jar
cassandra-driver-core-3.6.0.jar
checker-compat-qual-2.5.5.jar
checker-qual-3.12.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.162.jar
commons-beanutils-1.9.4.jar
commons-cli-1.1.jar
Expand All @@ -44,12 +39,15 @@ 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
Expand Down Expand Up @@ -91,7 +89,7 @@ grpc-netty-shaded-1.47.0.jar
grpc-protobuf-1.28.0.jar
grpc-protobuf-lite-1.28.0.jar
gson-2.9.0.jar
guava-27.0-jre.jar
guava-18.0.jar
guava-30.0-jre.jar
guava-31.0.1-android.jar
hamcrest-2.2.jar
Expand All @@ -105,7 +103,6 @@ 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
Expand Down Expand Up @@ -135,8 +132,7 @@ 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.2.jar
java-cup-runtime-11b-20160615.jar
jamm-0.3.0.jar
javapoet-1.8.0.jar
javassist-3.21.0-GA.jar
javatuples-1.2.jar
Expand All @@ -151,10 +147,9 @@ jcabi-log-0.14.jar
jcabi-manifests-1.1.jar
jcip-annotations-1.0-1.jar
jcl-over-slf4j-1.7.25.jar
jcommander-1.30.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
Expand All @@ -171,7 +166,6 @@ jersey-test-framework-core-3.0.3.jar
jersey-test-framework-provider-grizzly2-3.0.3.jar
jffi-1.2.16.jar
jffi-1.2.16-native.jar
jflex-1.8.2.jar
jieba-analysis-1.0.2.jar
jjwt-api-0.11.5.jar
jjwt-impl-0.11.5.jar
Expand All @@ -180,13 +174,13 @@ jline-2.14.6.jar
jna-5.12.1.jar
jnr-ffi-2.1.7.jar
jnr-x86asm-1.0.2.jar
joda-time-2.4.jar
joda-time-2.10.8.jar
jraft-core-1.3.11.jar
json-simple-1.1.jar
json-smart-2.3.jar
jsr305-3.0.1.jar
junit-4.13.1.jar
jvm-attach-api-1.5.jar
kerb-admin-2.0.0.jar
kerb-client-2.0.0.jar
kerb-common-2.0.0.jar
Expand All @@ -201,6 +195,7 @@ 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
listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
log4j-api-2.17.1.jar
log4j-core-2.17.1.jar
Expand All @@ -212,6 +207,7 @@ 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
Expand All @@ -223,15 +219,13 @@ 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.5.1.jar
ohc-core-j8-0.4.4.jar
opentracing-api-0.22.0.jar
opentracing-mock-0.22.0.jar
opentracing-noop-0.22.0.jar
Expand All @@ -245,7 +239,6 @@ picocli-4.3.2.jar
postgresql-42.4.3.jar
protobuf-java-3.21.7.jar
proto-google-common-protos-1.17.0.jar
psjava-0.1.19.jar
reporter-config3-3.0.3.jar
reporter-config-base-3.0.3.jar
rewriting-9.0-9.0.20190305.jar
Expand All @@ -254,15 +247,11 @@ scala-java8-compat_2.12-0.8.0.jar
scala-library-2.12.7.jar
scala-reflect-2.12.7.jar
sigar-1.6.4.jar
sjk-cli-0.14.jar
sjk-core-0.14.jar
sjk-json-0.14.jar
sjk-stacktrace-0.14.jar
slf4j-api-1.7.25.jar
snakeyaml-1.26.jar
snakeyaml-1.27.jar
snakeyaml-2.2.jar
snappy-java-1.1.2.6.jar
snappy-java-1.1.1.7.jar
snowball-stemmer-1.3.0.581.1.jar
sofa-common-tools-1.0.12.jar
sofa-rpc-all-5.7.6.jar
Expand All @@ -277,11 +266,11 @@ swagger-integration-jakarta-2.2.18.jar
swagger-jaxrs2-jakarta-2.2.18.jar
swagger-models-1.5.18.jar
swagger-models-jakarta-2.2.18.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
translation-1.0.4.jar
util-9.0-9.0.20190305.jar
validation-api-1.1.0.Final.jar
zstd-jni-1.5.5-1.jar
zt-zip-1.14.jar
2 changes: 1 addition & 1 deletion hugegraph-server/hugegraph-dist/src/assembly/travis/install-cassandra.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set -ev

TRAVIS_DIR=`dirname $0`
CASS_DOWNLOAD_ADDRESS="http://archive.apache.org/dist/cassandra"
CASS_VERSION="4.0.10"
CASS_VERSION="3.11.16"
CASS_PACKAGE="apache-cassandra-${CASS_VERSION}"
CASS_TAR="${CASS_PACKAGE}-bin.tar.gz"
CASS_CONF="${CASS_PACKAGE}/conf/cassandra.yaml"
Expand Down
Loading