merge from 2.0

2015-06-08 09:34:16 -05:00 · 2015-06-08 09:34:16 -05:00 · 46ce21c7b7
parent 5d26943fda a8ceb2c650
commit 46ce21c7b7
14 changed files with 17 additions and 17 deletions
--- a/bin/cassandra
+++ b/bin/cassandra
@ -209,7 +209,7 @@ while true; do
 done

 # see CASSANDRA-7254
-"$JAVA" -cp $CLASSPATH $JVM_OPTS 2>&1 | grep -q 'Error: Exception thrown by the agent : java.lang.NullPointerException'
+"$JAVA" -cp "$CLASSPATH" $JVM_OPTS 2>&1 | grep -q 'Error: Exception thrown by the agent : java.lang.NullPointerException'
 if [ $? -ne "1" ]; then 
    echo Unable to bind JMX, is Cassandra already running?
    exit 1;
--- a/bin/sstableupgrade
+++ b/bin/sstableupgrade
@ -38,7 +38,7 @@ else
    JAVA=`which java`
 fi

-if [ -z $CLASSPATH ]; then
+if [ -z "$CLASSPATH" ]; then
    echo "You must set the CLASSPATH var" >&2
    exit 1
 fi
@ -47,7 +47,7 @@ if [ "x$MAX_HEAP_SIZE" = "x" ]; then
    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 \
        -Dcassandra.storagedir="$cassandra_storagedir" \
        -Dlogback.configurationFile=logback-tools.xml \
        org.apache.cassandra.tools.StandaloneUpgrader "$@"
--- a/examples/client_only/bin/client_only
+++ b/examples/client_only/bin/client_only
@ -53,4 +53,4 @@ if [ "x$JAVA" = "x" ]; then
 fi

 #echo $CLASSPATH
-$JAVA -Xmx1G -ea -cp $CLASSPATH ClientOnlyExample $@
+"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" ClientOnlyExample $@
--- a/examples/hadoop_cql3_word_count/bin/word_count
+++ b/examples/hadoop_cql3_word_count/bin/word_count
@ -59,4 +59,4 @@ OUTPUT_REDUCER=cassandra
 INPUT_MAPPER=native

 #echo $CLASSPATH
-$JAVA -Xmx1G -ea -cp $CLASSPATH WordCount output_reducer=$OUTPUT_REDUCER input_mapper=$INPUT_MAPPER
+"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" WordCount output_reducer=$OUTPUT_REDUCER input_mapper=$INPUT_MAPPER
--- a/examples/hadoop_cql3_word_count/bin/word_count_counters
+++ b/examples/hadoop_cql3_word_count/bin/word_count_counters
@ -57,4 +57,4 @@ fi
 INPUT_MAPPER=native

 #echo $CLASSPATH
-$JAVA -Xmx1G -ea -cp $CLASSPATH WordCountCounters input_mapper=$INPUT_MAPPER
+"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" WordCountCounters input_mapper=$INPUT_MAPPER
--- a/examples/hadoop_cql3_word_count/bin/word_count_setup
+++ b/examples/hadoop_cql3_word_count/bin/word_count_setup
@ -58,4 +58,4 @@ HOST=localhost
 PORT=9160
 FRAMED=true

-$JAVA -Xmx1G -ea -Dcassandra.host=$HOST -Dcassandra.port=$PORT -Dcassandra.framed=$FRAMED -cp $CLASSPATH WordCountSetup
+"$JAVA" -Xmx1G -ea -Dcassandra.host=$HOST -Dcassandra.port=$PORT -Dcassandra.framed=$FRAMED -cp "$CLASSPATH" WordCountSetup
--- a/examples/hadoop_word_count/bin/word_count
+++ b/examples/hadoop_word_count/bin/word_count
@ -58,4 +58,4 @@ fi
 OUTPUT_REDUCER=cassandra

 #echo $CLASSPATH
-$JAVA -Xmx1G -ea -cp $CLASSPATH WordCount output_reducer=$OUTPUT_REDUCER
+"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" WordCount output_reducer=$OUTPUT_REDUCER
--- a/examples/hadoop_word_count/bin/word_count_counters
+++ b/examples/hadoop_word_count/bin/word_count_counters
@ -55,4 +55,4 @@ if [ "x$JAVA" = "x" ]; then
 fi

 #echo $CLASSPATH
-$JAVA -Xmx1G -ea -cp $CLASSPATH WordCountCounters
+"$JAVA" -Xmx1G -ea -cp "$CLASSPATH" WordCountCounters
--- a/examples/hadoop_word_count/bin/word_count_setup
+++ b/examples/hadoop_word_count/bin/word_count_setup
@ -58,4 +58,4 @@ HOST=localhost
 PORT=9160
 FRAMED=true

-$JAVA -Xmx1G -ea -Dcassandra.host=$HOST -Dcassandra.port=$PORT -Dcassandra.framed=$FRAMED -cp $CLASSPATH WordCountSetup
+"$JAVA" -Xmx1G -ea -Dcassandra.host=$HOST -Dcassandra.port=$PORT -Dcassandra.framed=$FRAMED -cp "$CLASSPATH" WordCountSetup
--- a/tools/bin/cassandra-stress
+++ b/tools/bin/cassandra-stress
@ -42,6 +42,6 @@ if [ "x$JAVA" = "x" ]; then
    exit 1
 fi

-$JAVA -server -ea -cp "$CLASSPATH" \
+"$JAVA" -server -ea -cp "$CLASSPATH" \
      -Dcassandra.storagedir="$cassandra_storagedir" \
      org.apache.cassandra.stress.Stress $@
--- a/tools/bin/cassandra-stressd
+++ b/tools/bin/cassandra-stressd
@ -52,7 +52,7 @@ fi
 case "$1" in
  start)
    echo "Starting $DESC: "
-    $JAVA -server -cp $CLASSPATH \
+    "$JAVA" -server -cp "$CLASSPATH" \
          -Dcassandra.storagedir="$cassandra_storagedir" \
          org.apache.cassandra.stress.StressServer $@ 1> ./stressd.out.log 2> ./stressd.err.log &
    echo $! > ./stressd.pid
--- a/tools/bin/sstablelevelreset
+++ b/tools/bin/sstablelevelreset
@ -39,12 +39,12 @@ 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 -cp $CLASSPATH  -Dstorage-config=$CASSANDRA_CONF \
+"$JAVA" -cp "$CLASSPATH"  -Dstorage-config=$CASSANDRA_CONF \
        -Dcassandra.storagedir="$cassandra_storagedir" \
        -Dlogback.configurationFile=logback-tools.xml \
        org.apache.cassandra.tools.SSTableLevelResetter "$@"
--- a/tools/bin/sstablemetadata
+++ b/tools/bin/sstablemetadata
@ -44,7 +44,7 @@ if [ -z "$CLASSPATH" ]; then
    exit 1
 fi

-$JAVA -cp $CLASSPATH \
+"$JAVA" -cp "$CLASSPATH" \
        -Dcassandra.storagedir="$cassandra_storagedir" \
        -Dlogback.configurationFile=logback-tools.xml \
        org.apache.cassandra.tools.SSTableMetadataViewer "$@"
--- a/tools/bin/sstablesplit
+++ b/tools/bin/sstablesplit
@ -38,12 +38,12 @@ 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 "$@"