Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6d0a752 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6d0a752 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6d0a752 Branch: refs/heads/cassandra-2.2 Commit: b6d0a752e4f681d4092222518c13bded34086d3d Parents: c74df40 42644c3 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Mar 22 16:04:58 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Mar 22 16:04:58 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/nodetool | 38 ++++++++------- bin/sstablekeys | 21 +++++--- bin/sstableloader | 13 +++-- bin/sstablescrub | 7 ++- bin/sstableupgrade | 24 ++++++---- bin/sstableverify | 9 +++- .../apache/cassandra/tools/SSTableExport.java | 1 + tools/bin/cassandra-stress | 37 +++++++++------ tools/bin/cassandra-stressd | 50 ++++++++++---------- tools/bin/json2sstable | 19 ++++++-- tools/bin/sstable2json | 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 ++++++++---- 18 files changed, 255 insertions(+), 141 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6d0a752/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e4db50e,5f01114..91dc588 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,39 -1,5 +1,40 @@@ -2.1.14 +2.2.6 + * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333) + * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809) + * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748) + * Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900) + * Fix bloom filter sizing with LCS (CASSANDRA-11344) + * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092) + * Fix intra-node serialization issue for multicolumn-restrictions (CASSANDRA-11196) + * Non-obsoleting compaction operations over compressed files can impose rate limit on normal reads (CASSANDRA-11301) + * 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) + * 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) + * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037) + * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793) + * Protect from keyspace dropped during repair (CASSANDRA-11065) + * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146) + * Better error message for cleanup (CASSANDRA-10991) + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123) + * Use cloned TokenMetadata in size estimates to avoid race against membership check + (CASSANDRA-10736) + * Always persist upsampled index summaries (CASSANDRA-10512) + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733) + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048) + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281) + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) + * Fix paging on DISTINCT queries repeats result when first row in partition changes + (CASSANDRA-10010) +Merged from 2.1: + * Backport CASSANDRA-10679 (CASSANDRA-9598) * Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342) * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286) * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6d0a752/bin/sstableverify ---------------------------------------------------------------------- diff --cc bin/sstableverify index c3e40c7,0000000..892750b mode 100755,000000..100755 --- a/bin/sstableverify +++ b/bin/sstableverify @@@ -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" -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.StandaloneVerifier "$@" + +# vi:ai sw=4 ts=4 tw=0 et http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6d0a752/src/java/org/apache/cassandra/tools/SSTableExport.java ----------------------------------------------------------------------
