Attachment #216728 for bug #248228

View | Details | Raw Unified | Return to bug 248228
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	cassandra
DISTVERSION=	4.0-beta1
CATEGORIES=	databases java
MASTER_SITES=	APACHE/cassandra/${DISTVERSION}:apache \
		https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.5-4/:maven \
		LOCAL/pi:repo
PKGNAMESUFFIX=	4
DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-src
DISTFILES=	${DISTNAME}.tar.gz:apache \
		${ZSTD_DISTFILE} \
		apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
EXTRACT_ONLY=	${DISTNAME}.tar.gz \
		apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz

JAVA_VERSION=	8 11
JAVA_VENDOR=	openjdk

REINPLACE_ARGS=	-i ''
SUB_LIST=	JAVA_HOME=${JAVA_HOME}

USERS=		cassandra

		sstableutil \
		sstableverify

ZSTDJNI_VERSION=${MASTER_SITES:M*\:maven:H:T}
PLIST_SUB=	DISTVERSION=${DISTVERSION} ZSTDJNI_VERSION=${ZSTDJNI_VERSION}

OPTIONS_DEFINE=		SIGAR DOCS
OPTIONS_DEFAULT=	SIGAR


.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/
.endif

post-install-DOCS-on:

Lines 1-7 Link Here

(-)distinfo (-7 / +9 lines)
1	TIMESTAMP = 1587819246	1	TIMESTAMP = 1595420655
2	SHA256 (apache-cassandra-4.0-alpha4-src.tar.gz) = 8f62238ac1f19fc2ab91c1f88981a46ded3b5e30ed7421266682cf81942b5856	2	SHA256 (apache-cassandra-4.0-beta1-src.tar.gz) = 341bcd561e68c569ba1083d7595476a09c10ac491df0051e7b5e4cc99590a865
3	SIZE (apache-cassandra-4.0-alpha4-src.tar.gz) = 45311406	3	SIZE (apache-cassandra-4.0-beta1-src.tar.gz) = 46454540
4	SHA256 (zstd-jni-1.4.4-9-freebsd_amd64.jar) = 97d20ae4ad56aad81d0f11cc4da21f6036bedc26f9908e4c2cc5998aa2dfcf4d	4	SHA256 (zstd-jni-1.4.5-4-freebsd_amd64.jar) = cdfcacd3d0b405869fc71c7c73ff861fa5421045f53a6168a0d0b4e8ae7ebfbc
5	SIZE (zstd-jni-1.4.4-9-freebsd_amd64.jar) = 521330	5	SIZE (zstd-jni-1.4.5-4-freebsd_amd64.jar) = 512671
6	SHA256 (apache-cassandra-4.0-alpha4-repo.tar.gz) = 6becab355e49fcddcd8b35e61febf39105d7a42574488ea91775bbd0b34d750b	6	SHA256 (zstd-jni-1.4.5-4-freebsd_i386.jar) = bb3e6e4081ffbe28648983d3c2f47cd488a29b6bb09b1e9f1219cdf82b3ed648
7	SIZE (apache-cassandra-4.0-alpha4-repo.tar.gz) = 74348796	7	SIZE (zstd-jni-1.4.5-4-freebsd_i386.jar) = 418462
		8	SHA256 (apache-cassandra-4.0-beta1-repo.tar.gz) = ef9efcff62f4ea567eed01e4f70185068a11f9cb766129ccce0f0f86d45506b1
		9	SIZE (apache-cassandra-4.0-beta1-repo.tar.gz) = 77747125




--- build.xml.orig	2020-07-17 21:24:30 UTC
+++ build.xml
@@ -23,6 +23,7 @@
     <property file="build.properties" />

+    <property name="pycmd" value="python"/>
 
     <!-- default version and SCM information -->
     <property name="base.version" value="4.0-beta1"/>
@@ -74,14 +75,14 @@
     <condition property="version" value="${base.version}">
       <isset property="release"/>
     </condition>

     <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,7 +247,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) -->

             <include name="**/*.jar" />
             <exclude name="**/*-sources.jar"/>
             <exclude name="**/ant-*.jar"/>
@@ -391,8 +392,7 @@
         bottom="Copyright &amp;copy; 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"/>

         </artifact:dependencies>
         <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
         <wikitext-to-html markupLanguage="Textile">
