merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40c3ad6a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40c3ad6a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40c3ad6a Branch: refs/heads/cassandra-2.2 Commit: 40c3ad6a0c05caa8c9253bde0e3be17b82adad2a Parents: f294ee1 b7adb03 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Jun 1 10:26:34 2015 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Jun 1 10:26:34 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/sstablekeys | 2 +- bin/sstableloader | 2 +- bin/sstablescrub | 2 +- bin/sstableupgrade | 2 +- tools/bin/json2sstable | 2 +- tools/bin/sstable2json | 2 +- tools/bin/sstablesplit | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40c3ad6a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0eb0751,7d276f7..75eb752 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,37 -1,5 +1,38 @@@ -2.0.16: +2.1.6 + * Consistent error message when a table mixes counter and non-counter + columns (CASSANDRA-9492) + * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508) + * (cqlsh) Better float precision by default (CASSANDRA-9224) + * Improve estimated row count (CASSANDRA-9107) + * Optimize range tombstone memory footprint (CASSANDRA-8603) + * Use configured gcgs in anticompaction (CASSANDRA-9397) + * Warn on misuse of unlogged batches (CASSANDRA-9282) + * Failure detector detects and ignores local pauses (CASSANDRA-9183) + * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029) + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361) + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298) + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057) + * Add support for top-k custom 2i queries (CASSANDRA-8717) + * Fix error when dropping table during compaction (CASSANDRA-9251) + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773) + * Add support for rate limiting log messages (CASSANDRA-9029) + * Log the partition key with tombstone warnings (CASSANDRA-8561) + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271) + * Fix PITR commitlog replay (CASSANDRA-9195) + * GCInspector logs very different times (CASSANDRA-9124) + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261) + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151) + * Repair waits for anticompaction to finish (CASSANDRA-9097) + * Fix streaming not holding ref when stream error (CASSANDRA-9295) + * Fix canonical view returning early opened SSTables (CASSANDRA-9396) +Merged from 2.0: + * Allow JVM_OPTS to be passed to standalone tools (CASSANDRA-5969) * Fix bad condition in RangeTombstoneList (CASSANDRA-9485) * Fix potential StackOverflow when setting CrcCheckChance over JMX (CASSANDRA-9488) * Fix null static columns in pages after the first, paged reversed http://git-wip-us.apache.org/repos/asf/cassandra/blob/40c3ad6a/bin/sstablekeys ---------------------------------------------------------------------- diff --cc bin/sstablekeys index 8308b88,b1f48fe..77d2e64 --- a/bin/sstablekeys +++ b/bin/sstablekeys @@@ -48,9 -48,8 +48,9 @@@ if [ $# -eq "0" ]; the exit 2 fi - "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \ + "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" $JVM_OPTS -Dstorage-config="$CASSANDRA_CONF" \ - -Dlog4j.configuration=log4j-tools.properties \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + -Dlogback.configurationFile=logback-tools.xml \ org.apache.cassandra.tools.SSTableExport "$@" -e # vi:ai sw=4 ts=4 tw=0 et http://git-wip-us.apache.org/repos/asf/cassandra/blob/40c3ad6a/bin/sstableloader ---------------------------------------------------------------------- diff --cc bin/sstableloader index 2ee4f51,f69fd0f..26b1e3f --- a/bin/sstableloader +++ b/bin/sstableloader @@@ -43,9 -43,8 +43,9 @@@ if [ -z "$CLASSPATH" ]; the exit 1 fi - "$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" -Xmx256M \ + "$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx256M \ - -Dlog4j.configuration=log4j-tools.properties \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + -Dlogback.configurationFile=logback-tools.xml \ org.apache.cassandra.tools.BulkLoader "$@" # vi:ai sw=4 ts=4 tw=0 et http://git-wip-us.apache.org/repos/asf/cassandra/blob/40c3ad6a/bin/sstablescrub ---------------------------------------------------------------------- diff --cc bin/sstablescrub index a5f9a67,70e7efb..ea784ef --- a/bin/sstablescrub +++ b/bin/sstablescrub @@@ -47,9 -47,8 +47,9 @@@ if [ "x$MAX_HEAP_SIZE" = "x" ]; the MAX_HEAP_SIZE="256M" fi - "$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" -Xmx$MAX_HEAP_SIZE \ + "$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx$MAX_HEAP_SIZE \ - -Dlog4j.configuration=log4j-tools.properties \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + -Dlogback.configurationFile=logback-tools.xml \ org.apache.cassandra.tools.StandaloneScrubber "$@" # vi:ai sw=4 ts=4 tw=0 et http://git-wip-us.apache.org/repos/asf/cassandra/blob/40c3ad6a/bin/sstableupgrade ---------------------------------------------------------------------- diff --cc bin/sstableupgrade index 6248ac8,dc72aec..c972d54 --- a/bin/sstableupgrade +++ b/bin/sstableupgrade @@@ -47,9 -47,8 +47,9 @@@ if [ "x$MAX_HEAP_SIZE" = "x" ]; the MAX_HEAP_SIZE="256M" fi - $JAVA $JAVA_AGENT -ea -cp $CLASSPATH -Xmx$MAX_HEAP_SIZE \ + $JAVA $JAVA_AGENT -ea -cp $CLASSPATH $JVM_OPTS -Xmx$MAX_HEAP_SIZE \ - -Dlog4j.configuration=log4j-tools.properties \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + -Dlogback.configurationFile=logback-tools.xml \ org.apache.cassandra.tools.StandaloneUpgrader "$@" # vi:ai sw=4 ts=4 tw=0 et http://git-wip-us.apache.org/repos/asf/cassandra/blob/40c3ad6a/tools/bin/json2sstable ---------------------------------------------------------------------- diff --cc tools/bin/json2sstable index bb10b51,0000000..a0278d4 mode 100755,000000..100755 --- a/tools/bin/json2sstable +++ b/tools/bin/json2sstable @@@ -1,51 -1,0 +1,51 @@@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if [ "x$CASSANDRA_INCLUDE" = "x" ]; then + for include in "`dirname "$0"`/cassandra.in.sh" \ + "$HOME/.cassandra.in.sh" \ + /usr/share/cassandra/cassandra.in.sh \ + /usr/local/share/cassandra/cassandra.in.sh \ + /opt/cassandra/cassandra.in.sh; do + if [ -r "$include" ]; then + . "$include" + break + fi + done +elif [ -r "$CASSANDRA_INCLUDE" ]; then + . "$CASSANDRA_INCLUDE" +fi + +# Use JAVA_HOME if set, otherwise look for java in PATH +if [ -x "$JAVA_HOME/bin/java" ]; then + JAVA="$JAVA_HOME/bin/java" +else + JAVA="`which java`" +fi + +if [ -z "$CLASSPATH" ]; then + echo "You must set the CLASSPATH var" >&2 + exit 1 +fi + - "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \ ++"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" $JVM_OPTS -Dstorage-config="$CASSANDRA_CONF" \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + -Dlogback.configurationFile=logback-tools.xml \ + org.apache.cassandra.tools.SSTableImport "$@" + +# vi:ai sw=4 ts=4 tw=0 et http://git-wip-us.apache.org/repos/asf/cassandra/blob/40c3ad6a/tools/bin/sstable2json ---------------------------------------------------------------------- diff --cc tools/bin/sstable2json index a7882bf,0000000..7eeb708 mode 100755,000000..100755 --- a/tools/bin/sstable2json +++ b/tools/bin/sstable2json @@@ -1,52 -1,0 +1,52 @@@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if [ "x$CASSANDRA_INCLUDE" = "x" ]; then + for include in "`dirname "$0"`/cassandra.in.sh" \ + "$HOME/.cassandra.in.sh" \ + /usr/share/cassandra/cassandra.in.sh \ + /usr/local/share/cassandra/cassandra.in.sh \ + /opt/cassandra/cassandra.in.sh; do + if [ -r "$include" ]; then + . "$include" + break + fi + done +elif [ -r "$CASSANDRA_INCLUDE" ]; then + . "$CASSANDRA_INCLUDE" +fi + + +# Use JAVA_HOME if set, otherwise look for java in PATH +if [ -x "$JAVA_HOME/bin/java" ]; then + JAVA="$JAVA_HOME/bin/java" +else + JAVA="`which java`" +fi + +if [ -z "$CLASSPATH" ]; then + echo "You must set the CLASSPATH var" >&2 + exit 1 +fi + - "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \ ++"$JAVA" $JAVA_AGENT -cp "$CLASSPATH" $JVM_OPTS -Dstorage-config="$CASSANDRA_CONF" \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + -Dlogback.configurationFile=logback-tools.xml \ + org.apache.cassandra.tools.SSTableExport "$@" + +# vi:ai sw=4 ts=4 tw=0 et http://git-wip-us.apache.org/repos/asf/cassandra/blob/40c3ad6a/tools/bin/sstablesplit ---------------------------------------------------------------------- diff --cc tools/bin/sstablesplit index 73e736e,0000000..1775c65 mode 100755,000000..100755 --- a/tools/bin/sstablesplit +++ b/tools/bin/sstablesplit @@@ -1,51 -1,0 +1,51 @@@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +if [ "x$CASSANDRA_INCLUDE" = "x" ]; then + for include in /usr/share/cassandra/cassandra.in.sh \ + /usr/local/share/cassandra/cassandra.in.sh \ + /opt/cassandra/cassandra.in.sh \ + ~/.cassandra.in.sh \ + `dirname $0`/cassandra.in.sh; do + if [ -r $include ]; then + . $include + break + fi + done +elif [ -r $CASSANDRA_INCLUDE ]; then + . $CASSANDRA_INCLUDE +fi + +# Use JAVA_HOME if set, otherwise look for java in PATH +if [ -x $JAVA_HOME/bin/java ]; then + JAVA=$JAVA_HOME/bin/java +else + JAVA=`which java` +fi + +if [ -z $CLASSPATH ]; then + echo "You must set the CLASSPATH var" >&2 + exit 1 +fi + - $JAVA $JAVA_AGENT -ea -cp $CLASSPATH -Xmx256M \ ++$JAVA $JAVA_AGENT -ea -cp $CLASSPATH $JVM_OPTS -Xmx256M \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + -Dlogback.configurationFile=logback-tools.xml \ + org.apache.cassandra.tools.StandaloneSplitter "$@" + +# vi:ai sw=4 ts=4 tw=0 et