Attachment #242052 for bug #265478

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




PORTNAME=	cassandra
DISTVERSION=	4.0.8
CATEGORIES=	databases java
MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/${DISTVERSION}/:apache \
		https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.5.0-4/:maven
		LOCAL/mikael:repo
PKGNAMESUFFIX=	4
DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-src
DISTFILES=	${DISTNAME}.tar.gz:apache \
		${ZSTD_DISTFILE} \
		${MAVEN_CACHE_FILE}:prefetch
DIST_SUBDIR=	${PORTNAME}
EXTRACT_ONLY=	${DISTNAME}.tar.gz \
		${MAVEN_CACHE_FILE}

MAINTAINER=	language.devel@gmail.com
COMMENT=	Highly scalable distributed database

LICENSE=	APACHE20
LICENSE_FILE=	${WRKSRC}/LICENSE.txt

FETCH_DEPENDS=	ant:devel/apache-ant
RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java \
		netty>0:java/netty

USES=		cpe python:3.7+ shebangfix
USE_JAVA=	yes
USE_ANT=	yes
USE_RC_SUBR=	cassandra
SHEBANG_FILES=	bin/cqlsh.py pylib/setup.py
TEST_TARGET=	test
CPE_VENDOR=	apache

CONFLICTS=	cassandra3

JAVA_VERSION=	8 11
JAVA_VENDOR=	openjdk

SUB_LIST=	JAVA_HOME=${JAVA_HOME}

		sstableutil \
		sstableverify

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

OPTIONS_DEFINE=		SIGAR DOCS


PORTDOCS=		*

MAVEN_CACHE_FILE=	apache-${PORTNAME}-${DISTVERSION}-repo.tar.xz

.if !exists(${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE})
pre-fetch:
	${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
	${MKDIR} ${WRKSRC}/.build
	${MKDIR} ${WRKSRC}/src/java
	${CP} ${FILESDIR}/maven/build.* ${WRKSRC}
	${CP} ${FILESDIR}/maven/build-* ${WRKSRC}/.build
	cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} resolver-dist-lib
	cd ${REPO_DIR} && ${FIND} . -type f -name "*.repositories" -a -exec ${SED} -i '' -e '2s,.*,Mon Aug 08 20:40:04 CEST 2022,' {} +
	cd ${WRKDIR} && ${MTREE_CMD} -cbnSp repository | ${MTREE_CMD} -C | ${SED} \
		-e 's:time=[0-9.]*:time=0.000000000:' \
		-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
		-e 's:flags=.*:flags=none:' \
		-e 's:^\.:./repository:' \
		> maven-offline-cache.mtree
	cd ${WRKDIR} && ${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE} \
		@maven-offline-cache.mtree
#TODO: debug, remove
	ls -al ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE}
	${SHA256} ${WRKDIR}/maven-offline-cache.mtree ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE}
.endif

do-build:
	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.

do-build-DOCS-on:
	cd ${WRKSRC} && ${SETENV} CASSANDRA_LOG_DIR=${WRKDIR}/gen-doc-log ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dpycmd=${PYTHON_CMD} -Dpyver=${PYTHON_VER} freebsd-stage-doc

do-build-DOCS-off:
	cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} freebsd-stage

post-build:
.for f in ${SCRIPT_FILES}

	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/
	cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/
	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/
	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/fqltool.jar ${STAGEDIR}${DATADIR}/tools/lib/
	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/stress.jar ${STAGEDIR}${DATADIR}/tools/lib/
