You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by aw...@apache.org on 2017/07/11 18:29:27 UTC
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
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/e406700c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e406700c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e406700c
Branch: refs/heads/trunk
Commit: e406700cf1118d30e2ef3230882020739eecac89
Parents: 48ffad8 2400d07
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Jul 11 14:10:55 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Jul 11 14:16:59 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 ++
build.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
circle.yml | 2 +-
3 files changed, 56 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e406700c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a66f4b3,ce2324d..dc22831
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,10 +1,12 @@@
+3.11.1
+ * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
+Merged from 3.0:
+ 3.0.15
+ * Set test.runners based on cores and memory size (CASSANDRA-13078)
* Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
- * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
* Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
* Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568)
- Merged from 2.2:
+Merged from 2.2:
* Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592)
* Fix nested Tuples/UDTs validation (CASSANDRA-13646)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e406700c/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index c643b50,53c2cea..7a83949
--- a/build.xml
+++ b/build.xml
@@@ -1721,7 -1664,42 +1733,42 @@@
]]>
</scriptdef>
- <target name="test" depends="build-test,stress-build" description="Parallel Test Runner">
+ <target name="get-cores">
+ <property environment="env"/>
+ <!-- support for Windows -->
+ <condition property="cores.count" value="${env.NUMBER_OF_PROCESSORS}">
+ <os family="windows" />
+ </condition>
+ <!-- support for Linux and Solaris (package SUNWgnu-coreutils is required) -->
+ <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
+ <arg value="--all"/>
+ </exec>
+ <!-- support for Mac OS X -->
+ <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
+ <arg value="-n"/>
+ <arg value="hw.ncpu"/>
+ </exec>
+ <echo message="Number of cores: ${cores.count}"/>
+ </target>
+
+ <target name="get-mem">
+ <condition property="mem.size" value="unknown">
+ <os family="windows" />
+ </condition>
+ <!-- support for Linux and Solaris (package SUNWgnu-coreutils is required) -->
+ <exec executable="bash" outputproperty="mem.size" os="Linux,SunOS,Solaris" failifexecutionfails="false">
+ <arg value="-c"/>
+ <arg value="free -b | grep Mem: | awk '{print $2}'"/>
+ </exec>
+ <!-- support for Mac OS X -->
+ <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
+ <arg value="-n"/>
+ <arg value="hw.memsize"/>
+ </exec>
+ <echo message="Mem size : ${mem.size}"/>
+ </target>
+
- <target name="test" depends="build-test,get-cores,get-mem" description="Parallel Test Runner">
++ <target name="test" depends="build-test,get-cores,get-mem,stress-build" description="Parallel Test Runner">
<path id="all-test-classes-path">
<fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
</path>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org