git: 0a2fae11105d - main - databases/cassandra3: Remove expired port
Rene Ladan <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a2fae11105da4b14bcad506cced055283807d19 commit 0a2fae11105da4b14bcad506cced055283807d19 Author: Rene Ladan <[email protected]> AuthorDate: 2026-07-31 20:34:16 +0000 Commit: Rene Ladan <[email protected]> CommitDate: 2026-07-31 20:34:56 +0000 databases/cassandra3: Remove expired port 2026-07-31 databases/cassandra3: Cassandra 3.x is no longer maintained upstream, superseded by databases/cassandra4 --- MOVED | 1 + databases/Makefile | 1 - databases/cassandra3/Makefile | 146 --------------------- databases/cassandra3/distinfo | 5 - databases/cassandra3/files/cassandra.in | 39 ------ databases/cassandra3/files/patch-bin_cassandra | 20 --- .../cassandra3/files/patch-bin_cassandra.in.sh | 22 ---- databases/cassandra3/files/patch-build.xml | 117 ----------------- .../cassandra3/files/patch-conf_cassandra-env.sh | 11 -- .../cassandra3/files/patch-conf_cassandra.yaml | 68 ---------- .../files/patch-pylib_cassandra-cqlsh-tests.sh | 59 --------- .../cassandra3/files/patch-pylib_requirements.txt | 16 --- ...rc_java_org_apache_cassandra_config_Config.java | 11 -- ...cassandra_db_commitlog_MemoryMappedSegment.java | 11 -- ...org_apache_cassandra_service_StartupChecks.java | 18 --- ...org_apache_cassandra_tools_nodetool_Status.java | 11 -- ..._apache_cassandra_utils_FastByteOperations.java | 108 --------------- .../files/patch-test_conf_cassandra.yaml | 10 -- .../files/patch-tools_bin_cassandra.in.sh | 24 ---- databases/cassandra3/pkg-descr | 12 -- databases/cassandra3/pkg-message | 12 -- databases/cassandra3/pkg-plist | 145 -------------------- 22 files changed, 1 insertion(+), 866 deletions(-) diff --git a/MOVED b/MOVED index 1033b8dd88a9..1b2436181a2a 100644 --- a/MOVED +++ b/MOVED @@ -5533,3 +5533,4 @@ www/dolibarr17||2026-07-31|Has expired: php81 is the recommended max version for www/py-django-configurations|www/py-django-configurator|2026-07-31|Has expired: Upstream no longer active, project is abandoned, please use www/py-django-configurator instead www/dolibarr16||2026-07-31|Has expired: php81 is the recommended max version for run it www/dolibarr18||2026-07-31|Has expired: php81 is the recommended max version for run it +databases/cassandra3|databases/cassandra4|2026-07-31|Has expired: Cassandra 3.x is no longer maintained upstream, superseded by databases/cassandra4 diff --git a/databases/Makefile b/databases/Makefile index f22ae1a1e065..01f53bae3f06 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -27,7 +27,6 @@ SUBDIR += c3p0 SUBDIR += cargo-pgrx SUBDIR += cassandra-cpp-driver - SUBDIR += cassandra3 SUBDIR += cassandra4 SUBDIR += cassandra5 SUBDIR += casstcl diff --git a/databases/cassandra3/Makefile b/databases/cassandra3/Makefile deleted file mode 100644 index 40cf9aafa957..000000000000 --- a/databases/cassandra3/Makefile +++ /dev/null @@ -1,146 +0,0 @@ -PORTNAME= cassandra -DISTVERSION= 3.11.14 -PORTREVISION= 4 -CATEGORIES= databases java -MASTER_SITES= LOCAL/fernape:repo -PKGNAMESUFFIX= 3 -DISTFILES= apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo - -MAINTAINER= [email protected] -COMMENT= Highly scalable distributed database -WWW= https://cassandra.apache.org/ - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -DEPRECATED= Cassandra 3.x is no longer maintained upstream, superseded by databases/cassandra4 -EXPIRATION_DATE= 2026-07-31 - -RUN_DEPENDS= snappyjava>=0:archivers/snappy-java -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ - bash>0:shells/bash \ - git>0:devel/git - -USES= cpe java:ant,run python -JAVA_VERSION= 8 -JAVA_VENDOR= openjdk -CPE_VENDOR= apache - -USE_RC_SUBR= cassandra - -USE_GITHUB= yes -GH_ACCOUNT= polo-language -GH_TAGNAME= c29ba30 - -TEST_TARGET= test - -CONFLICTS= cassandra4 - -DATADIR= ${JAVASHAREDIR}/${PORTNAME} - -REINPLACE_ARGS= -i '' -SUB_LIST= JAVA_HOME=${JAVA_HOME} - -USERS= cassandra -GROUPS= cassandra - -PLIST_SUB= PORTVERSION=${PORTVERSION} -PORTDOCS= * - -OPTIONS_DEFINE= SIGAR DOCS -OPTIONS_DEFAULT= SIGAR -OPTIONS_SUB= yes - -SIGAR_DESC= Use SIGAR to collect system information -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} -SIGAR_RUN_DEPENDS= java-sigar>=1.6.4:java/sigar - -CONFIG_FILES= cassandra-env.sh \ - cassandra-jaas.config \ - cassandra-rackdc.properties \ - cassandra-topology.properties \ - cassandra.yaml \ - commitlog_archiving.properties \ - hotspot_compiler \ - jvm.options \ - logback-tools.xml \ - logback.xml - -DIST_DIR= ${WRKSRC}/build/dist -REPO_DIR= ${WRKDIR}/repository - -SCRIPT_FILES= cassandra \ - cqlsh \ - nodetool \ - sstableloader \ - sstablescrub \ - sstableupgrade \ - sstableutil \ - sstableverify - -ANT_OPTS_LOCAL= ${ANT_OPTS} -Xmx512m - -post-patch: - @${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh - -do-build: - @${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target. - -do-build-DOCS-on: - cd ${WRKSRC} && ${MAKE_ENV} ANT_OPTS="${ANT_OPTS_LOCAL}" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc - -do-build-DOCS-off: - cd ${WRKSRC} && ${MAKE_ENV} ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} freebsd-stage - -post-build: -.for f in ${SCRIPT_FILES} - @${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${DIST_DIR}/bin/${f} -.endfor - @${REINPLACE_CMD} -e 's|`dirname "$$0"`/..|${DATADIR}|' ${DIST_DIR}/bin/cassandra.in.sh - @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${DIST_DIR}/bin/cassandra.in.sh - @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${DIST_DIR}/conf/cassandra-env.sh - @${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/conf|${ETCDIR}|' ${DIST_DIR}/bin/cassandra.in.sh -.for f in ${CONFIG_FILES} - @${MV} ${DIST_DIR}/conf/${f} ${DIST_DIR}/conf/${f}.sample -.endfor - @${RM} ${DIST_DIR}/lib/licenses/sigar* - @${RMDIR} ${DIST_DIR}/lib/sigar-bin - -do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} -.for f in CHANGES LICENSE NEWS NOTICE - cd ${DIST_DIR} && ${INSTALL_DATA} ${f}.txt ${STAGEDIR}${DATADIR}/ -.endfor -.for d in interface lib pylib tools - cd ${DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ "! -path '*/bin/*'" -.endfor - ${MKDIR} ${STAGEDIR}${ETCDIR} - cd ${DIST_DIR}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/ - cd ${DIST_DIR} && ${COPYTREE_BIN} bin ${STAGEDIR}${DATADIR} - cd ${DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/ - cd ${DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/ - cd ${DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/ -.for f in ${SCRIPT_FILES} - ${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f} -.endfor - ${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar - -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for d in doc javadoc - cd ${DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DOCSDIR}/ -.endfor - -post-install-SIGAR-on: - ${LN} -s ${JAVAJARDIR}/sigar.jar ${STAGEDIR}${DATADIR}/lib/sigar.jar - -do-test: - # A bare 'python' must be on PATH for test to succeed. - @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.patched - @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.orig bin/cassandra.in.sh - @cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ANT_CMD="${ANT}" pylib/cassandra-cqlsh-tests.sh ${WRKSRC} ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD} ${REPO_DIR} - @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.orig - @cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.patched bin/cassandra.in.sh - -.include <bsd.port.mk> diff --git a/databases/cassandra3/distinfo b/databases/cassandra3/distinfo deleted file mode 100644 index ab256d0ea2bd..000000000000 --- a/databases/cassandra3/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1667648919 -SHA256 (apache-cassandra-3.11.14-repo.tar.gz) = 6390ad0eb91156c37d738f5fe96695c5b3d5c3603ab24c8e65e443cbd916b1d2 -SIZE (apache-cassandra-3.11.14-repo.tar.gz) = 59360725 -SHA256 (polo-language-cassandra-3.11.14-c29ba30_GH0.tar.gz) = 03c501b62952256e28ef19c85c73fe371cd1a6c40cc7f84dae076152ab3130ef -SIZE (polo-language-cassandra-3.11.14-c29ba30_GH0.tar.gz) = 16297535 diff --git a/databases/cassandra3/files/cassandra.in b/databases/cassandra3/files/cassandra.in deleted file mode 100644 index 9615fbe572f6..000000000000 --- a/databases/cassandra3/files/cassandra.in +++ /dev/null @@ -1,39 +0,0 @@ -#!/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} - -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/cassandra3/files/patch-bin_cassandra b/databases/cassandra3/files/patch-bin_cassandra deleted file mode 100644 index b05592c1623f..000000000000 --- a/databases/cassandra3/files/patch-bin_cassandra +++ /dev/null @@ -1,20 +0,0 @@ ---- bin/cassandra.orig 2020-07-14 21:00:51 UTC -+++ bin/cassandra -@@ -31,7 +31,7 @@ - # JVM_OPTS -- Additional arguments to the JVM for heap size, etc - # JVM_ON_OUT_OF_MEMORY_ERROR_OPT -- The OnOutOfMemoryError JVM option if specified - # CASSANDRA_CONF -- Directory containing Cassandra configuration files. --# CASSANDRA_LOG_DIR -- Directory containing logs(default: $CASSANDRA_HOME/logs). -+# CASSANDRA_LOG_DIR -- Directory containing logs(default: /var/log/cassandra). - # - # As a convenience, a fragment of shell is sourced in order to set one or - # more of these variables. This so-called `include' can be placed in a -@@ -128,7 +128,7 @@ if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then - fi - - if [ -z "$CASSANDRA_LOG_DIR" ]; then -- CASSANDRA_LOG_DIR=$CASSANDRA_HOME/logs -+ CASSANDRA_LOG_DIR=/var/log/cassandra - fi - - # Special-case path variables. diff --git a/databases/cassandra3/files/patch-bin_cassandra.in.sh b/databases/cassandra3/files/patch-bin_cassandra.in.sh deleted file mode 100644 index b721f1260f21..000000000000 --- a/databases/cassandra3/files/patch-bin_cassandra.in.sh +++ /dev/null @@ -1,22 +0,0 @@ ---- bin/cassandra.in.sh.orig 2019-02-02 22:06:43 UTC -+++ bin/cassandra.in.sh -@@ -26,8 +26,8 @@ fi - # This can be the path to a jar file, or a directory containing the - # compiled classes. NOTE: This isn't needed by the startup script, - # it's just used here in constructing the classpath. --cassandra_bin="$CASSANDRA_HOME/build/classes/main" --cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift" -+#cassandra_bin="$CASSANDRA_HOME/build/classes/main" -+#cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift" - #cassandra_bin="$CASSANDRA_HOME/build/cassandra.jar" - - # the default location for commitlogs, sstables, and saved caches -@@ -38,7 +38,7 @@ cassandra_storagedir="$CASSANDRA_HOME/data" - #JAVA_HOME=/usr/local/jdk6 - - # The java classpath (required) --CLASSPATH="$CASSANDRA_CONF:$cassandra_bin" -+CLASSPATH="$CASSANDRA_CONF" - - for jar in "$CASSANDRA_HOME"/lib/*.jar; do - CLASSPATH="$CLASSPATH:$jar" diff --git a/databases/cassandra3/files/patch-build.xml b/databases/cassandra3/files/patch-build.xml deleted file mode 100644 index 6b406a5d7b31..000000000000 --- a/databases/cassandra3/files/patch-build.xml +++ /dev/null @@ -1,117 +0,0 @@ ---- build.xml.orig 2022-10-28 19:54:09 UTC -+++ build.xml -@@ -31,6 +31,8 @@ - <property file="build.properties" /> - <property file="build.properties.default" /> - <property name="debuglevel" value="source,lines,vars"/> -+ <property name="pycmd" value="python"/> -+ <property name="rat.skip" value="true"/> - - <!-- default version and SCM information --> - <property name="base.version" value="3.11.14"/> -@@ -85,7 +87,7 @@ - <condition property="version" value="${base.version}"> - <isset property="release"/> - </condition> -- <property name="version" value="${base.version}-SNAPSHOT"/> -+ <property name="version" value="${base.version}"/> - <property name="version.properties.dir" - value="${build.src.resources}/org/apache/cassandra/config/" /> - <property name="final.name" value="${ant.project.name}-${version}"/> -@@ -272,6 +274,7 @@ - <target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip"> - <exec executable="make" osfamily="unix" dir="${doc.dir}"> - <arg value="html"/> -+ <arg value="PYTHON_CMD=${pycmd}"/> - </exec> - </target> - -@@ -924,6 +927,88 @@ - </jar> - </target> - -+ <!-- FreeBSD for staging --> -+ <target name="freebsd-stage" depends="jar" -+ description="Create Cassandra directory structure for staging"> -+ <mkdir dir="${dist.dir}"/> -+ <copy todir="${dist.dir}/lib"> -+ <fileset dir="${build.lib}"> -+ <exclude name="sigar*.jar"/> -+ <exclude name="sigar-bin/*"/> -+ <exclude name="snappy*.jar"/> -+ <exclude name="licenses/snappy*.txt"/> -+ </fileset> -+ <fileset dir="${build.dir}"> -+ <include name="${final.name}.jar" /> -+ <include name="${ant.project.name}-thrift-${version}.jar" /> -+ </fileset> -+ </copy> -+ <copy todir="${dist.dir}/bin"> -+ <fileset dir="bin"> -+ <exclude name="*.bat" /> -+ <exclude name="*.ps1" /> -+ <exclude name="*.orig" /> -+ </fileset> -+ </copy> -+ <copy todir="${dist.dir}/conf"> -+ <fileset dir="conf"> -+ <exclude name="*.ps1" /> -+ <exclude name="*.orig" /> -+ </fileset> -+ </copy> -+ <copy todir="${dist.dir}/interface"> -+ <fileset dir="interface"> -+ <include name="**/*.thrift" /> -+ </fileset> -+ </copy> -+ <copy todir="${dist.dir}/pylib"> -+ <fileset dir="pylib"> -+ <include name="**" /> -+ <exclude name="**/*.pyc" /> -+ </fileset> -+ </copy> -+ <copy todir="${dist.dir}/"> -+ <fileset dir="${basedir}"> -+ <include name="*.txt" /> -+ </fileset> -+ </copy> -+ <copy todir="${dist.dir}/tools/bin"> -+ <fileset dir="${basedir}/tools/bin"> -+ <exclude name="*.bat" /> -+ <exclude name="*.ps1" /> -+ <exclude name="*.orig" /> -+ </fileset> -+ </copy> -+ <copy todir="${dist.dir}/tools/"> -+ <fileset dir="${basedir}/tools/"> -+ <include name="*.yaml"/> -+ </fileset> -+ </copy> -+ <copy todir="${dist.dir}/tools/lib"> -+ <fileset dir="${build.dir}/tools/lib/"> -+ <include name="*.jar" /> -+ </fileset> -+ </copy> -+ </target> -+ -+ <target name="freebsd-stage-doc" depends="freebsd-stage,javadoc,gen-doc" -+ description="Create Cassandra directory structure for staging, including docs"> -+ <copy todir="${dist.dir}/javadoc"> -+ <fileset dir="${javadoc.dir}"/> -+ </copy> -+ <copy todir="${dist.dir}/doc"> -+ <fileset dir="doc"> -+ <include name="cql3/CQL.html" /> -+ <include name="cql3/CQL.css" /> -+ <include name="SASI.md" /> -+ </fileset> -+ </copy> -+ <copy todir="${dist.dir}/doc/html"> -+ <fileset dir="doc" /> -+ <globmapper from="build/html/*" to="*"/> -+ </copy> -+ </target> -+ - <!-- creates release tarballs --> - <target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar" - description="Create Cassandra release artifacts"> diff --git a/databases/cassandra3/files/patch-conf_cassandra-env.sh b/databases/cassandra3/files/patch-conf_cassandra-env.sh deleted file mode 100644 index a9d76e6bae50..000000000000 --- a/databases/cassandra3/files/patch-conf_cassandra-env.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- conf/cassandra-env.sh.orig 2020-02-10 22:55:14 UTC -+++ conf/cassandra-env.sh -@@ -123,7 +123,7 @@ esac - - # Sets the path where logback and GC logs are written. - if [ "x$CASSANDRA_LOG_DIR" = "x" ] ; then -- CASSANDRA_LOG_DIR="$CASSANDRA_HOME/logs" -+ CASSANDRA_LOG_DIR="/var/log/cassandra" - fi - - #GC log path has to be defined here because it needs to access CASSANDRA_HOME diff --git a/databases/cassandra3/files/patch-conf_cassandra.yaml b/databases/cassandra3/files/patch-conf_cassandra.yaml deleted file mode 100644 index a38a0d3fbf95..000000000000 --- a/databases/cassandra3/files/patch-conf_cassandra.yaml +++ /dev/null @@ -1,68 +0,0 @@ ---- conf/cassandra.yaml.orig 2022-10-28 19:54:09 UTC -+++ conf/cassandra.yaml -@@ -71,7 +71,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. -@@ -188,13 +188,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition - # will spread data evenly across them, subject to the granularity of - # the configured compaction strategy. - # 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 - - # 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 -@@ -205,7 +205,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: - # -@@ -306,20 +306,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 -@@ -366,7 +358,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 - - # 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/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh b/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh deleted file mode 100644 index b27df106f467..000000000000 --- a/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh +++ /dev/null @@ -1,59 +0,0 @@ ---- pylib/cassandra-cqlsh-tests.sh.orig 2022-01-03 17:11:14 UTC -+++ pylib/cassandra-cqlsh-tests.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -x -+#!/usr/local/bin/bash -x - # - # Licensed to the Apache Software Foundation (ASF) under one - # or more contributor license agreements. See the NOTICE file -@@ -15,7 +15,6 @@ - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. --# - - ################################ - # -@@ -24,9 +23,13 @@ - ################################ - - WORKSPACE=$1 --PYTHON_VERSION=$2 --JAVA_HOME=$3 -+JAVA_HOME=$2 -+REPO_DIR=$3 -+PYTHON_CMD=$4 -+REPO_DIR=$5 - -+PYTHON_VERSION=python3 -+ - if [ "${WORKSPACE}" = "" ]; then - echo "Specify Cassandra source directory" - exit -@@ -65,7 +68,7 @@ fi - - # Loop to prevent failure due to maven-ant-tasks not downloading a jar.. - for x in $(seq 1 3); do -- ant -buildfile ${CASSANDRA_DIR}/build.xml realclean jar -+ ${ANT_CMD} -buildfile ${CASSANDRA_DIR}/build.xml realclean jar -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} - RETURN="$?" - if [ "${RETURN}" -eq "0" ]; then - break -@@ -79,7 +82,7 @@ fi - - # Set up venv with dtest dependencies - set -e # enable immediate exit if venv setup fails --virtualenv --python=$PYTHON_VERSION venv -+virtualenv --python=$PYTHON_CMD venv - source venv/bin/activate - pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt - pip freeze -@@ -120,7 +123,7 @@ case "${pre_or_post_cdc}" in - ;; - esac - --ccm start --wait-for-binary-proto -+ccm start --wait-for-binary-proto --root - - cd ${CASSANDRA_DIR}/pylib/cqlshlib/ - diff --git a/databases/cassandra3/files/patch-pylib_requirements.txt b/databases/cassandra3/files/patch-pylib_requirements.txt deleted file mode 100644 index 27616df2d111..000000000000 --- a/databases/cassandra3/files/patch-pylib_requirements.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- pylib/requirements.txt.orig 2022-01-04 12:21:36 UTC -+++ pylib/requirements.txt -@@ -1,7 +1,6 @@ - # See python driver docs: futures and six have to be installed before - # cythonizing the driver, perhaps only on old pips. - # http://datastax.github.io/python-driver/installation.html#cython-based-extensions --futures - six>=0.12.0 - -e git+https://github.com/datastax/python-driver.git@cassandra-test#egg=cassandra-driver - # Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases. -@@ -17,4 +16,4 @@ nose-test-select - parse - pycodestyle - psutil --thrift==0.9.3 -+thrift==0.10.0 diff --git a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java b/databases/cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java deleted file mode 100644 index ed8858c23cce..000000000000 --- a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java +++ /dev/null @@ -1,11 +0,0 @@ ---- src/java/org/apache/cassandra/config/Config.java.orig 2019-10-24 16:42:10 UTC -+++ src/java/org/apache/cassandra/config/Config.java -@@ -260,7 +260,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/cassandra3/files/patch-src_java_org_apache_cassandra_db_commitlog_MemoryMappedSegment.java b/databases/cassandra3/files/patch-src_java_org_apache_cassandra_db_commitlog_MemoryMappedSegment.java deleted file mode 100644 index f70f7674b3ae..000000000000 --- a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_db_commitlog_MemoryMappedSegment.java +++ /dev/null @@ -1,11 +0,0 @@ ---- src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java.orig 2019-10-24 16:42:10 UTC -+++ src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java -@@ -90,7 +90,7 @@ public class MemoryMappedSegment extends CommitLogSegm - { - throw new FSWriteError(e, getPath()); - } -- NativeLibrary.trySkipCache(fd, startMarker, nextMarker, logFile.getAbsolutePath()); -+// NativeLibrary.trySkipCache(fd, startMarker, nextMarker, logFile.getAbsolutePath()); - } - - @Override diff --git a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java b/databases/cassandra3/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java deleted file mode 100644 index 68e2e9a75753..000000000000 --- a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java +++ /dev/null @@ -1,18 +0,0 @@ ---- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2018-02-14 20:43:59 UTC -+++ src/java/org/apache/cassandra/service/StartupChecks.java -@@ -263,7 +263,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/cassandra3/files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java b/databases/cassandra3/files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java deleted file mode 100644 index 5390ab1f59cd..000000000000 --- a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java +++ /dev/null @@ -1,11 +0,0 @@ ---- src/java/org/apache/cassandra/tools/nodetool/Status.java.orig 2021-07-01 14:37:50 UTC -+++ src/java/org/apache/cassandra/tools/nodetool/Status.java -@@ -190,7 +190,7 @@ public class Status extends NodeToolCmd - String addressPlaceholder = String.format("%%-%ds ", maxAddressLength); - buf.append("%s%s "); // status - buf.append(addressPlaceholder); // address -- buf.append("%-9s "); // load -+ buf.append("%-11s "); // load (support up to "xxxx.xxx XiB") - if (!isTokenPerNode) - buf.append("%-11s "); // "Tokens" - if (hasEffectiveOwns) diff --git a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java b/databases/cassandra3/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java deleted file mode 100644 index 7d5ec7c223f1..000000000000 --- a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java +++ /dev/null @@ -1,108 +0,0 @@ ---- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig 2018-03-01 05:02:12 UTC -+++ src/java/org/apache/cassandra/utils/FastByteOperations.java -@@ -179,6 +179,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, -@@ -197,7 +211,7 @@ public class FastByteOperations - else - { - obj1 = null; -- offset1 = theUnsafe.getLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET); -+ offset1 = unsafeGetLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET); - } - int length1; - { -@@ -219,7 +233,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) -@@ -234,7 +248,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); - } -@@ -244,7 +258,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) -@@ -252,7 +266,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 - { -@@ -291,7 +305,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(); -@@ -314,7 +328,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; -@@ -347,8 +361,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) - { -@@ -361,8 +375,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/cassandra3/files/patch-test_conf_cassandra.yaml b/databases/cassandra3/files/patch-test_conf_cassandra.yaml deleted file mode 100644 index 8cdaf3180e12..000000000000 --- a/databases/cassandra3/files/patch-test_conf_cassandra.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- test/conf/cassandra.yaml.orig 2018-03-06 21:24:02 UTC -+++ test/conf/cassandra.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/cassandra3/files/patch-tools_bin_cassandra.in.sh b/databases/cassandra3/files/patch-tools_bin_cassandra.in.sh deleted file mode 100644 index 50d1124f2967..000000000000 --- a/databases/cassandra3/files/patch-tools_bin_cassandra.in.sh +++ /dev/null @@ -1,24 +0,0 @@ ---- tools/bin/cassandra.in.sh.orig 2019-02-02 22:06:43 UTC -+++ tools/bin/cassandra.in.sh -@@ -26,9 +26,9 @@ fi - # This can be the path to a jar file, or a directory containing the - # compiled classes. NOTE: This isn't needed by the startup script, - # it's just used here in constructing the classpath. --cassandra_bin="$CASSANDRA_HOME/build/classes/main" --cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/stress" --cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift" -+#cassandra_bin="$CASSANDRA_HOME/build/classes/main" -+#cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/stress" -+#cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift" - #cassandra_bin="$cassandra_home/build/cassandra.jar" - - # the default location for commitlogs, sstables, and saved caches -@@ -39,7 +39,7 @@ cassandra_storagedir="$CASSANDRA_HOME/data" - #JAVA_HOME=/usr/local/jdk6 - - # The java classpath (required) --CLASSPATH="$CASSANDRA_CONF:$cassandra_bin" -+CLASSPATH="$CASSANDRA_CONF" - - for jar in "$CASSANDRA_HOME"/tools/lib/*.jar; do - CLASSPATH="$CLASSPATH:$jar" diff --git a/databases/cassandra3/pkg-descr b/databases/cassandra3/pkg-descr deleted file mode 100644 index c14d3a30ca12..000000000000 --- a/databases/cassandra3/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Apache Cassandra is a free and open-source distributed database. -It is a Java-based, highly scalable, eventually consistent, wide -column store. Cassandra database clusters are masterless with no -single point of failure. Replication can be configured across -multiple data centers. - -Originally influenced by Dynamo and BigTable, Cassandra was initially -developed at and open sourced by Facebook before becoming a top-level -Apache project. - -The CQL query language offers SQL-like data access and management. -Drivers are available for a number of languages. diff --git a/databases/cassandra3/pkg-message b/databases/cassandra3/pkg-message deleted file mode 100644 index 37224b063199..000000000000 --- a/databases/cassandra3/pkg-message +++ /dev/null @@ -1,12 +0,0 @@ -[ -{ type: install - message: <<EOM -Entries for this machine's hostname may need to be set in /etc/hosts -if you get a "Local host name unknown" exception on startup -(see https://issues.apache.org/jira/browse/CASSANDRA-2380): - - ::1 localhost localhost.your.domain your-host-name - 127.0.0.1 localhost localhost.your.domain your-host-name -EOM -} -] diff --git a/databases/cassandra3/pkg-plist b/databases/cassandra3/pkg-plist deleted file mode 100644 index 580b15fa5b78..000000000000 --- a/databases/cassandra3/pkg-plist +++ /dev/null @@ -1,145 +0,0 @@ -%%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%%/interface/cassandra.thrift -%%DATADIR%%/lib/airline-0.6.jar -%%DATADIR%%/lib/antlr-runtime-3.5.2.jar -%%DATADIR%%/lib/apache-cassandra-%%PORTVERSION%%.jar -%%DATADIR%%/lib/apache-cassandra-thrift-%%PORTVERSION%%.jar -%%DATADIR%%/lib/asm-5.0.4.jar -%%DATADIR%%/lib/caffeine-2.2.6.jar -%%DATADIR%%/lib/cassandra-driver-core-3.0.1-shaded.jar -%%DATADIR%%/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip -%%DATADIR%%/lib/commons-cli-1.1.jar -%%DATADIR%%/lib/commons-codec-1.9.jar -%%DATADIR%%/lib/commons-lang3-3.1.jar -%%DATADIR%%/lib/commons-math3-3.2.jar -%%DATADIR%%/lib/compress-lzf-0.8.4.jar -%%DATADIR%%/lib/concurrent-trees-2.4.0.jar -%%DATADIR%%/lib/concurrentlinkedhashmap-lru-1.4.jar -%%DATADIR%%/lib/disruptor-3.0.1.jar -%%DATADIR%%/lib/ecj-4.4.2.jar -%%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip -%%DATADIR%%/lib/guava-18.0.jar -%%DATADIR%%/lib/HdrHistogram-2.1.9.jar -%%DATADIR%%/lib/high-scale-lib-1.0.6.jar -%%DATADIR%%/lib/hppc-0.5.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.0.jar -%%DATADIR%%/lib/javax.inject-1.jar -%%DATADIR%%/lib/jbcrypt-0.4.jar -%%DATADIR%%/lib/jcl-over-slf4j-1.7.25.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/joda-time-2.4.jar -%%DATADIR%%/lib/json-simple-1.1.jar -%%DATADIR%%/lib/libthrift-0.9.2.jar -%%DATADIR%%/lib/log4j-over-slf4j-1.7.25.jar -%%DATADIR%%/lib/logback-classic-1.2.9.jar -%%DATADIR%%/lib/logback-core-1.2.9.jar -%%DATADIR%%/lib/lz4-1.3.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/netty-all-4.0.44.Final.jar -%%DATADIR%%/lib/ohc-core-0.4.4.jar -%%DATADIR%%/lib/ohc-core-j8-0.4.4.jar -%%DATADIR%%/lib/reporter-config-base-3.0.3.jar -%%DATADIR%%/lib/reporter-config3-3.0.3.jar -%%DATADIR%%/lib/six-1.16.0-py2.py3-none-any.zip -%%DATADIR%%/lib/slf4j-api-1.7.25.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 -%%DATADIR%%/lib/thrift-server-0.3.7.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 *** 57 LINES SKIPPED ***