svn commit: r533701 - in head/databases: . cassandra3 cassandra4 cassandra4/files
Kurt Jaeger
pi at FreeBSD.org
Sat May 2 19:48:36 UTC 2020
Author: pi
Date: Sat May 2 19:48:32 2020
New Revision: 533701
URL: https://svnweb.freebsd.org/changeset/ports/533701
Log:
New port: databases/cassandra4: Highly scalable distributed database
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.
This is an ALPHA version! It is not intended for production use.
WWW: https://cassandra.apache.org/
PR: 246081
Submitted by: Angelo Polo <language.devel at gmail.com>
Reviewed by: yuri
Added:
head/databases/cassandra4/
- copied from r533489, head/databases/cassandra3/
head/databases/cassandra4/files/patch-doc_gen-nodetool-docs.py (contents, props changed)
head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java (contents, props changed)
head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java (contents, props changed)
Deleted:
head/databases/cassandra4/files/patch-bin_cassandra.in.sh
head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java
head/databases/cassandra4/files/patch-tools_bin_cassandra.in.sh
Modified:
head/databases/Makefile
head/databases/cassandra3/Makefile
head/databases/cassandra4/Makefile
head/databases/cassandra4/distinfo
head/databases/cassandra4/files/cassandra.in
head/databases/cassandra4/files/patch-bin_cassandra
head/databases/cassandra4/files/patch-build.xml
head/databases/cassandra4/files/patch-conf_cassandra-env.sh
head/databases/cassandra4/files/patch-conf_cassandra.yaml
head/databases/cassandra4/files/patch-doc_Makefile
head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java
head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java
head/databases/cassandra4/pkg-descr
head/databases/cassandra4/pkg-plist
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Sat May 2 17:56:59 2020 (r533700)
+++ head/databases/Makefile Sat May 2 19:48:32 2020 (r533701)
@@ -32,6 +32,7 @@
SUBDIR += c3p0
SUBDIR += cassandra-cpp-driver
SUBDIR += cassandra3
+ SUBDIR += cassandra4
SUBDIR += casstcl
SUBDIR += cayley
SUBDIR += cdb
Modified: head/databases/cassandra3/Makefile
==============================================================================
--- head/databases/cassandra3/Makefile Sat May 2 17:56:59 2020 (r533700)
+++ head/databases/cassandra3/Makefile Sat May 2 19:48:32 2020 (r533701)
@@ -26,6 +26,8 @@ USE_JAVA= yes
USE_ANT= yes
USE_RC_SUBR= cassandra
+CONFLICTS= cassandra4
+
JAVA_VERSION= 1.8
JAVA_VENDOR= openjdk
Modified: head/databases/cassandra4/Makefile
==============================================================================
--- head/databases/cassandra3/Makefile Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/Makefile Sat May 2 19:48:32 2020 (r533701)
@@ -1,14 +1,18 @@
# $FreeBSD$
PORTNAME= cassandra
-DISTVERSION= 3.11.6
+DISTVERSION= 4.0-alpha4
CATEGORIES= databases java
-MASTER_SITES= APACHE/cassandra/${PORTVERSION}:apache \
- LOCAL/yuri:repo
-PKGNAMESUFFIX= 3
-DISTNAME= apache-${PORTNAME}-${PORTVERSION}-src
+MASTER_SITES= APACHE/cassandra/${DISTVERSION}:apache \
+ https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.4-9/:maven \
+ LOCAL/pi:repo
+PKGNAMESUFFIX= 4
+DISTNAME= apache-${PORTNAME}-${DISTVERSION}-src
DISTFILES= ${DISTNAME}.tar.gz:apache \
- apache-${PORTNAME}-3.11.4-repo.tar.gz:repo
+ zstd-jni-1.4.4-9-freebsd_amd64.jar:maven \
+ apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
+EXTRACT_ONLY= ${DISTNAME}.tar.gz \
+ apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz
MAINTAINER= language.devel at gmail.com
COMMENT= Highly scalable distributed database
@@ -16,17 +20,18 @@ COMMENT= Highly scalable distributed database
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-DEPRECATED= Uses deprecated version of python
-EXPIRATION_DATE= 2020-09-15
+RUN_DEPENDS= snappyjava>=0:archivers/snappy-java \
+ netty>0:java/netty
-RUN_DEPENDS= snappyjava>=0:archivers/snappy-java
-
-USES= python:2.7
+USES= python:3.7
USE_JAVA= yes
USE_ANT= yes
USE_RC_SUBR= cassandra
+TEST_TARGET= test
-JAVA_VERSION= 1.8
+CONFLICTS= cassandra3
+
+JAVA_VERSION= 8 11
JAVA_VENDOR= openjdk
REINPLACE_ARGS= -i ''
@@ -36,7 +41,7 @@ USERS= cassandra
GROUPS= cassandra
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
-DIST_DIR= ${WRKSRC}/build/dist
+BUILD_DIST_DIR= ${WRKSRC}/build/dist
REPO_DIR= ${WRKDIR}/repository
CONFIG_FILES= cassandra-env.sh \
@@ -46,12 +51,16 @@ CONFIG_FILES= cassandra-env.sh \
cassandra.yaml \
commitlog_archiving.properties \
hotspot_compiler \
- jvm.options \
logback-tools.xml \
- logback.xml
+ logback.xml \
+ jvm8-clients.options \
+ jvm8-server.options \
+ jvm11-clients.options \
+ jvm11-server.options \
+ jvm-clients.options \
+ jvm-server.options
SCRIPT_FILES= cassandra \
- cqlsh \
nodetool \
sstableloader \
sstablescrub \
@@ -59,7 +68,7 @@ SCRIPT_FILES= cassandra \
sstableutil \
sstableverify
-PLIST_SUB= PORTVERSION=${PORTVERSION}
+PLIST_SUB= DISTVERSION=${DISTVERSION}
OPTIONS_DEFINE= SIGAR DOCS
OPTIONS_DEFAULT= SIGAR
@@ -77,52 +86,75 @@ do-build:
@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
do-build-DOCS-on:
- @cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
+ 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
do-build-DOCS-off:
- @cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} freebsd-stage
+ cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} freebsd-stage
post-build:
.for f in ${SCRIPT_FILES}
- @${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${DIST_DIR}/bin/${f}
+ @${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${BUILD_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
- @${REINPLACE_CMD} -e 's|\$$\CASSANDRA_HOME/conf|${ETCDIR}|' ${DIST_DIR}/conf/cassandra-env.sh
+ @${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} ${DIST_DIR}/conf/${f} ${DIST_DIR}/conf/${f}.sample
+ @${MV} ${BUILD_DIST_DIR}/conf/${f} ${BUILD_DIST_DIR}/conf/${f}.sample
.endfor
- @${RM} ${DIST_DIR}/lib/licenses/sigar*
- @${RMDIR} ${DIST_DIR}/lib/sigar-bin
+ @${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 ${DIST_DIR} && ${INSTALL_DATA} ${f}.txt ${STAGEDIR}${DATADIR}/
+ cd ${BUILD_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/*'"
+.for d in lib pylib tools
+ cd ${BUILD_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/
+ 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/
.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
+
+.include <bsd.port.pre.mk>
+
+.if ${JAVA_PORT_VERSION} == 11
+USEJDK11= -Duse.jdk11=true
+.endif
+
+.if ${ARCH} == amd64
+PLIST_SUB+= AMD64ONLY=""
+.else
+PLIST_SUB+= AMD64ONLY="@comment "
+.endif
+
+post-install:
+ ${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar
+.if ${ARCH} == amd64
+ ${CP} ${DISTDIR}/zstd-jni-1.4.4-9-freebsd_amd64.jar ${STAGEDIR}${DATADIR}/lib/
+.endif
+
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
.for d in doc javadoc
- cd ${DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DOCSDIR}/
+ 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 <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/databases/cassandra4/distinfo
==============================================================================
--- head/databases/cassandra3/distinfo Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/distinfo Sat May 2 19:48:32 2020 (r533701)
@@ -1,5 +1,7 @@
-TIMESTAMP = 1582025236
-SHA256 (apache-cassandra-3.11.6-src.tar.gz) = 9d2b976c942f8d845a621183c83b15ce06308c76942986aa7216b6e1c2f3480c
-SIZE (apache-cassandra-3.11.6-src.tar.gz) = 35097130
-SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44
-SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889
+TIMESTAMP = 1587819246
+SHA256 (apache-cassandra-4.0-alpha4-src.tar.gz) = 8f62238ac1f19fc2ab91c1f88981a46ded3b5e30ed7421266682cf81942b5856
+SIZE (apache-cassandra-4.0-alpha4-src.tar.gz) = 45311406
+SHA256 (zstd-jni-1.4.4-9-freebsd_amd64.jar) = 97d20ae4ad56aad81d0f11cc4da21f6036bedc26f9908e4c2cc5998aa2dfcf4d
+SIZE (zstd-jni-1.4.4-9-freebsd_amd64.jar) = 521330
+SHA256 (apache-cassandra-4.0-alpha4-repo.tar.gz) = 6becab355e49fcddcd8b35e61febf39105d7a42574488ea91775bbd0b34d750b
+SIZE (apache-cassandra-4.0-alpha4-repo.tar.gz) = 74348796
Modified: head/databases/cassandra4/files/cassandra.in
==============================================================================
--- head/databases/cassandra3/files/cassandra.in Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/files/cassandra.in Sat May 2 19:48:32 2020 (r533701)
@@ -29,7 +29,7 @@ command=%%PREFIX%%/bin/cassandra
command_args="-p /var/run/cassandra/cassandra.pid >/dev/null 2>/dev/null"
start_precmd="${name}_prestart"
-procname=%%PREFIX%%/openjdk8/bin/java
+procname=%%JAVA_HOME%%/bin/java
pidfile=/var/run/cassandra/cassandra.pid
cassandra_prestart()
Modified: head/databases/cassandra4/files/patch-bin_cassandra
==============================================================================
--- head/databases/cassandra3/files/patch-bin_cassandra Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/files/patch-bin_cassandra Sat May 2 19:48:32 2020 (r533701)
@@ -1,6 +1,6 @@
---- bin/cassandra.orig 2019-12-13 12:50:29 UTC
+--- bin/cassandra.orig 2020-04-10 22:29:25 UTC
+++ bin/cassandra
-@@ -30,7 +30,7 @@
+@@ -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.
@@ -9,7 +9,7 @@
#
# 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
-@@ -127,7 +127,7 @@ if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then
+@@ -116,7 +116,7 @@ if [ -f "$CASSANDRA_CONF/cassandra-env.sh" ]; then
fi
if [ -z "$CASSANDRA_LOG_DIR" ]; then
Modified: head/databases/cassandra4/files/patch-build.xml
==============================================================================
--- head/databases/cassandra3/files/patch-build.xml Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/files/patch-build.xml Sat May 2 19:48:32 2020 (r533701)
@@ -1,4 +1,4 @@
---- build.xml.orig 2020-02-10 22:55:14 UTC
+--- build.xml.orig 2020-04-10 22:29:25 UTC
+++ build.xml
@@ -23,6 +23,7 @@
<property file="build.properties" />
@@ -7,8 +7,8 @@
+ <property name="pycmd" value="python"/>
<!-- default version and SCM information -->
- <property name="base.version" value="3.11.6"/>
-@@ -80,14 +81,14 @@
+ <property name="base.version" value="4.0-alpha4"/>
+@@ -75,14 +76,14 @@
<condition property="version" value="${base.version}">
<isset property="release"/>
</condition>
@@ -25,7 +25,24 @@
<property name="maven-ant-tasks.url"
value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
<!-- details of how and which Maven repository we publish to -->
-@@ -246,8 +247,7 @@
+@@ -241,7 +242,7 @@
+ </path>
+ <path id="cassandra.classpath.test">
+ <file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->
+- <fileset dir="${build.lib}">
++ <fileset dir="${stagedlib}">
+ <include name="**/*.jar" />
+ <exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
+@@ -262,6 +263,7 @@
+ bottom="Copyright © 2009-2020 The Apache Software Foundation"
+ useexternalfile="yes" encoding="UTF-8"
+ maxmemory="256m">
++ <arg value="${jdk11-javac-exports}"/>
+ <filesets/>
+ </javadoc>
+ </sequential>
+@@ -379,8 +381,7 @@
<artifact:dependencies pathId="wikitext.classpath">
<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
@@ -35,15 +52,16 @@
</artifact:dependencies>
<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
<wikitext-to-html markupLanguage="Textile">
-@@ -260,6 +260,7 @@
- <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
+@@ -393,6 +394,8 @@
+ <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation" unless="ant.gen-doc.skip">
<exec executable="make" osfamily="unix" dir="${doc.dir}">
<arg value="html"/>
+ <arg value="PYTHON_CMD=${pycmd}"/>
++ <arg value="PYTHON_VER=${pyver}"/>
</exec>
<exec executable="cmd" osfamily="dos" dir="${doc.dir}">
<arg value="/c"/>
-@@ -302,10 +303,6 @@
+@@ -435,10 +438,6 @@
description="Initialize Maven ANT Tasks">
<typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
@@ -54,7 +72,7 @@
<macrodef name="install">
<attribute name="pomFile"/>
<attribute name="file"/>
-@@ -695,16 +692,14 @@
+@@ -842,16 +841,14 @@
filesetId="build-dependency-jars"
cacheDependencyRefs="true"
dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
@@ -73,7 +91,7 @@
</artifact:dependencies>
<copy todir="${build.dir.lib}/jars">
<fileset refid="build-dependency-jars"/>
-@@ -717,7 +712,7 @@
+@@ -864,7 +861,7 @@
<!-- code coverage tools -->
<artifact:dependencies pomRefId="coverage-deps-pom"
filesetId="coverage-dependency-jars">
@@ -82,7 +100,7 @@
</artifact:dependencies>
<copy todir="${build.dir.lib}/jars">
<fileset refid="coverage-dependency-jars"/>
-@@ -738,8 +733,7 @@
+@@ -893,8 +890,7 @@
sourcesFilesetId="test-dependency-sources"
cacheDependencyRefs="true"
dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
@@ -92,8 +110,8 @@
</artifact:dependencies>
<copy todir="${test.lib}/jars">
<fileset refid="test-dependency-jars"/>
-@@ -1034,6 +1028,88 @@
- </jar>
+@@ -1217,6 +1213,86 @@
+ </copy>
</target>
+ <!-- FreeBSD for staging -->
@@ -105,11 +123,14 @@
+ <exclude name="sigar*.jar"/>
+ <exclude name="sigar-bin/*"/>
+ <exclude name="snappy*.jar"/>
++ <exclude name="netty-all*.jar"/>
++ <exclude name="ohc*.jar"/>
+ <exclude name="licenses/snappy*.txt"/>
++ <exclude name="licenses/netty-4*.txt"/>
++ <exclude name="licenses/ohc*.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">
@@ -125,11 +146,6 @@
+ <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="**" />
@@ -179,9 +195,9 @@
+ </target>
+
<!-- creates release tarballs -->
- <target name="artifacts" depends="jar,javadoc,gen-doc"
+ <target name="artifacts" depends="_artifacts-init"
description="Create Cassandra release artifacts">
-@@ -1776,8 +1852,8 @@
+@@ -1923,8 +1999,8 @@
<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
<arg value="--all"/>
</exec>
@@ -192,7 +208,7 @@
<arg value="-n"/>
<arg value="hw.ncpu"/>
</exec>
-@@ -1797,6 +1873,11 @@
+@@ -1944,6 +2020,11 @@
<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
<arg value="-n"/>
<arg value="hw.memsize"/>
Modified: head/databases/cassandra4/files/patch-conf_cassandra-env.sh
==============================================================================
--- head/databases/cassandra3/files/patch-conf_cassandra-env.sh Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/files/patch-conf_cassandra-env.sh Sat May 2 19:48:32 2020 (r533701)
@@ -1,6 +1,6 @@
---- conf/cassandra-env.sh.orig 2020-02-10 22:55:14 UTC
+--- conf/cassandra-env.sh.orig 2020-01-30 17:34:31 UTC
+++ conf/cassandra-env.sh
-@@ -123,7 +123,7 @@ esac
+@@ -88,7 +88,7 @@ calculate_heap_sizes()
# Sets the path where logback and GC logs are written.
if [ "x$CASSANDRA_LOG_DIR" = "x" ] ; then
Modified: head/databases/cassandra4/files/patch-conf_cassandra.yaml
==============================================================================
--- head/databases/cassandra3/files/patch-conf_cassandra.yaml Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/files/patch-conf_cassandra.yaml Sat May 2 19:48:32 2020 (r533701)
@@ -1,6 +1,6 @@
---- conf/cassandra.yaml.orig 2019-02-02 22:09:01 UTC
+--- conf/cassandra.yaml.orig 2020-01-30 17:34:31 UTC
+++ conf/cassandra.yaml
-@@ -70,7 +70,7 @@ max_hints_delivery_threads: 2
+@@ -76,7 +76,7 @@ max_hints_delivery_threads: 2
# Directory where Cassandra should store hints.
# If not set, the default directory is $CASSANDRA_HOME/data/hints.
@@ -9,9 +9,9 @@
# How often hints should be flushed from the internal buffers to disk.
# Will *not* trigger fsync.
-@@ -187,13 +187,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
- # will spread data evenly across them, subject to the granularity of
- # the configured compaction strategy.
+@@ -203,13 +203,13 @@ 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
@@ -26,7 +26,7 @@
# 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
-@@ -204,7 +204,7 @@ cdc_enabled: false
+@@ -220,7 +220,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.
@@ -35,7 +35,7 @@
# Policy for data disk failures:
#
-@@ -305,20 +305,12 @@ key_cache_save_period: 14400
+@@ -312,20 +312,12 @@ key_cache_save_period: 14400
# Row cache implementation class name. Available implementations:
#
@@ -57,12 +57,12 @@
#
# Default value is 0, to disable row caching.
row_cache_size_in_mb: 0
-@@ -365,7 +357,7 @@ counter_cache_save_period: 7200
+@@ -372,7 +364,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" or "batch."
+ # commitlog_sync may be either "periodic", "group", or "batch."
#
Modified: head/databases/cassandra4/files/patch-doc_Makefile
==============================================================================
--- head/databases/cassandra3/files/patch-doc_Makefile Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/files/patch-doc_Makefile Sat May 2 19:48:32 2020 (r533701)
@@ -1,20 +1,23 @@
---- doc/Makefile.orig 2019-02-02 22:06:43 UTC
+--- 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-2.7
++SPHINXBUILD = sphinx-build-${PYTHON_VER}
PAPER =
BUILDDIR = build
-@@ -17,7 +17,7 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s
+@@ -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'
Added: head/databases/cassandra4/files/patch-doc_gen-nodetool-docs.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/cassandra4/files/patch-doc_gen-nodetool-docs.py Sat May 2 19:48:32 2020 (r533701)
@@ -0,0 +1,20 @@
+--- doc/gen-nodetool-docs.py.orig 2020-04-10 22:29:25 UTC
++++ doc/gen-nodetool-docs.py
+@@ -57,7 +57,7 @@ def create_rst(command):
+ cmdName = command.group(0).strip()
+ cmdFilename = outdir + "/" + cmdName + ".txt"
+ rstFilename = outdir + "/" + cmdName + ".rst"
+- with open(cmdFilename, "w+") as cmdFile:
++ with open(cmdFilename, "w+b") as cmdFile:
+ proc = Popen([nodetool, "help", cmdName], stdin=PIPE, stdout=PIPE)
+ (out, err) = proc.communicate()
+ cmdFile.write(out)
+@@ -76,7 +76,7 @@ with open(outdir + "/nodetool.rst", "w+") as output:
+ output.write(command)
+
+ # create the command usage pages
+-with open(helpfilename, "rw+") as helpfile:
++with open(helpfilename, "r+") as helpfile:
+ for commandLine in helpfile:
+ command = command_re.match(commandLine)
+ create_rst(command)
Modified: head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java
==============================================================================
--- head/databases/cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java Sat May 2 19:48:32 2020 (r533701)
@@ -1,6 +1,6 @@
---- src/java/org/apache/cassandra/config/Config.java.orig 2019-10-24 16:42:10 UTC
+--- src/java/org/apache/cassandra/config/Config.java.orig 2020-01-30 17:34:32 UTC
+++ src/java/org/apache/cassandra/config/Config.java
-@@ -260,7 +260,7 @@ public class Config
+@@ -289,7 +289,7 @@ public class Config
public volatile int key_cache_save_period = 14400;
public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;
Added: head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java Sat May 2 19:48:32 2020 (r533701)
@@ -0,0 +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
+@@ -143,12 +143,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.
+ }
+
+ /**
Modified: head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
==============================================================================
--- head/databases/cassandra3/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java Sat May 2 19:48:32 2020 (r533701)
@@ -1,6 +1,6 @@
---- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2018-02-14 20:43:59 UTC
+--- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-01-30 17:34:32 UTC
+++ src/java/org/apache/cassandra/service/StartupChecks.java
-@@ -263,7 +263,14 @@ public class StartupChecks
+@@ -262,7 +262,14 @@ public class StartupChecks
{
public void execute()
{
Modified: head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java
==============================================================================
--- head/databases/cassandra3/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java Sat May 2 19:48:32 2020 (r533701)
@@ -1,6 +1,6 @@
---- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig 2018-03-01 05:02:12 UTC
+--- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig 2020-03-30 16:37:37 UTC
+++ src/java/org/apache/cassandra/utils/FastByteOperations.java
-@@ -179,6 +179,20 @@ public class FastByteOperations
+@@ -191,6 +191,20 @@ public class FastByteOperations
static final boolean BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);
@@ -21,16 +21,16 @@
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
+@@ -214,7 +228,7 @@ public class FastByteOperations
else
{
obj1 = null;
-- offset1 = theUnsafe.getLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET);
-+ offset1 = unsafeGetLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET);
+- offset1 = theUnsafe.getLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET) + position1;
++ offset1 = unsafeGetLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET) + position1;
}
- int length1;
- {
-@@ -219,7 +233,7 @@ public class FastByteOperations
+
+ return compareTo(obj1, offset1, length1, buffer2, BYTE_ARRAY_BASE_OFFSET + offset2, length2);
+@@ -230,7 +244,7 @@ public class FastByteOperations
if (src.hasArray())
System.arraycopy(src.array(), src.arrayOffset() + srcPosition, trg, trgPosition, length);
else
@@ -39,7 +39,7 @@
}
public void copy(ByteBuffer srcBuf, int srcPosition, ByteBuffer trgBuf, int trgPosition, int length)
-@@ -234,7 +248,7 @@ public class FastByteOperations
+@@ -245,7 +259,7 @@ public class FastByteOperations
else
{
src = null;
@@ -48,7 +48,7 @@
}
copy(src, srcOffset + srcPosition, trgBuf, trgPosition, length);
}
-@@ -244,7 +258,7 @@ public class FastByteOperations
+@@ -255,7 +269,7 @@ public class FastByteOperations
if (trgBuf.hasArray())
copy(src, srcOffset, trgBuf.array(), trgBuf.arrayOffset() + trgPosition, length);
else
@@ -57,7 +57,7 @@
}
public static void copy(Object src, long srcOffset, byte[] trg, int trgPosition, int length)
-@@ -252,7 +266,7 @@ public class FastByteOperations
+@@ -263,7 +277,7 @@ public class FastByteOperations
if (length <= MIN_COPY_THRESHOLD)
{
for (int i = 0 ; i < length ; i++)
@@ -66,7 +66,7 @@
}
else
{
-@@ -291,7 +305,7 @@ public class FastByteOperations
+@@ -302,7 +316,7 @@ public class FastByteOperations
else
{
obj1 = null;
@@ -75,7 +75,7 @@
}
offset1 += buffer1.position();
length1 = buffer1.remaining();
-@@ -314,7 +328,7 @@ public class FastByteOperations
+@@ -325,7 +339,7 @@ public class FastByteOperations
else
{
obj2 = null;
@@ -84,7 +84,7 @@
}
int length2 = limit - position;
offset2 += position;
-@@ -347,8 +361,8 @@ public class FastByteOperations
+@@ -358,8 +372,8 @@ public class FastByteOperations
int wordComparisons = minLength & ~7;
for (int i = 0; i < wordComparisons ; i += Longs.BYTES)
{
@@ -95,7 +95,7 @@
if (lw != rw)
{
-@@ -361,8 +375,8 @@ public class FastByteOperations
+@@ -372,8 +386,8 @@ public class FastByteOperations
for (int i = wordComparisons ; i < minLength ; i++)
{
Added: head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java Sat May 2 19:48:32 2020 (r533701)
@@ -0,0 +1,14 @@
+--- src/java/org/apache/cassandra/utils/NativeLibrary.java.orig 2020-01-30 17:34:32 UTC
++++ src/java/org/apache/cassandra/utils/NativeLibrary.java
+@@ -141,7 +141,10 @@ public final class NativeLibrary
+ else if (osName.contains("windows"))
+ return WINDOWS;
+
+- logger.warn("the current operating system, {}, is unsupported by cassandra", osName);
++ if (osName.contains("bsd"))
++ logger.warn("the current operating system, {}, is fantastic, though not officially supported by cassandra", osName);
++ else
++ logger.warn("the current operating system, {}, is unsupported by cassandra", osName);
+ if (osName.contains("aix"))
+ return AIX;
+ else
Modified: head/databases/cassandra4/pkg-descr
==============================================================================
--- head/databases/cassandra3/pkg-descr Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/pkg-descr Sat May 2 19:48:32 2020 (r533701)
@@ -11,4 +11,6 @@ Apache project.
The CQL query language offers SQL-like data access and management.
Drivers are available for a number of languages.
+This is an ALPHA version! It is not intended for production use.
+
WWW: https://cassandra.apache.org/
Modified: head/databases/cassandra4/pkg-plist
==============================================================================
--- head/databases/cassandra3/pkg-plist Fri May 1 02:46:22 2020 (r533489)
+++ head/databases/cassandra4/pkg-plist Sat May 2 19:48:32 2020 (r533701)
@@ -11,113 +11,125 @@
%%DATADIR%%/bin/sstableverify
%%DATADIR%%/bin/stop-server
%%DATADIR%%/CHANGES.txt
-%%DATADIR%%/interface/cassandra.thrift
-%%DATADIR%%/lib/airline-0.6.jar
+%%DATADIR%%/lib/airline-0.8.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.10.zip
-%%DATADIR%%/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip
+%%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.6.0-shaded.jar
+%%DATADIR%%/lib/cassandra-driver-internal-only-3.21.0.post0-05fb2c8d.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/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/ecj-4.6.1.jar
%%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip
-%%DATADIR%%/lib/guava-18.0.jar
+%%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.5.4.jar
-%%DATADIR%%/lib/jackson-core-asl-1.9.13.jar
-%%DATADIR%%/lib/jackson-mapper-asl-1.9.13.jar
-%%DATADIR%%/lib/jamm-0.3.0.jar
+%%DATADIR%%/lib/hppc-0.8.1.jar
+%%DATADIR%%/lib/j2objc-annotations-1.3.jar
+%%DATADIR%%/lib/jackson-annotations-2.9.5.jar
+%%DATADIR%%/lib/jackson-core-2.9.5.jar
+%%DATADIR%%/lib/jackson-databind-2.9.5.jar
+%%DATADIR%%/lib/jamm-0.3.2.jar
%%DATADIR%%/lib/javax.inject.jar
%%DATADIR%%/lib/jbcrypt-0.3m.jar
-%%DATADIR%%/lib/jcl-over-slf4j-1.7.7.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/joda-time-2.4.jar
%%DATADIR%%/lib/json-simple-1.1.jar
%%DATADIR%%/lib/jstackjunit-0.0.1.jar
-%%DATADIR%%/lib/libthrift-0.9.2.jar
-%%DATADIR%%/lib/licenses/airline-0.6.txt
+%%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-5.0.4.txt
-%%DATADIR%%/lib/licenses/caffeine-2.2.6.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/concurrentlinkedhashmap-lru-1.4.txt
-%%DATADIR%%/lib/licenses/disruptor-3.0.1.txt
-%%DATADIR%%/lib/licenses/ecj-4.4.2.txt
+%%DATADIR%%/lib/licenses/ecj-4.6.1.txt
%%DATADIR%%/lib/licenses/futures-2.1.6.txt
-%%DATADIR%%/lib/licenses/guava-18.0.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/jackson-core-asl-1.9.13.txt
-%%DATADIR%%/lib/licenses/jackson-mapper-asl-1.9.13.txt
-%%DATADIR%%/lib/licenses/jamm-0.3.0.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.7.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/libthrift-0.9.2.txt
-%%DATADIR%%/lib/licenses/log4j-over-slf4j-1.7.7.txt
-%%DATADIR%%/lib/licenses/logback-classic-1.1.3.txt
-%%DATADIR%%/lib/licenses/logback-core-1.1.3.txt
-%%DATADIR%%/lib/licenses/lz4-1.3.0.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-all-4.0.44.Final.txt
-%%DATADIR%%/lib/licenses/ohc-0.4.4.txt
+%%DATADIR%%/lib/licenses/netty-tcnative-2.0.25.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.7.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/licenses/thrift-server-0.3.7.txt
-%%DATADIR%%/lib/log4j-over-slf4j-1.7.7.jar
-%%DATADIR%%/lib/logback-classic-1.1.3.jar
-%%DATADIR%%/lib/logback-core-1.1.3.jar
-%%DATADIR%%/lib/lz4-1.3.0.jar
+%%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/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/mxdump-0.14.jar
+%%DATADIR%%/lib/netty.jar
+%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.25.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.7.3-py2.py3-none-any.zip
-%%DATADIR%%/lib/slf4j-api-1.7.7.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/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
+%%AMD64ONLY%%%%DATADIR%%/lib/zstd-jni-1.4.4-9-freebsd_amd64.jar
%%DATADIR%%/LICENSE.txt
%%DATADIR%%/NEWS.txt
%%DATADIR%%/NOTICE.txt
@@ -139,23 +151,26 @@
%%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_commands.py
%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
-%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_invocation.py
%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
-%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_parsing.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/Dockerfile.ubuntu.py2
+%%DATADIR%%/pylib/Dockerfile.ubuntu.py3
+%%DATADIR%%/pylib/README.asc
%%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/sstabledump
%%DATADIR%%/tools/bin/sstableexpiredblockers
%%DATADIR%%/tools/bin/sstablelevelreset
@@ -166,6 +181,8 @@
%%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
@@ -179,7 +196,12 @@
@sample %%ETCDIR%%/commitlog_archiving.properties.sample
@sample %%ETCDIR%%/cqlshrc.sample
@sample %%ETCDIR%%/hotspot_compiler.sample
- at sample %%ETCDIR%%/jvm.options.sample
+ at sample %%ETCDIR%%/jvm-clients.options.sample
+ at sample %%ETCDIR%%/jvm-server.options.sample
+ at sample %%ETCDIR%%/jvm11-clients.options.sample
+ at sample %%ETCDIR%%/jvm11-server.options.sample
+ at sample %%ETCDIR%%/jvm8-clients.options.sample
+ at sample %%ETCDIR%%/jvm8-server.options.sample
@sample %%ETCDIR%%/logback-tools.xml.sample
@sample %%ETCDIR%%/logback.xml.sample
bin/cassandra
More information about the svn-ports-all
mailing list