Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/251449ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/251449ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/251449ff Branch: refs/heads/trunk Commit: 251449ffade8fd67d9894a3798093c9c426e266d Parents: c9285d0 1d7c0bc Author: Yuki Morishita <[email protected]> Authored: Mon Apr 25 20:08:24 2016 -0500 Committer: Yuki Morishita <[email protected]> Committed: Mon Apr 25 20:08:24 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/debug-cql | 8 ++++---- bin/nodetool | 9 +++++---- bin/sstableloader | 9 +++++---- bin/sstablescrub | 9 +++++---- bin/sstableupgrade | 9 +++++---- bin/sstableutil | 9 +++++---- bin/sstableverify | 9 +++++---- tools/bin/cassandra-stress | 9 +++++---- tools/bin/cassandra-stressd | 9 +++++---- tools/bin/sstabledump | 9 +++++---- tools/bin/sstableexpiredblockers | 9 +++++---- tools/bin/sstablelevelreset | 9 +++++---- tools/bin/sstablemetadata | 9 +++++---- tools/bin/sstableofflinerelevel | 9 +++++---- tools/bin/sstablerepairedset | 9 +++++---- tools/bin/sstablesplit | 9 +++++---- 17 files changed, 80 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/251449ff/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index de17a70,1837a6e..ea21ee7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -14,11 -3,8 +14,12 @@@ Merged from 2.2 * cqlsh: COPY FROM should use regular inserts for single statement batches and report errors correctly if workers processes crash on initialization (CASSANDRA-11474) * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + * Allow only DISTINCT queries with partition keys restrictions (CASSANDRA-11339) + * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532) + * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) Merged from 2.1: + * Change order of directory searching for cassandra.in.sh to favor local one (CASSANDRA-11628) * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values (CASSANDRA-11633) * clqsh: COPY FROM throws TypeError with Cython extensions enabled (CASSANDRA-11574) * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549) http://git-wip-us.apache.org/repos/asf/cassandra/blob/251449ff/bin/sstableutil ---------------------------------------------------------------------- diff --cc bin/sstableutil index 9f07785,0000000..7457834 mode 100755,000000..100755 --- a/bin/sstableutil +++ b/bin/sstableutil @@@ -1,60 -1,0 +1,61 @@@ +#!/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 \ ++ # Locations (in order) to use when searching for an include file. ++ for include in "`dirname "$0"`/cassandra.in.sh" \ + "$HOME/.cassandra.in.sh" \ - "`dirname "$0"`/cassandra.in.sh"; do ++ /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 [ "x$JAVA" = "x" ]; then + echo "Java executable not found (hint: set JAVA_HOME)" >&2 + exit 1 +fi + +if [ -z "$CLASSPATH" ]; then + echo "You must set the CLASSPATH var" >&2 + exit 1 +fi + +if [ "x$MAX_HEAP_SIZE" = "x" ]; then + MAX_HEAP_SIZE="256M" +fi + +"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx$MAX_HEAP_SIZE \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + -Dlogback.configurationFile=logback-tools.xml \ + org.apache.cassandra.tools.StandaloneSSTableUtil "$@" + +# vi:ai sw=4 ts=4 tw=0 et http://git-wip-us.apache.org/repos/asf/cassandra/blob/251449ff/bin/sstableverify ---------------------------------------------------------------------- diff --cc bin/sstableverify index 892750b,892750b..6b296cf --- a/bin/sstableverify +++ b/bin/sstableverify @@@ -17,11 -17,11 +17,12 @@@ # 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 \ ++ # Locations (in order) to use when searching for an include file. ++ for include in "`dirname "$0"`/cassandra.in.sh" \ "$HOME/.cassandra.in.sh" \ -- "`dirname "$0"`/cassandra.in.sh"; do ++ /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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/251449ff/tools/bin/sstabledump ---------------------------------------------------------------------- diff --cc tools/bin/sstabledump index 6bbbfc6,0000000..92ad5c5 mode 100755,000000..100755 --- a/tools/bin/sstabledump +++ b/tools/bin/sstabledump @@@ -1,60 -1,0 +1,61 @@@ +#!/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 \ ++ # Locations (in order) to use when searching for an include file. ++ for include in "`dirname "$0"`/cassandra.in.sh" \ + "$HOME/.cassandra.in.sh" \ - "`dirname "$0"`/cassandra.in.sh"; do ++ /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 [ "x$JAVA" = "x" ]; then + echo "Java executable not found (hint: set JAVA_HOME)" >&2 + exit 1 +fi + +if [ -z "$CLASSPATH" ]; then + echo "You must set the CLASSPATH var" >&2 + exit 1 +fi + +if [ "x$MAX_HEAP_SIZE" = "x" ]; then + MAX_HEAP_SIZE="256M" +fi + +"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx$MAX_HEAP_SIZE \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + -Dlogback.configurationFile=logback-tools.xml \ + org.apache.cassandra.tools.SSTableExport "$@" + +# vi:ai sw=4 ts=4 tw=0 et
