diff --git a/databases/cassandra4/Makefile b/databases/cassandra4/Makefile index a4ee9f37723d..d0407995fabe 100644 --- a/databases/cassandra4/Makefile +++ b/databases/cassandra4/Makefile @@ -1,171 +1,197 @@ PORTNAME= cassandra -DISTVERSION= 4.0-beta2 +DISTVERSION= 4.0.8 CATEGORIES= databases java MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/${DISTVERSION}/:apache \ - https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.5-4/:maven \ - LOCAL/mikael:repo + https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.5.0-4/:maven PKGNAMESUFFIX= 4 DISTNAME= apache-${PORTNAME}-${DISTVERSION}-src DISTFILES= ${DISTNAME}.tar.gz:apache \ ${ZSTD_DISTFILE} \ - apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo + ${MAVEN_CACHE_FILE}:prefetch +DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}.tar.gz \ - apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz + ${MAVEN_CACHE_FILE} MAINTAINER= language.devel@gmail.com COMMENT= Highly scalable distributed database WWW= https://cassandra.apache.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt +FETCH_DEPENDS= ant:devel/apache-ant RUN_DEPENDS= snappyjava>=0:archivers/snappy-java \ netty>0:java/netty -USES= cpe python:3.7+ +USES= cpe python:3.7+ shebangfix USE_JAVA= yes USE_ANT= yes USE_RC_SUBR= cassandra +SHEBANG_FILES= bin/cqlsh.py pylib/setup.py TEST_TARGET= test CPE_VENDOR= apache CONFLICTS= cassandra3 -JAVA_VERSION= 8+ +JAVA_VERSION= 8 11 JAVA_VENDOR= openjdk SUB_LIST= JAVA_HOME=${JAVA_HOME} USERS= cassandra GROUPS= cassandra DATADIR= ${JAVASHAREDIR}/${PORTNAME} BUILD_DIST_DIR= ${WRKSRC}/build/dist REPO_DIR= ${WRKDIR}/repository CONFIG_FILES= cassandra-env.sh \ cassandra-jaas.config \ cassandra-rackdc.properties \ cassandra-topology.properties \ cassandra.yaml \ commitlog_archiving.properties \ hotspot_compiler \ logback-tools.xml \ logback.xml \ jvm8-clients.options \ jvm8-server.options \ jvm11-clients.options \ jvm11-server.options \ jvm-clients.options \ jvm-server.options SCRIPT_FILES= cassandra \ nodetool \ sstableloader \ sstablescrub \ sstableupgrade \ sstableutil \ sstableverify -ZSTDJNI_VERSION=${MASTER_SITES:M*\:maven:H:T} +ZSTDJNI_VERSION= ${MASTER_SITES:M*\:maven:H:T} PLIST_SUB= DISTVERSION=${DISTVERSION} ZSTDJNI_VERSION=${ZSTDJNI_VERSION} OPTIONS_DEFINE= SIGAR DOCS OPTIONS_DEFAULT= SIGAR OPTIONS_SUB= yes SIGAR_DESC= Use SIGAR to collect system information SIGAR_RUN_DEPENDS= java-sigar>=1.6.4:java/sigar DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} PORTDOCS= * +MAVEN_CACHE_FILE= apache-${PORTNAME}-${DISTVERSION}-repo.tar.xz + +.if !exists(${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE}) +pre-fetch: + ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} + ${MKDIR} ${WRKSRC}/.build + ${MKDIR} ${WRKSRC}/src/java + ${CP} ${FILESDIR}/maven/build.* ${WRKSRC} + ${CP} ${FILESDIR}/maven/build-* ${WRKSRC}/.build + cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} resolver-dist-lib + cd ${REPO_DIR} && ${FIND} . -type f -name "*.repositories" -a -exec ${SED} -i '' -e '2s,.*,Mon Aug 08 20:40:04 CEST 2022,' {} + + cd ${WRKDIR} && ${MTREE_CMD} -cbnSp repository | ${MTREE_CMD} -C | ${SED} \ + -e 's:time=[0-9.]*:time=0.000000000:' \ + -e 's:\([gu]id\)=[0-9]*:\1=0:g' \ + -e 's:flags=.*:flags=none:' \ + -e 's:^\.:./repository:' \ + > maven-offline-cache.mtree + cd ${WRKDIR} && ${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE} \ + @maven-offline-cache.mtree + ${SHA256} ${WRKDIR}/maven-offline-cache.mtree ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE} +.endif + do-build: @${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target. do-build-DOCS-on: - cd ${WRKSRC} && ${SETENV} CASSANDRA_LOG_DIR=${WRKDIR}/gen-doc-log ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} -Dpycmd=${PYTHON_CMD} -Dpyver=${PYTHON_VER} freebsd-stage-doc + cd ${WRKSRC} && ${SETENV} CASSANDRA_LOG_DIR=${WRKDIR}/gen-doc-log ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dpycmd=${PYTHON_CMD} -Dpyver=${PYTHON_VER} freebsd-stage-doc do-build-DOCS-off: - cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} freebsd-stage + cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} freebsd-stage post-build: .for f in ${SCRIPT_FILES} @${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${BUILD_DIST_DIR}/bin/${f} .endfor @${REINPLACE_CMD} -e 's|`dirname "$$0"`/..|${DATADIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${BUILD_DIST_DIR}/conf/cassandra-env.sh @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/conf|${ETCDIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh .for f in ${CONFIG_FILES} @${MV} ${BUILD_DIST_DIR}/conf/${f} ${BUILD_DIST_DIR}/conf/${f}.sample .endfor @${RM} ${BUILD_DIST_DIR}/lib/licenses/sigar* @${RMDIR} ${BUILD_DIST_DIR}/lib/sigar-bin @${RM} ${BUILD_DIST_DIR}/lib/zstd-jni* @${RM} ${BUILD_DIST_DIR}/lib/licenses/zstd-jni* do-install: ${MKDIR} ${STAGEDIR}${DATADIR} .for f in CHANGES LICENSE NEWS NOTICE cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} ${f}.txt ${STAGEDIR}${DATADIR}/ .endfor .for d in lib pylib tools cd ${BUILD_DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ "! -path '*/bin/*'" .endfor ${MKDIR} ${STAGEDIR}${ETCDIR} cd ${BUILD_DIST_DIR}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/ cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} bin ${STAGEDIR}${DATADIR} cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/ cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/ cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/ + cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/fqltool.jar ${STAGEDIR}${DATADIR}/tools/lib/ + cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/stress.jar ${STAGEDIR}${DATADIR}/tools/lib/ .for f in ${SCRIPT_FILES} ${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f} .endfor ${RLN} ${STAGEDIR}${DATADIR}/bin/cqlsh ${STAGEDIR}${PREFIX}/bin/cqlsh ${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar do-test: - @cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test + @cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test .include .if ${JAVA_PORT_VERSION} == 11 -USEJDK11= -Duse.jdk11=true +USEJDK11= -Duse.jdk11=true -Drat.skip=true .endif .if ${ARCH} == amd64 PLIST_SUB+= AMD64ONLY="" PLIST_SUB+= I386ONLY="@comment " .elif ${ARCH} == i386 PLIST_SUB+= AMD64ONLY="@comment " PLIST_SUB+= I386ONLY="" .else PLIST_SUB+= AMD64ONLY="@comment " PLIST_SUB+= I386ONLY="@comment " .endif .if ${ARCH} == amd64 || ${ARCH} == i386 ZSTD_DISTFILE= zstd-jni-${MASTER_SITES:M*\:maven:H:T}-freebsd_${ARCH}.jar:maven .else ZSTD_DISTFILE= .endif post-install: ${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar .if ${ARCH} == amd64 || ${ARCH} == i386 - ${CP} ${DISTDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/ + ${CP} ${DISTDIR}/${DIST_SUBDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/ .endif post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for d in doc javadoc cd ${BUILD_DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DOCSDIR}/ .endfor post-install-SIGAR-on: ${LN} -s ${JAVAJARDIR}/sigar.jar ${STAGEDIR}${DATADIR}/lib/sigar.jar .include diff --git a/databases/cassandra4/distinfo b/databases/cassandra4/distinfo index 82d3b4cbe97c..976d31650bd9 100644 --- a/databases/cassandra4/distinfo +++ b/databases/cassandra4/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1601573969 -SHA256 (apache-cassandra-4.0-beta2-src.tar.gz) = 02347ce3d55fd7d68f90c112ee01d82902dfd959cf03c107a51d15bcaabb48c5 -SIZE (apache-cassandra-4.0-beta2-src.tar.gz) = 46741277 -SHA256 (zstd-jni-1.4.5-4-freebsd_amd64.jar) = cdfcacd3d0b405869fc71c7c73ff861fa5421045f53a6168a0d0b4e8ae7ebfbc -SIZE (zstd-jni-1.4.5-4-freebsd_amd64.jar) = 512671 -SHA256 (zstd-jni-1.4.5-4-freebsd_i386.jar) = bb3e6e4081ffbe28648983d3c2f47cd488a29b6bb09b1e9f1219cdf82b3ed648 -SIZE (zstd-jni-1.4.5-4-freebsd_i386.jar) = 418462 -SHA256 (apache-cassandra-4.0-beta2-repo.tar.gz) = 9a0d3ad05f535158dd65761a16f3a9fb0362cbe365d6e08ef6d9896bbf3a022f -SIZE (apache-cassandra-4.0-beta2-repo.tar.gz) = 77730955 +TIMESTAMP = 1679924890 +SHA256 (cassandra/apache-cassandra-4.0.8-src.tar.gz) = 98da97d7fe850a0a24eb2aef212e982f73205cbd63955d2915b4ad02e28dae9c +SIZE (cassandra/apache-cassandra-4.0.8-src.tar.gz) = 12953548 +SHA256 (cassandra/zstd-jni-1.5.0-4-freebsd_amd64.jar) = b653460b6ff374db2c01f39a7b7cdb44008c9efd55dc96ae5f869abe9f58d180 +SIZE (cassandra/zstd-jni-1.5.0-4-freebsd_amd64.jar) = 670993 +SHA256 (cassandra/zstd-jni-1.5.0-4-freebsd_i386.jar) = 1bcb75c5837e42d10ec0193ba9df099874792f0829b0ce8dd3412303c6454595 +SIZE (cassandra/zstd-jni-1.5.0-4-freebsd_i386.jar) = 604557 +SHA256 (cassandra/apache-cassandra-4.0.8-repo.tar.xz) = 807a108e3639f247dafa3ce4ebc4744b93668cf463915edf7b654d317d1abaff +SIZE (cassandra/apache-cassandra-4.0.8-repo.tar.xz) = 78148020 diff --git a/databases/cassandra4/files/cassandra.in b/databases/cassandra4/files/cassandra.in index 421ba7e55d9c..9615fbe572f6 100644 --- a/databases/cassandra4/files/cassandra.in +++ b/databases/cassandra4/files/cassandra.in @@ -1,40 +1,39 @@ #!/bin/sh # PROVIDE: cassandra # REQUIRE: LOGIN # KEYWORD: shutdown # # Be sure to configure full settings in %%ETCDIR%% prior to enabling daemon. # # Add the following lines to /etc/rc.conf or /etc/.conf.local to # enable the Cassandra daemon: # cassandra_enable: Set to "YES" to enable the daemon. # cassandra_user: The user under which to run the daemon. # Defaults to "cassandra". . /etc/rc.subr name=cassandra rcvar=cassandra_enable desc="Cassandra daemon" load_rc_config $name : ${cassandra_enable:=NO} : ${cassandra_user:=cassandra} -command=%%PREFIX%%/bin/cassandra -command_args="-p /var/run/cassandra/cassandra.pid >/dev/null 2>/dev/null" -start_precmd="${name}_prestart" - -procname=%%JAVA_HOME%%/bin/java pidfile=/var/run/cassandra/cassandra.pid +command=/usr/sbin/daemon +command_args="-frP ${pidfile} %%PREFIX%%/bin/cassandra -f" +start_precmd="${name}_prestart" + cassandra_prestart() { export JAVA_HOME=%%JAVA_HOME%% install -d -o ${cassandra_user} /var/run/cassandra install -d -o ${cassandra_user} /var/log/cassandra } run_rc_command "$1" diff --git a/databases/cassandra4/files/maven/build-owasp.xml b/databases/cassandra4/files/maven/build-owasp.xml new file mode 100644 index 000000000000..f3174999e8d4 --- /dev/null +++ b/databases/cassandra4/files/maven/build-owasp.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + Downloading OWASP Dependency checks ... + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/databases/cassandra4/files/maven/build-rat.xml b/databases/cassandra4/files/maven/build-rat.xml new file mode 100644 index 000000000000..5a6aa0aa8546 --- /dev/null +++ b/databases/cassandra4/files/maven/build-rat.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/databases/cassandra4/files/maven/build-resolver.xml b/databases/cassandra4/files/maven/build-resolver.xml new file mode 100644 index 000000000000..a159d97acaff --- /dev/null +++ b/databases/cassandra4/files/maven/build-resolver.xml @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Downloading Resolver ANT Tasks... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/databases/cassandra4/files/maven/build.properties.default b/databases/cassandra4/files/maven/build.properties.default new file mode 100644 index 000000000000..11da534e32c1 --- /dev/null +++ b/databases/cassandra4/files/maven/build.properties.default @@ -0,0 +1,4 @@ +# Maven2 Repository Locations (you can override these in "build.properties" to point to a local proxy, e.g. Nexus) +artifact.remoteRepository.central: https://repo1.maven.org/maven2 +artifact.remoteRepository.apache: https://repo.maven.apache.org/maven2 + diff --git a/databases/cassandra4/files/maven/build.xml b/databases/cassandra4/files/maven/build.xml new file mode 100644 index 000000000000..e9093d367d3b --- /dev/null +++ b/databases/cassandra4/files/maven/build.xml @@ -0,0 +1,2174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -Djdk.attach.allowAttachSelf=true + + -XX:+UseConcMarkSweepGC + -XX:+CMSParallelRemarkEnabled + -XX:SurvivorRatio=8 + -XX:MaxTenuringThreshold=1 + -XX:CMSInitiatingOccupancyFraction=75 + -XX:+UseCMSInitiatingOccupancyOnly + -XX:CMSWaitDuration=10000 + -XX:+CMSParallelInitialMarkEnabled + -XX:+CMSEdenChunksRecordAlways + + --add-exports java.base/jdk.internal.misc=ALL-UNNAMED + --add-exports java.base/jdk.internal.ref=ALL-UNNAMED + --add-exports java.base/sun.nio.ch=ALL-UNNAMED + --add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED + --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED + --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED + --add-exports java.sql/java.sql=ALL-UNNAMED + + --add-opens java.base/java.lang.module=ALL-UNNAMED + --add-opens java.base/java.net=ALL-UNNAMED + --add-opens java.base/jdk.internal.loader=ALL-UNNAMED + --add-opens java.base/jdk.internal.ref=ALL-UNNAMED + --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED + --add-opens java.base/jdk.internal.math=ALL-UNNAMED + --add-opens java.base/jdk.internal.module=ALL-UNNAMED + --add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED + --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED + + + + + + + + + + + + + + + -XX:-CMSClassUnloadingEnabled + -Dio.netty.tryReflectionSetAccessible=true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Building Grammar ${build.src.antlr}/Cql.g ... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Downloading Maven ANT Tasks... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + Apache Cassandra ${eclipse.project.name} + + + + + + + +]]> + + + + + + + + ${eclipse.project.name} + + + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature + +]]> + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/databases/cassandra4/files/patch-bin_cqlsh b/databases/cassandra4/files/patch-bin_cqlsh new file mode 100644 index 000000000000..8797af062ef5 --- /dev/null +++ b/databases/cassandra4/files/patch-bin_cqlsh @@ -0,0 +1,11 @@ +--- bin/cqlsh.orig 2022-05-06 16:40:06 UTC ++++ bin/cqlsh +@@ -88,7 +88,7 @@ if [ "$USER_SPECIFIED_PYTHON" != "" ]; then + # run a user specified Python interpreter + run_if_supported_version "$USER_SPECIFIED_PYTHON" "$@" + else +- for interpreter in python3 python python2.7; do ++ for interpreter in python3 python3.9 python3.8 python3.7 python3.6 python python2.7; do + run_if_supported_version "$interpreter" "$@" + done + fi diff --git a/databases/cassandra4/files/patch-build.xml b/databases/cassandra4/files/patch-build.xml index 525d27889af5..260d784805f8 100644 --- a/databases/cassandra4/files/patch-build.xml +++ b/databases/cassandra4/files/patch-build.xml @@ -1,232 +1,179 @@ ---- build.xml.orig 2020-08-28 13:55:55 UTC +--- build.xml.orig 2022-07-12 10:18:13 UTC +++ build.xml -@@ -23,6 +23,7 @@ +@@ -31,6 +31,7 @@ + - -@@ -74,14 +75,14 @@ + +@@ -81,7 +82,7 @@ - + - - - -- -+ - - -@@ -271,7 +272,7 @@ +@@ -288,6 +289,24 @@ + + - - -- ++ ++ + - - - -@@ -291,7 +292,7 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -297,7 +316,7 @@ windowtitle="${ant.project.name} API" classpathref="cassandra.classpath" - bottom="Copyright © 2009-2020 The Apache Software Foundation" + bottom="Copyright © 2009-2022 The Apache Software Foundation" useexternalfile="yes" encoding="UTF-8" failonerror="false" - maxmemory="256m" additionalparam="${jdk11-javadoc-exports}"> + maxmemory="512m" additionalparam="${jdk11-javadoc-exports}"> -@@ -416,8 +417,7 @@ - - - -- -- -+ - - - -@@ -430,6 +430,8 @@ - +@@ -438,6 +457,8 @@ + + + - - -@@ -472,10 +474,6 @@ - description="Initialize Maven ANT Tasks"> - + -- -- -- -- - - - -@@ -889,16 +887,14 @@ - filesetId="build-dependency-jars" - cacheDependencyRefs="true" - dependencyRefsBuildFile="${build.dir}/build-dependencies.xml"> -- -- -+ - - - -- -- -+ - - - -@@ -911,7 +907,7 @@ - - -- -+ - - - -@@ -940,8 +936,7 @@ - sourcesFilesetId="test-dependency-sources" - cacheDependencyRefs="true" - dependencyRefsBuildFile="${build.dir}/test-dependencies.xml"> -- -- -+ - - - -@@ -1251,6 +1246,87 @@ +@@ -896,7 +917,7 @@ + + + +- + + +@@ -1147,6 +1168,89 @@ + + + + + + + + + + + -+ ++ + + + + + + + + + + + + + + + + + + + + + + + + ++ ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -@@ -1371,6 +1447,7 @@ - - - - -- -- -+ -+ - - - -@@ -1981,6 +2058,11 @@ - - - -+ -+ -+ -+ -+ - - +@@ -1397,7 +1501,7 @@ + + + +- ++ + + + +@@ -2089,7 +2193,7 @@ + + +- ++ + + + diff --git a/databases/cassandra4/files/patch-conf_cassandra.yaml b/databases/cassandra4/files/patch-conf_cassandra.yaml index e0a14634891b..ceb30f186b12 100644 --- a/databases/cassandra4/files/patch-conf_cassandra.yaml +++ b/databases/cassandra4/files/patch-conf_cassandra.yaml @@ -1,68 +1,71 @@ ---- conf/cassandra.yaml.orig 2020-07-17 21:24:30 UTC +--- conf/cassandra.yaml.orig 2022-05-06 16:40:06 UTC +++ conf/cassandra.yaml -@@ -73,7 +73,7 @@ max_hints_delivery_threads: 2 +@@ -77,7 +77,7 @@ max_hints_delivery_threads: 2 # Directory where Cassandra should store hints. # If not set, the default directory is $CASSANDRA_HOME/data/hints. -# hints_directory: /var/lib/cassandra/hints +hints_directory: /var/db/cassandra/hints # How often hints should be flushed from the internal buffers to disk. # Will *not* trigger fsync. -@@ -200,13 +200,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition +@@ -204,8 +204,8 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition # directories are specified, Cassandra will spread data evenly across # them by partitioning the token ranges. # If not set, the default directory is $CASSANDRA_HOME/data/data. -# data_file_directories: -# - /var/lib/cassandra/data +data_file_directories: + - /var/db/cassandra/data + # Directory were Cassandra should store the data of the local system keyspaces. + # By default Cassandra will store the data of the local system keyspaces in the first of the data directories specified +@@ -217,7 +217,7 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition # commit log. when running on magnetic HDD, this should be a # separate spindle than the data directories. # If not set, the default directory is $CASSANDRA_HOME/data/commitlog. -# commitlog_directory: /var/lib/cassandra/commitlog +commitlog_directory: /var/db/cassandra/commitlog # Enable / disable CDC functionality on a per-node basis. This modifies the logic used # for write path allocation rejection (standard: never reject. cdc: reject Mutation -@@ -217,7 +217,7 @@ cdc_enabled: false +@@ -228,7 +228,7 @@ cdc_enabled: false # segment contains mutations for a CDC-enabled table. This should be placed on a # separate spindle than the data directories. If not set, the default directory is # $CASSANDRA_HOME/data/cdc_raw. -# cdc_raw_directory: /var/lib/cassandra/cdc_raw +cdc_raw_directory: /var/db/cassandra/cdc_raw # Policy for data disk failures: # -@@ -309,20 +309,12 @@ key_cache_save_period: 14400 +@@ -320,20 +320,12 @@ key_cache_save_period: 14400 # Row cache implementation class name. Available implementations: # -# org.apache.cassandra.cache.OHCProvider -# Fully off-heap row cache implementation (default). -# # org.apache.cassandra.cache.SerializingCacheProvider # This is the row cache implementation availabile # in previous releases of Cassandra. -# row_cache_class_name: org.apache.cassandra.cache.OHCProvider +# row_cache_class_name: org.apache.cassandra.cache.SerializingCacheProvider # Maximum size of the row cache in memory. -# Please note that OHC cache implementation requires some additional off-heap memory to manage -# the map structures and some in-flight memory during operations before/after cache entries can be -# accounted against the cache capacity. This overhead is usually small compared to the whole capacity. -# Do not specify more memory that the system can afford in the worst usual situation and leave some -# headroom for OS block level cache. Do never allow your system to swap. # # Default value is 0, to disable row caching. row_cache_size_in_mb: 0 -@@ -369,7 +361,7 @@ counter_cache_save_period: 7200 +@@ -380,7 +372,7 @@ counter_cache_save_period: 7200 # saved caches # If not set, the default directory is $CASSANDRA_HOME/data/saved_caches. -# saved_caches_directory: /var/lib/cassandra/saved_caches +saved_caches_directory: /var/db/cassandra/saved_caches - # commitlog_sync may be either "periodic", "group", or "batch." - # + # Number of seconds the server will wait for each cache (row, key, etc ...) to load while starting + # the Cassandra process. Setting this to a negative value is equivalent to disabling all cache loading on startup diff --git a/databases/cassandra4/files/patch-doc_Makefile b/databases/cassandra4/files/patch-doc_Makefile deleted file mode 100644 index b47ccff34712..000000000000 --- a/databases/cassandra4/files/patch-doc_Makefile +++ /dev/null @@ -1,23 +0,0 @@ ---- doc/Makefile.orig 2020-01-30 17:34:31 UTC -+++ doc/Makefile -@@ -3,7 +3,7 @@ - - # You can set these variables from the command line. - SPHINXOPTS = --SPHINXBUILD = sphinx-build -+SPHINXBUILD = sphinx-build-${PYTHON_VER} - PAPER = - BUILDDIR = build - -@@ -17,9 +17,9 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s - YAML_DOC_INPUT=../conf/cassandra.yaml - YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst - --MAKE_CASSANDRA_YAML = python convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT) -+MAKE_CASSANDRA_YAML = ${PYTHON_CMD} convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT) - --GENERATE_NODETOOL_DOCS = python gen-nodetool-docs.py -+GENERATE_NODETOOL_DOCS = ${PYTHON_CMD} gen-nodetool-docs.py - - WEB_SITE_PRESENCE_FILE='source/.build_for_website' - diff --git a/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html b/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html deleted file mode 100644 index 98f93b30a521..000000000000 --- a/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html +++ /dev/null @@ -1,17 +0,0 @@ ---- doc/source/_templates/indexcontent.html.orig 2020-08-28 13:55:55 UTC -+++ doc/source/_templates/indexcontent.html -@@ -1,5 +1,12 @@ --{% extends "defindex.html" %} --{% block tables %} -+{% extends "layout.html" %} -+{%- block htmltitle -%} -+{{ html_title }} -+{%- endblock -%} -+{% block body %} -+

