You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/12/18 18:19:49 UTC
git commit: Include shuffle in the debian package (and rename to
cassandra-shuffle)
Updated Branches:
refs/heads/cassandra-1.2.0 b7c4de924 -> bc598b5a0
Include shuffle in the debian package (and rename to cassandra-shuffle)
patch by slebresne; reviewed by urandom for CASSANDRA-5058
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc598b5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc598b5a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc598b5a
Branch: refs/heads/cassandra-1.2.0
Commit: bc598b5a05b5033b524706553ebfe578fae5a841
Parents: b7c4de9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 18 18:18:59 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 18 18:18:59 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cassandra-shuffle | 57 +++++++++++++++++++++++++++++++++++++++++
bin/shuffle | 57 -----------------------------------------
debian/cassandra.install | 1 +
4 files changed, 59 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc598b5a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5b5ab49..4a13a7c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@
* Fix potential infinite loop when reloading CFS (CASSANDRA-5064)
* Fix SimpleAuthorizer example (CASSANDRA-5072)
* cqlsh: force CL.ONE for tracing and system.schema* queries (CASSANDRA-5070)
+ * Includes cassandra-shuffle in the debian package (CASSANDRA-5058)
Merged from 1.1:
* fix temporarily missing schema after upgrade from pre-1.1.5 (CASSANDRA-5061)
* Fix ALTER TABLE overriding compression options with defaults
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc598b5a/bin/cassandra-shuffle
----------------------------------------------------------------------
diff --git a/bin/cassandra-shuffle b/bin/cassandra-shuffle
new file mode 100644
index 0000000..d6dabfe
--- /dev/null
+++ b/bin/cassandra-shuffle
@@ -0,0 +1,57 @@
+#!/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 \
+ `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 $CASSANDRA_CONF -o -z $CLASSPATH ]; then
+ echo "You must set the CASSANDRA_CONF and CLASSPATH vars" >&2
+ exit 1
+fi
+
+# Special-case path variables.
+case "`uname`" in
+ CYGWIN*)
+ CLASSPATH=`cygpath -p -w "$CLASSPATH"`
+ CASSANDRA_CONF=`cygpath -p -w "$CASSANDRA_CONF"`
+ ;;
+esac
+
+$JAVA -cp $CLASSPATH \
+ -Xmx32m \
+ -Dlog4j.configuration=log4j-tools.properties \
+ org.apache.cassandra.tools.Shuffle $@
+
+# vi:ai sw=4 ts=4 tw=0 et
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc598b5a/bin/shuffle
----------------------------------------------------------------------
diff --git a/bin/shuffle b/bin/shuffle
deleted file mode 100755
index d6dabfe..0000000
--- a/bin/shuffle
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/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 \
- `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 $CASSANDRA_CONF -o -z $CLASSPATH ]; then
- echo "You must set the CASSANDRA_CONF and CLASSPATH vars" >&2
- exit 1
-fi
-
-# Special-case path variables.
-case "`uname`" in
- CYGWIN*)
- CLASSPATH=`cygpath -p -w "$CLASSPATH"`
- CASSANDRA_CONF=`cygpath -p -w "$CASSANDRA_CONF"`
- ;;
-esac
-
-$JAVA -cp $CLASSPATH \
- -Xmx32m \
- -Dlog4j.configuration=log4j-tools.properties \
- org.apache.cassandra.tools.Shuffle $@
-
-# vi:ai sw=4 ts=4 tw=0 et
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc598b5a/debian/cassandra.install
----------------------------------------------------------------------
diff --git a/debian/cassandra.install b/debian/cassandra.install
index 8e3c20c..e196605 100644
--- a/debian/cassandra.install
+++ b/debian/cassandra.install
@@ -13,6 +13,7 @@ bin/sstablekeys usr/bin
bin/sstableloader usr/bin
bin/cqlsh usr/bin
bin/sstablescrub usr/bin
+bin/cassandra-shuffle usr/bin
tools/bin/cassandra-stress usr/bin
tools/bin/token-generator usr/bin
lib/*.jar usr/share/cassandra/lib