@@ -405,6 +405,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"/>

         </exec>
         <exec executable="cmd" osfamily="dos" dir="${doc.dir}">
             <arg value="/c"/>
@@ -447,10 +449,6 @@
             description="Initialize Maven ANT Tasks">
       <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
 

       <macrodef name="install">
         <attribute name="pomFile"/>
         <attribute name="file"/>
@@ -865,16 +863,14 @@
                              filesetId="build-dependency-jars"
                              cacheDependencyRefs="true"
                              dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">

       </artifact:dependencies>
       <copy todir="${build.dir.lib}/jars">
           <fileset refid="build-dependency-jars"/>
@@ -887,7 +883,7 @@
       <!-- code coverage tools -->
       <artifact:dependencies pomRefId="coverage-deps-pom"
                              filesetId="coverage-dependency-jars">

       </artifact:dependencies>
       <copy todir="${build.dir.lib}/jars">
           <fileset refid="coverage-dependency-jars"/>
@@ -916,8 +912,7 @@
                              sourcesFilesetId="test-dependency-sources"
                              cacheDependencyRefs="true"
                              dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">

       </artifact:dependencies>
       <copy todir="${test.lib}/jars">
         <fileset refid="test-dependency-jars"/>
@@ -1227,6 +1222,87 @@
       </copy>
     </target>
 

+        <fileset dir="pylib">
+          <include name="**" />
+          <exclude name="**/*.pyc" />
+          <exclude name="Dockerfile.ubuntu.*" />
+        </fileset>
+      </copy>
+      <copy todir="${dist.dir}/">

     <!-- creates release tarballs -->
     <target name="artifacts" depends="_artifacts-init"
             description="Create Cassandra release artifacts">
@@ -1347,6 +1423,7 @@
   <target name="_build-test">
     <javac
      fork="true"
+     memorymaximumsize="512M"
      compiler="modern"
      debug="true"
      debuglevel="${debuglevel}"
@@ -1938,8 +2015,8 @@
     <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
       <arg value="--all"/>
     </exec>

       <arg value="-n"/>
       <arg value="hw.ncpu"/>
     </exec>
@@ -1959,6 +2036,11 @@
     <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
       <arg value="-n"/>
       <arg value="hw.memsize"/>




--- conf/cassandra.yaml.orig	2020-07-17 21:24:30 UTC
+++ conf/cassandra.yaml
@@ -73,7 +73,7 @@ max_hints_delivery_threads: 2
 
 # Directory where Cassandra should store hints.
 # If not set, the default directory is $CASSANDRA_HOME/data/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
 # 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.

 
 # 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
 # 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.

 
 # Policy for data disk failures:
 #
@@ -309,20 +309,12 @@ key_cache_save_period: 14400
 
 # Row cache implementation class name. Available implementations:
 #

 #
 # Default value is 0, to disable row caching.
 row_cache_size_in_mb: 0
@@ -369,7 +361,7 @@ counter_cache_save_period: 7200
 
 # saved caches
 # If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.

Lines 1-6 Link Here