{{ docstitle|e }}

-+

-+ {% trans %}Welcome! This is the documentation for Apache Cassandra {{ version }}.{% endtrans %} -+

-
This documentation is a work-in-progress. - Contributions are welcome.
- diff --git a/databases/cassandra4/files/patch-doc_source___util_cql.py b/databases/cassandra4/files/patch-doc_source___util_cql.py deleted file mode 100644 index 33bb6108a90a..000000000000 --- a/databases/cassandra4/files/patch-doc_source___util_cql.py +++ /dev/null @@ -1,10 +0,0 @@ ---- doc/source/_util/cql.py.orig 2020-10-03 15:05:17 UTC -+++ doc/source/_util/cql.py -@@ -26,7 +26,6 @@ from pygments.lexer import Lexer, RegexLexer, do_inser - from pygments.token import Punctuation, Whitespace, Error, \ - Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal - from pygments.lexers import get_lexer_by_name, ClassNotFound --from pygments.util import iteritems - - __all__ = [ 'CQLLexer' ] - diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java index 7983231aeb11..86e8c2a152bf 100644 --- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java +++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java @@ -1,11 +1,11 @@ ---- src/java/org/apache/cassandra/config/Config.java.orig 2020-08-28 13:55:55 UTC +--- src/java/org/apache/cassandra/config/Config.java.orig 2022-05-06 16:40:06 UTC +++ src/java/org/apache/cassandra/config/Config.java -@@ -290,7 +290,7 @@ public class Config +@@ -304,7 +304,7 @@ public class Config public volatile int key_cache_save_period = 14400; public volatile int key_cache_keys_to_save = Integer.MAX_VALUE; - public String row_cache_class_name = "org.apache.cassandra.cache.OHCProvider"; + public String row_cache_class_name = "org.apache.cassandra.cache.SerializingCacheProvider"; public long row_cache_size_in_mb = 0; public volatile int row_cache_save_period = 0; public volatile int row_cache_keys_to_save = Integer.MAX_VALUE; diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java index ddc683881057..1b1c2d0aadf3 100644 --- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java +++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java @@ -1,18 +1,18 @@ ---- src/java/org/apache/cassandra/service/NativeTransportService.java.orig 2020-04-01 19:54:51 UTC +--- src/java/org/apache/cassandra/service/NativeTransportService.java.orig 2020-12-18 17:35:13 UTC +++ src/java/org/apache/cassandra/service/NativeTransportService.java -@@ -143,12 +143,15 @@ public class NativeTransportService +@@ -159,12 +159,15 @@ public class NativeTransportService */ public static boolean useEpoll() { + /* final boolean enableEpoll = Boolean.parseBoolean(System.getProperty("cassandra.native.epoll.enabled", "true")); if (enableEpoll && !Epoll.isAvailable() && NativeLibrary.osType == NativeLibrary.OSType.LINUX) logger.warn("epoll not available", Epoll.unavailabilityCause()); return enableEpoll && Epoll.isAvailable(); + */ + return false; // Epoll is only available for Linux. Prevent warning given that we otherwise pass ourselves off as Linux. } /** diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java index c562d9011acd..6f62b1c83ef8 100644 --- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java +++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java @@ -1,18 +1,18 @@ ---- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-08-28 13:55:56 UTC +--- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2021-03-26 19:57:28 UTC +++ src/java/org/apache/cassandra/service/StartupChecks.java @@ -281,7 +281,14 @@ public class StartupChecks { public void execute() { - SigarLibrary.instance.warnIfRunningInDegradedMode(); + try { + @SuppressWarnings("unused") + Class loadMe = org.hyperic.sigar.SigarException.class; + + SigarLibrary.instance.warnIfRunningInDegradedMode(); + } catch (NoClassDefFoundError e) { + logger.info("Could not initialize SIGAR library: SIGAR option not selected during install or jar no longer available."); + } } }; diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java index 8ccde2695304..3f18ded96bcb 100644 --- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java +++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java @@ -1,108 +1,108 @@ ---- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig 2020-03-30 16:37:37 UTC +--- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig 2020-12-18 17:35:13 UTC +++ src/java/org/apache/cassandra/utils/FastByteOperations.java -@@ -191,6 +191,20 @@ public class FastByteOperations +@@ -205,6 +205,20 @@ public class FastByteOperations static final boolean BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN); + private static byte unsafeGetByte(Object o, long offset) + { + return o == null + ? theUnsafe.getByte(offset) + : theUnsafe.getByte(o, offset); + } + + private static long unsafeGetLong(Object o, long offset) + { + return o == null + ? theUnsafe.getLong(offset) + : theUnsafe.getLong(o, offset); + } + public int compare(byte[] buffer1, int offset1, int length1, byte[] buffer2, int offset2, int length2) { return compareTo(buffer1, BYTE_ARRAY_BASE_OFFSET + offset1, length1, -@@ -214,7 +228,7 @@ public class FastByteOperations +@@ -228,7 +242,7 @@ public class FastByteOperations else { obj1 = null; - offset1 = theUnsafe.getLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET) + position1; + offset1 = unsafeGetLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET) + position1; } return compareTo(obj1, offset1, length1, buffer2, BYTE_ARRAY_BASE_OFFSET + offset2, length2); -@@ -230,7 +244,7 @@ public class FastByteOperations +@@ -249,7 +263,7 @@ public class FastByteOperations if (src.hasArray()) System.arraycopy(src.array(), src.arrayOffset() + srcPosition, trg, trgPosition, length); else - copy(null, srcPosition + theUnsafe.getLong(src, DIRECT_BUFFER_ADDRESS_OFFSET), trg, trgPosition, length); + copy(null, srcPosition + unsafeGetLong(src, DIRECT_BUFFER_ADDRESS_OFFSET), trg, trgPosition, length); } - public void copy(ByteBuffer srcBuf, int srcPosition, ByteBuffer trgBuf, int trgPosition, int length) -@@ -245,7 +259,7 @@ public class FastByteOperations + public void copy(byte[] src, int srcPosition, ByteBuffer trg, int trgPosition, int length) +@@ -272,7 +286,7 @@ public class FastByteOperations else { src = null; - srcOffset = theUnsafe.getLong(srcBuf, DIRECT_BUFFER_ADDRESS_OFFSET); + srcOffset = unsafeGetLong(srcBuf, DIRECT_BUFFER_ADDRESS_OFFSET); } copy(src, srcOffset + srcPosition, trgBuf, trgPosition, length); } -@@ -255,7 +269,7 @@ public class FastByteOperations +@@ -282,7 +296,7 @@ public class FastByteOperations if (trgBuf.hasArray()) copy(src, srcOffset, trgBuf.array(), trgBuf.arrayOffset() + trgPosition, length); else - copy(src, srcOffset, null, trgPosition + theUnsafe.getLong(trgBuf, DIRECT_BUFFER_ADDRESS_OFFSET), length); + copy(src, srcOffset, null, trgPosition + unsafeGetLong(trgBuf, DIRECT_BUFFER_ADDRESS_OFFSET), length); } public static void copy(Object src, long srcOffset, byte[] trg, int trgPosition, int length) -@@ -263,7 +277,7 @@ public class FastByteOperations +@@ -290,7 +304,7 @@ public class FastByteOperations if (length <= MIN_COPY_THRESHOLD) { for (int i = 0 ; i < length ; i++) - trg[trgPosition + i] = theUnsafe.getByte(src, srcOffset + i); + trg[trgPosition + i] = unsafeGetByte(src, srcOffset + i); } else { -@@ -302,7 +316,7 @@ public class FastByteOperations +@@ -329,7 +343,7 @@ public class FastByteOperations else { obj1 = null; - offset1 = theUnsafe.getLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET); + offset1 = unsafeGetLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET); } offset1 += buffer1.position(); length1 = buffer1.remaining(); -@@ -325,7 +339,7 @@ public class FastByteOperations +@@ -352,7 +366,7 @@ public class FastByteOperations else { obj2 = null; - offset2 = theUnsafe.getLong(buffer, DIRECT_BUFFER_ADDRESS_OFFSET); + offset2 = unsafeGetLong(buffer, DIRECT_BUFFER_ADDRESS_OFFSET); } int length2 = limit - position; offset2 += position; -@@ -358,8 +372,8 @@ public class FastByteOperations +@@ -385,8 +399,8 @@ public class FastByteOperations int wordComparisons = minLength & ~7; for (int i = 0; i < wordComparisons ; i += Longs.BYTES) { - long lw = theUnsafe.getLong(buffer1, memoryOffset1 + i); - long rw = theUnsafe.getLong(buffer2, memoryOffset2 + i); + long lw = unsafeGetLong(buffer1, memoryOffset1 + i); + long rw = unsafeGetLong(buffer2, memoryOffset2 + i); if (lw != rw) { -@@ -372,8 +386,8 @@ public class FastByteOperations +@@ -399,8 +413,8 @@ public class FastByteOperations for (int i = wordComparisons ; i < minLength ; i++) { - int b1 = theUnsafe.getByte(buffer1, memoryOffset1 + i) & 0xFF; - int b2 = theUnsafe.getByte(buffer2, memoryOffset2 + i) & 0xFF; + int b1 = unsafeGetByte(buffer1, memoryOffset1 + i) & 0xFF; + int b2 = unsafeGetByte(buffer2, memoryOffset2 + i) & 0xFF; if (b1 != b2) return b1 - b2; } diff --git a/databases/cassandra4/files/patch-test_conf_cassandra-murmur.yaml b/databases/cassandra4/files/patch-test_conf_cassandra-murmur.yaml new file mode 100644 index 000000000000..b9ec0a7b5450 --- /dev/null +++ b/databases/cassandra4/files/patch-test_conf_cassandra-murmur.yaml @@ -0,0 +1,10 @@ +--- test/conf/cassandra-murmur.yaml.orig 2021-05-25 15:24:22 UTC ++++ test/conf/cassandra-murmur.yaml +@@ -36,7 +36,6 @@ server_encryption_options: + incremental_backups: true + concurrent_compactors: 4 + compaction_throughput_mb_per_sec: 0 +-row_cache_class_name: org.apache.cassandra.cache.OHCProvider + row_cache_size_in_mb: 16 + enable_user_defined_functions: true + enable_scripted_user_defined_functions: true diff --git a/databases/cassandra4/files/patch-test_conf_cassandra-seeds.yaml b/databases/cassandra4/files/patch-test_conf_cassandra-seeds.yaml new file mode 100644 index 000000000000..af236bca394c --- /dev/null +++ b/databases/cassandra4/files/patch-test_conf_cassandra-seeds.yaml @@ -0,0 +1,10 @@ +--- test/conf/cassandra-seeds.yaml.orig 2021-05-25 15:24:52 UTC ++++ test/conf/cassandra-seeds.yaml +@@ -37,7 +37,6 @@ server_encryption_options: + incremental_backups: true + concurrent_compactors: 4 + compaction_throughput_mb_per_sec: 0 +-row_cache_class_name: org.apache.cassandra.cache.OHCProvider + row_cache_size_in_mb: 16 + enable_user_defined_functions: true + enable_scripted_user_defined_functions: true diff --git a/databases/cassandra4/files/patch-test_conf_unit-test-conf_test-native-port.yaml b/databases/cassandra4/files/patch-test_conf_unit-test-conf_test-native-port.yaml new file mode 100644 index 000000000000..72ab0ee6d9af --- /dev/null +++ b/databases/cassandra4/files/patch-test_conf_unit-test-conf_test-native-port.yaml @@ -0,0 +1,10 @@ +--- test/conf/unit-test-conf/test-native-port.yaml.orig 2021-05-25 15:19:42 UTC ++++ test/conf/unit-test-conf/test-native-port.yaml +@@ -40,7 +40,6 @@ server_encryption_options: + incremental_backups: true + concurrent_compactors: 4 + compaction_throughput_mb_per_sec: 0 +-row_cache_class_name: org.apache.cassandra.cache.OHCProvider + row_cache_size_in_mb: 16 + enable_user_defined_functions: true + enable_scripted_user_defined_functions: true diff --git a/databases/cassandra4/pkg-plist b/databases/cassandra4/pkg-plist index 017e819e91ca..da8be43e7b34 100644 --- a/databases/cassandra4/pkg-plist +++ b/databases/cassandra4/pkg-plist @@ -1,213 +1,149 @@ %%DATADIR%%/bin/cassandra %%DATADIR%%/bin/cassandra.in.sh %%DATADIR%%/bin/cqlsh %%DATADIR%%/bin/cqlsh.py %%DATADIR%%/bin/debug-cql %%DATADIR%%/bin/nodetool %%DATADIR%%/bin/sstableloader %%DATADIR%%/bin/sstablescrub %%DATADIR%%/bin/sstableupgrade %%DATADIR%%/bin/sstableutil %%DATADIR%%/bin/sstableverify %%DATADIR%%/bin/stop-server %%DATADIR%%/CHANGES.txt %%DATADIR%%/lib/airline-0.8.jar %%DATADIR%%/lib/antlr-runtime-3.5.2.jar %%DATADIR%%/lib/apache-cassandra-%%DISTVERSION%%.jar %%DATADIR%%/lib/asm-7.1.jar -%%DATADIR%%/lib/caffeine-2.3.5.jar -%%DATADIR%%/lib/cassandra-driver-core-3.9.0-shaded.jar -%%DATADIR%%/lib/cassandra-driver-internal-only-3.23.0.post0-1a184b99.zip -%%DATADIR%%/lib/chronicle-bytes-1.16.3.jar -%%DATADIR%%/lib/chronicle-core-1.16.4.jar -%%DATADIR%%/lib/chronicle-queue-4.16.3.jar -%%DATADIR%%/lib/chronicle-threads-1.16.0.jar -%%DATADIR%%/lib/chronicle-wire-1.16.1.jar +%%DATADIR%%/lib/caffeine-2.5.6.jar +%%DATADIR%%/lib/cassandra-driver-core-3.11.0-shaded.jar +%%DATADIR%%/lib/cassandra-driver-internal-only-3.25.0.zip +%%DATADIR%%/lib/chronicle-bytes-2.20.111.jar +%%DATADIR%%/lib/chronicle-core-2.20.126.jar +%%DATADIR%%/lib/chronicle-queue-5.20.123.jar +%%DATADIR%%/lib/chronicle-threads-2.20.111.jar +%%DATADIR%%/lib/chronicle-wire-2.20.117.jar %%DATADIR%%/lib/commons-cli-1.1.jar %%DATADIR%%/lib/commons-codec-1.9.jar %%DATADIR%%/lib/commons-lang3-3.11.jar %%DATADIR%%/lib/commons-math3-3.2.jar %%DATADIR%%/lib/concurrent-trees-2.4.0.jar %%DATADIR%%/lib/ecj-4.6.1.jar %%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip %%DATADIR%%/lib/geomet-0.1.0.zip %%DATADIR%%/lib/guava-27.0-jre.jar %%DATADIR%%/lib/HdrHistogram-2.1.9.jar %%DATADIR%%/lib/high-scale-lib-1.0.6.jar %%DATADIR%%/lib/hppc-0.8.1.jar %%DATADIR%%/lib/j2objc-annotations-1.3.jar -%%DATADIR%%/lib/jackson-annotations-2.9.10.jar -%%DATADIR%%/lib/jackson-core-2.9.10.jar -%%DATADIR%%/lib/jackson-databind-2.9.10.4.jar +%%DATADIR%%/lib/jackson-annotations-2.13.2.jar +%%DATADIR%%/lib/jackson-core-2.13.2.jar +%%DATADIR%%/lib/jackson-databind-2.13.2.2.jar %%DATADIR%%/lib/jamm-0.3.2.jar -%%DATADIR%%/lib/javax.inject.jar -%%DATADIR%%/lib/jbcrypt-0.3m.jar +%%DATADIR%%/lib/java-cup-runtime-11b-20160615.jar +%%DATADIR%%/lib/javax.inject-1.jar +%%DATADIR%%/lib/jbcrypt-0.4.jar %%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar %%DATADIR%%/lib/jcommander-1.30.jar -%%DATADIR%%/lib/jctools-core-1.2.1.jar -%%DATADIR%%/lib/jflex-1.6.0.jar -%%DATADIR%%/lib/jna-4.2.2.jar +%%DATADIR%%/lib/jctools-core-3.1.0.jar +%%DATADIR%%/lib/jflex-1.8.2.jar +%%DATADIR%%/lib/jna-5.6.0.jar %%DATADIR%%/lib/json-simple-1.1.jar -%%DATADIR%%/lib/jstackjunit-0.0.1.jar %%DATADIR%%/lib/jvm-attach-api-1.5.jar -%%DATADIR%%/lib/licenses/airline-0.8.txt -%%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt -%%DATADIR%%/lib/licenses/asm-6.2.txt -%%DATADIR%%/lib/licenses/caffeine-2.3.5.txt -%%DATADIR%%/lib/licenses/cassandra-driver-3.0.1.txt -%%DATADIR%%/lib/licenses/chronicle-bytes-1.16.3.txt -%%DATADIR%%/lib/licenses/chronicle-core-1.16.3-SNAPSHOT.txt -%%DATADIR%%/lib/licenses/chronicle-queue-4.16.3.txt -%%DATADIR%%/lib/licenses/chronicle-threads-1.16.0.txt -%%DATADIR%%/lib/licenses/chronicle-wire-1.16.1.txt -%%DATADIR%%/lib/licenses/commons-cli-1.1.txt -%%DATADIR%%/lib/licenses/commons-codec-1.9.txt -%%DATADIR%%/lib/licenses/commons-lang3-3.1.txt -%%DATADIR%%/lib/licenses/commons-math3-3.2.txt -%%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt -%%DATADIR%%/lib/licenses/concurrent-trees-2.4.0.txt -%%DATADIR%%/lib/licenses/ecj-4.6.1.txt -%%DATADIR%%/lib/licenses/futures-2.1.6.txt -%%DATADIR%%/lib/licenses/geom-0.1.0.txt -%%DATADIR%%/lib/licenses/guava-23.3-jre.txt -%%DATADIR%%/lib/licenses/hdrhistogram-2.1.9.txt -%%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt -%%DATADIR%%/lib/licenses/hppc-0.5.4.txt -%%DATADIR%%/lib/licenses/j2objc-annotations-1.3.txt -%%DATADIR%%/lib/licenses/jackson-annotations-2.9.5.txt -%%DATADIR%%/lib/licenses/jackson-core-2.9.5.txt -%%DATADIR%%/lib/licenses/jackson-databind-2.9.5.txt -%%DATADIR%%/lib/licenses/jamm-0.3.2.txt -%%DATADIR%%/lib/licenses/javax.inject.txt -%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt -%%DATADIR%%/lib/licenses/jcl-over-slf4j-1.7.25.txt -%%DATADIR%%/lib/licenses/jctools-core-1.2.1.txt -%%DATADIR%%/lib/licenses/jflex-1.6.0.txt -%%DATADIR%%/lib/licenses/jna-4.2.2.txt -%%DATADIR%%/lib/licenses/joda-time-2.4.txt -%%DATADIR%%/lib/licenses/json-simple-1.1.txt -%%DATADIR%%/lib/licenses/jstackjunit-0.0.1.txt -%%DATADIR%%/lib/licenses/LICENSE-2.0.txt -%%DATADIR%%/lib/licenses/log4j-over-slf4j-1.7.25.txt -%%DATADIR%%/lib/licenses/logback-classic-1.2.3.txt -%%DATADIR%%/lib/licenses/logback-core-1.2.3.txt -%%DATADIR%%/lib/licenses/lz4-1.4.0.txt -%%DATADIR%%/lib/licenses/metrics-core-3.1.5.txt -%%DATADIR%%/lib/licenses/metrics-jvm-3.1.5.txt -%%DATADIR%%/lib/licenses/metrics-logback-3.1.5.txt -%%DATADIR%%/lib/licenses/netty-tcnative-2.0.31.txt -%%DATADIR%%/lib/licenses/psjava-0.1.19.txt -%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt -%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt -%%DATADIR%%/lib/licenses/six-1.7.3.txt -%%DATADIR%%/lib/licenses/slf4j-api-1.7.25.txt -%%DATADIR%%/lib/licenses/snakeyaml-1.11.txt -%%DATADIR%%/lib/licenses/snowball-stemmer-1.3.0.581.1.txt -%%DATADIR%%/lib/licenses/ST4-4.0.8.txt -%%DATADIR%%/lib/licenses/stream-2.5.2.txt %%DATADIR%%/lib/log4j-over-slf4j-1.7.25.jar -%%DATADIR%%/lib/logback-classic-1.2.3.jar -%%DATADIR%%/lib/logback-core-1.2.3.jar -%%DATADIR%%/lib/lz4-java-1.7.1.jar +%%DATADIR%%/lib/logback-classic-1.2.9.jar +%%DATADIR%%/lib/logback-core-1.2.9.jar +%%DATADIR%%/lib/lz4-java-1.8.0.jar %%DATADIR%%/lib/metrics-core-3.1.5.jar %%DATADIR%%/lib/metrics-jvm-3.1.5.jar %%DATADIR%%/lib/metrics-logback-3.1.5.jar %%DATADIR%%/lib/mxdump-0.14.jar %%DATADIR%%/lib/netty.jar -%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.31.Final.jar +%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.36.Final.jar %%DATADIR%%/lib/psjava-0.1.19.jar %%DATADIR%%/lib/reporter-config-base-3.0.3.jar %%DATADIR%%/lib/reporter-config3-3.0.3.jar %%DATADIR%%/lib/six-1.12.0-py2.py3-none-any.zip %%DATADIR%%/lib/sjk-cli-0.14.jar %%DATADIR%%/lib/sjk-core-0.14.jar %%DATADIR%%/lib/sjk-json-0.14.jar %%DATADIR%%/lib/sjk-stacktrace-0.14.jar %%DATADIR%%/lib/slf4j-api-1.7.25.jar -%%DATADIR%%/lib/snakeyaml-1.11.jar +%%DATADIR%%/lib/snakeyaml-1.26.jar %%DATADIR%%/lib/snappy-java.jar %%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar %%DATADIR%%/lib/ST4-4.0.8.jar %%DATADIR%%/lib/stream-2.5.2.jar %%AMD64ONLY%%%%DATADIR%%/lib/zstd-jni-%%ZSTDJNI_VERSION%%-freebsd_amd64.jar %%I386ONLY%%%%DATADIR%%/lib/zstd-jni-%%ZSTDJNI_VERSION%%-freebsd_i386.jar %%DATADIR%%/LICENSE.txt %%DATADIR%%/NEWS.txt %%DATADIR%%/NOTICE.txt -%%DATADIR%%/pylib/cassandra-cqlsh-tests.sh %%DATADIR%%/pylib/cqlshlib/__init__.py %%DATADIR%%/pylib/cqlshlib/copyutil.py %%DATADIR%%/pylib/cqlshlib/cql3handling.py %%DATADIR%%/pylib/cqlshlib/cqlhandling.py %%DATADIR%%/pylib/cqlshlib/cqlshhandling.py %%DATADIR%%/pylib/cqlshlib/displaying.py %%DATADIR%%/pylib/cqlshlib/formatting.py %%DATADIR%%/pylib/cqlshlib/helptopics.py %%DATADIR%%/pylib/cqlshlib/pylexotron.py %%DATADIR%%/pylib/cqlshlib/saferscanner.py %%DATADIR%%/pylib/cqlshlib/setup.cfg %%DATADIR%%/pylib/cqlshlib/sslhandling.py -%%DATADIR%%/pylib/cqlshlib/test/__init__.py -%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py -%%DATADIR%%/pylib/cqlshlib/test/basecase.py -%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py -%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py -%%DATADIR%%/pylib/cqlshlib/test/test_copyutil.py -%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py -%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py -%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py -%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql -%%DATADIR%%/pylib/cqlshlib/test/winpty.py %%DATADIR%%/pylib/cqlshlib/tracing.py %%DATADIR%%/pylib/cqlshlib/util.py %%DATADIR%%/pylib/cqlshlib/wcwidth.py %%DATADIR%%/pylib/README.asc +%%DATADIR%%/pylib/pytest.ini %%DATADIR%%/pylib/requirements.txt %%DATADIR%%/pylib/setup.py %%DATADIR%%/tools/bin/auditlogviewer %%DATADIR%%/tools/bin/cassandra-stress %%DATADIR%%/tools/bin/cassandra-stressd %%DATADIR%%/tools/bin/cassandra.in.sh %%DATADIR%%/tools/bin/compaction-stress %%DATADIR%%/tools/bin/fqltool +%%DATADIR%%/tools/bin/generatetokens +%%DATADIR%%/tools/bin/jmxtool %%DATADIR%%/tools/bin/sstabledump %%DATADIR%%/tools/bin/sstableexpiredblockers %%DATADIR%%/tools/bin/sstablelevelreset %%DATADIR%%/tools/bin/sstablemetadata %%DATADIR%%/tools/bin/sstableofflinerelevel %%DATADIR%%/tools/bin/sstablerepairedset %%DATADIR%%/tools/bin/sstablesplit %%DATADIR%%/tools/cqlstress-counter-example.yaml %%DATADIR%%/tools/cqlstress-example.yaml %%DATADIR%%/tools/cqlstress-insanity-example.yaml %%DATADIR%%/tools/cqlstress-lwt-example.yaml %%DATADIR%%/tools/lib/fqltool.jar %%DATADIR%%/tools/lib/stress.jar %%ETCDIR%%/metrics-reporter-config-sample.yaml %%ETCDIR%%/README.txt %%ETCDIR%%/triggers/README.txt %%SIGAR%%%%DATADIR%%/lib/sigar.jar @sample %%ETCDIR%%/cassandra-env.sh.sample @sample %%ETCDIR%%/cassandra-jaas.config.sample @sample %%ETCDIR%%/cassandra-rackdc.properties.sample @sample %%ETCDIR%%/cassandra-topology.properties.sample @sample %%ETCDIR%%/cassandra.yaml.sample @sample %%ETCDIR%%/commitlog_archiving.properties.sample @sample %%ETCDIR%%/cqlshrc.sample @sample %%ETCDIR%%/hotspot_compiler.sample @sample %%ETCDIR%%/jvm-clients.options.sample @sample %%ETCDIR%%/jvm-server.options.sample @sample %%ETCDIR%%/jvm11-clients.options.sample @sample %%ETCDIR%%/jvm11-server.options.sample @sample %%ETCDIR%%/jvm8-clients.options.sample @sample %%ETCDIR%%/jvm8-server.options.sample @sample %%ETCDIR%%/logback-tools.xml.sample @sample %%ETCDIR%%/logback.xml.sample bin/cassandra bin/cqlsh bin/nodetool bin/sstableloader bin/sstablescrub bin/sstableupgrade bin/sstableutil bin/sstableverify