.for f in ${SCRIPT_FILES}
	${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
.endfor

	${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar

do-test:
	@cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test

.include <bsd.port.pre.mk>

.if ${JAVA_PORT_VERSION} == 11
USEJDK11=	-Duse.jdk11=true -Drat.skip=true
.endif

.if ${ARCH} == amd64

post-install:
	${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar
.if ${ARCH} == amd64 || ${ARCH} == i386
	${CP} ${DISTDIR}/${DIST_SUBDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/
.endif

post-install-DOCS-on:

Lines 1-9 Link Here

(-)./distinfo (-9 / +9 lines)
1	TIMESTAMP = 1601573969	1	TIMESTAMP = 1679924890
2	SHA256 (apache-cassandra-4.0-beta2-src.tar.gz) = 02347ce3d55fd7d68f90c112ee01d82902dfd959cf03c107a51d15bcaabb48c5	2	SHA256 (cassandra/apache-cassandra-4.0.8-src.tar.gz) = 98da97d7fe850a0a24eb2aef212e982f73205cbd63955d2915b4ad02e28dae9c
3	SIZE (apache-cassandra-4.0-beta2-src.tar.gz) = 46741277	3	SIZE (cassandra/apache-cassandra-4.0.8-src.tar.gz) = 12953548
4	SHA256 (zstd-jni-1.4.5-4-freebsd_amd64.jar) = cdfcacd3d0b405869fc71c7c73ff861fa5421045f53a6168a0d0b4e8ae7ebfbc	4	SHA256 (cassandra/zstd-jni-1.5.0-4-freebsd_amd64.jar) = b653460b6ff374db2c01f39a7b7cdb44008c9efd55dc96ae5f869abe9f58d180
5	SIZE (zstd-jni-1.4.5-4-freebsd_amd64.jar) = 512671	5	SIZE (cassandra/zstd-jni-1.5.0-4-freebsd_amd64.jar) = 670993
6	SHA256 (zstd-jni-1.4.5-4-freebsd_i386.jar) = bb3e6e4081ffbe28648983d3c2f47cd488a29b6bb09b1e9f1219cdf82b3ed648	6	SHA256 (cassandra/zstd-jni-1.5.0-4-freebsd_i386.jar) = 1bcb75c5837e42d10ec0193ba9df099874792f0829b0ce8dd3412303c6454595
7	SIZE (zstd-jni-1.4.5-4-freebsd_i386.jar) = 418462	7	SIZE (cassandra/zstd-jni-1.5.0-4-freebsd_i386.jar) = 604557
8	SHA256 (apache-cassandra-4.0-beta2-repo.tar.gz) = 9a0d3ad05f535158dd65761a16f3a9fb0362cbe365d6e08ef6d9896bbf3a022f	8	SHA256 (cassandra/apache-cassandra-4.0.8-repo.tar.xz) = 807a108e3639f247dafa3ce4ebc4744b93668cf463915edf7b654d317d1abaff
9	SIZE (apache-cassandra-4.0-beta2-repo.tar.gz) = 77730955	9	SIZE (cassandra/apache-cassandra-4.0.8-repo.tar.xz) = 78148020




: ${cassandra_enable:=NO}
: ${cassandra_user:=cassandra}

command=%%PREFIX%%/bin/cassandra
command_args="-p /var/run/cassandra/cassandra.pid >/dev/null 2>/dev/null"
start_precmd="${name}_prestart"

procname=%%JAVA_HOME%%/bin/java
pidfile=/var/run/cassandra/cassandra.pid

command=/usr/sbin/daemon
command_args="-frP ${pidfile} %%PREFIX%%/bin/cassandra -f"
start_precmd="${name}_prestart"

cassandra_prestart()
{




--- build.xml.orig	2022-07-12 10:18:13 UTC
+++ build.xml
@@ -31,6 +31,7 @@
     <property file="build.properties" />
     <property file="build.properties.default" />
     <property name="debuglevel" value="source,lines,vars"/>
+    <property name="pycmd" value="python"/>
 
     <!-- default version and SCM information -->
     <property name="base.version" value="4.0.5"/>
@@ -81,7 +82,7 @@
     <condition property="version" value="${base.version}">
       <isset property="release"/>
     </condition>

     <property name="version.properties.dir"
               value="${build.src.resources}/org/apache/cassandra/config/" />
     <property name="final.name" value="${ant.project.name}-${version}"/>
@@ -288,6 +289,24 @@
             <exclude name="**/ant-*.jar"/>
         </fileset>
-    <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
+    <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/>
     <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 -->
@@ -271,7 +272,7 @@
     </path>
+    <path id="cassandra.classpath.staged">
+        <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" />
+        </fileset>
+        <fileset dir="${build.dir.lib}">
+            <include name="**/assertj-core-3.15.0.jar" />
+            <include name="**/byteman*.jar" />
+            <include name="**/commons-lang-2.4.jar" />
+            <include name="**/commons-collections-3.2.1.jar" />
+            <include name="**/ohc-core-0.5.1.jar" />
+            <include name="**/ohc-core-j8-0.5.1.jar" />
+        </fileset>
+        <fileset dir="${test.lib}/jars">
+            <include name="**/*.jar" />
+            <exclude name="**/ant-*.jar"/>
+        </fileset>
+    </path>
 
   <macrodef name="create-javadoc">
     <attribute name="destdir"/>
@@ -297,7 +316,7 @@
         windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
         bottom="Copyright &amp;copy; 2009-2022 The Apache Software Foundation"
         useexternalfile="yes" encoding="UTF-8" failonerror="false"
-        maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">
+        maxmemory="512m" additionalparam="${jdk11-javadoc-exports}">
         <filesets/>
       </javadoc>
       <fail message="javadoc failed">
@@ -438,6 +457,8 @@
     <target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip">
             <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
             <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
-            <remoteRepository refid="central"/>
-            <remoteRepository refid="apache"/>
+            <localRepository path="${localm2}"/>
         </artifact:dependencies>
         <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
         <wikitext-to-html markupLanguage="Textile">
@@ -430,6 +430,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>
     </target>
             <arg value="/c"/>
@@ -472,10 +474,6 @@
             description="Initialize Maven ANT Tasks">
       <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
 
@@ -896,7 +917,7 @@
         </javac>
     </target>
 
-    <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,rat-check"
+    <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
             name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
         <!-- Order matters! -->
@@ -1147,6 +1168,89 @@
                              dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
-          <remoteRepository refid="central"/>
-          <remoteRepository refid="apache"/>
+          <localRepository path="${localm2}"/>
       </artifact:dependencies>
       <!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
       <artifact:dependencies pomRefId="build-deps-pom-sources"
                              sourcesFilesetId="build-dependency-sources"
                              cacheDependencyRefs="true"
                              dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
-          <remoteRepository refid="central"/>
-          <remoteRepository refid="apache"/>
+          <localRepository path="${localm2}"/>
       </artifact:dependencies>
       <copy todir="${build.dir.lib}/jars">
           <fileset refid="build-dependency-jars"/>
@@ -911,7 +907,7 @@
       <!-- code coverage tools -->
       <artifact:dependencies pomRefId="coverage-deps-pom"
                              filesetId="coverage-dependency-jars">
-          <remoteRepository refid="central"/>
+          <localRepository path="${localm2}"/>
       </artifact:dependencies>
       <copy todir="${build.dir.lib}/jars">
           <fileset refid="coverage-dependency-jars"/>
@@ -940,8 +936,7 @@
                              sourcesFilesetId="test-dependency-sources"
                              cacheDependencyRefs="true"
                              dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
-        <remoteRepository refid="apache"/>
-        <remoteRepository refid="central"/>
+        <localRepository path="${localm2}"/>
       </artifact:dependencies>
       <copy todir="${test.lib}/jars">
         <fileset refid="test-dependency-jars"/>
@@ -1251,6 +1246,87 @@
       </copy>
     </target>
 

+          <exclude name="netty-all*.jar"/>
+          <exclude name="ohc*.jar"/>
+          <exclude name="licenses/snappy*.txt"/>
+          <exclude name="licenses/netty-all*.txt"/>
+          <exclude name="licenses/ohc*.txt"/>
+        </fileset>
+        <fileset dir="${build.dir}">

+          <include name="**" />
+          <exclude name="**/*.pyc" />
+          <exclude name="Dockerfile.ubuntu.*" />
+          <exclude name="cqlshlib/test/**" />
+          <exclude name="cassandra-cqlsh-tests.sh" />
+        </fileset>
+      </copy>
+      <copy todir="${dist.dir}/">

+    </target>
+    
     <!-- creates release tarballs -->
     <target name="artifacts" depends="_artifacts-init,gen-doc,sources-jar,javadoc-jar"
             description="Create Cassandra release artifacts">
@@ -1397,7 +1501,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${stress.build.classes}"/>
           <pathelement location="${fqltool.build.classes}"/>
-          <path refid="cassandra.classpath.test" />
+          <path refid="cassandra.classpath.staged" />
           <pathelement location="${test.classes}"/>
           <pathelement location="${stress.test.classes}"/>
           <pathelement location="${fqltool.test.classes}"/>
@@ -2089,7 +2193,7 @@
       <arg value="--all"/>
     </exec>
-    <!-- support for Mac OS X -->
-    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
+    <!-- support for Mac OS X and FreeBSD -->
+    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false">
       <arg value="-n"/>
       <arg value="hw.ncpu"/>
     </exec>
@@ -1981,6 +2058,11 @@
     <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
       <arg value="-n"/>
       <arg value="hw.memsize"/>
+    </exec>
+    <!-- support for FreeBSD -->
+    <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false">
+      <arg value="-n"/>
+      <arg value="hw.physmem"/>
     </exec>
     <echo message="Mem size : ${mem.size}"/>
   </target>
 
   <!-- ECJ 4.6.1 in standalone mode does not work with JPMS, so we skip this target for Java 11 -->
-  <target name="eclipse-warnings" depends="build, _assert_rat_output" description="Run eclipse compiler code analysis" if="java.version.8">
+  <target name="eclipse-warnings" depends="build" description="Run eclipse compiler code analysis" if="java.version.8">
         <property name="ecj.log.dir" value="${build.dir}/ecj" />
         <property name="ecj.warnings.file" value="${ecj.log.dir}/eclipse_compiler_checks.txt"/>
         <mkdir  dir="${ecj.log.dir}" />

Lines 1-6 Link Here

(-)./files/patch-conf_cassandra.yaml (-8 / +11 lines)
1	--- conf/cassandra.yaml.orig 2020-07-17 21:24:30 UTC	1	--- conf/cassandra.yaml.orig 2022-05-06 16:40:06 UTC
2	+++ conf/cassandra.yaml	2	+++ conf/cassandra.yaml
3	@@ -73,7 +73,7 @@ max_hints_delivery_threads: 2	3	@@ -77,7 +77,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	@@ -200,13 +200,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition	12	@@ -204,8 +204,8 @@ 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 18-23 Link Here
18	+data_file_directories:	18	+data_file_directories:
19	+ - /var/db/cassandra/data	19	+ - /var/db/cassandra/data
20		20
		21	# Directory were Cassandra should store the data of the local system keyspaces.
		22	# By default Cassandra will store the data of the local system keyspaces in the first of the data directories specified
		23	@@ -217,7 +217,7 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
21	# commit log. when running on magnetic HDD, this should be a	24	# commit log. when running on magnetic HDD, this should be a
22	# separate spindle than the data directories.	25	# separate spindle than the data directories.
23	# If not set, the default directory is $CASSANDRA_HOME/data/commitlog.	26	# If not set, the default directory is $CASSANDRA_HOME/data/commitlog.
Lines 26-32 Link Here
26		29
27	# Enable / disable CDC functionality on a per-node basis. This modifies the logic used	30	# 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	31	# for write path allocation rejection (standard: never reject. cdc: reject Mutation
29	@@ -217,7 +217,7 @@ cdc_enabled: false	32	@@ -228,7 +228,7 @@ cdc_enabled: false
30	# segment contains mutations for a CDC-enabled table. This should be placed on a	33	# 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	34	# separate spindle than the data directories. If not set, the default directory is
32	# $CASSANDRA_HOME/data/cdc_raw.	35	# $CASSANDRA_HOME/data/cdc_raw.
Lines 35-41 Link Here
35		38
36	# Policy for data disk failures:	39	# Policy for data disk failures:
37	#	40	#
38	@@ -309,20 +309,12 @@ key_cache_save_period: 14400	41	@@ -320,20 +320,12 @@ key_cache_save_period: 14400
39		42
40	# Row cache implementation class name. Available implementations:	43	# Row cache implementation class name. Available implementations:
41	#	44	#
Lines 57-68 Link Here
57	#	60	#
58	# Default value is 0, to disable row caching.	61	# Default value is 0, to disable row caching.
59	row_cache_size_in_mb: 0	62	row_cache_size_in_mb: 0
60	@@ -369,7 +361,7 @@ counter_cache_save_period: 7200	63	@@ -380,7 +372,7 @@ counter_cache_save_period: 7200
61		64
62	# saved caches	65	# saved caches
63	# If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.	66	# If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
64	-# saved_caches_directory: /var/lib/cassandra/saved_caches	67	-# saved_caches_directory: /var/lib/cassandra/saved_caches
65	+saved_caches_directory: /var/db/cassandra/saved_caches	68	+saved_caches_directory: /var/db/cassandra/saved_caches
66		69
67	# commitlog_sync may be either "periodic", "group", or "batch."	70	# Number of seconds the server will wait for each cache (row, key, etc ...) to load while starting
68	#	71	# the Cassandra process. Setting this to a negative value is equivalent to disabling all cache loading on startup

Lines 1-6 Link Here

(-)./files/patch-src_java_org_apache_cassandra_config_Config.java (-2 / +2 lines)
1	--- src/java/org/apache/cassandra/config/Config.java.orig 2020-08-28 13:55:55 UTC	1	--- src/java/org/apache/cassandra/config/Config.java.orig 2022-05-06 16:40:06 UTC
2	+++ src/java/org/apache/cassandra/config/Config.java	2	+++ src/java/org/apache/cassandra/config/Config.java
3	@@ -290,7 +290,7 @@ public class Config	3	@@ -304,7 +304,7 @@ public class Config
4	public volatile int key_cache_save_period = 14400;	4	public volatile int key_cache_save_period = 14400;
5	public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;	5	public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;
6		6

Lines 1-6 Link Here

(-)./files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java (-2 / +2 lines)
1	--- src/java/org/apache/cassandra/service/NativeTransportService.java.orig 2020-04-01 19:54:51 UTC	1	--- src/java/org/apache/cassandra/service/NativeTransportService.java.orig 2020-12-18 17:35:13 UTC
2	+++ src/java/org/apache/cassandra/service/NativeTransportService.java	2	+++ src/java/org/apache/cassandra/service/NativeTransportService.java
3	@@ -143,12 +143,15 @@ public class NativeTransportService	3	@@ -159,12 +159,15 @@ public class NativeTransportService
4	*/	4	*/
5	public static boolean useEpoll()	5	public static boolean useEpoll()
6	{	6	{

Lines 1-4 Link Here

(-)./files/patch-src_java_org_apache_cassandra_service_StartupChecks.java (-1 / +1 lines)
1	--- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-08-28 13:55:56 UTC	1	--- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2021-03-26 19:57:28 UTC
2	+++ src/java/org/apache/cassandra/service/StartupChecks.java	2	+++ src/java/org/apache/cassandra/service/StartupChecks.java
3	@@ -281,7 +281,14 @@ public class StartupChecks	3	@@ -281,7 +281,14 @@ public class StartupChecks
4	{	4	{




--- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig	2020-12-18 17:35:13 UTC
+++ src/java/org/apache/cassandra/utils/FastByteOperations.java
@@ -205,6 +205,20 @@ public class FastByteOperations
 
         static final boolean BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);
 

         public int compare(byte[] buffer1, int offset1, int length1, byte[] buffer2, int offset2, int length2)
         {
             return compareTo(buffer1, BYTE_ARRAY_BASE_OFFSET + offset1, length1,
@@ -228,7 +242,7 @@ public class FastByteOperations
             else
             {
                 obj1 = null;

             }
 
             return compareTo(obj1, offset1, length1, buffer2, BYTE_ARRAY_BASE_OFFSET + offset2, length2);
@@ -249,7 +263,7 @@ public class FastByteOperations
             if (src.hasArray())
                 System.arraycopy(src.array(), src.arrayOffset() + srcPosition, trg, trgPosition, length);
             else

+                copy(null, srcPosition + unsafeGetLong(src, DIRECT_BUFFER_ADDRESS_OFFSET), trg, trgPosition, length);
         }
 
         public void copy(byte[] src, int srcPosition, ByteBuffer trg, int trgPosition, int length)
@@ -272,7 +286,7 @@ public class FastByteOperations
             else
             {
                 src = null;

             }
             copy(src, srcOffset + srcPosition, trgBuf, trgPosition, length);
         }
@@ -282,7 +296,7 @@ public class FastByteOperations
             if (trgBuf.hasArray())
                 copy(src, srcOffset, trgBuf.array(), trgBuf.arrayOffset() + trgPosition, length);
             else

         }
 
         public static void copy(Object src, long srcOffset, byte[] trg, int trgPosition, int length)
@@ -290,7 +304,7 @@ public class FastByteOperations
             if (length <= MIN_COPY_THRESHOLD)
             {
                 for (int i = 0 ; i < length ; i++)

             }
             else
             {
@@ -329,7 +343,7 @@ public class FastByteOperations
             else
             {
                 obj1 = null;

             }
             offset1 += buffer1.position();
             length1 = buffer1.remaining();
@@ -352,7 +366,7 @@ public class FastByteOperations
             else
             {
                 obj2 = null;

             }
             int length2 = limit - position;
             offset2 += position;
@@ -385,8 +399,8 @@ public class FastByteOperations
             int wordComparisons = minLength & ~7;
             for (int i = 0; i < wordComparisons ; i += Longs.BYTES)
             {

 
                 if (lw != rw)
                 {
@@ -399,8 +413,8 @@ public class FastByteOperations
 
             for (int i = wordComparisons ; i < minLength ; i++)
             {

Lines 12-14 Link Here

(-)./pkg-descr (+2 lines)
12	Drivers are available for a number of languages.	12	Drivers are available for a number of languages.
13		13
14	This is a BETA version!	14	This is a BETA version!
		15
		16	WWW: https://cassandra.apache.org/




%%DATADIR%%/lib/antlr-runtime-3.5.2.jar
%%DATADIR%%/lib/apache-cassandra-%%DISTVERSION%%.jar
%%DATADIR%%/lib/asm-7.1.jar
%%DATADIR%%/lib/caffeine-2.5.6.jar
%%DATADIR%%/lib/cassandra-driver-core-3.11.0-shaded.jar
%%DATADIR%%/lib/cassandra-driver-internal-only-3.25.0.zip
%%DATADIR%%/lib/chronicle-bytes-2.20.111.jar
%%DATADIR%%/lib/chronicle-core-2.20.126.jar
%%DATADIR%%/lib/chronicle-queue-5.20.123.jar
%%DATADIR%%/lib/chronicle-threads-2.20.111.jar
%%DATADIR%%/lib/chronicle-wire-2.20.117.jar
%%DATADIR%%/lib/commons-cli-1.1.jar
%%DATADIR%%/lib/commons-codec-1.9.jar
%%DATADIR%%/lib/commons-lang3-3.11.jar

%%DATADIR%%/lib/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.13.2.jar
%%DATADIR%%/lib/jackson-core-2.13.2.jar
%%DATADIR%%/lib/jackson-databind-2.13.2.2.jar
%%DATADIR%%/lib/jamm-0.3.2.jar
%%DATADIR%%/lib/java-cup-runtime-11b-20160615.jar
%%DATADIR%%/lib/javax.inject-1.jar
%%DATADIR%%/lib/jbcrypt-0.4.jar
%%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar
%%DATADIR%%/lib/jcommander-1.30.jar
%%DATADIR%%/lib/jctools-core-3.1.0.jar
%%DATADIR%%/lib/jflex-1.8.2.jar
%%DATADIR%%/lib/jna-5.6.0.jar
%%DATADIR%%/lib/json-simple-1.1.jar
%%DATADIR%%/lib/jstackjunit-0.0.1.jar
%%DATADIR%%/lib/jvm-attach-api-1.5.jar
%%DATADIR%%/lib/licenses/airline-0.8.txt
%%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt
%%DATADIR%%/lib/licenses/asm-6.2.txt
%%DATADIR%%/lib/licenses/caffeine-2.3.5.txt
%%DATADIR%%/lib/licenses/cassandra-driver-3.0.1.txt
%%DATADIR%%/lib/licenses/chronicle-bytes-1.16.3.txt
%%DATADIR%%/lib/licenses/chronicle-core-1.16.3-SNAPSHOT.txt
%%DATADIR%%/lib/licenses/chronicle-queue-4.16.3.txt
%%DATADIR%%/lib/licenses/chronicle-threads-1.16.0.txt
%%DATADIR%%/lib/licenses/chronicle-wire-1.16.1.txt
%%DATADIR%%/lib/licenses/commons-cli-1.1.txt
%%DATADIR%%/lib/licenses/commons-codec-1.9.txt
%%DATADIR%%/lib/licenses/commons-lang3-3.1.txt
%%DATADIR%%/lib/licenses/commons-math3-3.2.txt
%%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
%%DATADIR%%/lib/licenses/concurrent-trees-2.4.0.txt
%%DATADIR%%/lib/licenses/ecj-4.6.1.txt
%%DATADIR%%/lib/licenses/futures-2.1.6.txt
%%DATADIR%%/lib/licenses/geom-0.1.0.txt
%%DATADIR%%/lib/licenses/guava-23.3-jre.txt
%%DATADIR%%/lib/licenses/hdrhistogram-2.1.9.txt
%%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt
%%DATADIR%%/lib/licenses/hppc-0.5.4.txt
%%DATADIR%%/lib/licenses/j2objc-annotations-1.3.txt
%%DATADIR%%/lib/licenses/jackson-annotations-2.9.5.txt
%%DATADIR%%/lib/licenses/jackson-core-2.9.5.txt
%%DATADIR%%/lib/licenses/jackson-databind-2.9.5.txt
%%DATADIR%%/lib/licenses/jamm-0.3.2.txt
%%DATADIR%%/lib/licenses/javax.inject.txt
%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
%%DATADIR%%/lib/licenses/jcl-over-slf4j-1.7.25.txt
%%DATADIR%%/lib/licenses/jctools-core-1.2.1.txt
%%DATADIR%%/lib/licenses/jflex-1.6.0.txt
%%DATADIR%%/lib/licenses/jna-4.2.2.txt
%%DATADIR%%/lib/licenses/joda-time-2.4.txt
%%DATADIR%%/lib/licenses/json-simple-1.1.txt
%%DATADIR%%/lib/licenses/jstackjunit-0.0.1.txt
%%DATADIR%%/lib/licenses/LICENSE-2.0.txt
%%DATADIR%%/lib/licenses/log4j-over-slf4j-1.7.25.txt
%%DATADIR%%/lib/licenses/logback-classic-1.2.3.txt
%%DATADIR%%/lib/licenses/logback-core-1.2.3.txt
%%DATADIR%%/lib/licenses/lz4-1.4.0.txt
%%DATADIR%%/lib/licenses/metrics-core-3.1.5.txt
%%DATADIR%%/lib/licenses/metrics-jvm-3.1.5.txt
%%DATADIR%%/lib/licenses/metrics-logback-3.1.5.txt
%%DATADIR%%/lib/licenses/netty-tcnative-2.0.31.txt
%%DATADIR%%/lib/licenses/psjava-0.1.19.txt
%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt
%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt
%%DATADIR%%/lib/licenses/six-1.7.3.txt
%%DATADIR%%/lib/licenses/slf4j-api-1.7.25.txt
%%DATADIR%%/lib/licenses/snakeyaml-1.11.txt
%%DATADIR%%/lib/licenses/snowball-stemmer-1.3.0.581.1.txt
%%DATADIR%%/lib/licenses/ST4-4.0.8.txt
%%DATADIR%%/lib/licenses/stream-2.5.2.txt
%%DATADIR%%/lib/log4j-over-slf4j-1.7.25.jar
%%DATADIR%%/lib/logback-classic-1.2.9.jar
%%DATADIR%%/lib/logback-core-1.2.9.jar
%%DATADIR%%/lib/lz4-java-1.8.0.jar
%%DATADIR%%/lib/metrics-core-3.1.5.jar
%%DATADIR%%/lib/metrics-jvm-3.1.5.jar
%%DATADIR%%/lib/metrics-logback-3.1.5.jar
%%DATADIR%%/lib/mxdump-0.14.jar
%%DATADIR%%/lib/netty.jar
%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.36.Final.jar
%%DATADIR%%/lib/psjava-0.1.19.jar
%%DATADIR%%/lib/reporter-config-base-3.0.3.jar
%%DATADIR%%/lib/reporter-config3-3.0.3.jar

%%DATADIR%%/lib/sjk-json-0.14.jar
%%DATADIR%%/lib/sjk-stacktrace-0.14.jar
%%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%%/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/saferscanner.py
%%DATADIR%%/pylib/cqlshlib/setup.cfg
%%DATADIR%%/pylib/cqlshlib/sslhandling.py
%%DATADIR%%/pylib/cqlshlib/test/__init__.py
%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
%%DATADIR%%/pylib/cqlshlib/test/basecase.py
%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
%%DATADIR%%/pylib/cqlshlib/test/test_copyutil.py
%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
%%DATADIR%%/pylib/cqlshlib/test/winpty.py
%%DATADIR%%/pylib/cqlshlib/tracing.py
%%DATADIR%%/pylib/cqlshlib/util.py
%%DATADIR%%/pylib/cqlshlib/wcwidth.py
%%DATADIR%%/pylib/README.asc
%%DATADIR%%/pylib/pytest.ini
%%DATADIR%%/pylib/requirements.txt
%%DATADIR%%/pylib/setup.py
%%DATADIR%%/tools/bin/auditlogviewer

%%DATADIR%%/tools/bin/cassandra.in.sh
%%DATADIR%%/tools/bin/compaction-stress
%%DATADIR%%/tools/bin/fqltool
%%DATADIR%%/tools/bin/generatetokens
%%DATADIR%%/tools/bin/jmxtool
%%DATADIR%%/tools/bin/sstabledump
%%DATADIR%%/tools/bin/sstableexpiredblockers
%%DATADIR%%/tools/bin/sstablelevelreset

Return to bug 265478

Lines 1-16 Link Here

(-)./Makefile (-13 / +41 lines)
1	PORTNAME= cassandra	1	PORTNAME= cassandra
2	DISTVERSION= 4.0-beta2	2	DISTVERSION= 4.0.8
3	CATEGORIES= databases java	3	CATEGORIES= databases java
4	MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/${DISTVERSION}/:apache \	4	MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/${DISTVERSION}/:apache \
5	https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.5-4/:maven \	5	https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.5.0-4/:maven
6	LOCAL/mikael:repo
7	PKGNAMESUFFIX= 4	6	PKGNAMESUFFIX= 4
8	DISTNAME= apache-${PORTNAME}-${DISTVERSION}-src	7	DISTNAME= apache-${PORTNAME}-${DISTVERSION}-src
9	DISTFILES= ${DISTNAME}.tar.gz:apache \	8	DISTFILES= ${DISTNAME}.tar.gz:apache \
10	${ZSTD_DISTFILE} \	9	${ZSTD_DISTFILE} \
11	apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo	10	${MAVEN_CACHE_FILE}:prefetch
		11	DIST_SUBDIR= ${PORTNAME}
12	EXTRACT_ONLY= ${DISTNAME}.tar.gz \	12	EXTRACT_ONLY= ${DISTNAME}.tar.gz \
13	apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz	13	${MAVEN_CACHE_FILE}
14		14
15	MAINTAINER= language.devel@gmail.com	15	MAINTAINER= language.devel@gmail.com
16	COMMENT= Highly scalable distributed database	16	COMMENT= Highly scalable distributed database
Lines 19-37 Link Here
19	LICENSE= APACHE20	19	LICENSE= APACHE20
20	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	20	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
21		21
		22	FETCH_DEPENDS= ant:devel/apache-ant
22	RUN_DEPENDS= snappyjava>=0:archivers/snappy-java \	23	RUN_DEPENDS= snappyjava>=0:archivers/snappy-java \
23	netty>0:java/netty	24	netty>0:java/netty
24		25
25	USES= cpe python:3.7+	26	USES= cpe python:3.7+ shebangfix
26	USE_JAVA= yes	27	USE_JAVA= yes
27	USE_ANT= yes	28	USE_ANT= yes
28	USE_RC_SUBR= cassandra	29	USE_RC_SUBR= cassandra
		30	SHEBANG_FILES= bin/cqlsh.py pylib/setup.py
29	TEST_TARGET= test	31	TEST_TARGET= test
30	CPE_VENDOR= apache	32	CPE_VENDOR= apache
31		33
32	CONFLICTS= cassandra3	34	CONFLICTS= cassandra3
33		35
34	JAVA_VERSION= 8+	36	JAVA_VERSION= 8 11
35	JAVA_VENDOR= openjdk	37	JAVA_VENDOR= openjdk
36		38
37	SUB_LIST= JAVA_HOME=${JAVA_HOME}	39	SUB_LIST= JAVA_HOME=${JAVA_HOME}
Lines 67-73 Link Here
67	sstableutil \	69	sstableutil \
68	sstableverify	70	sstableverify
69		71
70	ZSTDJNI_VERSION=${MASTER_SITES:M*\:maven:H:T}	72	ZSTDJNI_VERSION= ${MASTER_SITES:M*\:maven:H:T}
71	PLIST_SUB= DISTVERSION=${DISTVERSION} ZSTDJNI_VERSION=${ZSTDJNI_VERSION}	73	PLIST_SUB= DISTVERSION=${DISTVERSION} ZSTDJNI_VERSION=${ZSTDJNI_VERSION}
72		74
73	OPTIONS_DEFINE= SIGAR DOCS	75	OPTIONS_DEFINE= SIGAR DOCS
Lines 82-95 Link Here
82		84
83	PORTDOCS= *	85	PORTDOCS= *
84		86
		87	MAVEN_CACHE_FILE= apache-${PORTNAME}-${DISTVERSION}-repo.tar.xz
		88
		89	.if !exists(${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE})
		90	pre-fetch:
		91	${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
		92	${MKDIR} ${WRKSRC}/.build
		93	${MKDIR} ${WRKSRC}/src/java
		94	${CP} ${FILESDIR}/maven/build.* ${WRKSRC}
		95	${CP} ${FILESDIR}/maven/build-* ${WRKSRC}/.build
		96	cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} resolver-dist-lib
		97	cd ${REPO_DIR} && ${FIND} . -type f -name ".repositories" -a -exec ${SED} -i '' -e '2s,.,Mon Aug 08 20:40:04 CEST 2022,' {} +
		98	cd ${WRKDIR} && ${MTREE_CMD} -cbnSp repository \| ${MTREE_CMD} -C \| ${SED} \
		99	-e 's:time=[0-9.]*:time=0.000000000:' \
		100	-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
		101	-e 's:flags=.*:flags=none:' \
		102	-e 's:^\.:./repository:' \
		103	> maven-offline-cache.mtree
		104	cd ${WRKDIR} && ${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE} \
		105	@maven-offline-cache.mtree
		106	#TODO: debug, remove
		107	ls -al ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE}
		108	${SHA256} ${WRKDIR}/maven-offline-cache.mtree ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE}
		109	.endif
		110
85	do-build:	111	do-build:
86	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.	112	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
87		113
88	do-build-DOCS-on:	114	do-build-DOCS-on:
89	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	115	cd ${WRKSRC} && ${SETENV} CASSANDRA_LOG_DIR=${WRKDIR}/gen-doc-log ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dpycmd=${PYTHON_CMD} -Dpyver=${PYTHON_VER} freebsd-stage-doc
90		116
91	do-build-DOCS-off:	117	do-build-DOCS-off:
92	cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} freebsd-stage	118	cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} freebsd-stage
93		119
94	post-build:	120	post-build:
95	.for f in ${SCRIPT_FILES}	121	.for f in ${SCRIPT_FILES}
Lines 121-126 Link Here
121	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/	147	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/
122	cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/	148	cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/
123	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/	149	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/
		150	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/fqltool.jar ${STAGEDIR}${DATADIR}/tools/lib/
		151	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/stress.jar ${STAGEDIR}${DATADIR}/tools/lib/
124	.for f in ${SCRIPT_FILES}	152	.for f in ${SCRIPT_FILES}
125	${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}	153	${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
126	.endfor	154	.endfor
Lines 128-139 Link Here
128	${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar	156	${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar
129		157
130	do-test:	158	do-test:
131	@cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test	159	@cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test
132		160
133	.include <bsd.port.pre.mk>	161	.include <bsd.port.pre.mk>
134		162
135	.if ${JAVA_PORT_VERSION} == 11	163	.if ${JAVA_PORT_VERSION} == 11
136	USEJDK11= -Duse.jdk11=true	164	USEJDK11= -Duse.jdk11=true -Drat.skip=true
137	.endif	165	.endif
138		166
139	.if ${ARCH} == amd64	167	.if ${ARCH} == amd64
Lines 156-162 Link Here
156	post-install:	184	post-install:
157	${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar	185	${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar
158	.if ${ARCH} == amd64 \|\| ${ARCH} == i386	186	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
159	${CP} ${DISTDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/	187	${CP} ${DISTDIR}/${DIST_SUBDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/
160	.endif	188	.endif
161		189
162	post-install-DOCS-on:	190	post-install-DOCS-on:

Lines 23-34 Link Here

(-)./files/cassandra.in (-5 / +4 lines)
23	: ${cassandra_enable:=NO}	23	: ${cassandra_enable:=NO}
24	: ${cassandra_user:=cassandra}	24	: ${cassandra_user:=cassandra}
25		25
26	command=%%PREFIX%%/bin/cassandra
27	command_args="-p /var/run/cassandra/cassandra.pid >/dev/null 2>/dev/null"
28	start_precmd="${name}_prestart"
29
30	procname=%%JAVA_HOME%%/bin/java
31	pidfile=/var/run/cassandra/cassandra.pid	26	pidfile=/var/run/cassandra/cassandra.pid
		27
		28	command=/usr/sbin/daemon
		29	command_args="-frP ${pidfile} %%PREFIX%%/bin/cassandra -f"
		30	start_precmd="${name}_prestart"
32		31
33	cassandra_prestart()	32	cassandra_prestart()
34	{	33	{

Lines 1-14 Link Here

(-)./files/patch-build.xml (-116 / +63 lines)
1	--- build.xml.orig 2020-08-28 13:55:55 UTC	1	--- build.xml.orig 2022-07-12 10:18:13 UTC
2	+++ build.xml	2	+++ build.xml
3	@@ -23,6 +23,7 @@	3	@@ -31,6 +31,7 @@
4	<property file="build.properties" />	4	<property file="build.properties" />
5	<property file="build.properties.default" />	5	<property file="build.properties.default" />
6	<property name="debuglevel" value="source,lines,vars"/>	6	<property name="debuglevel" value="source,lines,vars"/>
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-beta2"/>	10	<property name="base.version" value="4.0.5"/>
11	@@ -74,14 +75,14 @@	11	@@ -81,7 +82,7 @@
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 17-117 Link Here
17	<property name="version.properties.dir"	17	<property name="version.properties.dir"
18	value="${build.src.resources}/org/apache/cassandra/config/" />	18	value="${build.src.resources}/org/apache/cassandra/config/" />
19	<property name="final.name" value="${ant.project.name}-${version}"/>	19	<property name="final.name" value="${ant.project.name}-${version}"/>
20		20	@@ -288,6 +289,24 @@
21	<!-- details of what version of Maven ANT Tasks to fetch -->	21	<exclude name="*/ant-.jar"/>
22	<property name="maven-ant-tasks.version" value="2.1.3" />	22	</fileset>
23	- <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
24	+ <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/>
25	<property name="maven-ant-tasks.url"
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 -->
28	@@ -271,7 +272,7 @@
29	</path>	23	</path>
30	<path id="cassandra.classpath.test">	24	+ <path id="cassandra.classpath.staged">
31	<file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->	25	+ <file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->
32	- <fileset dir="${build.lib}">
33	+ <fileset dir="${stagedlib}">	26	+ <fileset dir="${stagedlib}">
34	<include name="*/.jar" />	27	+ <include name="*/.jar" />
35	<exclude name="*/-sources.jar"/>	28	+ </fileset>
36	<exclude name="*/ant-.jar"/>	29	+ <fileset dir="${build.dir.lib}">
37	@@ -291,7 +292,7 @@	30	+ <include name="**/assertj-core-3.15.0.jar" />
		31	+ <include name="*/byteman.jar" />
		32	+ <include name="**/commons-lang-2.4.jar" />
		33	+ <include name="**/commons-collections-3.2.1.jar" />
		34	+ <include name="**/ohc-core-0.5.1.jar" />
		35	+ <include name="**/ohc-core-j8-0.5.1.jar" />
		36	+ </fileset>
		37	+ <fileset dir="${test.lib}/jars">
		38	+ <include name="*/.jar" />
		39	+ <exclude name="*/ant-.jar"/>
		40	+ </fileset>
		41	+ </path>
		42
		43	<macrodef name="create-javadoc">
		44	<attribute name="destdir"/>
		45	@@ -297,7 +316,7 @@
38	windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"	46	windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
39	bottom="Copyright &copy; 2009-2020 The Apache Software Foundation"	47	bottom="Copyright &copy; 2009-2022 The Apache Software Foundation"
40	useexternalfile="yes" encoding="UTF-8" failonerror="false"	48	useexternalfile="yes" encoding="UTF-8" failonerror="false"
41	- maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">	49	- maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">
42	+ maxmemory="512m" additionalparam="${jdk11-javadoc-exports}">	50	+ maxmemory="512m" additionalparam="${jdk11-javadoc-exports}">
43	<filesets/>	51	<filesets/>
44	</javadoc>	52	</javadoc>
45	<fail message="javadoc failed">	53	<fail message="javadoc failed">
46	@@ -416,8 +417,7 @@	54	@@ -438,6 +457,8 @@
47	<artifact:dependencies pathId="wikitext.classpath">	55	<target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip">
48	<dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
49	<dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
50	- <remoteRepository refid="central"/>
51	- <remoteRepository refid="apache"/>
52	+ <localRepository path="${localm2}"/>
53	</artifact:dependencies>
54	<taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
55	<wikitext-to-html markupLanguage="Textile">
56	@@ -430,6 +430,8 @@
57	<target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation" unless="ant.gen-doc.skip">
58	<exec executable="make" osfamily="unix" dir="${doc.dir}">	56	<exec executable="make" osfamily="unix" dir="${doc.dir}">
59	<arg value="html"/>	57	<arg value="html"/>
60	+ <arg value="PYTHON_CMD=${pycmd}"/>	58	+ <arg value="PYTHON_CMD=${pycmd}"/>
61	+ <arg value="PYTHON_VER=${pyver}"/>	59	+ <arg value="PYTHON_VER=${pyver}"/>
62	</exec>	60	</exec>
63	<exec executable="cmd" osfamily="dos" dir="${doc.dir}">	61	</target>
64	<arg value="/c"/>
65	@@ -472,10 +474,6 @@
66	description="Initialize Maven ANT Tasks">
67	<typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
68		62
69	- <!-- define the remote repositories we use -->	63	@@ -896,7 +917,7 @@
70	- <artifact:remoteRepository id="central" url="${artifact.remoteRepository.central}"/>	64	</javac>
71	- <artifact:remoteRepository id="apache" url="${artifact.remoteRepository.apache}"/>	65	</target>
72	-	66
73	<macrodef name="install">	67	- <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,rat-check"
74	<attribute name="pomFile"/>	68	+ <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
75	<attribute name="file"/>	69	name="build-project">
76	@@ -889,16 +887,14 @@	70	<echo message="${ant.project.name}: ${ant.file}"/>
77	filesetId="build-dependency-jars"	71	<!-- Order matters! -->
78	cacheDependencyRefs="true"	72	@@ -1147,6 +1168,89 @@
79	dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
80	- <remoteRepository refid="central"/>
81	- <remoteRepository refid="apache"/>
82	+ <localRepository path="${localm2}"/>
83	</artifact:dependencies>
84	<!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
85	<artifact:dependencies pomRefId="build-deps-pom-sources"
86	sourcesFilesetId="build-dependency-sources"
87	cacheDependencyRefs="true"
88	dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
89	- <remoteRepository refid="central"/>
90	- <remoteRepository refid="apache"/>
91	+ <localRepository path="${localm2}"/>
92	</artifact:dependencies>
93	<copy todir="${build.dir.lib}/jars">
94	<fileset refid="build-dependency-jars"/>
95	@@ -911,7 +907,7 @@
96	<!-- code coverage tools -->
97	<artifact:dependencies pomRefId="coverage-deps-pom"
98	filesetId="coverage-dependency-jars">
99	- <remoteRepository refid="central"/>
100	+ <localRepository path="${localm2}"/>
101	</artifact:dependencies>
102	<copy todir="${build.dir.lib}/jars">
103	<fileset refid="coverage-dependency-jars"/>
104	@@ -940,8 +936,7 @@
105	sourcesFilesetId="test-dependency-sources"
106	cacheDependencyRefs="true"
107	dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
108	- <remoteRepository refid="apache"/>
109	- <remoteRepository refid="central"/>
110	+ <localRepository path="${localm2}"/>
111	</artifact:dependencies>
112	<copy todir="${test.lib}/jars">
113	<fileset refid="test-dependency-jars"/>
114	@@ -1251,6 +1246,87 @@
115	</copy>	73	</copy>
116	</target>	74	</target>
117		75
Lines 127-133 Link Here
127	+ <exclude name="netty-all*.jar"/>	85	+ <exclude name="netty-all*.jar"/>
128	+ <exclude name="ohc*.jar"/>	86	+ <exclude name="ohc*.jar"/>
129	+ <exclude name="licenses/snappy*.txt"/>	87	+ <exclude name="licenses/snappy*.txt"/>
130	+ <exclude name="licenses/netty-4*.txt"/>	88	+ <exclude name="licenses/netty-all*.txt"/>
131	+ <exclude name="licenses/ohc*.txt"/>	89	+ <exclude name="licenses/ohc*.txt"/>
132	+ </fileset>	90	+ </fileset>
133	+ <fileset dir="${build.dir}">	91	+ <fileset dir="${build.dir}">
Lines 152-157 Link Here
152	+ <include name="**" />	110	+ <include name="**" />
153	+ <exclude name="*/.pyc" />	111	+ <exclude name="*/.pyc" />
154	+ <exclude name="Dockerfile.ubuntu.*" />	112	+ <exclude name="Dockerfile.ubuntu.*" />
		113	+ <exclude name="cqlshlib/test/**" />
		114	+ <exclude name="cassandra-cqlsh-tests.sh" />
155	+ </fileset>	115	+ </fileset>
156	+ </copy>	116	+ </copy>
157	+ <copy todir="${dist.dir}/">	117	+ <copy todir="${dist.dir}/">
Lines 197-232 Link Here
197	+ </target>	157	+ </target>
198	+	158	+
199	<!-- creates release tarballs -->	159	<!-- creates release tarballs -->
200	<target name="artifacts" depends="_artifacts-init"	160	<target name="artifacts" depends="_artifacts-init,gen-doc,sources-jar,javadoc-jar"
201	description="Create Cassandra release artifacts">	161	description="Create Cassandra release artifacts">
202	@@ -1371,6 +1447,7 @@	162	@@ -1397,7 +1501,7 @@
203	<target name="_build-test">	163	<pathelement path="${java.class.path}"/>
204	<javac	164	<pathelement location="${stress.build.classes}"/>
205	fork="true"	165	<pathelement location="${fqltool.build.classes}"/>
206	+ memorymaximumsize="512M"	166	- <path refid="cassandra.classpath.test" />
207	compiler="modern"	167	+ <path refid="cassandra.classpath.staged" />
208	debug="true"	168	<pathelement location="${test.classes}"/>
209	debuglevel="${debuglevel}"	169	<pathelement location="${stress.test.classes}"/>
210	@@ -1960,8 +2037,8 @@	170	<pathelement location="${fqltool.test.classes}"/>
211	<exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">	171	@@ -2089,7 +2193,7 @@
212	<arg value="--all"/>
213	</exec>
214	- <!-- support for Mac OS X -->
215	- <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
216	+ <!-- support for Mac OS X and FreeBSD -->
217	+ <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false">
218	<arg value="-n"/>
219	<arg value="hw.ncpu"/>
220	</exec>
221	@@ -1981,6 +2058,11 @@
222	<exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
223	<arg value="-n"/>
224	<arg value="hw.memsize"/>
225	+ </exec>
226	+ <!-- support for FreeBSD -->
227	+ <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false">
228	+ <arg value="-n"/>
229	+ <arg value="hw.physmem"/>
230	</exec>
231	<echo message="Mem size : ${mem.size}"/>
232	</target>	172	</target>
		173
		174	<!-- ECJ 4.6.1 in standalone mode does not work with JPMS, so we skip this target for Java 11 -->
		175	- <target name="eclipse-warnings" depends="build, _assert_rat_output" description="Run eclipse compiler code analysis" if="java.version.8">
		176	+ <target name="eclipse-warnings" depends="build" description="Run eclipse compiler code analysis" if="java.version.8">
		177	<property name="ecj.log.dir" value="${build.dir}/ecj" />
		178	<property name="ecj.warnings.file" value="${ecj.log.dir}/eclipse_compiler_checks.txt"/>
		179	<mkdir dir="${ecj.log.dir}" />

Lines 1-6 Link Here

(-)./files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java (-12 / +12 lines)
1	--- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig 2020-03-30 16:37:37 UTC	1	--- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig 2020-12-18 17:35:13 UTC
2	+++ src/java/org/apache/cassandra/utils/FastByteOperations.java	2	+++ src/java/org/apache/cassandra/utils/FastByteOperations.java
3	@@ -191,6 +191,20 @@ public class FastByteOperations	3	@@ -205,6 +205,20 @@ public class FastByteOperations
4		4
5	static final boolean BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);	5	static final boolean BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);
6		6
Lines 21-27 Link Here
21	public int compare(byte[] buffer1, int offset1, int length1, byte[] buffer2, int offset2, int length2)	21	public int compare(byte[] buffer1, int offset1, int length1, byte[] buffer2, int offset2, int length2)
22	{	22	{
23	return compareTo(buffer1, BYTE_ARRAY_BASE_OFFSET + offset1, length1,	23	return compareTo(buffer1, BYTE_ARRAY_BASE_OFFSET + offset1, length1,
24	@@ -214,7 +228,7 @@ public class FastByteOperations	24	@@ -228,7 +242,7 @@ public class FastByteOperations
25	else	25	else
26	{	26	{
27	obj1 = null;	27	obj1 = null;
Lines 30-36 Link Here
30	}	30	}
31		31
32	return compareTo(obj1, offset1, length1, buffer2, BYTE_ARRAY_BASE_OFFSET + offset2, length2);	32	return compareTo(obj1, offset1, length1, buffer2, BYTE_ARRAY_BASE_OFFSET + offset2, length2);
33	@@ -230,7 +244,7 @@ public class FastByteOperations	33	@@ -249,7 +263,7 @@ public class FastByteOperations
34	if (src.hasArray())	34	if (src.hasArray())
35	System.arraycopy(src.array(), src.arrayOffset() + srcPosition, trg, trgPosition, length);	35	System.arraycopy(src.array(), src.arrayOffset() + srcPosition, trg, trgPosition, length);
36	else	36	else
Lines 38-45 Link Here
38	+ copy(null, srcPosition + unsafeGetLong(src, DIRECT_BUFFER_ADDRESS_OFFSET), trg, trgPosition, length);	38	+ copy(null, srcPosition + unsafeGetLong(src, DIRECT_BUFFER_ADDRESS_OFFSET), trg, trgPosition, length);
39	}	39	}
40		40
41	public void copy(ByteBuffer srcBuf, int srcPosition, ByteBuffer trgBuf, int trgPosition, int length)	41	public void copy(byte[] src, int srcPosition, ByteBuffer trg, int trgPosition, int length)
42	@@ -245,7 +259,7 @@ public class FastByteOperations	42	@@ -272,7 +286,7 @@ public class FastByteOperations
43	else	43	else
44	{	44	{
45	src = null;	45	src = null;
Lines 48-54 Link Here
48	}	48	}
49	copy(src, srcOffset + srcPosition, trgBuf, trgPosition, length);	49	copy(src, srcOffset + srcPosition, trgBuf, trgPosition, length);
50	}	50	}
51	@@ -255,7 +269,7 @@ public class FastByteOperations	51	@@ -282,7 +296,7 @@ public class FastByteOperations
52	if (trgBuf.hasArray())	52	if (trgBuf.hasArray())
53	copy(src, srcOffset, trgBuf.array(), trgBuf.arrayOffset() + trgPosition, length);	53	copy(src, srcOffset, trgBuf.array(), trgBuf.arrayOffset() + trgPosition, length);
54	else	54	else
Lines 57-63 Link Here
57	}	57	}
58		58
59	public static void copy(Object src, long srcOffset, byte[] trg, int trgPosition, int length)	59	public static void copy(Object src, long srcOffset, byte[] trg, int trgPosition, int length)
60	@@ -263,7 +277,7 @@ public class FastByteOperations	60	@@ -290,7 +304,7 @@ public class FastByteOperations
61	if (length <= MIN_COPY_THRESHOLD)	61	if (length <= MIN_COPY_THRESHOLD)
62	{	62	{
63	for (int i = 0 ; i < length ; i++)	63	for (int i = 0 ; i < length ; i++)
Lines 66-72 Link Here
66	}	66	}
67	else	67	else
68	{	68	{
69	@@ -302,7 +316,7 @@ public class FastByteOperations	69	@@ -329,7 +343,7 @@ public class FastByteOperations
70	else	70	else
71	{	71	{
72	obj1 = null;	72	obj1 = null;
Lines 75-81 Link Here
75	}	75	}
76	offset1 += buffer1.position();	76	offset1 += buffer1.position();
77	length1 = buffer1.remaining();	77	length1 = buffer1.remaining();
78	@@ -325,7 +339,7 @@ public class FastByteOperations	78	@@ -352,7 +366,7 @@ public class FastByteOperations
79	else	79	else
80	{	80	{
81	obj2 = null;	81	obj2 = null;
Lines 84-90 Link Here
84	}	84	}
85	int length2 = limit - position;	85	int length2 = limit - position;
86	offset2 += position;	86	offset2 += position;
87	@@ -358,8 +372,8 @@ public class FastByteOperations	87	@@ -385,8 +399,8 @@ public class FastByteOperations
88	int wordComparisons = minLength & ~7;	88	int wordComparisons = minLength & ~7;
89	for (int i = 0; i < wordComparisons ; i += Longs.BYTES)	89	for (int i = 0; i < wordComparisons ; i += Longs.BYTES)
90	{	90	{
Lines 95-101 Link Here
95		95
96	if (lw != rw)	96	if (lw != rw)
97	{	97	{
98	@@ -372,8 +386,8 @@ public class FastByteOperations	98	@@ -399,8 +413,8 @@ public class FastByteOperations
99		99
100	for (int i = wordComparisons ; i < minLength ; i++)	100	for (int i = wordComparisons ; i < minLength ; i++)
101	{	101	{

Lines 15-28 Link Here

(-)./pkg-plist (-89 / +25 lines)
15	%%DATADIR%%/lib/antlr-runtime-3.5.2.jar	15	%%DATADIR%%/lib/antlr-runtime-3.5.2.jar
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.5.6.jar
19	%%DATADIR%%/lib/cassandra-driver-core-3.9.0-shaded.jar	19	%%DATADIR%%/lib/cassandra-driver-core-3.11.0-shaded.jar
20	%%DATADIR%%/lib/cassandra-driver-internal-only-3.23.0.post0-1a184b99.zip	20	%%DATADIR%%/lib/cassandra-driver-internal-only-3.25.0.zip
21	%%DATADIR%%/lib/chronicle-bytes-1.16.3.jar	21	%%DATADIR%%/lib/chronicle-bytes-2.20.111.jar
22	%%DATADIR%%/lib/chronicle-core-1.16.4.jar	22	%%DATADIR%%/lib/chronicle-core-2.20.126.jar
23	%%DATADIR%%/lib/chronicle-queue-4.16.3.jar	23	%%DATADIR%%/lib/chronicle-queue-5.20.123.jar
24	%%DATADIR%%/lib/chronicle-threads-1.16.0.jar	24	%%DATADIR%%/lib/chronicle-threads-2.20.111.jar
25	%%DATADIR%%/lib/chronicle-wire-1.16.1.jar	25	%%DATADIR%%/lib/chronicle-wire-2.20.117.jar
26	%%DATADIR%%/lib/commons-cli-1.1.jar	26	%%DATADIR%%/lib/commons-cli-1.1.jar
27	%%DATADIR%%/lib/commons-codec-1.9.jar	27	%%DATADIR%%/lib/commons-codec-1.9.jar
28	%%DATADIR%%/lib/commons-lang3-3.11.jar	28	%%DATADIR%%/lib/commons-lang3-3.11.jar
Lines 36-120 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.10.jar	39	%%DATADIR%%/lib/jackson-annotations-2.13.2.jar
40	%%DATADIR%%/lib/jackson-core-2.9.10.jar	40	%%DATADIR%%/lib/jackson-core-2.13.2.jar
41	%%DATADIR%%/lib/jackson-databind-2.9.10.4.jar	41	%%DATADIR%%/lib/jackson-databind-2.13.2.2.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/java-cup-runtime-11b-20160615.jar
44	%%DATADIR%%/lib/jbcrypt-0.3m.jar	44	%%DATADIR%%/lib/javax.inject-1.jar
		45	%%DATADIR%%/lib/jbcrypt-0.4.jar
45	%%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar	46	%%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar
46	%%DATADIR%%/lib/jcommander-1.30.jar	47	%%DATADIR%%/lib/jcommander-1.30.jar
47	%%DATADIR%%/lib/jctools-core-1.2.1.jar	48	%%DATADIR%%/lib/jctools-core-3.1.0.jar
48	%%DATADIR%%/lib/jflex-1.6.0.jar	49	%%DATADIR%%/lib/jflex-1.8.2.jar
49	%%DATADIR%%/lib/jna-4.2.2.jar	50	%%DATADIR%%/lib/jna-5.6.0.jar
50	%%DATADIR%%/lib/json-simple-1.1.jar	51	%%DATADIR%%/lib/json-simple-1.1.jar
51	%%DATADIR%%/lib/jstackjunit-0.0.1.jar
52	%%DATADIR%%/lib/jvm-attach-api-1.5.jar	52	%%DATADIR%%/lib/jvm-attach-api-1.5.jar
53	%%DATADIR%%/lib/licenses/airline-0.8.txt
54	%%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt
55	%%DATADIR%%/lib/licenses/asm-6.2.txt
56	%%DATADIR%%/lib/licenses/caffeine-2.3.5.txt
57	%%DATADIR%%/lib/licenses/cassandra-driver-3.0.1.txt
58	%%DATADIR%%/lib/licenses/chronicle-bytes-1.16.3.txt
59	%%DATADIR%%/lib/licenses/chronicle-core-1.16.3-SNAPSHOT.txt
60	%%DATADIR%%/lib/licenses/chronicle-queue-4.16.3.txt
61	%%DATADIR%%/lib/licenses/chronicle-threads-1.16.0.txt
62	%%DATADIR%%/lib/licenses/chronicle-wire-1.16.1.txt
63	%%DATADIR%%/lib/licenses/commons-cli-1.1.txt
64	%%DATADIR%%/lib/licenses/commons-codec-1.9.txt
65	%%DATADIR%%/lib/licenses/commons-lang3-3.1.txt
66	%%DATADIR%%/lib/licenses/commons-math3-3.2.txt
67	%%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
68	%%DATADIR%%/lib/licenses/concurrent-trees-2.4.0.txt
69	%%DATADIR%%/lib/licenses/ecj-4.6.1.txt
70	%%DATADIR%%/lib/licenses/futures-2.1.6.txt
71	%%DATADIR%%/lib/licenses/geom-0.1.0.txt
72	%%DATADIR%%/lib/licenses/guava-23.3-jre.txt
73	%%DATADIR%%/lib/licenses/hdrhistogram-2.1.9.txt
74	%%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt
75	%%DATADIR%%/lib/licenses/hppc-0.5.4.txt
76	%%DATADIR%%/lib/licenses/j2objc-annotations-1.3.txt
77	%%DATADIR%%/lib/licenses/jackson-annotations-2.9.5.txt
78	%%DATADIR%%/lib/licenses/jackson-core-2.9.5.txt
79	%%DATADIR%%/lib/licenses/jackson-databind-2.9.5.txt
80	%%DATADIR%%/lib/licenses/jamm-0.3.2.txt
81	%%DATADIR%%/lib/licenses/javax.inject.txt
82	%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
83	%%DATADIR%%/lib/licenses/jcl-over-slf4j-1.7.25.txt
84	%%DATADIR%%/lib/licenses/jctools-core-1.2.1.txt
85	%%DATADIR%%/lib/licenses/jflex-1.6.0.txt
86	%%DATADIR%%/lib/licenses/jna-4.2.2.txt
87	%%DATADIR%%/lib/licenses/joda-time-2.4.txt
88	%%DATADIR%%/lib/licenses/json-simple-1.1.txt
89	%%DATADIR%%/lib/licenses/jstackjunit-0.0.1.txt
90	%%DATADIR%%/lib/licenses/LICENSE-2.0.txt
91	%%DATADIR%%/lib/licenses/log4j-over-slf4j-1.7.25.txt
92	%%DATADIR%%/lib/licenses/logback-classic-1.2.3.txt
93	%%DATADIR%%/lib/licenses/logback-core-1.2.3.txt
94	%%DATADIR%%/lib/licenses/lz4-1.4.0.txt
95	%%DATADIR%%/lib/licenses/metrics-core-3.1.5.txt
96	%%DATADIR%%/lib/licenses/metrics-jvm-3.1.5.txt
97	%%DATADIR%%/lib/licenses/metrics-logback-3.1.5.txt
98	%%DATADIR%%/lib/licenses/netty-tcnative-2.0.31.txt
99	%%DATADIR%%/lib/licenses/psjava-0.1.19.txt
100	%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt
101	%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt
102	%%DATADIR%%/lib/licenses/six-1.7.3.txt
103	%%DATADIR%%/lib/licenses/slf4j-api-1.7.25.txt
104	%%DATADIR%%/lib/licenses/snakeyaml-1.11.txt
105	%%DATADIR%%/lib/licenses/snowball-stemmer-1.3.0.581.1.txt
106	%%DATADIR%%/lib/licenses/ST4-4.0.8.txt
107	%%DATADIR%%/lib/licenses/stream-2.5.2.txt
108	%%DATADIR%%/lib/log4j-over-slf4j-1.7.25.jar	53	%%DATADIR%%/lib/log4j-over-slf4j-1.7.25.jar
109	%%DATADIR%%/lib/logback-classic-1.2.3.jar	54	%%DATADIR%%/lib/logback-classic-1.2.9.jar
110	%%DATADIR%%/lib/logback-core-1.2.3.jar	55	%%DATADIR%%/lib/logback-core-1.2.9.jar
111	%%DATADIR%%/lib/lz4-java-1.7.1.jar	56	%%DATADIR%%/lib/lz4-java-1.8.0.jar
112	%%DATADIR%%/lib/metrics-core-3.1.5.jar	57	%%DATADIR%%/lib/metrics-core-3.1.5.jar
113	%%DATADIR%%/lib/metrics-jvm-3.1.5.jar	58	%%DATADIR%%/lib/metrics-jvm-3.1.5.jar
114	%%DATADIR%%/lib/metrics-logback-3.1.5.jar	59	%%DATADIR%%/lib/metrics-logback-3.1.5.jar
115	%%DATADIR%%/lib/mxdump-0.14.jar	60	%%DATADIR%%/lib/mxdump-0.14.jar
116	%%DATADIR%%/lib/netty.jar	61	%%DATADIR%%/lib/netty.jar
117	%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.31.Final.jar	62	%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.36.Final.jar
118	%%DATADIR%%/lib/psjava-0.1.19.jar	63	%%DATADIR%%/lib/psjava-0.1.19.jar
119	%%DATADIR%%/lib/reporter-config-base-3.0.3.jar	64	%%DATADIR%%/lib/reporter-config-base-3.0.3.jar
120	%%DATADIR%%/lib/reporter-config3-3.0.3.jar	65	%%DATADIR%%/lib/reporter-config3-3.0.3.jar
Lines 124-130 Link Here
124	%%DATADIR%%/lib/sjk-json-0.14.jar	69	%%DATADIR%%/lib/sjk-json-0.14.jar
125	%%DATADIR%%/lib/sjk-stacktrace-0.14.jar	70	%%DATADIR%%/lib/sjk-stacktrace-0.14.jar
126	%%DATADIR%%/lib/slf4j-api-1.7.25.jar	71	%%DATADIR%%/lib/slf4j-api-1.7.25.jar
127	%%DATADIR%%/lib/snakeyaml-1.11.jar	72	%%DATADIR%%/lib/snakeyaml-1.26.jar
128	%%DATADIR%%/lib/snappy-java.jar	73	%%DATADIR%%/lib/snappy-java.jar
129	%%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar	74	%%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar
130	%%DATADIR%%/lib/ST4-4.0.8.jar	75	%%DATADIR%%/lib/ST4-4.0.8.jar
Lines 134-140 Link Here
134	%%DATADIR%%/LICENSE.txt	79	%%DATADIR%%/LICENSE.txt
135	%%DATADIR%%/NEWS.txt	80	%%DATADIR%%/NEWS.txt
136	%%DATADIR%%/NOTICE.txt	81	%%DATADIR%%/NOTICE.txt
137	%%DATADIR%%/pylib/cassandra-cqlsh-tests.sh
138	%%DATADIR%%/pylib/cqlshlib/__init__.py	82	%%DATADIR%%/pylib/cqlshlib/__init__.py
139	%%DATADIR%%/pylib/cqlshlib/copyutil.py	83	%%DATADIR%%/pylib/cqlshlib/copyutil.py
140	%%DATADIR%%/pylib/cqlshlib/cql3handling.py	84	%%DATADIR%%/pylib/cqlshlib/cql3handling.py
Lines 147-167 Link Here
147	%%DATADIR%%/pylib/cqlshlib/saferscanner.py	91	%%DATADIR%%/pylib/cqlshlib/saferscanner.py
148	%%DATADIR%%/pylib/cqlshlib/setup.cfg	92	%%DATADIR%%/pylib/cqlshlib/setup.cfg
149	%%DATADIR%%/pylib/cqlshlib/sslhandling.py	93	%%DATADIR%%/pylib/cqlshlib/sslhandling.py
150	%%DATADIR%%/pylib/cqlshlib/test/__init__.py
151	%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
152	%%DATADIR%%/pylib/cqlshlib/test/basecase.py
153	%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
154	%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
155	%%DATADIR%%/pylib/cqlshlib/test/test_copyutil.py
156	%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
157	%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
158	%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
159	%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
160	%%DATADIR%%/pylib/cqlshlib/test/winpty.py
161	%%DATADIR%%/pylib/cqlshlib/tracing.py	94	%%DATADIR%%/pylib/cqlshlib/tracing.py
162	%%DATADIR%%/pylib/cqlshlib/util.py	95	%%DATADIR%%/pylib/cqlshlib/util.py
163	%%DATADIR%%/pylib/cqlshlib/wcwidth.py	96	%%DATADIR%%/pylib/cqlshlib/wcwidth.py
164	%%DATADIR%%/pylib/README.asc	97	%%DATADIR%%/pylib/README.asc
		98	%%DATADIR%%/pylib/pytest.ini
165	%%DATADIR%%/pylib/requirements.txt	99	%%DATADIR%%/pylib/requirements.txt
166	%%DATADIR%%/pylib/setup.py	100	%%DATADIR%%/pylib/setup.py
167	%%DATADIR%%/tools/bin/auditlogviewer	101	%%DATADIR%%/tools/bin/auditlogviewer
Lines 170-175 Link Here
170	%%DATADIR%%/tools/bin/cassandra.in.sh	104	%%DATADIR%%/tools/bin/cassandra.in.sh
171	%%DATADIR%%/tools/bin/compaction-stress	105	%%DATADIR%%/tools/bin/compaction-stress
172	%%DATADIR%%/tools/bin/fqltool	106	%%DATADIR%%/tools/bin/fqltool
		107	%%DATADIR%%/tools/bin/generatetokens
		108	%%DATADIR%%/tools/bin/jmxtool
173	%%DATADIR%%/tools/bin/sstabledump	109	%%DATADIR%%/tools/bin/sstabledump
174	%%DATADIR%%/tools/bin/sstableexpiredblockers	110	%%DATADIR%%/tools/bin/sstableexpiredblockers
175	%%DATADIR%%/tools/bin/sstablelevelreset	111	%%DATADIR%%/tools/bin/sstablelevelreset