Attachment 191502 Details for Bug 226377 – Updated shar with rc script

Updated shar with rc script

cassandra3.shar (text/plain), 31.85 KB, created by Angelo Polo on 2018-03-14 18:33:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Angelo Polo

Created: 2018-03-14 18:33:07 UTC

Size: 31.85 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	cassandra3
>#	cassandra3/pkg-descr
>#	cassandra3/pkg-message
>#	cassandra3/distinfo
>#	cassandra3/Makefile
>#	cassandra3/files
>#	cassandra3/files/patch-conf_cassandra.yaml
>#	cassandra3/files/patch-test_conf_cassandra.yaml
>#	cassandra3/files/patch-build.xml
>#	cassandra3/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java
>#	cassandra3/files/patch-tools_bin_cassandra.in.sh
>#	cassandra3/files/patch-doc_Makefile
>#	cassandra3/files/patch-bin_cassandra.in.sh
>#	cassandra3/files/cassandra.in
>#	cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java
>#	cassandra3/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
>#	cassandra3/pkg-plist
>#
>echo c - cassandra3
>mkdir -p cassandra3 > /dev/null 2>&1
>echo x - cassandra3/pkg-descr
>sed 's/^X//' >cassandra3/pkg-descr << 'ee5b9baf970464b33b6122f55bb55de0'
>XApache Cassandra is a free and open-source distributed database.
>XIt is a Java-based, highly scalable, eventually consistent, wide
>Xcolumn store. Cassandra database clusters are masterless with no
>Xsingle point of failure. Replication can be configured across
>Xmultiple data centers.
>X
>XOriginally influenced by Dynamo and BigTable, Cassandra was initially
>Xdeveloped at and open sourced by Facebook before becoming a top-level
>XApache project.
>X
>XThe CQL query language offers SQL-like data access and management.
>XDrivers are available for a number of languages.
>X
>XWWW: http://cassandra.apache.org/
>ee5b9baf970464b33b6122f55bb55de0
>echo x - cassandra3/pkg-message
>sed 's/^X//' >cassandra3/pkg-message << '3cd52847076bcf3b3b0925906f09cb1e'
>X======================================================================
>X
>XEntries for this machine's hostname may need to be set in /etc/hosts
>Xif you get a "Local host name unknown" exception on startup
>X(see https://issues.apache.org/jira/browse/CASSANDRA-2380):
>X
>X	::1		localhost localhost.your.domain your-host-name
>X	127.0.0.1	localhost localhost.your.domain your-host-name
>X
>XThe default log directory is set to $CASSANDRA_HOME/logs on line 192
>Xof the cassandra script. If this path is non-existent or incorrect,
>Xbe sure to temporarily enable modification and change it.
>X
>X======================================================================
>3cd52847076bcf3b3b0925906f09cb1e
>echo x - cassandra3/distinfo
>sed 's/^X//' >cassandra3/distinfo << '78ecf3ba489f58a3075827f69c1097b0'
>XTIMESTAMP = 1520026292
>XSHA256 (apache-cassandra-3.11.2-src.tar.gz) = 48119b6309b8fbd7ee020d13c7a646889d85c11d02fd84f82d1084c54a58a8d1
>XSIZE (apache-cassandra-3.11.2-src.tar.gz) = 36441459
>78ecf3ba489f58a3075827f69c1097b0
>echo x - cassandra3/Makefile
>sed 's/^X//' >cassandra3/Makefile << 'e76ff7f2a1eb02a73650965ccb3df963'
>X# $FreeBSD$
>X
>XPORTNAME=	cassandra
>XPORTVERSION=	3.11.2
>XCATEGORIES=	databases java
>XMASTER_SITES=	APACHE/cassandra/${PORTVERSION}
>XPKGNAMESUFFIX=	3
>XDISTNAME=	apache-${PORTNAME}-${PORTVERSION}-src
>X
>XMAINTAINER=	language.devel@gmail.com
>XCOMMENT=	Highly scalable distributed database
>X
>XLICENSE=	APACHE20
>X
>XRUN_DEPENDS=		snappyjava>=0:archivers/snappy-java
>X
>XOPTIONS_DEFINE=		DOCS SIGAR
>XOPTIONS_DEFAULT=	SIGAR
>XOPTIONS_SUB=		yes
>XPYTHON_PKGNAMEPREFIX=	py27-
>XUSES=			python:2.7
>XDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \
>X			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme
>XPORTDOCS=		*
>XSIGAR_RUN_DEPENDS=	java-sigar>=1.6.4:java/sigar
>XSIGAR_DESC=		Use SIGAR to collect system information
>XPLIST_SUB=		PORTVERSION=${PORTVERSION}
>X
>XJAVA_VERSION=	1.8
>XJAVA_VENDOR=	openjdk
>XUSE_JAVA=	yes
>XUSE_ANT=	yes
>XUSE_RC_SUBR=	cassandra
>XREINPLACE_ARGS=	-i ''
>XSUB_LIST=	JAVA_HOME=${JAVA_HOME}
>X
>XDATADIR=	${JAVASHAREDIR}/${PORTNAME}
>XDIST_DIR=	${WRKSRC}/build/dist
>X
>XCONFIG_FILES=	cassandra-env.sh \
>X		cassandra-jaas.config \
>X		cassandra-rackdc.properties \
>X		cassandra-topology.properties \
>X		cassandra.yaml \
>X		commitlog_archiving.properties \
>X		hotspot_compiler \
>X		jvm.options \
>X		logback-tools.xml \
>X		logback.xml
>X
>XSCRIPT_FILES=	cassandra \
>X		cqlsh \
>X		nodetool \
>X		sstableloader \
>X		sstablescrub \
>X		sstableupgrade \
>X		sstableutil \
>X		sstableverify
>X
>Xdo-build-DOCS-on:
>X	cd ${WRKSRC} && ${ANT} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
>X
>Xdo-build-DOCS-off:
>X	cd ${WRKSRC} && ${ANT} freebsd-stage
>X
>Xpost-build:
>X.for f in ${SCRIPT_FILES}
>X	${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${DIST_DIR}/bin/${f}
>X.endfor
>X	${REINPLACE_CMD} -e 's|\`dirname "\$$\0"\`/..|${DATADIR}|' ${DIST_DIR}/bin/cassandra.in.sh
>X	${REINPLACE_CMD} -e 's|\$$\CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${DIST_DIR}/bin/cassandra.in.sh
>X	${REINPLACE_CMD} -e 's|\$$\CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${DIST_DIR}/conf/cassandra-env.sh
>X	${REINPLACE_CMD} -e 's|\$$\CASSANDRA_HOME/conf|${ETCDIR}|' ${DIST_DIR}/bin/cassandra.in.sh
>X	${REINPLACE_CMD} -e 's|\$$\CASSANDRA_HOME/conf|${ETCDIR}|' ${DIST_DIR}/conf/cassandra-env.sh
>X.for f in ${CONFIG_FILES}
>X	${MV} ${DIST_DIR}/conf/${f} ${DIST_DIR}/conf/${f}.sample
>X.endfor
>X
>Xdo-install:
>X	${MKDIR} ${STAGEDIR}${DATADIR}
>X.for f in CHANGES LICENSE NEWS NOTICE
>X	cd ${DIST_DIR} && ${INSTALL_DATA} ${f}.txt ${STAGEDIR}${DATADIR}/
>X.endfor
>X.for d in interface lib pylib tools
>X	cd ${DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ "! -path '*/bin/*'"
>X.endfor
>X	${MKDIR} ${STAGEDIR}${ETCDIR}
>X	cd ${DIST_DIR}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/
>X	cd ${DIST_DIR} && ${COPYTREE_BIN} bin ${STAGEDIR}${DATADIR}
>X	cd ${DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/
>X	cd ${DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/tools
>X	cd ${DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/
>X.for f in ${SCRIPT_FILES}
>X	${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
>X.endfor
>X	${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar
>X
>Xpost-install-DOCS-on:
>X	${MKDIR} ${STAGEDIR}${DOCSDIR}
>X.for d in doc javadoc
>X	cd ${DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DOCSDIR}/
>X.endfor
>X
>Xpost-install-SIGAR-on:
>X	${LN} -s ${JAVAJARDIR}/sigar.jar ${STAGEDIR}${DATADIR}/lib/sigar.jar
>X
>X.include <bsd.port.mk>
>e76ff7f2a1eb02a73650965ccb3df963
>echo c - cassandra3/files
>mkdir -p cassandra3/files > /dev/null 2>&1
>echo x - cassandra3/files/patch-conf_cassandra.yaml
>sed 's/^X//' >cassandra3/files/patch-conf_cassandra.yaml << '5d4cdaf5cb85627508c1998ad4763b27'
>X--- conf/cassandra.yaml.orig	2018-03-06 21:12:51 UTC
>X+++ conf/cassandra.yaml
>X@@ -305,20 +305,12 @@ key_cache_save_period: 14400
>X 
>X # Row cache implementation class name. Available implementations:
>X #
>X-# org.apache.cassandra.cache.OHCProvider
>X-#   Fully off-heap row cache implementation (default).
>X-#
>X # org.apache.cassandra.cache.SerializingCacheProvider
>X #   This is the row cache implementation availabile
>X #   in previous releases of Cassandra.
>X-# row_cache_class_name: org.apache.cassandra.cache.OHCProvider
>X+# row_cache_class_name: org.apache.cassandra.cache.SerializingCacheProvider
>X 
>X # Maximum size of the row cache in memory.
>X-# Please note that OHC cache implementation requires some additional off-heap memory to manage
>X-# the map structures and some in-flight memory during operations before/after cache entries can be
>X-# accounted against the cache capacity. This overhead is usually small compared to the whole capacity.
>X-# Do not specify more memory that the system can afford in the worst usual situation and leave some
>X-# headroom for OS block level cache. Do never allow your system to swap.
>X #
>X # Default value is 0, to disable row caching.
>X row_cache_size_in_mb: 0
>5d4cdaf5cb85627508c1998ad4763b27
>echo x - cassandra3/files/patch-test_conf_cassandra.yaml
>sed 's/^X//' >cassandra3/files/patch-test_conf_cassandra.yaml << '630954055eddb571d5e912f9316cb1d0'
>X--- test/conf/cassandra.yaml.orig	2018-03-06 21:24:02 UTC
>X+++ test/conf/cassandra.yaml
>X@@ -40,7 +40,6 @@ server_encryption_options:
>X incremental_backups: true
>X concurrent_compactors: 4
>X compaction_throughput_mb_per_sec: 0
>X-row_cache_class_name: org.apache.cassandra.cache.OHCProvider
>X row_cache_size_in_mb: 16
>X enable_user_defined_functions: true
>X enable_scripted_user_defined_functions: true
>630954055eddb571d5e912f9316cb1d0
>echo x - cassandra3/files/patch-build.xml
>sed 's/^X//' >cassandra3/files/patch-build.xml << 'aeb317b71f927f0b6c02c8dd464ed9dd'
>X--- build.xml.orig	2018-02-14 20:43:59 UTC
>X+++ build.xml
>X@@ -23,6 +23,7 @@
>X     <property file="build.properties" />
>X     <property file="build.properties.default" />
>X     <property name="debuglevel" value="source,lines,vars"/>
>X+    <property name="pycmd" value="python"/>
>X 
>X     
>X     <property name="base.version" value="3.11.2"/>
>X@@ -75,7 +76,7 @@
>X     <condition property="version" value="${base.version}">
>X       <isset property="release"/>
>X     </condition>
>X-    <property name="version" value="${base.version}-SNAPSHOT"/>
>X+    <property name="version" value="${base.version}"/>
>X     <property name="version.properties.dir"
>X               value="${build.src.resources}/org/apache/cassandra/config/" />
>X     <property name="final.name" value="${ant.project.name}-${version}"/>
>X@@ -258,6 +259,7 @@
>X     <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
>X         <exec executable="make" osfamily="unix" dir="${doc.dir}">
>X             <arg value="html"/>
>X+            <arg value="PYTHON_CMD=${pycmd}"/>
>X         </exec>
>X         <exec executable="cmd" osfamily="dos" dir="${doc.dir}">
>X             <arg value="/c"/>
>X@@ -1018,6 +1020,88 @@
>X       </jar>
>X     </target>
>X 
>X+    
>X+    <target name="freebsd-stage" depends="jar"
>X+            description="Create Cassandra directory structure for staging">
>X+      <mkdir dir="${dist.dir}"/>
>X+      <copy todir="${dist.dir}/lib">
>X+        <fileset dir="${build.lib}">
>X+          <exclude name="sigar*.jar"/>
>X+          <exclude name="sigar-bin/*"/>
>X+          <exclude name="snappy*.jar"/>
>X+          <exclude name="licenses/snappy*.txt"/>
>X+        </fileset>
>X+        <fileset dir="${build.dir}">
>X+          <include name="${final.name}.jar" />
>X+          <include name="${ant.project.name}-thrift-${version}.jar" />
>X+        </fileset>
>X+      </copy>
>X+      <copy todir="${dist.dir}/bin">
>X+        <fileset dir="bin">
>X+	  <exclude name="*.bat" />
>X+	  <exclude name="*.ps1" />
>X+	  <exclude name="*.orig" />
>X+	</fileset>
>X+      </copy>
>X+      <copy todir="${dist.dir}/conf">
>X+        <fileset dir="conf">
>X+          <exclude name="*.ps1" />
>X+	  <exclude name="*.orig" />
>X+        </fileset>
>X+      </copy>
>X+      <copy todir="${dist.dir}/interface">
>X+        <fileset dir="interface">
>X+          <include name="**/*.thrift" />
>X+        </fileset>
>X+      </copy>
>X+      <copy todir="${dist.dir}/pylib">
>X+        <fileset dir="pylib">
>X+          <include name="**" />
>X+          <exclude name="**/*.pyc" />
>X+        </fileset>
>X+      </copy>
>X+      <copy todir="${dist.dir}/">
>X+        <fileset dir="${basedir}">
>X+          <include name="*.txt" />
>X+        </fileset>
>X+      </copy>
>X+      <copy todir="${dist.dir}/tools/bin">
>X+        <fileset dir="${basedir}/tools/bin">
>X+          <exclude name="*.bat" />
>X+          <exclude name="*.ps1" />
>X+	  <exclude name="*.orig" />
>X+        </fileset>
>X+      </copy>
>X+      <copy todir="${dist.dir}/tools/">
>X+        <fileset dir="${basedir}/tools/">
>X+            <include name="*.yaml"/>
>X+	</fileset>
>X+      </copy>
>X+      <copy todir="${dist.dir}/tools/lib">
>X+        <fileset dir="${build.dir}/tools/lib/">
>X+            <include name="*.jar" />
>X+        </fileset>
>X+      </copy>
>X+    </target>
>X+
>X+    <target name="freebsd-stage-doc" depends="freebsd-stage,javadoc,gen-doc"
>X+            description="Create Cassandra directory structure for staging, including docs">
>X+      <copy todir="${dist.dir}/javadoc">
>X+        <fileset dir="${javadoc.dir}"/>
>X+      </copy>
>X+      <copy todir="${dist.dir}/doc">
>X+        <fileset dir="doc">
>X+          <include name="cql3/CQL.html" />
>X+          <include name="cql3/CQL.css" />
>X+          <include name="SASI.md" />
>X+        </fileset>
>X+      </copy>
>X+      <copy todir="${dist.dir}/doc/html">
>X+        <fileset dir="doc" />
>X+        <globmapper from="build/html/*" to="*"/>
>X+      </copy>
>X+    </target>
>X+    
>X     
>X     <target name="artifacts" depends="jar,javadoc,gen-doc"
>X             description="Create Cassandra release artifacts">
>aeb317b71f927f0b6c02c8dd464ed9dd
>echo x - cassandra3/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java
>sed 's/^X//' >cassandra3/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java << '0508f31fd3100a838e62dcaf48ab8f11'
>X--- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig	2018-03-01 05:02:12 UTC
>X+++ src/java/org/apache/cassandra/utils/FastByteOperations.java
>X@@ -179,6 +179,20 @@ public class FastByteOperations
>X 
>X         static final boolean BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);
>X 
>X+        private static byte unsafeGetByte(Object o, long offset)
>X+        {
>X+            return o == null
>X+                    ? theUnsafe.getByte(offset)
>X+                    : theUnsafe.getByte(o, offset);
>X+        }
>X+
>X+        private static long unsafeGetLong(Object o, long offset)
>X+        {
>X+            return o == null
>X+                    ? theUnsafe.getLong(offset)
>X+                    : theUnsafe.getLong(o, offset);
>X+        }
>X+
>X         public int compare(byte[] buffer1, int offset1, int length1, byte[] buffer2, int offset2, int length2)
>X         {
>X             return compareTo(buffer1, BYTE_ARRAY_BASE_OFFSET + offset1, length1,
>X@@ -197,7 +211,7 @@ public class FastByteOperations
>X             else
>X             {
>X                 obj1 = null;
>X-                offset1 = theUnsafe.getLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET);
>X+                offset1 = unsafeGetLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET);
>X             }
>X             int length1;
>X             {
>X@@ -219,7 +233,7 @@ public class FastByteOperations
>X             if (src.hasArray())
>X                 System.arraycopy(src.array(), src.arrayOffset() + srcPosition, trg, trgPosition, length);
>X             else
>X-                copy(null, srcPosition + theUnsafe.getLong(src, DIRECT_BUFFER_ADDRESS_OFFSET), trg, trgPosition, length);
>X+                copy(null, srcPosition + unsafeGetLong(src, DIRECT_BUFFER_ADDRESS_OFFSET), trg, trgPosition, length);
>X         }
>X 
>X         public void copy(ByteBuffer srcBuf, int srcPosition, ByteBuffer trgBuf, int trgPosition, int length)
>X@@ -234,7 +248,7 @@ public class FastByteOperations
>X             else
>X             {
>X                 src = null;
>X-                srcOffset = theUnsafe.getLong(srcBuf, DIRECT_BUFFER_ADDRESS_OFFSET);
>X+                srcOffset = unsafeGetLong(srcBuf, DIRECT_BUFFER_ADDRESS_OFFSET);
>X             }
>X             copy(src, srcOffset + srcPosition, trgBuf, trgPosition, length);
>X         }
>X@@ -244,7 +258,7 @@ public class FastByteOperations
>X             if (trgBuf.hasArray())
>X                 copy(src, srcOffset, trgBuf.array(), trgBuf.arrayOffset() + trgPosition, length);
>X             else
>X-                copy(src, srcOffset, null, trgPosition + theUnsafe.getLong(trgBuf, DIRECT_BUFFER_ADDRESS_OFFSET), length);
>X+                copy(src, srcOffset, null, trgPosition + unsafeGetLong(trgBuf, DIRECT_BUFFER_ADDRESS_OFFSET), length);
>X         }
>X 
>X         public static void copy(Object src, long srcOffset, byte[] trg, int trgPosition, int length)
>X@@ -252,7 +266,7 @@ public class FastByteOperations
>X             if (length <= MIN_COPY_THRESHOLD)
>X             {
>X                 for (int i = 0 ; i < length ; i++)
>X-                    trg[trgPosition + i] = theUnsafe.getByte(src, srcOffset + i);
>X+                    trg[trgPosition + i] = unsafeGetByte(src, srcOffset + i);
>X             }
>X             else
>X             {
>X@@ -291,7 +305,7 @@ public class FastByteOperations
>X             else
>X             {
>X                 obj1 = null;
>X-                offset1 = theUnsafe.getLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET);
>X+                offset1 = unsafeGetLong(buffer1, DIRECT_BUFFER_ADDRESS_OFFSET);
>X             }
>X             offset1 += buffer1.position();
>X             length1 = buffer1.remaining();
>X@@ -314,7 +328,7 @@ public class FastByteOperations
>X             else
>X             {
>X                 obj2 = null;
>X-                offset2 = theUnsafe.getLong(buffer, DIRECT_BUFFER_ADDRESS_OFFSET);
>X+                offset2 = unsafeGetLong(buffer, DIRECT_BUFFER_ADDRESS_OFFSET);
>X             }
>X             int length2 = limit - position;
>X             offset2 += position;
>X@@ -347,8 +361,8 @@ public class FastByteOperations
>X             int wordComparisons = minLength & ~7;
>X             for (int i = 0; i < wordComparisons ; i += Longs.BYTES)
>X             {
>X-                long lw = theUnsafe.getLong(buffer1, memoryOffset1 + i);
>X-                long rw = theUnsafe.getLong(buffer2, memoryOffset2 + i);
>X+                long lw = unsafeGetLong(buffer1, memoryOffset1 + i);
>X+                long rw = unsafeGetLong(buffer2, memoryOffset2 + i);
>X 
>X                 if (lw != rw)
>X                 {
>X@@ -361,8 +375,8 @@ public class FastByteOperations
>X 
>X             for (int i = wordComparisons ; i < minLength ; i++)
>X             {
>X-                int b1 = theUnsafe.getByte(buffer1, memoryOffset1 + i) & 0xFF;
>X-                int b2 = theUnsafe.getByte(buffer2, memoryOffset2 + i) & 0xFF;
>X+                int b1 = unsafeGetByte(buffer1, memoryOffset1 + i) & 0xFF;
>X+                int b2 = unsafeGetByte(buffer2, memoryOffset2 + i) & 0xFF;
>X                 if (b1 != b2)
>X                     return b1 - b2;
>X             }
>0508f31fd3100a838e62dcaf48ab8f11
>echo x - cassandra3/files/patch-tools_bin_cassandra.in.sh
>sed 's/^X//' >cassandra3/files/patch-tools_bin_cassandra.in.sh << '1c74f2143936904161e456c37db0c75a'
>X--- tools/bin/cassandra.in.sh.orig	2018-03-01 14:02:52 UTC
>X+++ tools/bin/cassandra.in.sh
>X@@ -26,9 +26,9 @@ fi
>X # This can be the path to a jar file, or a directory containing the
>X # compiled classes. NOTE: This isn't needed by the startup script,
>X # it's just used here in constructing the classpath.
>X-cassandra_bin="$CASSANDRA_HOME/build/classes/main"
>X-cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/stress"
>X-cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
>X+#cassandra_bin="$CASSANDRA_HOME/build/classes/main"
>X+#cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/stress"
>X+#cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
>X #cassandra_bin="$cassandra_home/build/cassandra.jar"
>X 
>X # the default location for commitlogs, sstables, and saved caches
>X@@ -39,7 +39,7 @@ cassandra_storagedir="$CASSANDRA_HOME/da
>X #JAVA_HOME=/usr/local/jdk6
>X 
>X # The java classpath (required)
>X-CLASSPATH="$CASSANDRA_CONF:$cassandra_bin"
>X+CLASSPATH="$CASSANDRA_CONF"
>X 
>X for jar in "$CASSANDRA_HOME"/tools/lib/*.jar; do
>X     CLASSPATH="$CLASSPATH:$jar"
>1c74f2143936904161e456c37db0c75a
>echo x - cassandra3/files/patch-doc_Makefile
>sed 's/^X//' >cassandra3/files/patch-doc_Makefile << '613368a8c79fd18c69df203f4be47a29'
>X--- doc/Makefile.orig	2018-02-22 15:43:58 UTC
>X+++ doc/Makefile
>X@@ -3,7 +3,7 @@
>X 
>X # You can set these variables from the command line.
>X SPHINXOPTS    =
>X-SPHINXBUILD   = sphinx-build
>X+SPHINXBUILD   = sphinx-build-2.7
>X PAPER         =
>X BUILDDIR      = build
>X 
>X@@ -17,7 +17,7 @@ I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $
>X YAML_DOC_INPUT=../conf/cassandra.yaml
>X YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst
>X 
>X-MAKE_CASSANDRA_YAML = python convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
>X+MAKE_CASSANDRA_YAML = ${PYTHON_CMD} convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
>X 
>X WEB_SITE_PRESENCE_FILE='source/.build_for_website'
>X 
>613368a8c79fd18c69df203f4be47a29
>echo x - cassandra3/files/patch-bin_cassandra.in.sh
>sed 's/^X//' >cassandra3/files/patch-bin_cassandra.in.sh << 'f4041bfd3ed96c1dae00e80fd32bafa7'
>X--- bin/cassandra.in.sh.orig	2018-03-01 13:35:20 UTC
>X+++ bin/cassandra.in.sh
>X@@ -26,8 +26,8 @@ fi
>X # This can be the path to a jar file, or a directory containing the 
>X # compiled classes. NOTE: This isn't needed by the startup script,
>X # it's just used here in constructing the classpath.
>X-cassandra_bin="$CASSANDRA_HOME/build/classes/main"
>X-cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
>X+#cassandra_bin="$CASSANDRA_HOME/build/classes/main"
>X+#cassandra_bin="$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift"
>X #cassandra_bin="$CASSANDRA_HOME/build/cassandra.jar"
>X 
>X # the default location for commitlogs, sstables, and saved caches
>X@@ -38,7 +38,7 @@ cassandra_storagedir="$CASSANDRA_HOME/da
>X #JAVA_HOME=/usr/local/jdk6
>X 
>X # The java classpath (required)
>X-CLASSPATH="$CASSANDRA_CONF:$cassandra_bin"
>X+CLASSPATH="$CASSANDRA_CONF"
>X 
>X for jar in "$CASSANDRA_HOME"/lib/*.jar; do
>X     CLASSPATH="$CLASSPATH:$jar"
>f4041bfd3ed96c1dae00e80fd32bafa7
>echo x - cassandra3/files/cassandra.in
>sed 's/^X//' >cassandra3/files/cassandra.in << '9d729e987ee2f7e1e88aaa0603b9b31a'
>X#!/bin/sh
>X#
>X# $FreeBSD$
>X#
>X# PROVIDE: cassandra
>X# REQUIRE: LOGIN
>X# KEYWORD: shutdown
>X#
>X# Be sure to configure full settings in %%ETCDIR%% and create
>X# user ${cassandra_user} prior to enabling daemon.
>X#
>X# Add the following lines to /etc/rc.conf or /etc/.conf.local to
>X# enable the Cassandra daemon:
>X# cassandra_enable:		Set to "YES" to enable the daemon.
>X# cassandra_user: 		The user under which to run the daemon.
>X#				Defaults to "cassandra".
>X
>X. /etc/rc.subr
>X
>Xname=cassandra
>Xrcvar=cassandra_enable
>Xdesc="Cassandra daemon"
>X
>Xload_rc_config $name
>X
>X: ${cassandra_enable:=NO}
>X: ${cassandra_user:=cassandra}
>X
>Xcommand=%%PREFIX%%/bin/cassandra
>Xcommand_args="-p /var/run/cassandra/cassandra.pid >/dev/null 2>/dev/null"
>Xstart_precmd="${name}_prestart"
>X
>Xprocname=%%PREFIX%%/openjdk8/bin/java
>Xpidfile=/var/run/cassandra/cassandra.pid
>X
>Xcassandra_prestart()
>X{
>X	export JAVA_HOME=%%JAVA_HOME%%
>X	install -d -o ${cassandra_user} /var/run/cassandra
>X}
>X
>Xrun_rc_command "$1"
>9d729e987ee2f7e1e88aaa0603b9b31a
>echo x - cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java
>sed 's/^X//' >cassandra3/files/patch-src_java_org_apache_cassandra_config_Config.java << 'e707dad5d63c7edb81284a83357f3285'
>X--- src/java/org/apache/cassandra/config/Config.java.orig	2018-03-06 21:16:18 UTC
>X+++ src/java/org/apache/cassandra/config/Config.java
>X@@ -252,7 +252,7 @@ public class Config
>X     public volatile int key_cache_save_period = 14400;
>X     public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;
>X 
>X-    public String row_cache_class_name = "org.apache.cassandra.cache.OHCProvider";
>X+    public String row_cache_class_name = "org.apache.cassandra.cache.SerializingCacheProvider";
>X     public long row_cache_size_in_mb = 0;
>X     public volatile int row_cache_save_period = 0;
>X     public volatile int row_cache_keys_to_save = Integer.MAX_VALUE;
>e707dad5d63c7edb81284a83357f3285
>echo x - cassandra3/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
>sed 's/^X//' >cassandra3/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java << '6db0c53a022ca3f91e4e29ea56b51201'
>X--- src/java/org/apache/cassandra/service/StartupChecks.java.orig	2018-02-14 20:43:59 UTC
>X+++ src/java/org/apache/cassandra/service/StartupChecks.java
>X@@ -263,7 +263,14 @@ public class StartupChecks
>X     {
>X         public void execute()
>X         {
>X-            SigarLibrary.instance.warnIfRunningInDegradedMode();
>X+            try {
>X+                @SuppressWarnings("unused")
>X+                Class<?> loadMe = org.hyperic.sigar.SigarException.class;
>X+                
>X+                SigarLibrary.instance.warnIfRunningInDegradedMode();
>X+            } catch (NoClassDefFoundError e) {
>X+                logger.info("Could not initialize SIGAR library: SIGAR option not selected during install or jar no longer available.");
>X+            }
>X         }
>X     };
>X 
>6db0c53a022ca3f91e4e29ea56b51201
>echo x - cassandra3/pkg-plist
>sed 's/^X//' >cassandra3/pkg-plist << '4cf6a3025c56db884c474ef07ffd4f21'
>X%%DATADIR%%/bin/cassandra
>X%%DATADIR%%/bin/cassandra.in.sh
>X%%DATADIR%%/bin/cqlsh
>X%%DATADIR%%/bin/cqlsh.py
>X%%DATADIR%%/bin/debug-cql
>X%%DATADIR%%/bin/nodetool
>X%%DATADIR%%/bin/sstableloader
>X%%DATADIR%%/bin/sstablescrub
>X%%DATADIR%%/bin/sstableupgrade
>X%%DATADIR%%/bin/sstableutil
>X%%DATADIR%%/bin/sstableverify
>X%%DATADIR%%/bin/stop-server
>X%%DATADIR%%/CHANGES.txt
>X%%DATADIR%%/interface/cassandra.thrift
>X%%DATADIR%%/lib/airline-0.6.jar
>X%%DATADIR%%/lib/antlr-runtime-3.5.2.jar
>X%%DATADIR%%/lib/apache-cassandra-%%PORTVERSION%%.jar
>X%%DATADIR%%/lib/apache-cassandra-thrift-%%PORTVERSION%%.jar
>X%%DATADIR%%/lib/asm-5.0.4.jar
>X%%DATADIR%%/lib/caffeine-2.2.6.jar
>X%%DATADIR%%/lib/cassandra-driver-core-3.0.1-shaded.jar
>X%%DATADIR%%/lib/cassandra-driver-internal-only-3.10.zip
>X%%DATADIR%%/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip
>X%%DATADIR%%/lib/commons-cli-1.1.jar
>X%%DATADIR%%/lib/commons-codec-1.9.jar
>X%%DATADIR%%/lib/commons-lang3-3.1.jar
>X%%DATADIR%%/lib/commons-math3-3.2.jar
>X%%DATADIR%%/lib/compress-lzf-0.8.4.jar
>X%%DATADIR%%/lib/concurrent-trees-2.4.0.jar
>X%%DATADIR%%/lib/concurrentlinkedhashmap-lru-1.4.jar
>X%%DATADIR%%/lib/disruptor-3.0.1.jar
>X%%DATADIR%%/lib/ecj-4.4.2.jar
>X%%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip
>X%%DATADIR%%/lib/guava-18.0.jar
>X%%DATADIR%%/lib/HdrHistogram-2.1.9.jar
>X%%DATADIR%%/lib/high-scale-lib-1.0.6.jar
>X%%DATADIR%%/lib/hppc-0.5.4.jar
>X%%DATADIR%%/lib/jackson-core-asl-1.9.13.jar
>X%%DATADIR%%/lib/jackson-mapper-asl-1.9.13.jar
>X%%DATADIR%%/lib/jamm-0.3.0.jar
>X%%DATADIR%%/lib/javax.inject.jar
>X%%DATADIR%%/lib/jbcrypt-0.3m.jar
>X%%DATADIR%%/lib/jcl-over-slf4j-1.7.7.jar
>X%%DATADIR%%/lib/jctools-core-1.2.1.jar
>X%%DATADIR%%/lib/jflex-1.6.0.jar
>X%%DATADIR%%/lib/jna-4.2.2.jar
>X%%DATADIR%%/lib/joda-time-2.4.jar
>X%%DATADIR%%/lib/json-simple-1.1.jar
>X%%DATADIR%%/lib/jstackjunit-0.0.1.jar
>X%%DATADIR%%/lib/libthrift-0.9.2.jar
>X%%DATADIR%%/lib/licenses/airline-0.6.txt
>X%%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt
>X%%DATADIR%%/lib/licenses/asm-5.0.4.txt
>X%%DATADIR%%/lib/licenses/caffeine-2.2.6.txt
>X%%DATADIR%%/lib/licenses/cassandra-driver-3.0.1.txt
>X%%DATADIR%%/lib/licenses/commons-cli-1.1.txt
>X%%DATADIR%%/lib/licenses/commons-codec-1.9.txt
>X%%DATADIR%%/lib/licenses/commons-lang3-3.1.txt
>X%%DATADIR%%/lib/licenses/commons-math3-3.2.txt
>X%%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
>X%%DATADIR%%/lib/licenses/concurrent-trees-2.4.0.txt
>X%%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.4.txt
>X%%DATADIR%%/lib/licenses/disruptor-3.0.1.txt
>X%%DATADIR%%/lib/licenses/ecj-4.4.2.txt
>X%%DATADIR%%/lib/licenses/futures-2.1.6.txt
>X%%DATADIR%%/lib/licenses/guava-18.0.txt
>X%%DATADIR%%/lib/licenses/hdrhistogram-2.1.9.txt
>X%%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt
>X%%DATADIR%%/lib/licenses/hppc-0.5.4.txt
>X%%DATADIR%%/lib/licenses/jackson-core-asl-1.9.13.txt
>X%%DATADIR%%/lib/licenses/jackson-mapper-asl-1.9.13.txt
>X%%DATADIR%%/lib/licenses/jamm-0.3.0.txt
>X%%DATADIR%%/lib/licenses/javax.inject.txt
>X%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
>X%%DATADIR%%/lib/licenses/jcl-over-slf4j-1.7.7.txt
>X%%DATADIR%%/lib/licenses/jctools-core-1.2.1.txt
>X%%DATADIR%%/lib/licenses/jflex-1.6.0.txt
>X%%DATADIR%%/lib/licenses/jna-4.2.2.txt
>X%%DATADIR%%/lib/licenses/joda-time-2.4.txt
>X%%DATADIR%%/lib/licenses/json-simple-1.1.txt
>X%%DATADIR%%/lib/licenses/jstackjunit-0.0.1.txt
>X%%DATADIR%%/lib/licenses/libthrift-0.9.2.txt
>X%%DATADIR%%/lib/licenses/log4j-over-slf4j-1.7.7.txt
>X%%DATADIR%%/lib/licenses/logback-classic-1.1.3.txt
>X%%DATADIR%%/lib/licenses/logback-core-1.1.3.txt
>X%%DATADIR%%/lib/licenses/lz4-1.3.0.txt
>X%%DATADIR%%/lib/licenses/metrics-core-3.1.0.txt
>X%%DATADIR%%/lib/licenses/metrics-jvm-3.1.0.txt
>X%%DATADIR%%/lib/licenses/metrics-logback-3.1.0.txt
>X%%DATADIR%%/lib/licenses/netty-all-4.0.44.Final.txt
>X%%DATADIR%%/lib/licenses/ohc-0.4.4.txt
>X%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt
>X%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt
>X%%DATADIR%%/lib/licenses/six-1.7.3.txt
>X%%DATADIR%%/lib/licenses/slf4j-api-1.7.7.txt
>X%%DATADIR%%/lib/licenses/snakeyaml-1.11.txt
>X%%DATADIR%%/lib/licenses/snowball-stemmer-1.3.0.581.1.txt
>X%%DATADIR%%/lib/licenses/ST4-4.0.8.txt
>X%%DATADIR%%/lib/licenses/stream-2.5.2.txt
>X%%DATADIR%%/lib/licenses/thrift-server-0.3.7.txt
>X%%DATADIR%%/lib/log4j-over-slf4j-1.7.7.jar
>X%%DATADIR%%/lib/logback-classic-1.1.3.jar
>X%%DATADIR%%/lib/logback-core-1.1.3.jar
>X%%DATADIR%%/lib/lz4-1.3.0.jar
>X%%DATADIR%%/lib/metrics-core-3.1.0.jar
>X%%DATADIR%%/lib/metrics-jvm-3.1.0.jar
>X%%DATADIR%%/lib/metrics-logback-3.1.0.jar
>X%%DATADIR%%/lib/netty-all-4.0.44.Final.jar
>X%%DATADIR%%/lib/ohc-core-0.4.4.jar
>X%%DATADIR%%/lib/ohc-core-j8-0.4.4.jar
>X%%DATADIR%%/lib/reporter-config-base-3.0.3.jar
>X%%DATADIR%%/lib/reporter-config3-3.0.3.jar
>X%%DATADIR%%/lib/six-1.7.3-py2.py3-none-any.zip
>X%%DATADIR%%/lib/slf4j-api-1.7.7.jar
>X%%DATADIR%%/lib/snakeyaml-1.11.jar
>X%%DATADIR%%/lib/snappy-java.jar
>X%%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar
>X%%DATADIR%%/lib/ST4-4.0.8.jar
>X%%DATADIR%%/lib/stream-2.5.2.jar
>X%%DATADIR%%/lib/thrift-server-0.3.7.jar
>X%%DATADIR%%/LICENSE.txt
>X%%DATADIR%%/NEWS.txt
>X%%DATADIR%%/NOTICE.txt
>X%%DATADIR%%/pylib/cqlshlib/__init__.py
>X%%DATADIR%%/pylib/cqlshlib/copyutil.py
>X%%DATADIR%%/pylib/cqlshlib/cql3handling.py
>X%%DATADIR%%/pylib/cqlshlib/cqlhandling.py
>X%%DATADIR%%/pylib/cqlshlib/cqlshhandling.py
>X%%DATADIR%%/pylib/cqlshlib/displaying.py
>X%%DATADIR%%/pylib/cqlshlib/formatting.py
>X%%DATADIR%%/pylib/cqlshlib/helptopics.py
>X%%DATADIR%%/pylib/cqlshlib/pylexotron.py
>X%%DATADIR%%/pylib/cqlshlib/saferscanner.py
>X%%DATADIR%%/pylib/cqlshlib/sslhandling.py
>X%%DATADIR%%/pylib/cqlshlib/test/__init__.py
>X%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
>X%%DATADIR%%/pylib/cqlshlib/test/basecase.py
>X%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
>X%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
>X%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
>X%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.py
>X%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
>X%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_invocation.py
>X%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
>X%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_parsing.py
>X%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
>X%%DATADIR%%/pylib/cqlshlib/test/winpty.py
>X%%DATADIR%%/pylib/cqlshlib/tracing.py
>X%%DATADIR%%/pylib/cqlshlib/util.py
>X%%DATADIR%%/pylib/cqlshlib/wcwidth.py
>X%%DATADIR%%/pylib/setup.py
>X%%DATADIR%%/tools/bin/cassandra-stress
>X%%DATADIR%%/tools/bin/cassandra-stressd
>X%%DATADIR%%/tools/bin/cassandra.in.sh
>X%%DATADIR%%/tools/bin/compaction-stress
>X%%DATADIR%%/tools/bin/sstabledump
>X%%DATADIR%%/tools/bin/sstableexpiredblockers
>X%%DATADIR%%/tools/bin/sstablelevelreset
>X%%DATADIR%%/tools/bin/sstablemetadata
>X%%DATADIR%%/tools/bin/sstableofflinerelevel
>X%%DATADIR%%/tools/bin/sstablerepairedset
>X%%DATADIR%%/tools/bin/sstablesplit
>X%%DATADIR%%/tools/cqlstress-counter-example.yaml
>X%%DATADIR%%/tools/cqlstress-example.yaml
>X%%DATADIR%%/tools/cqlstress-insanity-example.yaml
>X%%DATADIR%%/tools/lib/stress.jar
>X%%ETCDIR%%/metrics-reporter-config-sample.yaml
>X%%ETCDIR%%/README.txt
>X%%ETCDIR%%/triggers/README.txt
>X%%SIGAR%%%%DATADIR%%/lib/sigar.jar
>X@sample %%ETCDIR%%/cassandra-env.sh.sample
>X@sample %%ETCDIR%%/cassandra-jaas.config.sample
>X@sample %%ETCDIR%%/cassandra-rackdc.properties.sample
>X@sample %%ETCDIR%%/cassandra-topology.properties.sample
>X@sample %%ETCDIR%%/cassandra.yaml.sample
>X@sample %%ETCDIR%%/commitlog_archiving.properties.sample
>X@sample %%ETCDIR%%/cqlshrc.sample
>X@sample %%ETCDIR%%/hotspot_compiler.sample
>X@sample %%ETCDIR%%/jvm.options.sample
>X@sample %%ETCDIR%%/logback-tools.xml.sample
>X@sample %%ETCDIR%%/logback.xml.sample
>Xbin/cassandra
>Xbin/cqlsh
>Xbin/nodetool
>Xbin/sstableloader
>Xbin/sstablescrub
>Xbin/sstableupgrade
>Xbin/sstableutil
>Xbin/sstableverify
>4cf6a3025c56db884c474ef07ffd4f21
>exit
>

Actions: View

Attachments on bug 226377: 191234 | 191294 | 191502 | 195202 | 196689 | 196690 | 196691 | 196954 | 197462 | 197936