Skip to content

Commit 70ab14e

Browse files
Zony7Zony7
authored
feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)
1 parent e90489f commit 70ab14e

File tree

6 files changed

+41
-31
lines changed

6 files changed

+41
-31
lines changed

‎hugegraph-cassandra/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>org.apache.cassandra</groupId>
3939
<artifactId>cassandra-all</artifactId>
40-
<version>3.11.12</version>
40+
<version>4.0.10</version>
4141
<exclusions>
4242
<exclusion>
4343
<groupId>org.slf4j</groupId>

‎hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ protected Map<String, Object> getMetricsByHost(String host) {
112112
metrics.put(DISK_USAGE, UnitUtil.bytesToGB(diskSize));
113113
metrics.put(DISK_USAGE + READABLE,
114114
UnitUtil.bytesToReadableString(diskSize));
115-
metrics.put(DISK_USAGE + "_details", probe.getLoadMap());
115+
metrics.put(DISK_USAGE + "_details", probe.getLoadMap(false));
116116
metrics.put(DISK_UNIT, "GB");
117117

118118
// Uptime Metrics
@@ -125,11 +125,11 @@ protected Map<String, Object> getMetricsByHost(String host) {
125125
this.appendExtraMetrics(metrics, probe);
126126

127127
// Nodes Metrics
128-
metrics.put("live_nodes", probe.getLiveNodes());
129-
metrics.put("joining_nodes", probe.getJoiningNodes());
130-
metrics.put("moving_nodes", probe.getMovingNodes());
131-
metrics.put("leaving_nodes", probe.getLeavingNodes());
132-
metrics.put("unreachable_nodes", probe.getUnreachableNodes());
128+
metrics.put("live_nodes", probe.getLiveNodes(false));
129+
metrics.put("joining_nodes", probe.getJoiningNodes(false));
130+
metrics.put("moving_nodes", probe.getMovingNodes(false));
131+
metrics.put("leaving_nodes", probe.getLeavingNodes(false));
132+
metrics.put("unreachable_nodes", probe.getUnreachableNodes(false));
133133

134134
// Others
135135
metrics.put("keyspaces", probe.getKeyspaces());

‎hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import java.util.concurrent.TimeUnit;
3333
import java.util.stream.Collectors;
3434

35-
import org.apache.cassandra.config.SchemaConstants;
35+
import org.apache.cassandra.schema.SchemaConstants;
3636
import org.apache.cassandra.db.SystemKeyspace;
3737
import org.apache.cassandra.dht.ByteOrderedPartitioner;
3838
import org.apache.cassandra.dht.IPartitioner;
@@ -222,7 +222,7 @@ private static Map<TokenRange, Long> describeSplits(
222222
"WHERE keyspace_name = ? AND table_name = ? AND " +
223223
"range_start = ? AND range_end = ?",
224224
SchemaConstants.SYSTEM_KEYSPACE_NAME,
225-
SystemKeyspace.SIZE_ESTIMATES);
225+
SystemKeyspace.LEGACY_SIZE_ESTIMATES);
226226

227227
ResultSet resultSet = session.execute(query, keyspace, table,
228228
tokenRange.getStart().toString(),

‎hugegraph-dist/release-docs/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ See licenses/ for text of these licenses.
252252
(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)
253253
(Apache License, Version 2.0) * ASM based accessors helper used by json-smart (net.minidev:accessors-smart:1.2 - http://www.minidev.net/)
254254
(Apache License, Version 2.0) * Annotations for Metrics (io.dropwizard.metrics:metrics-annotation:4.2.4 - https://metrics.dropwizard.io/metrics-annotation)
255-
(Apache License, Version 2.0) * Apache Cassandra (org.apache.cassandra:cassandra-all:3.11.12 - https://cassandra.apache.org)
255+
(Apache License, Version 2.0) * Apache Cassandra (org.apache.cassandra:cassandra-all:4.0.10 - https://cassandra.apache.org)
256256
(Apache License, Version 2.0) * Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.4 - https://commons.apache.org/proper/commons-beanutils/)
257257
(Apache License, Version 2.0) * Apache Commons Codec (commons-codec:commons-codec:1.11 - http://commons.apache.org/proper/commons-codec/)
258258
(Apache License, Version 2.0) * Apache Commons Codec (commons-codec:commons-codec:1.15 - https://commons.apache.org/proper/commons-codec/)

‎hugegraph-dist/scripts/dependency/known-dependencies.txt

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
HdrHistogram-2.1.9.jar
22
ST4-4.0.8.jar
33
accessors-smart-1.2.jar
4-
airline-0.6.jar
4+
airline-0.8.jar
55
animal-sniffer-annotations-1.14.jar
66
annotations-4.1.1.4.jar
77
ansj_seg-5.1.6.jar
88
antlr-runtime-3.5.2.jar
99
aopalliance-repackaged-3.0.1.jar
1010
arthas-agent-attach-3.7.1.jar
1111
arthas-packaging-3.7.1.jar
12-
asm-5.0.4.jar
1312
asm-6.0.jar
13+
asm-7.1.jar
1414
asm-analysis-5.0.3.jar
1515
asm-commons-5.0.3.jar
1616
asm-tree-5.0.3.jar
@@ -21,12 +21,17 @@ bolt-1.6.4.jar
2121
byte-buddy-1.10.5.jar
2222
byte-buddy-agent-1.10.5.jar
2323
byte-buddy-agent-1.11.6.jar
24-
caffeine-2.2.6.jar
2524
caffeine-2.3.1.jar
26-
cassandra-all-3.11.12.jar
25+
caffeine-2.5.6.jar
26+
cassandra-all-4.0.10.jar
2727
cassandra-driver-core-3.6.0.jar
2828
checker-qual-2.0.0.jar
2929
checker-qual-3.5.0.jar
30+
chronicle-bytes-2.20.111.jar
31+
chronicle-core-2.20.126.jar
32+
chronicle-queue-5.20.123.jar
33+
chronicle-threads-2.20.111.jar
34+
chronicle-wire-2.20.117.jar
3035
classgraph-4.8.95.jar
3136
commons-beanutils-1.9.4.jar
3237
commons-cli-1.1.jar
@@ -40,15 +45,12 @@ commons-configuration-1.10.jar
4045
commons-configuration2-2.8.0.jar
4146
commons-io-2.7.jar
4247
commons-lang-2.6.jar
43-
commons-lang3-3.1.jar
4448
commons-lang3-3.11.jar
4549
commons-logging-1.1.1.jar
4650
commons-logging-1.2.jar
4751
commons-math3-3.2.jar
4852
commons-text-1.10.0.jar
49-
compress-lzf-0.8.4.jar
5053
concurrent-trees-2.4.0.jar
51-
concurrentlinkedhashmap-lru-1.4.jar
5254
cypher-gremlin-extensions-1.0.4.jar
5355
disruptor-3.3.7.jar
5456
eclipse-collections-11.1.0.jar
@@ -98,18 +100,20 @@ hk2-api-3.0.1.jar
98100
hk2-locator-3.0.1.jar
99101
hk2-utils-3.0.1.jar
100102
hppc-0.7.1.jar
103+
hppc-0.8.1.jar
101104
htrace-core4-4.2.0-incubating.jar
102105
httpclient-4.5.13.jar
103106
httpcore-4.4.13.jar
104107
ikanalyzer-2012_u6.jar
105108
ivy-2.4.0.jar
106109
j2objc-annotations-1.1.jar
107-
jackson-annotations-2.12.5.jar
110+
j2objc-annotations-1.3.jar
111+
jackson-annotations-2.13.2.jar
108112
jackson-annotations-2.14.0-rc1.jar
109-
jackson-core-2.12.5.jar
113+
jackson-core-2.13.2.jar
110114
jackson-core-2.14.0-rc1.jar
111115
jackson-databind-2.12.1.jar
112-
jackson-databind-2.12.5.jar
116+
jackson-databind-2.13.2.2.jar
113117
jackson-databind-2.14.0-rc1.jar
114118
jackson-dataformat-yaml-2.9.3.jar
115119
jackson-datatype-jsr310-2.12.1.jar
@@ -125,7 +129,9 @@ jakarta.servlet-api-5.0.0.jar
125129
jakarta.validation-api-3.0.0.jar
126130
jakarta.ws.rs-api-3.0.0.jar
127131
jakarta.xml.bind-api-4.0.0-RC2.jar
128-
jamm-0.3.0.jar
132+
jamm-0.3.2.jar
133+
java-cup-runtime-11b-20160615.jar
134+
jcommander-1.30.jar
129135
javapoet-1.8.0.jar
130136
javassist-3.21.0-GA.jar
131137
javatuples-1.2.jar
@@ -141,8 +147,8 @@ jcabi-manifests-1.1.jar
141147
jcip-annotations-1.0-1.jar
142148
jcl-over-slf4j-1.7.25.jar
143149
jcseg-core-2.6.2.jar
144-
jctools-core-1.2.1.jar
145150
jctools-core-2.1.1.jar
151+
jctools-core-3.1.0.jar
146152
jersey-apache-connector-3.0.3.jar
147153
jersey-client-3.0.3.jar
148154
jersey-common-3.0.3.jar
@@ -159,7 +165,7 @@ jersey-test-framework-core-3.0.3.jar
159165
jersey-test-framework-provider-grizzly2-3.0.3.jar
160166
jffi-1.2.16-native.jar
161167
jffi-1.2.16.jar
162-
jflex-1.6.0.jar
168+
jflex-1.8.2.jar
163169
jieba-analysis-1.0.2.jar
164170
jjwt-api-0.11.5.jar
165171
jjwt-impl-0.11.5.jar
@@ -169,7 +175,7 @@ jna-5.12.1.jar
169175
jnr-ffi-2.1.7.jar
170176
jnr-x86asm-1.0.2.jar
171177
joda-time-2.10.8.jar
172-
joda-time-2.4.jar
178+
jvm-attach-api-1.5.jar
173179
jraft-core-1.3.11.jar
174180
json-simple-1.1.jar
175181
json-smart-2.3.jar
@@ -189,7 +195,6 @@ kerby-config-2.0.0.jar
189195
kerby-pkix-2.0.0.jar
190196
kerby-util-2.0.0.jar
191197
kerby-xdr-2.0.0.jar
192-
libthrift-0.9.2.jar
193198
log4j-api-2.17.1.jar
194199
log4j-core-2.17.1.jar
195200
log4j-slf4j-impl-2.17.1.jar
@@ -200,7 +205,6 @@ lucene-core-8.11.2.jar
200205
lucene-queries-4.7.2.jar
201206
lucene-queryparser-4.7.2.jar
202207
lucene-sandbox-4.7.2.jar
203-
lz4-1.3.0.jar
204208
lz4-java-1.8.0.jar
205209
metrics-annotation-4.2.4.jar
206210
metrics-core-3.0.2.jar
@@ -212,13 +216,15 @@ metrics-jvm-3.1.5.jar
212216
metrics-logback-3.1.5.jar
213217
mmseg4j-core-1.10.0.jar
214218
mockito-core-3.3.3.jar
219+
mxdump-0.14.jar
215220
netty-all-4.1.44.Final.jar
216221
netty-all-4.1.61.Final.jar
222+
netty-tcnative-boringssl-static-2.0.36.Final.jar
217223
nimbus-jose-jwt-4.41.2.jar
218224
nlp-lang-1.7.7.jar
219225
objenesis-2.6.jar
220226
ohc-core-0.7.4.jar
221-
ohc-core-j8-0.4.4.jar
227+
ohc-core-j8-0.5.1.jar
222228
opentracing-api-0.22.0.jar
223229
opentracing-mock-0.22.0.jar
224230
opentracing-noop-0.22.0.jar
@@ -231,19 +237,23 @@ perfmark-api-0.25.0.jar
231237
picocli-4.3.2.jar
232238
postgresql-42.4.1.jar
233239
protobuf-java-3.21.7.jar
240+
psjava-0.1.19.jar
234241
reporter-config-base-3.0.3.jar
235242
reporter-config3-3.0.3.jar
236243
rewriting-9.0-9.0.20190305.jar
237244
rocksdbjni-7.2.2.jar
238245
scala-java8-compat_2.12-0.8.0.jar
239246
scala-library-2.12.7.jar
240247
scala-reflect-2.12.7.jar
248+
sjk-cli-0.14.jar
249+
sjk-core-0.14.jar
250+
sjk-json-0.14.jar
251+
sjk-stacktrace-0.14.jar
241252
sigar-1.6.4.jar
242253
slf4j-api-1.7.25.jar
243-
slf4j-api-1.7.7.jar
244254
snakeyaml-1.26.jar
245255
snakeyaml-1.27.jar
246-
snappy-java-1.1.1.7.jar
256+
snappy-java-1.1.2.6.jar
247257
snowball-stemmer-1.3.0.581.1.jar
248258
sofa-common-tools-1.0.12.jar
249259
sofa-rpc-all-5.7.6.jar
@@ -257,11 +267,11 @@ swagger-integration-jakarta-2.1.9.jar
257267
swagger-jaxrs2-jakarta-2.1.9.jar
258268
swagger-models-1.5.18.jar
259269
swagger-models-jakarta-2.1.9.jar
260-
thrift-server-0.3.7.jar
261270
tinkergraph-gremlin-3.5.1.jar
262271
token-provider-2.0.0.jar
263272
tracer-core-3.0.8.jar
264273
translation-1.0.4.jar
265274
util-9.0-9.0.20190305.jar
266275
validation-api-1.1.0.Final.jar
267276
zt-zip-1.14.jar
277+
zstd-jni-1.5.5-1.jar

‎hugegraph-dist/src/assembly/travis/install-cassandra.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set -ev
1919

2020
TRAVIS_DIR=`dirname $0`
2121
CASS_DOWNLOAD_ADDRESS="http://archive.apache.org/dist/cassandra"
22-
CASS_VERSION="3.10"
22+
CASS_VERSION="4.0.10"
2323
CASS_PACKAGE="apache-cassandra-${CASS_VERSION}"
2424
CASS_TAR="${CASS_PACKAGE}-bin.tar.gz"
2525
CASS_CONF="${CASS_PACKAGE}/conf/cassandra.yaml"

0 commit comments

Comments
 (0)