(-)files/patch-src_java_org_apache_cassandra_service_StartupChecks.java (-2 / +2 lines)
1	--- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-01-30 17:34:32 UTC	1	--- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-07-17 21:24:30 UTC
2	+++ src/java/org/apache/cassandra/service/StartupChecks.java	2	+++ src/java/org/apache/cassandra/service/StartupChecks.java
3	@@ -262,7 +262,14 @@ public class StartupChecks	3	@@ -276,7 +276,14 @@ public class StartupChecks
4	{	4	{
5	public void execute()	5	public void execute()
6	{	6	{




%%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/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/jamm-0.3.2.jar
%%DATADIR%%/lib/javax.inject.jar
%%DATADIR%%/lib/jbcrypt-0.3m.jar

%%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/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/psjava-0.1.19.jar
%%DATADIR%%/lib/reporter-config-base-3.0.3.jar
%%DATADIR%%/lib/reporter-config3-3.0.3.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/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

Return to bug 248228

Lines 1-15 Link Here

(-)Makefile (-7 / +18 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cassandra	3	PORTNAME= cassandra
4	DISTVERSION= 4.0-alpha4	4	DISTVERSION= 4.0-beta1
5	CATEGORIES= databases java	5	CATEGORIES= databases java
6	MASTER_SITES= APACHE/cassandra/${DISTVERSION}:apache \	6	MASTER_SITES= APACHE/cassandra/${DISTVERSION}:apache \
7	https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.4-9/:maven \	7	https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.5-4/:maven \
8	LOCAL/pi:repo	8	LOCAL/pi:repo
9	PKGNAMESUFFIX= 4	9	PKGNAMESUFFIX= 4
10	DISTNAME= apache-${PORTNAME}-${DISTVERSION}-src	10	DISTNAME= apache-${PORTNAME}-${DISTVERSION}-src
11	DISTFILES= ${DISTNAME}.tar.gz:apache \	11	DISTFILES= ${DISTNAME}.tar.gz:apache \
12	zstd-jni-1.4.4-9-freebsd_amd64.jar:maven \	12	${ZSTD_DISTFILE} \
13	apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo	13	apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
14	EXTRACT_ONLY= ${DISTNAME}.tar.gz \	14	EXTRACT_ONLY= ${DISTNAME}.tar.gz \
15	apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz	15	apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz
Lines 34-40 Link Here
34	JAVA_VERSION= 8 11	34	JAVA_VERSION= 8 11
35	JAVA_VENDOR= openjdk	35	JAVA_VENDOR= openjdk
36		36
37	REINPLACE_ARGS= -i ''
38	SUB_LIST= JAVA_HOME=${JAVA_HOME}	37	SUB_LIST= JAVA_HOME=${JAVA_HOME}
39		38
40	USERS= cassandra	39	USERS= cassandra
Lines 68-74 Link Here
68	sstableutil \	67	sstableutil \
69	sstableverify	68	sstableverify
70		69
71	PLIST_SUB= DISTVERSION=${DISTVERSION}	70	ZSTDJNI_VERSION=${MASTER_SITES:M*\:maven:H:T}
		71	PLIST_SUB= DISTVERSION=${DISTVERSION} ZSTDJNI_VERSION=${ZSTDJNI_VERSION}
72		72
73	OPTIONS_DEFINE= SIGAR DOCS	73	OPTIONS_DEFINE= SIGAR DOCS
74	OPTIONS_DEFAULT= SIGAR	74	OPTIONS_DEFAULT= SIGAR
Lines 138-151 Link Here
138		138
139	.if ${ARCH} == amd64	139	.if ${ARCH} == amd64
140	PLIST_SUB+= AMD64ONLY=""	140	PLIST_SUB+= AMD64ONLY=""
		141	PLIST_SUB+= I386ONLY="@comment "
		142	.elif ${ARCH} == i386
		143	PLIST_SUB+= AMD64ONLY="@comment "
		144	PLIST_SUB+= I386ONLY=""
141	.else	145	.else
142	PLIST_SUB+= AMD64ONLY="@comment "	146	PLIST_SUB+= AMD64ONLY="@comment "
		147	PLIST_SUB+= I386ONLY="@comment "
143	.endif	148	.endif
144		149
		150	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
		151	ZSTD_DISTFILE= zstd-jni-${MASTER_SITES:M*\:maven:H:T}-freebsd_${ARCH}.jar:maven
		152	.else
		153	ZSTD_DISTFILE=
		154	.endif
		155
145	post-install:	156	post-install:
146	${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar	157	${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar
147	.if ${ARCH} == amd64	158	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
148	${CP} ${DISTDIR}/zstd-jni-1.4.4-9-freebsd_amd64.jar ${STAGEDIR}${DATADIR}/lib/	159	${CP} ${DISTDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/
149	.endif	160	.endif
150		161
151	post-install-DOCS-on:	162	post-install-DOCS-on:

Lines 1-4 Link Here

(-)files/patch-build.xml (-21 / +22 lines)
1	--- build.xml.orig 2020-04-10 22:29:25 UTC	1	--- build.xml.orig 2020-07-17 21:24:30 UTC
2	+++ build.xml	2	+++ build.xml
3	@@ -23,6 +23,7 @@	3	@@ -23,6 +23,7 @@
4	<property file="build.properties" />	4	<property file="build.properties" />
Lines 7-14 Link Here
7	+ <property name="pycmd" value="python"/>	7	+ <property name="pycmd" value="python"/>
8		8
9	<!-- default version and SCM information -->	9	<!-- default version and SCM information -->
10	<property name="base.version" value="4.0-alpha4"/>	10	<property name="base.version" value="4.0-beta1"/>
11	@@ -75,14 +76,14 @@	11	@@ -74,14 +75,14 @@
12	<condition property="version" value="${base.version}">	12	<condition property="version" value="${base.version}">
13	<isset property="release"/>	13	<isset property="release"/>
14	</condition>	14	</condition>
Lines 25-31 Link Here
25	<property name="maven-ant-tasks.url"	25	<property name="maven-ant-tasks.url"
26	value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />	26	value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
27	<!-- details of how and which Maven repository we publish to -->	27	<!-- details of how and which Maven repository we publish to -->
28	@@ -241,7 +242,7 @@	28	@@ -246,7 +247,7 @@
29	</path>	29	</path>
30	<path id="cassandra.classpath.test">	30	<path id="cassandra.classpath.test">
31	<file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->	31	<file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->
Lines 34-48 Link Here
34	<include name="*/.jar" />	34	<include name="*/.jar" />
35	<exclude name="*/-sources.jar"/>	35	<exclude name="*/-sources.jar"/>
36	<exclude name="*/ant-.jar"/>	36	<exclude name="*/ant-.jar"/>
37	@@ -262,6 +263,7 @@	37	@@ -391,8 +392,7 @@
38	bottom="Copyright &copy; 2009-2020 The Apache Software Foundation"
39	useexternalfile="yes" encoding="UTF-8"
40	maxmemory="256m">
41	+ <arg value="${jdk11-javac-exports}"/>
42	<filesets/>
43	</javadoc>
44	</sequential>
45	@@ -379,8 +381,7 @@
46	<artifact:dependencies pathId="wikitext.classpath">	38	<artifact:dependencies pathId="wikitext.classpath">
47	<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>	39	<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
48	<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>	40	<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
Lines 52-58 Link Here
52	</artifact:dependencies>	44	</artifact:dependencies>
53	<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />	45	<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
54	<wikitext-to-html markupLanguage="Textile">	46	<wikitext-to-html markupLanguage="Textile">
55	@@ -393,6 +394,8 @@	47	@@ -405,6 +405,8 @@
56	<target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation" unless="ant.gen-doc.skip">	48	<target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation" unless="ant.gen-doc.skip">
57	<exec executable="make" osfamily="unix" dir="${doc.dir}">	49	<exec executable="make" osfamily="unix" dir="${doc.dir}">
58	<arg value="html"/>	50	<arg value="html"/>
Lines 61-67 Link Here
61	</exec>	53	</exec>
62	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">	54	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">
63	<arg value="/c"/>	55	<arg value="/c"/>
64	@@ -435,10 +438,6 @@	56	@@ -447,10 +449,6 @@
65	description="Initialize Maven ANT Tasks">	57	description="Initialize Maven ANT Tasks">
66	<typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />	58	<typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
67		59
Lines 72-78 Link Here
72	<macrodef name="install">	64	<macrodef name="install">
73	<attribute name="pomFile"/>	65	<attribute name="pomFile"/>
74	<attribute name="file"/>	66	<attribute name="file"/>
75	@@ -842,16 +841,14 @@	67	@@ -865,16 +863,14 @@
76	filesetId="build-dependency-jars"	68	filesetId="build-dependency-jars"
77	cacheDependencyRefs="true"	69	cacheDependencyRefs="true"
78	dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">	70	dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
Lines 91-97 Link Here
91	</artifact:dependencies>	83	</artifact:dependencies>
92	<copy todir="${build.dir.lib}/jars">	84	<copy todir="${build.dir.lib}/jars">
93	<fileset refid="build-dependency-jars"/>	85	<fileset refid="build-dependency-jars"/>
94	@@ -864,7 +861,7 @@	86	@@ -887,7 +883,7 @@
95	<!-- code coverage tools -->	87	<!-- code coverage tools -->
96	<artifact:dependencies pomRefId="coverage-deps-pom"	88	<artifact:dependencies pomRefId="coverage-deps-pom"
97	filesetId="coverage-dependency-jars">	89	filesetId="coverage-dependency-jars">
Lines 100-106 Link Here
100	</artifact:dependencies>	92	</artifact:dependencies>
101	<copy todir="${build.dir.lib}/jars">	93	<copy todir="${build.dir.lib}/jars">
102	<fileset refid="coverage-dependency-jars"/>	94	<fileset refid="coverage-dependency-jars"/>
103	@@ -893,8 +890,7 @@	95	@@ -916,8 +912,7 @@
104	sourcesFilesetId="test-dependency-sources"	96	sourcesFilesetId="test-dependency-sources"
105	cacheDependencyRefs="true"	97	cacheDependencyRefs="true"
106	dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">	98	dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
Lines 110-116 Link Here
110	</artifact:dependencies>	102	</artifact:dependencies>
111	<copy todir="${test.lib}/jars">	103	<copy todir="${test.lib}/jars">
112	<fileset refid="test-dependency-jars"/>	104	<fileset refid="test-dependency-jars"/>
113	@@ -1217,6 +1213,86 @@	105	@@ -1227,6 +1222,87 @@
114	</copy>	106	</copy>
115	</target>	107	</target>
116		108
Lines 150-155 Link Here
150	+ <fileset dir="pylib">	142	+ <fileset dir="pylib">
151	+ <include name="**" />	143	+ <include name="**" />
152	+ <exclude name="*/.pyc" />	144	+ <exclude name="*/.pyc" />
		145	+ <exclude name="Dockerfile.ubuntu.*" />
153	+ </fileset>	146	+ </fileset>
154	+ </copy>	147	+ </copy>
155	+ <copy todir="${dist.dir}/">	148	+ <copy todir="${dist.dir}/">
Lines 197-203 Link Here
197	<!-- creates release tarballs -->	190	<!-- creates release tarballs -->
198	<target name="artifacts" depends="_artifacts-init"	191	<target name="artifacts" depends="_artifacts-init"
199	description="Create Cassandra release artifacts">	192	description="Create Cassandra release artifacts">
200	@@ -1923,8 +1999,8 @@	193	@@ -1347,6 +1423,7 @@
		194	<target name="_build-test">
		195	<javac
		196	fork="true"
		197	+ memorymaximumsize="512M"
		198	compiler="modern"
		199	debug="true"
		200	debuglevel="${debuglevel}"
		201	@@ -1938,8 +2015,8 @@
201	<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">	202	<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
202	<arg value="--all"/>	203	<arg value="--all"/>
203	</exec>	204	</exec>
Lines 208-214 Link Here
208	<arg value="-n"/>	209	<arg value="-n"/>
209	<arg value="hw.ncpu"/>	210	<arg value="hw.ncpu"/>
210	</exec>	211	</exec>
211	@@ -1944,6 +2020,11 @@	212	@@ -1959,6 +2036,11 @@
212	<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">	213	<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
213	<arg value="-n"/>	214	<arg value="-n"/>
214	<arg value="hw.memsize"/>	215	<arg value="hw.memsize"/>

Lines 1-6 Link Here

(-)files/patch-conf_cassandra.yaml (-6 / +6 lines)
1	--- conf/cassandra.yaml.orig 2020-01-30 17:34:31 UTC	1	--- conf/cassandra.yaml.orig 2020-07-17 21:24:30 UTC
2	+++ conf/cassandra.yaml	2	+++ conf/cassandra.yaml
3	@@ -76,7 +76,7 @@ max_hints_delivery_threads: 2	3	@@ -73,7 +73,7 @@ max_hints_delivery_threads: 2
4		4
5	# Directory where Cassandra should store hints.	5	# Directory where Cassandra should store hints.
6	# If not set, the default directory is $CASSANDRA_HOME/data/hints.	6	# If not set, the default directory is $CASSANDRA_HOME/data/hints.
Lines 9-15 Link Here
9		9
10	# How often hints should be flushed from the internal buffers to disk.	10	# How often hints should be flushed from the internal buffers to disk.
11	# Will not trigger fsync.	11	# Will not trigger fsync.
12	@@ -203,13 +203,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition	12	@@ -200,13 +200,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
13	# directories are specified, Cassandra will spread data evenly across	13	# directories are specified, Cassandra will spread data evenly across
14	# them by partitioning the token ranges.	14	# them by partitioning the token ranges.
15	# If not set, the default directory is $CASSANDRA_HOME/data/data.	15	# If not set, the default directory is $CASSANDRA_HOME/data/data.
Lines 26-32 Link Here
26		26
27	# Enable / disable CDC functionality on a per-node basis. This modifies the logic used	27	# Enable / disable CDC functionality on a per-node basis. This modifies the logic used
28	# for write path allocation rejection (standard: never reject. cdc: reject Mutation	28	# for write path allocation rejection (standard: never reject. cdc: reject Mutation
29	@@ -220,7 +220,7 @@ cdc_enabled: false	29	@@ -217,7 +217,7 @@ cdc_enabled: false
30	# segment contains mutations for a CDC-enabled table. This should be placed on a	30	# segment contains mutations for a CDC-enabled table. This should be placed on a
31	# separate spindle than the data directories. If not set, the default directory is	31	# separate spindle than the data directories. If not set, the default directory is
32	# $CASSANDRA_HOME/data/cdc_raw.	32	# $CASSANDRA_HOME/data/cdc_raw.
Lines 35-41 Link Here
35		35
36	# Policy for data disk failures:	36	# Policy for data disk failures:
37	#	37	#
38	@@ -312,20 +312,12 @@ key_cache_save_period: 14400	38	@@ -309,20 +309,12 @@ key_cache_save_period: 14400
39		39
40	# Row cache implementation class name. Available implementations:	40	# Row cache implementation class name. Available implementations:
41	#	41	#
Lines 57-63 Link Here
57	#	57	#
58	# Default value is 0, to disable row caching.	58	# Default value is 0, to disable row caching.
59	row_cache_size_in_mb: 0	59	row_cache_size_in_mb: 0
60	@@ -372,7 +364,7 @@ counter_cache_save_period: 7200	60	@@ -369,7 +361,7 @@ counter_cache_save_period: 7200
61		61
62	# saved caches	62	# saved caches
63	# If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.	63	# If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.

Lines 16-23 Link Here

(-)pkg-plist (-10 / +9 lines)
16	%%DATADIR%%/lib/apache-cassandra-%%DISTVERSION%%.jar	16	%%DATADIR%%/lib/apache-cassandra-%%DISTVERSION%%.jar
17	%%DATADIR%%/lib/asm-7.1.jar	17	%%DATADIR%%/lib/asm-7.1.jar
18	%%DATADIR%%/lib/caffeine-2.3.5.jar	18	%%DATADIR%%/lib/caffeine-2.3.5.jar
19	%%DATADIR%%/lib/cassandra-driver-core-3.6.0-shaded.jar	19	%%DATADIR%%/lib/cassandra-driver-core-3.9.0-shaded.jar
20	%%DATADIR%%/lib/cassandra-driver-internal-only-3.21.0.post0-05fb2c8d.zip	20	%%DATADIR%%/lib/cassandra-driver-internal-only-3.23.0.post0-1a184b99.zip
21	%%DATADIR%%/lib/chronicle-bytes-1.16.3.jar	21	%%DATADIR%%/lib/chronicle-bytes-1.16.3.jar
22	%%DATADIR%%/lib/chronicle-core-1.16.4.jar	22	%%DATADIR%%/lib/chronicle-core-1.16.4.jar
23	%%DATADIR%%/lib/chronicle-queue-4.16.3.jar	23	%%DATADIR%%/lib/chronicle-queue-4.16.3.jar
Lines 36-44 Link Here
36	%%DATADIR%%/lib/high-scale-lib-1.0.6.jar	36	%%DATADIR%%/lib/high-scale-lib-1.0.6.jar
37	%%DATADIR%%/lib/hppc-0.8.1.jar	37	%%DATADIR%%/lib/hppc-0.8.1.jar
38	%%DATADIR%%/lib/j2objc-annotations-1.3.jar	38	%%DATADIR%%/lib/j2objc-annotations-1.3.jar
39	%%DATADIR%%/lib/jackson-annotations-2.9.5.jar	39	%%DATADIR%%/lib/jackson-annotations-2.9.10.jar
40	%%DATADIR%%/lib/jackson-core-2.9.5.jar	40	%%DATADIR%%/lib/jackson-core-2.9.10.jar
41	%%DATADIR%%/lib/jackson-databind-2.9.5.jar	41	%%DATADIR%%/lib/jackson-databind-2.9.10.4.jar
42	%%DATADIR%%/lib/jamm-0.3.2.jar	42	%%DATADIR%%/lib/jamm-0.3.2.jar
43	%%DATADIR%%/lib/javax.inject.jar	43	%%DATADIR%%/lib/javax.inject.jar
44	%%DATADIR%%/lib/jbcrypt-0.3m.jar	44	%%DATADIR%%/lib/jbcrypt-0.3m.jar
Lines 95-101 Link Here
95	%%DATADIR%%/lib/licenses/metrics-core-3.1.5.txt	95	%%DATADIR%%/lib/licenses/metrics-core-3.1.5.txt
96	%%DATADIR%%/lib/licenses/metrics-jvm-3.1.5.txt	96	%%DATADIR%%/lib/licenses/metrics-jvm-3.1.5.txt
97	%%DATADIR%%/lib/licenses/metrics-logback-3.1.5.txt	97	%%DATADIR%%/lib/licenses/metrics-logback-3.1.5.txt
98	%%DATADIR%%/lib/licenses/netty-tcnative-2.0.25.txt	98	%%DATADIR%%/lib/licenses/netty-tcnative-2.0.31.txt
99	%%DATADIR%%/lib/licenses/psjava-0.1.19.txt	99	%%DATADIR%%/lib/licenses/psjava-0.1.19.txt
100	%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt	100	%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt
101	%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt	101	%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt
Lines 114-120 Link Here
114	%%DATADIR%%/lib/metrics-logback-3.1.5.jar	114	%%DATADIR%%/lib/metrics-logback-3.1.5.jar
115	%%DATADIR%%/lib/mxdump-0.14.jar	115	%%DATADIR%%/lib/mxdump-0.14.jar
116	%%DATADIR%%/lib/netty.jar	116	%%DATADIR%%/lib/netty.jar
117	%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.25.Final.jar	117	%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.31.Final.jar
118	%%DATADIR%%/lib/psjava-0.1.19.jar	118	%%DATADIR%%/lib/psjava-0.1.19.jar
119	%%DATADIR%%/lib/reporter-config-base-3.0.3.jar	119	%%DATADIR%%/lib/reporter-config-base-3.0.3.jar
120	%%DATADIR%%/lib/reporter-config3-3.0.3.jar	120	%%DATADIR%%/lib/reporter-config3-3.0.3.jar
Lines 129-135 Link Here
129	%%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar	129	%%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar
130	%%DATADIR%%/lib/ST4-4.0.8.jar	130	%%DATADIR%%/lib/ST4-4.0.8.jar
131	%%DATADIR%%/lib/stream-2.5.2.jar	131	%%DATADIR%%/lib/stream-2.5.2.jar
132	%%AMD64ONLY%%%%DATADIR%%/lib/zstd-jni-1.4.4-9-freebsd_amd64.jar	132	%%AMD64ONLY%%%%DATADIR%%/lib/zstd-jni-%%ZSTDJNI_VERSION%%-freebsd_amd64.jar
		133	%%I386ONLY%%%%DATADIR%%/lib/zstd-jni-%%ZSTDJNI_VERSION%%-freebsd_i386.jar
133	%%DATADIR%%/LICENSE.txt	134	%%DATADIR%%/LICENSE.txt
134	%%DATADIR%%/NEWS.txt	135	%%DATADIR%%/NEWS.txt
135	%%DATADIR%%/NOTICE.txt	136	%%DATADIR%%/NOTICE.txt
Lines 160-167 Link Here
160	%%DATADIR%%/pylib/cqlshlib/tracing.py	161	%%DATADIR%%/pylib/cqlshlib/tracing.py
161	%%DATADIR%%/pylib/cqlshlib/util.py	162	%%DATADIR%%/pylib/cqlshlib/util.py
162	%%DATADIR%%/pylib/cqlshlib/wcwidth.py	163	%%DATADIR%%/pylib/cqlshlib/wcwidth.py
163	%%DATADIR%%/pylib/Dockerfile.ubuntu.py2
164	%%DATADIR%%/pylib/Dockerfile.ubuntu.py3
165	%%DATADIR%%/pylib/README.asc	164	%%DATADIR%%/pylib/README.asc
166	%%DATADIR%%/pylib/requirements.txt	165	%%DATADIR%%/pylib/requirements.txt
167	%%DATADIR%%/pylib/setup.py	166	%%DATADIR%%/pylib/setup.py