diff --git a/hugegraph-server/hugegraph-cassandra/pom.xml b/hugegraph-server/hugegraph-cassandra/pom.xml index 888f6dd7f8..5b2c4152b6 100644 --- a/hugegraph-server/hugegraph-cassandra/pom.xml +++ b/hugegraph-server/hugegraph-cassandra/pom.xml @@ -37,7 +37,7 @@ org.apache.cassandra cassandra-all - 4.0.10 + 3.11.12 org.slf4j diff --git a/hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java b/hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java index f2f2931c62..8759346764 100644 --- a/hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java +++ b/hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraMetrics.java @@ -112,7 +112,7 @@ protected Map getMetricsByHost(String host) { 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()); metrics.put(DISK_UNIT, "GB"); // Uptime Metrics @@ -125,11 +125,11 @@ protected Map getMetricsByHost(String host) { 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()); // Others metrics.put("keyspaces", probe.getKeyspaces()); diff --git a/hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java b/hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java index 9bcefb6aa4..c5734f62e7 100644 --- a/hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java +++ b/hugegraph-server/hugegraph-cassandra/src/main/java/org/apache/hugegraph/backend/store/cassandra/CassandraShard.java @@ -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; @@ -222,7 +222,7 @@ private static Map 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(), diff --git a/hugegraph-server/hugegraph-dist/release-docs/LICENSE b/hugegraph-server/hugegraph-dist/release-docs/LICENSE index b6306df6b5..25c50c2fbb 100644 --- a/hugegraph-server/hugegraph-dist/release-docs/LICENSE +++ b/hugegraph-server/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:4.0.10 - https://cassandra.apache.org) + (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 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-server/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt index 0069eea761..b392ac5a78 100644 --- a/hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt +++ b/hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt @@ -1,14 +1,19 @@ accessors-smart-1.2.jar +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt airline-0.8.jar animal-sniffer-annotations-1.19.jar +======= +airline-0.6.jar +animal-sniffer-annotations-1.14.jar +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt 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 @@ -19,19 +24,23 @@ 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.12.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 +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt 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 +======= +classgraph-4.8.95.jar +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt commons-beanutils-1.9.4.jar commons-cli-1.1.jar commons-codec-1.11.jar @@ -44,12 +53,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 @@ -105,18 +117,27 @@ 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 +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt j2objc-annotations-1.3.jar jackson-annotations-2.13.2.jar +======= +j2objc-annotations-1.1.jar +jackson-annotations-2.12.5.jar +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt jackson-annotations-2.14.0-rc1.jar -jackson-core-2.13.2.jar +jackson-core-2.12.5.jar jackson-core-2.14.0-rc1.jar +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt jackson-databind-2.13.2.2.jar +======= +jackson-databind-2.12.1.jar +jackson-databind-2.12.5.jar +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt jackson-databind-2.14.0-rc1.jar jackson-databind-2.15.2.jar jackson-dataformat-yaml-2.9.3.jar @@ -135,8 +156,12 @@ 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 +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt jamm-0.3.2.jar java-cup-runtime-11b-20160615.jar +======= +jamm-0.3.0.jar +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt javapoet-1.8.0.jar javassist-3.21.0-GA.jar javatuples-1.2.jar @@ -153,8 +178,8 @@ 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 @@ -170,8 +195,12 @@ jersey-server-3.0.3.jar jersey-test-framework-core-3.0.3.jar jersey-test-framework-provider-grizzly2-3.0.3.jar jffi-1.2.16.jar +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt jffi-1.2.16-native.jar jflex-1.8.2.jar +======= +jflex-1.6.0.jar +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt jieba-analysis-1.0.2.jar jjwt-api-0.11.5.jar jjwt-impl-0.11.5.jar @@ -181,6 +210,10 @@ jna-5.12.1.jar jnr-ffi-2.1.7.jar jnr-x86asm-1.0.2.jar joda-time-2.10.8.jar +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt +======= +joda-time-2.4.jar +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt jraft-core-1.3.11.jar json-simple-1.1.jar json-smart-2.3.jar @@ -201,7 +234,11 @@ kerby-config-2.0.0.jar kerby-pkix-2.0.0.jar kerby-util-2.0.0.jar kerby-xdr-2.0.0.jar +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar +======= +libthrift-0.9.2.jar +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt log4j-api-2.17.1.jar log4j-core-2.17.1.jar log4j-slf4j-impl-2.17.1.jar @@ -212,6 +249,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 @@ -223,15 +261,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 @@ -244,8 +280,12 @@ perfmark-api-0.25.0.jar picocli-4.3.2.jar postgresql-42.4.3.jar protobuf-java-3.21.7.jar +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt proto-google-common-protos-1.17.0.jar psjava-0.1.19.jar +======= +reporter-config-base-3.0.3.jar +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt reporter-config3-3.0.3.jar reporter-config-base-3.0.3.jar rewriting-9.0-9.0.20190305.jar @@ -254,15 +294,23 @@ 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 +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt sjk-cli-0.14.jar sjk-core-0.14.jar sjk-json-0.14.jar sjk-stacktrace-0.14.jar +======= +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt slf4j-api-1.7.25.jar +slf4j-api-1.7.7.jar snakeyaml-1.26.jar snakeyaml-1.27.jar +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt snakeyaml-2.2.jar snappy-java-1.1.2.6.jar +======= +snappy-java-1.1.1.7.jar +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt snowball-stemmer-1.3.0.581.1.jar sofa-common-tools-1.0.12.jar sofa-rpc-all-5.7.6.jar @@ -276,12 +324,20 @@ swagger-core-jakarta-2.2.18.jar swagger-integration-jakarta-2.2.18.jar swagger-jaxrs2-jakarta-2.2.18.jar swagger-models-1.5.18.jar +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt swagger-models-jakarta-2.2.18.jar +======= +swagger-models-jakarta-2.1.9.jar +thrift-server-0.3.7.jar +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt 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 +<<<<<<< HEAD:hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt zstd-jni-1.5.5-1.jar +======= +>>>>>>> parent of 70ab14e3 (feat(cassandra): adapt cassandra from 3.11.12 to 4.0.10 (#2300)):hugegraph-dist/scripts/dependency/known-dependencies.txt zt-zip-1.14.jar diff --git a/hugegraph-server/hugegraph-dist/src/assembly/travis/install-cassandra.sh b/hugegraph-server/hugegraph-dist/src/assembly/travis/install-cassandra.sh index 2bdfe0bf6a..367259d141 100755 --- a/hugegraph-server/hugegraph-dist/src/assembly/travis/install-cassandra.sh +++ b/hugegraph-server/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="4.0.10" +CASS_VERSION="3.10" CASS_PACKAGE="apache-cassandra-${CASS_VERSION}" CASS_TAR="${CASS_PACKAGE}-bin.tar.gz" CASS_CONF="${CASS_PACKAGE}/conf/cassandra.yaml"