Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b92d90dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b92d90dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b92d90dc Branch: refs/heads/cassandra-3.11 Commit: b92d90dc14ef978fbfa9e09520a641f6669cf631 Parents: b8cbdde 38096da Author: Jay Zhuang <jay.zhu...@yahoo.com> Authored: Wed May 30 21:59:22 2018 -0700 Committer: Jay Zhuang <jay.zhu...@yahoo.com> Committed: Wed May 30 22:00:51 2018 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 84 +++++++++++++++++++++++++++++--------------------------- 2 files changed, 44 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92d90dc/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3879a55,16fe6d1..2d4ef25 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,5 +1,22 @@@ -3.0.17 +3.11.3 + * Reduce nodetool GC thread count (CASSANDRA-14475) + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055) + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416) + * Update metrics to 3.1.5 (CASSANDRA-12924) + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793) + * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271) + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851) + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299) + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370) + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891) + * Serialize empty buffer as empty string for json output format (CASSANDRA-14245) + * Allow logging implementation to be interchanged for embedded testing (CASSANDRA-13396) + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247) + * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170) + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: + * Add Missing dependencies in pom-all (CASSANDRA-14422) * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447) * Fix deprecated repair error notifications from 3.x clusters to legacy JMX clients (CASSANDRA-13121) * Cassandra not starting when using enhanced startup scripts in windows (CASSANDRA-14418) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92d90dc/build.xml ---------------------------------------------------------------------- diff --cc build.xml index f8cdf82,3fc64fb..4edfbb1 --- a/build.xml +++ b/build.xml @@@ -67,11 -66,9 +67,11 @@@ <property name="dist.dir" value="${build.dir}/dist"/> <property name="tmp.dir" value="${java.io.tmpdir}"/> + <property name="doc.dir" value="${basedir}/doc"/> - ++ <property name="source.version" value="1.8"/> <property name="target.version" value="1.8"/> - + <condition property="version" value="${base.version}"> <isset property="release"/> </condition> @@@ -216,15 -212,12 +216,15 @@@ --> <target name="check-gen-cql3-grammar"> <uptodate property="cql3current" - srcfile="${build.src.java}/org/apache/cassandra/cql3/Cql.g" - targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens"/> + targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens"> + <srcfiles dir="${build.src.antlr}"> + <include name="*.g"/> + </srcfiles> + </uptodate> </target> - + <target name="gen-cql3-grammar" depends="check-gen-cql3-grammar" unless="cql3current"> - <echo>Building Grammar ${build.src.java}/org/apache/cassandra/cql3/Cql.g ...</echo> + <echo>Building Grammar ${build.src.antlr}/Cql.g ...</echo> <java classname="org.antlr.Tool" classpath="${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/ST4-4.0.8.jar" fork="true" @@@ -388,10 -360,9 +388,10 @@@ <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/> <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/> <dependency groupId="com.github.jbellis" artifactId="jamm" version="0.3.0"/> - + <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.7"> <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/> + <exclusion groupId="junit" artifactId="junit"/> </dependency> <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/> <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.2"> @@@ -639,9 -584,8 +640,10 @@@ <dependency groupId="org.fusesource" artifactId="sigar"/> <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/> <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/> + <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8"/> - <dependency groupId="org.ow2.asm" artifactId="asm"/> + <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" /> + <dependency groupId="org.jctools" artifactId="jctools-core"/> + <dependency groupId="org.ow2.asm" artifactId="asm" /> </artifact:pom> <artifact:pom id="thrift-pom" artifactId="cassandra-thrift" @@@ -995,7 -938,19 +997,7 @@@ <jar jarfile="${build.dir}/${final.name}-javadoc.jar" basedir="${javadoc.jars.dir}/main"/> - <!-- javadoc task always rebuilds so might as well remove the generated docs to prevent - <create-javadoc destdir="${javadoc.jars.dir}/clientutil"> - <filesets> - <fileset dir="${build.src.java}" defaultexcludes="yes"> - <include name="org/apache/cassandra/serializers/*" /> - <include name="org/apache/cassandra/utils/ByteBufferUtil*.java" /> - <include name="org/apache/cassandra/utils/Hex.java" /> - <include name="org/apache/cassandra/utils/UUIDGen*.java" /> - </fileset> - </filesets> - </create-javadoc> - <jar jarfile="${build.dir}/${ant.project.name}-clientutil-${version}-javadoc.jar" - basedir="${javadoc.jars.dir}/clientutil"/> + <!-- javadoc task always rebuilds so might as well remove the generated docs to prevent being pulled into the distribution by accident --> <delete quiet="true" dir="${javadoc.jars.dir}"/> </target> @@@ -1396,8 -1344,8 +1398,8 @@@ <jvmarg value="-Dcassandra.skip_sync=true" /> </testmacro> </target> - + - <target name="test-compression" depends="build-test" description="Execute unit tests with sstable compression enabled"> + <target name="test-compression" depends="build-test,stress-build" description="Execute unit tests with sstable compression enabled"> <property name="compressed_yaml" value="${build.test.dir}/cassandra.compressed.yaml"/> <concat destfile="${compressed_yaml}"> <fileset file="${test.conf}/cassandra.yaml"/> @@@ -1533,10 -1468,10 +1535,10 @@@ </sequential> </target> - <target name="test-all" + <target name="test-all" - depends="eclipse-warnings,test,long-test,test-compression" + depends="eclipse-warnings,test,long-test,test-compression,stress-test" description="Run all tests except for those under test-burn" /> - + <!-- Use JaCoCo ant extension without needing externally saved lib --> <target name="jacoco-init" depends="maven-ant-tasks-init"> <artifact:dependencies pathId="jacocoant.classpath"> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
