You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2015/06/08 16:35:12 UTC
[01/10] cassandra git commit: Added quotes to CLASSPATH and JAVA for
nix scripts, CASSANDRA-9529
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 b0dbea3dd -> a8ceb2c65
refs/heads/cassandra-2.1 5d26943fd -> 46ce21c7b
refs/heads/cassandra-2.2 99a84bcaf -> efb08ad30
refs/heads/trunk 4a61ca687 -> 823d8579c
Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8ceb2c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8ceb2c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8ceb2c6
Branch: refs/heads/cassandra-2.0
Commit: a8ceb2c6503bda43fad7a2669bc2c92a2b28e46d
Parents: b0dbea3
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Jun 2 08:07:07 2015 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 8 09:29:10 2015 -0500
----------------------------------------------------------------------
bin/cassandra | 2 +-
bin/sstablesplit | 4 ++--
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/sstableofflinerelevel | 4 ++--
15 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/cassandra
----------------------------------------------------------------------
diff --git a/bin/cassandra b/bin/cassandra
index 09fe013..d2f8ce7 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -207,7 +207,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;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/sstablesplit
----------------------------------------------------------------------
diff --git a/bin/sstablesplit b/bin/sstablesplit
index 15f0a04..43ad189 100755
--- a/bin/sstablesplit
+++ b/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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.StandaloneSplitter "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/sstableupgrade
----------------------------------------------------------------------
diff --git a/bin/sstableupgrade b/bin/sstableupgrade
index dc72aec..111fda6 100755
--- 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.StandaloneUpgrader "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/client_only/bin/client_only
----------------------------------------------------------------------
diff --git a/examples/client_only/bin/client_only b/examples/client_only/bin/client_only
index af2a623..99487cc 100755
--- 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 $@
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count b/examples/hadoop_cql3_word_count/bin/word_count
index 974a39a..76cca7d 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count_counters
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count_counters b/examples/hadoop_cql3_word_count/bin/word_count_counters
index 0b69b40..0da5e1a 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count_setup
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count_setup b/examples/hadoop_cql3_word_count/bin/word_count_setup
index d194a45..6e5650f 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count b/examples/hadoop_word_count/bin/word_count
index a0c5aa0..34534d7 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count_counters
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count_counters b/examples/hadoop_word_count/bin/word_count_counters
index 7793477..aaf40b8 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count_setup
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count_setup b/examples/hadoop_word_count/bin/word_count_setup
index d194a45..6e5650f 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/cassandra-stress
----------------------------------------------------------------------
diff --git a/tools/bin/cassandra-stress b/tools/bin/cassandra-stress
index 39257cd..57d2d64 100755
--- a/tools/bin/cassandra-stress
+++ b/tools/bin/cassandra-stress
@@ -42,4 +42,4 @@ if [ "x$JAVA" = "x" ]; then
exit 1
fi
-$JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.Stress $@
+"$JAVA" -server -cp "$CLASSPATH" org.apache.cassandra.stress.Stress $@
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/cassandra-stressd
----------------------------------------------------------------------
diff --git a/tools/bin/cassandra-stressd b/tools/bin/cassandra-stressd
index 8d337e5..6b8e165 100755
--- a/tools/bin/cassandra-stressd
+++ b/tools/bin/cassandra-stressd
@@ -50,7 +50,7 @@ fi
case "$1" in
start)
echo "Starting $DESC: "
- $JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.StressServer $@ 1> ./stressd.out.log 2> ./stressd.err.log &
+ "$JAVA" -server -cp "$CLASSPATH" 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/a8ceb2c6/tools/bin/sstablelevelreset
----------------------------------------------------------------------
diff --git a/tools/bin/sstablelevelreset b/tools/bin/sstablelevelreset
index a6fb33b..a4a4e5d 100755
--- a/tools/bin/sstablelevelreset
+++ b/tools/bin/sstablelevelreset
@@ -39,11 +39,11 @@ 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableLevelResetter "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/sstablemetadata
----------------------------------------------------------------------
diff --git a/tools/bin/sstablemetadata b/tools/bin/sstablemetadata
index 5e7c26a..6aeacfe 100755
--- a/tools/bin/sstablemetadata
+++ b/tools/bin/sstablemetadata
@@ -44,6 +44,6 @@ if [ -z "$CLASSPATH" ]; then
exit 1
fi
-$JAVA -cp $CLASSPATH \
+"$JAVA" -cp "$CLASSPATH" \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableMetadataViewer "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/sstableofflinerelevel
----------------------------------------------------------------------
diff --git a/tools/bin/sstableofflinerelevel b/tools/bin/sstableofflinerelevel
index 19cb4c1..0d3fc04 100755
--- a/tools/bin/sstableofflinerelevel
+++ b/tools/bin/sstableofflinerelevel
@@ -39,11 +39,11 @@ 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableOfflineRelevel "$@"
[08/10] cassandra git commit: merge from 2.1
Posted by jb...@apache.org.
merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efb08ad3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efb08ad3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efb08ad3
Branch: refs/heads/cassandra-2.2
Commit: efb08ad308d104b027bcb23a382072f6d516948d
Parents: 99a84bc 46ce21c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 8 09:34:52 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 8 09:34:52 2015 -0500
----------------------------------------------------------------------
bin/cassandra | 2 +-
bin/sstableupgrade | 4 ++--
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 ++--
13 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/efb08ad3/examples/hadoop_cql3_word_count/bin/word_count_counters
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/efb08ad3/examples/hadoop_word_count/bin/word_count_counters
----------------------------------------------------------------------
[03/10] cassandra git commit: Added quotes to CLASSPATH and JAVA for
nix scripts, CASSANDRA-9529
Posted by jb...@apache.org.
Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8ceb2c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8ceb2c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8ceb2c6
Branch: refs/heads/cassandra-2.2
Commit: a8ceb2c6503bda43fad7a2669bc2c92a2b28e46d
Parents: b0dbea3
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Jun 2 08:07:07 2015 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 8 09:29:10 2015 -0500
----------------------------------------------------------------------
bin/cassandra | 2 +-
bin/sstablesplit | 4 ++--
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/sstableofflinerelevel | 4 ++--
15 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/cassandra
----------------------------------------------------------------------
diff --git a/bin/cassandra b/bin/cassandra
index 09fe013..d2f8ce7 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -207,7 +207,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;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/sstablesplit
----------------------------------------------------------------------
diff --git a/bin/sstablesplit b/bin/sstablesplit
index 15f0a04..43ad189 100755
--- a/bin/sstablesplit
+++ b/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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.StandaloneSplitter "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/sstableupgrade
----------------------------------------------------------------------
diff --git a/bin/sstableupgrade b/bin/sstableupgrade
index dc72aec..111fda6 100755
--- 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.StandaloneUpgrader "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/client_only/bin/client_only
----------------------------------------------------------------------
diff --git a/examples/client_only/bin/client_only b/examples/client_only/bin/client_only
index af2a623..99487cc 100755
--- 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 $@
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count b/examples/hadoop_cql3_word_count/bin/word_count
index 974a39a..76cca7d 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count_counters
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count_counters b/examples/hadoop_cql3_word_count/bin/word_count_counters
index 0b69b40..0da5e1a 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count_setup
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count_setup b/examples/hadoop_cql3_word_count/bin/word_count_setup
index d194a45..6e5650f 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count b/examples/hadoop_word_count/bin/word_count
index a0c5aa0..34534d7 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count_counters
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count_counters b/examples/hadoop_word_count/bin/word_count_counters
index 7793477..aaf40b8 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count_setup
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count_setup b/examples/hadoop_word_count/bin/word_count_setup
index d194a45..6e5650f 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/cassandra-stress
----------------------------------------------------------------------
diff --git a/tools/bin/cassandra-stress b/tools/bin/cassandra-stress
index 39257cd..57d2d64 100755
--- a/tools/bin/cassandra-stress
+++ b/tools/bin/cassandra-stress
@@ -42,4 +42,4 @@ if [ "x$JAVA" = "x" ]; then
exit 1
fi
-$JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.Stress $@
+"$JAVA" -server -cp "$CLASSPATH" org.apache.cassandra.stress.Stress $@
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/cassandra-stressd
----------------------------------------------------------------------
diff --git a/tools/bin/cassandra-stressd b/tools/bin/cassandra-stressd
index 8d337e5..6b8e165 100755
--- a/tools/bin/cassandra-stressd
+++ b/tools/bin/cassandra-stressd
@@ -50,7 +50,7 @@ fi
case "$1" in
start)
echo "Starting $DESC: "
- $JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.StressServer $@ 1> ./stressd.out.log 2> ./stressd.err.log &
+ "$JAVA" -server -cp "$CLASSPATH" 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/a8ceb2c6/tools/bin/sstablelevelreset
----------------------------------------------------------------------
diff --git a/tools/bin/sstablelevelreset b/tools/bin/sstablelevelreset
index a6fb33b..a4a4e5d 100755
--- a/tools/bin/sstablelevelreset
+++ b/tools/bin/sstablelevelreset
@@ -39,11 +39,11 @@ 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableLevelResetter "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/sstablemetadata
----------------------------------------------------------------------
diff --git a/tools/bin/sstablemetadata b/tools/bin/sstablemetadata
index 5e7c26a..6aeacfe 100755
--- a/tools/bin/sstablemetadata
+++ b/tools/bin/sstablemetadata
@@ -44,6 +44,6 @@ if [ -z "$CLASSPATH" ]; then
exit 1
fi
-$JAVA -cp $CLASSPATH \
+"$JAVA" -cp "$CLASSPATH" \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableMetadataViewer "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/sstableofflinerelevel
----------------------------------------------------------------------
diff --git a/tools/bin/sstableofflinerelevel b/tools/bin/sstableofflinerelevel
index 19cb4c1..0d3fc04 100755
--- a/tools/bin/sstableofflinerelevel
+++ b/tools/bin/sstableofflinerelevel
@@ -39,11 +39,11 @@ 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableOfflineRelevel "$@"
[04/10] cassandra git commit: Added quotes to CLASSPATH and JAVA for
nix scripts, CASSANDRA-9529
Posted by jb...@apache.org.
Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8ceb2c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8ceb2c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8ceb2c6
Branch: refs/heads/trunk
Commit: a8ceb2c6503bda43fad7a2669bc2c92a2b28e46d
Parents: b0dbea3
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Jun 2 08:07:07 2015 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 8 09:29:10 2015 -0500
----------------------------------------------------------------------
bin/cassandra | 2 +-
bin/sstablesplit | 4 ++--
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/sstableofflinerelevel | 4 ++--
15 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/cassandra
----------------------------------------------------------------------
diff --git a/bin/cassandra b/bin/cassandra
index 09fe013..d2f8ce7 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -207,7 +207,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;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/sstablesplit
----------------------------------------------------------------------
diff --git a/bin/sstablesplit b/bin/sstablesplit
index 15f0a04..43ad189 100755
--- a/bin/sstablesplit
+++ b/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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.StandaloneSplitter "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/sstableupgrade
----------------------------------------------------------------------
diff --git a/bin/sstableupgrade b/bin/sstableupgrade
index dc72aec..111fda6 100755
--- 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.StandaloneUpgrader "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/client_only/bin/client_only
----------------------------------------------------------------------
diff --git a/examples/client_only/bin/client_only b/examples/client_only/bin/client_only
index af2a623..99487cc 100755
--- 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 $@
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count b/examples/hadoop_cql3_word_count/bin/word_count
index 974a39a..76cca7d 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count_counters
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count_counters b/examples/hadoop_cql3_word_count/bin/word_count_counters
index 0b69b40..0da5e1a 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count_setup
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count_setup b/examples/hadoop_cql3_word_count/bin/word_count_setup
index d194a45..6e5650f 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count b/examples/hadoop_word_count/bin/word_count
index a0c5aa0..34534d7 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count_counters
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count_counters b/examples/hadoop_word_count/bin/word_count_counters
index 7793477..aaf40b8 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count_setup
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count_setup b/examples/hadoop_word_count/bin/word_count_setup
index d194a45..6e5650f 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/cassandra-stress
----------------------------------------------------------------------
diff --git a/tools/bin/cassandra-stress b/tools/bin/cassandra-stress
index 39257cd..57d2d64 100755
--- a/tools/bin/cassandra-stress
+++ b/tools/bin/cassandra-stress
@@ -42,4 +42,4 @@ if [ "x$JAVA" = "x" ]; then
exit 1
fi
-$JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.Stress $@
+"$JAVA" -server -cp "$CLASSPATH" org.apache.cassandra.stress.Stress $@
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/cassandra-stressd
----------------------------------------------------------------------
diff --git a/tools/bin/cassandra-stressd b/tools/bin/cassandra-stressd
index 8d337e5..6b8e165 100755
--- a/tools/bin/cassandra-stressd
+++ b/tools/bin/cassandra-stressd
@@ -50,7 +50,7 @@ fi
case "$1" in
start)
echo "Starting $DESC: "
- $JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.StressServer $@ 1> ./stressd.out.log 2> ./stressd.err.log &
+ "$JAVA" -server -cp "$CLASSPATH" 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/a8ceb2c6/tools/bin/sstablelevelreset
----------------------------------------------------------------------
diff --git a/tools/bin/sstablelevelreset b/tools/bin/sstablelevelreset
index a6fb33b..a4a4e5d 100755
--- a/tools/bin/sstablelevelreset
+++ b/tools/bin/sstablelevelreset
@@ -39,11 +39,11 @@ 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableLevelResetter "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/sstablemetadata
----------------------------------------------------------------------
diff --git a/tools/bin/sstablemetadata b/tools/bin/sstablemetadata
index 5e7c26a..6aeacfe 100755
--- a/tools/bin/sstablemetadata
+++ b/tools/bin/sstablemetadata
@@ -44,6 +44,6 @@ if [ -z "$CLASSPATH" ]; then
exit 1
fi
-$JAVA -cp $CLASSPATH \
+"$JAVA" -cp "$CLASSPATH" \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableMetadataViewer "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/sstableofflinerelevel
----------------------------------------------------------------------
diff --git a/tools/bin/sstableofflinerelevel b/tools/bin/sstableofflinerelevel
index 19cb4c1..0d3fc04 100755
--- a/tools/bin/sstableofflinerelevel
+++ b/tools/bin/sstableofflinerelevel
@@ -39,11 +39,11 @@ 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableOfflineRelevel "$@"
[09/10] cassandra git commit: merge from 2.1
Posted by jb...@apache.org.
merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efb08ad3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efb08ad3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efb08ad3
Branch: refs/heads/trunk
Commit: efb08ad308d104b027bcb23a382072f6d516948d
Parents: 99a84bc 46ce21c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 8 09:34:52 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 8 09:34:52 2015 -0500
----------------------------------------------------------------------
bin/cassandra | 2 +-
bin/sstableupgrade | 4 ++--
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 ++--
13 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/efb08ad3/examples/hadoop_cql3_word_count/bin/word_count_counters
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/efb08ad3/examples/hadoop_word_count/bin/word_count_counters
----------------------------------------------------------------------
[06/10] cassandra git commit: merge from 2.0
Posted by jb...@apache.org.
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 <jb...@apache.org>
Authored: Mon Jun 8 09:34:16 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
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
[07/10] cassandra git commit: merge from 2.0
Posted by jb...@apache.org.
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/trunk
Commit: 46ce21c7b78366d14cf12a1c93528bc7c5dc0e2a
Parents: 5d26943 a8ceb2c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 8 09:34:16 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
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
[05/10] cassandra git commit: merge from 2.0
Posted by jb...@apache.org.
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.2
Commit: 46ce21c7b78366d14cf12a1c93528bc7c5dc0e2a
Parents: 5d26943 a8ceb2c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 8 09:34:16 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
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
[10/10] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/823d8579
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/823d8579
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/823d8579
Branch: refs/heads/trunk
Commit: 823d8579c59483673c27877303b0fd5d1a75df21
Parents: 4a61ca6 efb08ad
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 8 09:34:59 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 8 09:34:59 2015 -0500
----------------------------------------------------------------------
bin/cassandra | 2 +-
bin/sstableupgrade | 4 ++--
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 ++--
13 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[02/10] cassandra git commit: Added quotes to CLASSPATH and JAVA for
nix scripts, CASSANDRA-9529
Posted by jb...@apache.org.
Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8ceb2c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8ceb2c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8ceb2c6
Branch: refs/heads/cassandra-2.1
Commit: a8ceb2c6503bda43fad7a2669bc2c92a2b28e46d
Parents: b0dbea3
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Jun 2 08:07:07 2015 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 8 09:29:10 2015 -0500
----------------------------------------------------------------------
bin/cassandra | 2 +-
bin/sstablesplit | 4 ++--
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/sstableofflinerelevel | 4 ++--
15 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/cassandra
----------------------------------------------------------------------
diff --git a/bin/cassandra b/bin/cassandra
index 09fe013..d2f8ce7 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -207,7 +207,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;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/sstablesplit
----------------------------------------------------------------------
diff --git a/bin/sstablesplit b/bin/sstablesplit
index 15f0a04..43ad189 100755
--- a/bin/sstablesplit
+++ b/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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.StandaloneSplitter "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/bin/sstableupgrade
----------------------------------------------------------------------
diff --git a/bin/sstableupgrade b/bin/sstableupgrade
index dc72aec..111fda6 100755
--- 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.StandaloneUpgrader "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/client_only/bin/client_only
----------------------------------------------------------------------
diff --git a/examples/client_only/bin/client_only b/examples/client_only/bin/client_only
index af2a623..99487cc 100755
--- 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 $@
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count b/examples/hadoop_cql3_word_count/bin/word_count
index 974a39a..76cca7d 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count_counters
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count_counters b/examples/hadoop_cql3_word_count/bin/word_count_counters
index 0b69b40..0da5e1a 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_cql3_word_count/bin/word_count_setup
----------------------------------------------------------------------
diff --git a/examples/hadoop_cql3_word_count/bin/word_count_setup b/examples/hadoop_cql3_word_count/bin/word_count_setup
index d194a45..6e5650f 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count b/examples/hadoop_word_count/bin/word_count
index a0c5aa0..34534d7 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count_counters
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count_counters b/examples/hadoop_word_count/bin/word_count_counters
index 7793477..aaf40b8 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/examples/hadoop_word_count/bin/word_count_setup
----------------------------------------------------------------------
diff --git a/examples/hadoop_word_count/bin/word_count_setup b/examples/hadoop_word_count/bin/word_count_setup
index d194a45..6e5650f 100755
--- 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/cassandra-stress
----------------------------------------------------------------------
diff --git a/tools/bin/cassandra-stress b/tools/bin/cassandra-stress
index 39257cd..57d2d64 100755
--- a/tools/bin/cassandra-stress
+++ b/tools/bin/cassandra-stress
@@ -42,4 +42,4 @@ if [ "x$JAVA" = "x" ]; then
exit 1
fi
-$JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.Stress $@
+"$JAVA" -server -cp "$CLASSPATH" org.apache.cassandra.stress.Stress $@
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/cassandra-stressd
----------------------------------------------------------------------
diff --git a/tools/bin/cassandra-stressd b/tools/bin/cassandra-stressd
index 8d337e5..6b8e165 100755
--- a/tools/bin/cassandra-stressd
+++ b/tools/bin/cassandra-stressd
@@ -50,7 +50,7 @@ fi
case "$1" in
start)
echo "Starting $DESC: "
- $JAVA -server -cp $CLASSPATH org.apache.cassandra.stress.StressServer $@ 1> ./stressd.out.log 2> ./stressd.err.log &
+ "$JAVA" -server -cp "$CLASSPATH" 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/a8ceb2c6/tools/bin/sstablelevelreset
----------------------------------------------------------------------
diff --git a/tools/bin/sstablelevelreset b/tools/bin/sstablelevelreset
index a6fb33b..a4a4e5d 100755
--- a/tools/bin/sstablelevelreset
+++ b/tools/bin/sstablelevelreset
@@ -39,11 +39,11 @@ 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableLevelResetter "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/sstablemetadata
----------------------------------------------------------------------
diff --git a/tools/bin/sstablemetadata b/tools/bin/sstablemetadata
index 5e7c26a..6aeacfe 100755
--- a/tools/bin/sstablemetadata
+++ b/tools/bin/sstablemetadata
@@ -44,6 +44,6 @@ if [ -z "$CLASSPATH" ]; then
exit 1
fi
-$JAVA -cp $CLASSPATH \
+"$JAVA" -cp "$CLASSPATH" \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableMetadataViewer "$@"
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8ceb2c6/tools/bin/sstableofflinerelevel
----------------------------------------------------------------------
diff --git a/tools/bin/sstableofflinerelevel b/tools/bin/sstableofflinerelevel
index 19cb4c1..0d3fc04 100755
--- a/tools/bin/sstableofflinerelevel
+++ b/tools/bin/sstableofflinerelevel
@@ -39,11 +39,11 @@ 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 \
-Dlog4j.configuration=log4j-tools.properties \
org.apache.cassandra.tools.SSTableOfflineRelevel "$@"