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/46ce21c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46ce21c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46ce21c7 Branch: refs/heads/cassandra-2.1 Commit: 46ce21c7b78366d14cf12a1c93528bc7c5dc0e2a Parents: 5d26943 a8ceb2c Author: Jonathan Ellis <[email protected]> Authored: Mon Jun 8 09:34:16 2015 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jun 8 09:34:16 2015 -0500 ---------------------------------------------------------------------- bin/cassandra | 2 +- bin/sstableupgrade | 4 ++-- examples/client_only/bin/client_only | 2 +- examples/hadoop_cql3_word_count/bin/word_count | 2 +- examples/hadoop_cql3_word_count/bin/word_count_counters | 2 +- examples/hadoop_cql3_word_count/bin/word_count_setup | 2 +- examples/hadoop_word_count/bin/word_count | 2 +- examples/hadoop_word_count/bin/word_count_counters | 2 +- examples/hadoop_word_count/bin/word_count_setup | 2 +- tools/bin/cassandra-stress | 2 +- tools/bin/cassandra-stressd | 2 +- tools/bin/sstablelevelreset | 4 ++-- tools/bin/sstablemetadata | 2 +- tools/bin/sstablesplit | 4 ++-- 14 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46ce21c7/bin/cassandra ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46ce21c7/bin/sstableupgrade ---------------------------------------------------------------------- diff --cc bin/sstableupgrade index c972d54,111fda6..91fa422 --- 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 $JVM_OPTS -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/46ce21c7/tools/bin/cassandra-stress ---------------------------------------------------------------------- diff --cc tools/bin/cassandra-stress index 53440ac,57d2d64..14fbd09 --- a/tools/bin/cassandra-stress +++ b/tools/bin/cassandra-stress @@@ -42,6 -42,4 +42,6 @@@ if [ "x$JAVA" = "x" ]; the exit 1 fi - $JAVA -server -ea -cp "$CLASSPATH" \ -"$JAVA" -server -cp "$CLASSPATH" org.apache.cassandra.stress.Stress $@ ++"$JAVA" -server -ea -cp "$CLASSPATH" \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + org.apache.cassandra.stress.Stress $@ http://git-wip-us.apache.org/repos/asf/cassandra/blob/46ce21c7/tools/bin/cassandra-stressd ---------------------------------------------------------------------- diff --cc tools/bin/cassandra-stressd index 6532707,6b8e165..50dedee --- a/tools/bin/cassandra-stressd +++ b/tools/bin/cassandra-stressd @@@ -52,9 -50,7 +52,9 @@@ f case "$1" in start) echo "Starting $DESC: " - $JAVA -server -cp $CLASSPATH \ - "$JAVA" -server -cp "$CLASSPATH" org.apache.cassandra.stress.StressServer $@ 1> ./stressd.out.log 2> ./stressd.err.log & ++ "$JAVA" -server -cp "$CLASSPATH" \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + org.apache.cassandra.stress.StressServer $@ 1> ./stressd.out.log 2> ./stressd.err.log & echo $! > ./stressd.pid echo "done." ;; http://git-wip-us.apache.org/repos/asf/cassandra/blob/46ce21c7/tools/bin/sstablelevelreset ---------------------------------------------------------------------- diff --cc tools/bin/sstablelevelreset index 497d604,a4a4e5d..1756a21 --- a/tools/bin/sstablelevelreset +++ b/tools/bin/sstablelevelreset @@@ -44,7 -44,6 +44,7 @@@ if [ -z "$CLASSPATH" ]; the exit 1 fi - $JAVA -cp $CLASSPATH -Dstorage-config=$CASSANDRA_CONF \ + "$JAVA" -cp "$CLASSPATH" -Dstorage-config=$CASSANDRA_CONF \ - -Dlog4j.configuration=log4j-tools.properties \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + -Dlogback.configurationFile=logback-tools.xml \ org.apache.cassandra.tools.SSTableLevelResetter "$@" http://git-wip-us.apache.org/repos/asf/cassandra/blob/46ce21c7/tools/bin/sstablemetadata ---------------------------------------------------------------------- diff --cc tools/bin/sstablemetadata index f237793,6aeacfe..c5ff832 --- a/tools/bin/sstablemetadata +++ b/tools/bin/sstablemetadata @@@ -44,7 -44,6 +44,7 @@@ if [ -z "$CLASSPATH" ]; the exit 1 fi - $JAVA -cp $CLASSPATH \ + "$JAVA" -cp "$CLASSPATH" \ - -Dlog4j.configuration=log4j-tools.properties \ + -Dcassandra.storagedir="$cassandra_storagedir" \ + -Dlogback.configurationFile=logback-tools.xml \ org.apache.cassandra.tools.SSTableMetadataViewer "$@" http://git-wip-us.apache.org/repos/asf/cassandra/blob/46ce21c7/tools/bin/sstablesplit ---------------------------------------------------------------------- diff --cc tools/bin/sstablesplit index 1775c65,0000000..51da481 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 ++if [ -z "$CLASSPATH" ]; then + echo "You must set the CLASSPATH var" >&2 + exit 1 +fi + - $JAVA $JAVA_AGENT -ea -cp $CLASSPATH $JVM_OPTS -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
