cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [11/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Tue, 22 Mar 2016 21:10:59 GMT
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/5e722ee0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e722ee0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e722ee0

Branch: refs/heads/cassandra-3.5
Commit: 5e722ee0a0360a589c0497235ead0ea5ee85a805
Parents: 842e7c3 b6d0a75
Author: Yuki Morishita <yukim@apache.org>
Authored: Tue Mar 22 16:09:06 2016 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Tue Mar 22 16:09:06 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                      |  1 +
 bin/nodetool                     | 38 +++++++++++++-------------
 bin/sstableloader                | 13 ++++++---
 bin/sstablescrub                 |  7 ++++-
 bin/sstableupgrade               | 24 ++++++++++-------
 bin/sstableutil                  |  7 ++++-
 bin/sstableverify                |  9 +++++--
 tools/bin/cassandra-stress       | 37 ++++++++++++++++----------
 tools/bin/cassandra-stressd      | 50 ++++++++++++++++++-----------------
 tools/bin/sstabledump            | 20 +++++++++-----
 tools/bin/sstableexpiredblockers | 10 +++++--
 tools/bin/sstablelevelreset      | 36 ++++++++++++++++---------
 tools/bin/sstablemetadata        | 22 ++++++++++-----
 tools/bin/sstableofflinerelevel  | 10 +++++--
 tools/bin/sstablerepairedset     | 49 +++++++++++++++++++++-------------
 tools/bin/sstablesplit           | 29 +++++++++++++-------
 16 files changed, 231 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e722ee0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 21eb3e5,91dc588..904206b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,35 -8,13 +18,36 @@@ Merged from 2.2
   * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
   * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
   * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
 - * Fix filtering on non-primary key columns for thrift static column families
 -   (CASSANDRA-6377)
   * Only log yaml config once, at startup (CASSANDRA-11217)
 - * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
   * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
 +Merged from 2.1:
++ * Backport CASSANDRA-10679 (CASSANDRA-9598)
 + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
 + * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
 +
 +3.0.4
 + * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
 + * MV should only query complex columns included in the view (CASSANDRA-11069)
 + * Failed aggregate creation breaks server permanently (CASSANDRA-11064)
 + * Add sstabledump tool (CASSANDRA-7464)
 + * Introduce backpressure for hints (CASSANDRA-10972)
 + * Fix ClusteringPrefix not being able to read tombstone range boundaries (CASSANDRA-11158)
 + * Prevent logging in sandboxed state (CASSANDRA-11033)
 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
 + * Add query time validation method on Index (CASSANDRA-11043)
 + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
 + * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
 + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156)
 + * Fix wrong rack counting and invalid conditions check for TokenAllocation
 +   (CASSANDRA-11139)
 + * Avoid creating empty hint files (CASSANDRA-11090)
 + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120)
 + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062)
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
 + * Add dropped_columns to the list of schema table so it gets handled
 +   properly (CASSANDRA-11050)
 + * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 +Merged from 2.2:
   * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
   * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
   * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e722ee0/bin/sstableutil
----------------------------------------------------------------------
diff --cc bin/sstableutil
index 2860729,0000000..9f07785
mode 100755,000000..100755
--- a/bin/sstableutil
+++ b/bin/sstableutil
@@@ -1,55 -1,0 +1,60 @@@
 +#!/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 \
++                   "$HOME/.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 [ "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/5e722ee0/tools/bin/sstabledump
----------------------------------------------------------------------
diff --cc tools/bin/sstabledump
index 7eeb708,0000000..6bbbfc6
mode 100755,000000..100755
--- a/tools/bin/sstabledump
+++ b/tools/bin/sstabledump
@@@ -1,52 -1,0 +1,60 @@@
 +#!/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 "`dirname "$0"`/cassandra.in.sh" \
-                    "$HOME/.cassandra.in.sh" \
-                    /usr/share/cassandra/cassandra.in.sh \
++    for include in /usr/share/cassandra/cassandra.in.sh \
 +                   /usr/local/share/cassandra/cassandra.in.sh \
-                    /opt/cassandra/cassandra.in.sh; do
++                   /opt/cassandra/cassandra.in.sh \
++                   "$HOME/.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 [ "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
 +
- "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" $JVM_OPTS -Dstorage-config="$CASSANDRA_CONF" \
++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


Mime
View raw message