[5/6] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

[blerer]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/88d2ac4f/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index b4211bb,000..319eeb4
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
@@@ -1,1089 -1,0 +1,1106 @@@
 +/*
 + * 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.
 + */
 +package org.apache.cassandra.db;
 +
 +import java.io.IOException;
 +import java.nio.ByteBuffer;
 +import java.util.*;
 +
 +import com.google.common.collect.Iterables;
 +import com.google.common.collect.Sets;
 +
 +import org.apache.cassandra.cache.IRowCacheEntry;
 +import org.apache.cassandra.cache.RowCacheKey;
 +import org.apache.cassandra.cache.RowCacheSentinel;
 +import org.apache.cassandra.concurrent.Stage;
 +import org.apache.cassandra.concurrent.StageManager;
 +import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.config.ColumnDefinition;
 +import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.db.lifecycle.*;
 +import org.apache.cassandra.db.filter.*;
 +import org.apache.cassandra.db.partitions.*;
 +import org.apache.cassandra.db.rows.*;
 +import org.apache.cassandra.exceptions.RequestExecutionException;
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
 +import org.apache.cassandra.io.sstable.format.SSTableReadsListener;
 +import org.apache.cassandra.io.util.DataInputPlus;
 +import org.apache.cassandra.io.util.DataOutputPlus;
 +import org.apache.cassandra.metrics.TableMetrics;
 +import org.apache.cassandra.net.MessageOut;
 +import org.apache.cassandra.net.MessagingService;
 +import org.apache.cassandra.schema.IndexMetadata;
 +import org.apache.cassandra.service.CacheService;
 +import org.apache.cassandra.service.ClientState;
 +import org.apache.cassandra.service.StorageProxy;
 +import org.apache.cassandra.service.pager.*;
 +import org.apache.cassandra.thrift.ThriftResultsMerger;
 +import org.apache.cassandra.tracing.Tracing;
 +import org.apache.cassandra.utils.FBUtilities;
 +import org.apache.cassandra.utils.SearchIterator;
 +import org.apache.cassandra.utils.btree.BTreeSet;
 +import org.apache.cassandra.utils.concurrent.OpOrder;
 +import org.apache.cassandra.utils.memory.HeapAllocator;
 +
 +
 +/**
 + * A read command that selects a (part of a) single partition.
 + */
 +public class SinglePartitionReadCommand extends ReadCommand
 +{
 +protected static final SelectionDeserializer selectionDeserializer = new 
Deserializer();
 +
 +private final DecoratedKey partitionKey;
 +private final ClusteringIndexFilter clusteringIndexFilter;
 +
 +private int oldestUnrepairedTombstone = Integer.MAX_VALUE;
 +
 +public SinglePartitionReadCommand(boolean isDigest,
 +  int digestVersion,
 +  boolean isForThrift,
 +  CFMetaData metadata,
 +  int nowInSec,
 +  ColumnFilter columnFilter,
 +  RowFilter rowFilter,
 +  DataLimits limits,
 +  DecoratedKey partitionKey,
 +  ClusteringIndexFilter 
clusteringIndexFilter)
 +{
 +super(Kind.SINGLE_PARTITION, isDigest, digestVersion, isForThrift, 
metadata, nowInSec, columnFilter, rowFilter, limits);
 +assert partitionKey.getPartitioner() == metadata.partitioner;
 +this.partitionKey = partitionKey;
 +this.clusteringIndexFilter = clusteringIndexFilter;
 +}
 +
 +/**
 + * Creates a new read command on a single partition.
 + *
 + * @param metadata the table to query.
 + * @param nowInSec the time in seconds to use are "now" for this query.
 + * @param columnFilter the column filter to use for the query.
 + * @param rowFilter the row filter to use for the query.
 + * @param limits the limits to 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[mshuler]

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/9dd805d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dd805d0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dd805d0

Branch: refs/heads/cassandra-3.0
Commit: 9dd805d0dcd172db54783450b5964931d26154b0
Parents: f2c5ad7 2383935
Author: Michael Shuler 
Authored: Wed Sep 28 13:10:44 2016 -0500
Committer: Michael Shuler 
Committed: Wed Sep 28 13:10:44 2016 -0500

--

--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[mshuler]

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/405a828c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/405a828c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/405a828c

Branch: refs/heads/cassandra-3.0
Commit: 405a828c1f8f060bf0cb1cb7d0c601a5595c23f3
Parents: 82d1600 e9fe96f
Author: Michael Shuler 
Authored: Fri Sep 23 16:43:29 2016 -0500
Committer: Michael Shuler 
Committed: Fri Sep 23 16:43:29 2016 -0500

--

--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/82d1600d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82d1600d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82d1600d

Branch: refs/heads/cassandra-3.0
Commit: 82d1600d78fca3879f2204d46c597c93c53c40b2
Parents: 47b50b4 df819ec
Author: Aleksey Yeschenko 
Authored: Wed Sep 21 18:13:41 2016 -0700
Committer: Aleksey Yeschenko 
Committed: Wed Sep 21 18:14:49 2016 -0700

--
 CHANGES.txt|  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java|  4 ++--
 .../apache/cassandra/service/StorageService.java   | 17 ++---
 3 files changed, 17 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/82d1600d/CHANGES.txt
--
diff --cc CHANGES.txt
index d9db977,bc9fc5b..0524e49
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -2.2.8
 +3.0.10
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
+  * Fix exceptions when enabling gossip on nodes that haven't joined the ring 
(CASSANDRA-12253)
   * Fix authentication problem when invoking clqsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
(CASSANDRA-12554)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/82d1600d/src/java/org/apache/cassandra/gms/Gossiper.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/82d1600d/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index c06bed2,0b6e851..15a0146
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -707,17 -685,7 +718,17 @@@ public class StorageService extends Not
  {
  Map appStates = new 
EnumMap<>(ApplicationState.class);
  
 +if (SystemKeyspace.wasDecommissioned())
 +{
 +if (Boolean.getBoolean("cassandra.override_decommission"))
 +{
 +logger.warn("This node was decommissioned, but overriding 
by operator request.");
 +
SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
 +}
 +else
 +throw new ConfigurationException("This node was 
decommissioned and will not rejoin the ring unless 
cassandra.override_decommission=true has been set, or all existing data is 
removed and the node is bootstrapped again");
 +}
- if (replacing && 
!(Boolean.parseBoolean(System.getProperty("cassandra.join_ring", "true"
+ if (replacing && !joinRing)
  throw new ConfigurationException("Cannot set both 
join_ring=false and attempt to replace a node");
  if (DatabaseDescriptor.getReplaceTokens().size() > 0 || 
DatabaseDescriptor.getReplaceNode() != null)
  throw new RuntimeException("Replace method removed; use 
cassandra.replace_address instead");

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

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/47b50b45
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47b50b45
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47b50b45

Branch: refs/heads/cassandra-3.0
Commit: 47b50b45577ec5cb3b25729c866b71e80ab7722f
Parents: 88d4791 50726e7
Author: Stefania Alborghetti 
Authored: Thu Sep 22 08:58:52 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Sep 22 08:58:52 2016 +0800

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 18 --
 2 files changed, 13 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/47b50b45/CHANGES.txt
--
diff --cc CHANGES.txt
index 1a97087,ee4015e..d9db977
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,70 -1,7 +1,71 @@@
 -2.2.8
 +3.0.10
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
+  * Fix authentication problem when invoking clqsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
(CASSANDRA-12554)
 +Merged from 2.1:
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
 +
 +
 +3.0.9
 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor 
LegacyLayout.decodeBound (CASSANDRA-12423)
 + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
 + * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[tylerhobbs]

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/fc1cbdeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc1cbdeb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc1cbdeb

Branch: refs/heads/cassandra-3.0
Commit: fc1cbdeb6ee554da91a9be602b37e3628a34a484
Parents: ead27d9 38ff407
Author: Tyler Hobbs 
Authored: Wed Sep 21 13:53:27 2016 -0500
Committer: Tyler Hobbs 
Committed: Wed Sep 21 13:53:27 2016 -0500

--
 CHANGES.txt   |  3 +++
 .../service/PendingRangeCalculatorService.java| 18 +++---
 2 files changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc1cbdeb/CHANGES.txt
--
diff --cc CHANGES.txt
index abffd80,96f97f4..b873eb1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,66 -1,6 +1,69 @@@
 -2.2.8
 +3.0.10
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
++Merged from 2.2:
+  * Decrement pending range calculator jobs counter in finally block
+   (CASSANDRA-12554)
 +Merged from 2.1:
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
 +
 +
 +3.0.9
 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor 
LegacyLayout.decodeBound (CASSANDRA-12423)
 + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
 + * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[carl]

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/cded2764
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cded2764
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cded2764

Branch: refs/heads/cassandra-3.0
Commit: cded2764534d3f7a6ed5bd379523258b7cd3a04a
Parents: 5847222 ad4a91d
Author: Carl Yeksigian 
Authored: Thu Sep 1 17:11:12 2016 -0400
Committer: Carl Yeksigian 
Committed: Thu Sep 1 17:11:12 2016 -0400

--
 CHANGES.txt  |  1 +
 .../org/apache/cassandra/locator/PropertyFileSnitch.java | 11 +--
 2 files changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cded2764/CHANGES.txt
--
diff --cc CHANGES.txt
index e5e2b9c,fae713e..5cf351a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,53 -1,5 +1,54 @@@
 -2.2.8
 +3.0.9
 + * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

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/20dd606e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20dd606e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20dd606e

Branch: refs/heads/cassandra-3.0
Commit: 20dd606e7bf49f3954af85407b65e304401fed7d
Parents: a1d9a02 40c2d45
Author: Stefania Alborghetti 
Authored: Thu Sep 1 10:19:25 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Sep 1 10:19:25 2016 +0800

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/test/cassconnect.py | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/20dd606e/CHANGES.txt
--
diff --cc CHANGES.txt
index 8fde74e,a6a1114..0d425d6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,51 -1,5 +1,52 @@@
 -2.2.8
 +3.0.9
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
   

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/e4a53f4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4a53f4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4a53f4d

Branch: refs/heads/cassandra-3.0
Commit: e4a53f4d3160833af3ea7917a35e7e35ae02786d
Parents: ab98b11 b39d984
Author: Aleksey Yeschenko 
Authored: Wed Aug 31 20:24:03 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Aug 31 20:25:24 2016 +0100

--
 CHANGES.txt |   1 +
 src/java/org/apache/cassandra/gms/Gossiper.java |   5 +-
 .../apache/cassandra/gms/VersionedValue.java|   6 +
 .../apache/cassandra/locator/TokenMetadata.java |  52 ++-
 .../cassandra/service/LoadBroadcaster.java  |   2 +-
 .../cassandra/service/StorageService.java   | 136 +++
 6 files changed, 173 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4a53f4d/CHANGES.txt
--
diff --cc CHANGES.txt
index 4b77e4d,d7e9394..30931d3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,5 +1,51 @@@
 -2.2.8
 +3.0.9
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/3483418b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3483418b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3483418b

Branch: refs/heads/cassandra-3.0
Commit: 3483418bda4eb34b7aab5e9f80c1a0cefbc072b7
Parents: 8303fd1 6eff082
Author: Aleksey Yeschenko 
Authored: Tue Aug 30 16:48:31 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Aug 30 16:48:31 2016 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/repair/messages/RepairOption.java |  6 +-
 .../cassandra/service/StorageService.java   |  2 +-
 .../repair/messages/RepairOptionTest.java   | 20 
 4 files changed, 27 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3483418b/CHANGES.txt
--
diff --cc CHANGES.txt
index fcbf1e4,0f7cf0e..5349c14
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,49 -1,5 +1,50 @@@
 -2.2.8
 +3.0.9
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/8303fd1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8303fd1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8303fd1f

Branch: refs/heads/cassandra-3.0
Commit: 8303fd1f5c23b45b65b662db423fa6bbd2832635
Parents: 5cda140 acd46ab
Author: Aleksey Yeschenko 
Authored: Tue Aug 30 16:33:31 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Aug 30 16:33:31 2016 +0100

--
 CHANGES.txt   |  1 +
 .../apache/cassandra/repair/RepairRunnable.java   | 18 ++
 2 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8303fd1f/CHANGES.txt
--
diff --cc CHANGES.txt
index 7a1fbc5,74c44f8..fcbf1e4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,49 -1,5 +1,50 @@@
 -2.2.8
 +3.0.9
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * Fail repair on non-existing table (CASSANDRA-12279)
   * cqlsh copy: fix missing counter values (CASSANDRA-12476)
   * Move migration tasks to non-periodic queue, assure flush executor shutdown 
after 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

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/431ecdb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/431ecdb6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/431ecdb6

Branch: refs/heads/cassandra-3.0
Commit: 431ecdb6b4dd01c4f32d9a64a7cef2a107d1366c
Parents: 407dc30 b9fc6a5
Author: Stefania Alborghetti 
Authored: Thu Aug 25 09:10:20 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Aug 25 09:10:20 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 16 +---
 2 files changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/431ecdb6/CHANGES.txt
--
diff --cc CHANGES.txt
index bd1fc5d,001a389..9bd0434
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,43 -1,5 +1,44 @@@
 -2.2.8
 +3.0.9
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * cqlsh copy: fix missing counter values (CASSANDRA-12476)
   * Move migration tasks to non-periodic queue, assure flush executor shutdown 
after non-periodic executor (CASSANDRA-12251)
   * cqlsh copy: fixed possible race in initializing feeding thread 
(CASSANDRA-11701)
   * Only set broadcast_rpc_address on Ec2MultiRegionSnitch if it's not set 
(CASSANDRA-11357)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/431ecdb6/pylib/cqlshlib/copyutil.py
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[tylerhobbs]

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/407dc30e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/407dc30e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/407dc30e

Branch: refs/heads/cassandra-3.0
Commit: 407dc30e277e99644805b6a93f432bd5e80fbd3d
Parents: fe3f3da 23d4822
Author: Tyler Hobbs 
Authored: Wed Aug 24 16:52:27 2016 -0500
Committer: Tyler Hobbs 
Committed: Wed Aug 24 16:52:27 2016 -0500

--
 src/java/org/apache/cassandra/service/paxos/ProposeCallback.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[slebresne]

Merge branch 'cassandra-2.2' into cassandra-3.0

* cassandra-2.2:
  Allow nodetool info to run with readonly JMX access


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d7eb187
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d7eb187
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d7eb187

Branch: refs/heads/cassandra-3.0
Commit: 0d7eb18786a1e589ec803a07ac9ae9e77f481edb
Parents: 40ab631 774e59d
Author: Sylvain Lebresne 
Authored: Thu Jun 23 11:12:51 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jun 23 11:12:51 2016 +0200

--
 CHANGES.txt   |  1 +
 .../cassandra/locator/EndpointSnitchInfo.java | 11 +++
 .../locator/EndpointSnitchInfoMBean.java  |  9 +
 .../org/apache/cassandra/tools/NodeProbe.java | 18 ++
 4 files changed, 23 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d7eb187/CHANGES.txt
--
diff --cc CHANGES.txt
index d57fb7d,0be1043..ddbac69
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,10 +1,39 @@@
 -2.2.7
 +3.0.8
 + * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
 +Merged from 2.2:
+  * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
   * Validate bloom_filter_fp_chance against lowest supported
 value when the table is created (CASSANDRA-11920)
 - * RandomAccessReader: call isEOF() only when rebuffering, not for every read 
operation (CASSANDRA-12013)
   * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
   * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 +Merged from 2.1:
 + * Prevent select statements with clustering key > 64k (CASSANDRA-11882)
 + * Fix clock skew corrupting other nodes with paxos (CASSANDRA-11991)
 + * Remove distinction between non-existing static columns and existing but 
null in LWTs (CASSANDRA-9842)
 + * Cache local ranges when calculating repair neighbors (CASSANDRA-11934)
 + * Allow LWT operation on static column with only partition keys 
(CASSANDRA-10532)
 + * Create interval tree over canonical sstables to avoid missing sstables 
during streaming (CASSANDRA-11886)
 + * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid 
corrupting SSL connections (CASSANDRA-11749)
 +
 +
 +3.0.7
 + * Fix legacy serialization of Thrift-generated non-compound range tombstones
 +   when communicating with 2.x nodes (CASSANDRA-11930)
 + * Fix Directories instantiations where CFS.initialDirectories should be used 
(CASSANDRA-11849)
 + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
 + * Fix sstables not being protected from removal during index build 
(CASSANDRA-11905)
 + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
 + * Remove unneeded code to repair index summaries that have
 +   been improperly down-sampled (CASSANDRA-11127)
 + * Avoid WriteTimeoutExceptions during commit log replay due to materialized
 +   view lock contention (CASSANDRA-11891)
 + * Prevent OOM failures on SSTable corruption, improve tests for corruption 
detection (CASSANDRA-9530)
 + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
 + * Allow compaction strategies to disable early open (CASSANDRA-11754)
 + * Refactor Materialized View code (CASSANDRA-11475)
 + * Update Java Driver (CASSANDRA-11615)
 +Merged from 2.2:
   * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
   * Run CommitLog tests with different compression settings (CASSANDRA-9039)
   * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d7eb187/src/java/org/apache/cassandra/tools/NodeProbe.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[slebresne]

Merge branch 'cassandra-2.2' into cassandra-3.0

* cassandra-2.2:
  Fix CompressorTest on non-x86 environment


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d354ddcf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d354ddcf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d354ddcf

Branch: refs/heads/cassandra-3.0
Commit: d354ddcfbedca0e0ed4175689260e1145ad62bae
Parents: 969f797 8d5b7b6
Author: Sylvain Lebresne 
Authored: Thu Jun 23 10:46:31 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jun 23 10:46:31 2016 +0200

--
 test/unit/org/apache/cassandra/io/compress/CompressorTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d354ddcf/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

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/b6572234
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6572234
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6572234

Branch: refs/heads/cassandra-3.0
Commit: b6572234459c68ebae43a1e8594d1d801238bddc
Parents: b671522 68398ad
Author: Stefania Alborghetti 
Authored: Tue Jun 21 08:36:36 2016 +0200
Committer: Stefania Alborghetti 
Committed: Tue Jun 21 08:36:36 2016 +0200

--

--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[samt]

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/0a0e97df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a0e97df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a0e97df

Branch: refs/heads/cassandra-3.0
Commit: 0a0e97df548db21ba8ed4469244c878b4da3ed93
Parents: 863dbc7 142f358
Author: Sam Tunnicliffe 
Authored: Mon Jun 20 14:05:13 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Mon Jun 20 14:11:34 2016 +0100

--
 CHANGES.txt |   1 +
 .../cassandra/service/StorageService.java   | 137 +++
 .../org/apache/cassandra/transport/Server.java  |  22 ++-
 3 files changed, 37 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a0e97df/CHANGES.txt
--
diff --cc CHANGES.txt
index 4c0d9a0,76e601c..7873742
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,6 +1,32 @@@
 -2.2.7
 +3.0.8
 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
 +Merged from 2.2:
+  * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
   * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 +Merged from 2.1:
 + * Cache local ranges when calculating repair neighbors (CASSANDRA-11934)
 + * Allow LWT operation on static column with only partition keys 
(CASSANDRA-10532)
 + * Create interval tree over canonical sstables to avoid missing sstables 
during streaming (CASSANDRA-11886)
 + * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid 
corrupting SSL connections (CASSANDRA-11749)
 +
 +
 +3.0.7
 + * Fix legacy serialization of Thrift-generated non-compound range tombstones
 +   when communicating with 2.x nodes (CASSANDRA-11930)
 + * Fix Directories instantiations where CFS.initialDirectories should be used 
(CASSANDRA-11849)
 + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
 + * Fix sstables not being protected from removal during index build 
(CASSANDRA-11905)
 + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
 + * Remove unneeded code to repair index summaries that have
 +   been improperly down-sampled (CASSANDRA-11127)
 + * Avoid WriteTimeoutExceptions during commit log replay due to materialized
 +   view lock contention (CASSANDRA-11891)
 + * Prevent OOM failures on SSTable corruption, improve tests for corruption 
detection (CASSANDRA-9530)
 + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
 + * Allow compaction strategies to disable early open (CASSANDRA-11754)
 + * Refactor Materialized View code (CASSANDRA-11475)
 + * Update Java Driver (CASSANDRA-11615)
 +Merged from 2.2:
   * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
   * Run CommitLog tests with different compression settings (CASSANDRA-9039)
   * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a0e97df/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 5167151,a877074..394220d
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -26,37 -22,12 +22,13 @@@ import java.lang.management.ManagementF
  import java.net.InetAddress;
  import java.net.UnknownHostException;
  import java.nio.ByteBuffer;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Collection;
- import java.util.Collections;
- import java.util.EnumMap;
- import java.util.HashMap;
- import java.util.HashSet;
- import java.util.Iterator;
- import java.util.LinkedHashMap;
- import java.util.LinkedList;
- import java.util.List;
- import java.util.Map;
+ import java.util.*;
  import java.util.Map.Entry;
- import java.util.Set;
- import java.util.SortedMap;
- import java.util.TreeMap;
- import java.util.UUID;
- import java.util.concurrent.CopyOnWriteArrayList;
- import java.util.concurrent.ExecutionException;
- import java.util.concurrent.ExecutorService;
- import java.util.concurrent.Future;
- import java.util.concurrent.FutureTask;
- import java.util.concurrent.TimeUnit;
- import java.util.concurrent.TimeoutException;
+ import java.util.concurrent.*;
  import java.util.concurrent.atomic.AtomicBoolean;
  import java.util.concurrent.atomic.AtomicInteger;
 +import javax.annotation.Nullable;
- import javax.management.JMX;
- import javax.management.MBeanServer;
- import javax.management.NotificationBroadcasterSupport;
- import javax.management.ObjectName;
+ 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jmckenzie]

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/dbc40b1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbc40b1e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbc40b1e

Branch: refs/heads/cassandra-3.0
Commit: dbc40b1ed8dc0bd018b7e31c24363bb9e3e0e0c9
Parents: 70115ff fd91e15
Author: Josh McKenzie 
Authored: Fri Jun 17 12:50:02 2016 -0400
Committer: Josh McKenzie 
Committed: Fri Jun 17 12:50:02 2016 -0400

--
 test/unit/org/apache/cassandra/db/marshal/TimeTypeTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

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/c59897b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c59897b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c59897b6

Branch: refs/heads/cassandra-3.0
Commit: c59897b6cab7eff453c1cb759fb209d3d229f3c4
Parents: 6c867f0 1dffa02
Author: Stefania Alborghetti 
Authored: Fri Jun 10 15:18:31 2016 -0500
Committer: Stefania Alborghetti 
Committed: Fri Jun 10 15:18:31 2016 -0500

--
 CHANGES.txt   | 3 ++-
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c59897b6/CHANGES.txt
--
diff --cc CHANGES.txt
index cdbaebb,7ec3ae9..fd2fe79
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
 -2.2.7
 +3.0.8
 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
- 
++Merged from 2.2:
+  * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 +
 +3.0.7
 + * Fix legacy serialization of Thrift-generated non-compound range tombstones
 +   when communicating with 2.x nodes (CASSANDRA-11930)
 + * Fix Directories instantiations where CFS.initialDirectories should be used 
(CASSANDRA-11849)
 + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
 + * Fix sstables not being protected from removal during index build 
(CASSANDRA-11905)
 + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
 + * Remove unneeded code to repair index summaries that have
 +   been improperly down-sampled (CASSANDRA-11127)
 + * Avoid WriteTimeoutExceptions during commit log replay due to materialized
 +   view lock contention (CASSANDRA-11891)
 + * Prevent OOM failures on SSTable corruption, improve tests for corruption 
detection (CASSANDRA-9530)
 + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
 + * Allow compaction strategies to disable early open (CASSANDRA-11754)
 + * Refactor Materialized View code (CASSANDRA-11475)
 + * Update Java Driver (CASSANDRA-11615)
 +Merged from 2.2:
   * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
   * Run CommitLog tests with different compression settings (CASSANDRA-9039)
   * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c59897b6/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index eb56089,6b64664..5167151
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -221,10 -209,10 +221,10 @@@ public class StorageService extends Not
  /* This abstraction maintains the token/endpoint metadata information */
  private TokenMetadata tokenMetadata = new TokenMetadata();
  
 -public volatile VersionedValue.VersionedValueFactory valueFactory = new 
VersionedValue.VersionedValueFactory(getPartitioner());
 +public volatile VersionedValue.VersionedValueFactory valueFactory = new 
VersionedValue.VersionedValueFactory(tokenMetadata.partitioner);
  
  private Thread drainOnShutdown = null;
- private boolean inShutdownHook = false;
+ private volatile boolean inShutdownHook = false;
  
  public static final StorageService instance = new StorageService();
  

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[benedict]

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/5a5d0a1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a5d0a1e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a5d0a1e

Branch: refs/heads/cassandra-3.0
Commit: 5a5d0a1eb46dfa308acc9cff28f8c65fbb026b81
Parents: 958183f 2837ec6
Author: Benedict Elliott Smith 
Authored: Wed May 18 21:51:40 2016 +0100
Committer: Benedict Elliott Smith 
Committed: Wed May 18 21:51:40 2016 +0100

--
 .../apache/cassandra/db/ColumnFamilyStore.java  | 41 +---
 1 file changed, 19 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a5d0a1e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 98ba781,45486c1..a6d5c17
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1973,35 -2762,30 +1973,32 @@@ public class ColumnFamilyStore implemen
  final long truncatedAt;
  final ReplayPosition replayAfter;
  
- synchronized (data)
 -if (keyspace.getMetadata().durableWrites || takeSnapshot)
++if (keyspace.getMetadata().params.durableWrites || 
DatabaseDescriptor.isAutoSnapshot())
+ {
+ replayAfter = forceBlockingFlush();
++viewManager.forceBlockingFlush();
+ }
+ else
  {
- if (keyspace.getMetadata().params.durableWrites || 
DatabaseDescriptor.isAutoSnapshot())
+ // just nuke the memtable data w/o writing to disk first
 -Future replayAfterFuture;
 -synchronized (data)
++viewManager.dumpMemtables();
++try
  {
- replayAfter = forceBlockingFlush();
- viewManager.forceBlockingFlush();
 -final Flush flush = new Flush(true);
 -flushExecutor.execute(flush);
 -replayAfterFuture = postFlushExecutor.submit(flush.postFlush);
++replayAfter = dumpMemtable().get();
 +}
- else
++catch (Exception e)
 +{
- // just nuke the memtable data w/o writing to disk first
- viewManager.dumpMemtables();
- try
- {
- replayAfter = dumpMemtable().get();
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
++throw new RuntimeException(e);
  }
- 
- long now = System.currentTimeMillis();
- // make sure none of our sstables are somehow in the future 
(clock drift, perhaps)
- for (ColumnFamilyStore cfs : concatWithIndexes())
- for (SSTableReader sstable : cfs.data.getSSTables())
- now = Math.max(now, sstable.maxDataAge);
- truncatedAt = now;
 -replayAfter = FBUtilities.waitOnFuture(replayAfterFuture);
  }
  
+ long now = System.currentTimeMillis();
+ // make sure none of our sstables are somehow in the future (clock 
drift, perhaps)
+ for (ColumnFamilyStore cfs : concatWithIndexes())
+ for (SSTableReader sstable : cfs.data.getSSTables())
+ now = Math.max(now, sstable.maxDataAge);
+ truncatedAt = now;
+ 
  Runnable truncateRunnable = new Runnable()
  {
  public void run()

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[samt]

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/943e732c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/943e732c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/943e732c

Branch: refs/heads/cassandra-3.0
Commit: 943e732caeb1da59e5e9af5479cd9d75ca9d9030
Parents: 474d3bf dff7b44
Author: Sam Tunnicliffe 
Authored: Fri Apr 29 11:50:03 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Fri Apr 29 11:55:07 2016 +0100

--
 CHANGES.txt |  1 +
 .../restrictions/PrimaryKeyRestrictionSet.java  | 71 +++-
 .../restrictions/StatementRestrictions.java | 34 +++---
 .../SelectSingleColumnRelationTest.java |  4 ++
 4 files changed, 97 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/943e732c/CHANGES.txt
--
diff --cc CHANGES.txt
index 268d011,fb06cd6..3184cce
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
 -2.2.7
 +3.0.6
 + * Fix paging for range queries where all clustering columns are specified 
(CASSANDRA-11669)
 + * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
 + * Ignore all LocalStrategy keyspaces for streaming and other related
 +   operations (CASSANDRA-11627)
 + * Ensure columnfilter covers indexed columns for thrift 2i queries 
(CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
+  * Restore ability to filter on clustering columns when using a 2i 
(CASSANDRA-11510)
   * JSON datetime formatting needs timezone (CASSANDRA-11137)
   * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)
   * Remove unnescessary file existence check during anticompaction 
(CASSANDRA-11660)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/943e732c/src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java
index 8121858,0c10f13..e063f91
--- 
a/src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java
+++ 
b/src/java/org/apache/cassandra/cql3/restrictions/PrimaryKeyRestrictionSet.java
@@@ -64,27 -67,48 +64,58 @@@ final class PrimaryKeyRestrictionSet ex
   */
  private boolean contains;
  
 +/**
 + * true if the restrictions corresponding to a partition 
key, false if it's clustering columns.
 + */
 +private boolean isPartitionKey;
  
+ /**
+  * If restrictions apply to clustering columns, we need to check whether 
they can be satisfied by an index lookup
+  * as this affects which other restrictions can legally be specified (if 
an index is present, we are more lenient
+  * about what additional filtering can be performed on the results of a 
lookup - see CASSANDRA-11510).
+  *
+  * We don't hold a reference to the SecondaryIndexManager itself as this 
is not strictly a singleton (although
+  * we often treat is as one), the field would also require annotation 
with @Unmetered to avoid blowing up the
+  * object size (used when calculating the size of prepared statements for 
caching). Instead, we refer to the
+  * CFMetaData and retrieve the index manager when necessary.
+  *
+  * There are a couple of scenarios where the CFM can be null (and we make 
sure and test for null when we use it):
+  *  * where an empty set of restrictions are created for use in 
processing query results - see
+  *SelectStatement.forSelection
+  *  * where the restrictions apply to partition keys and not clustering 
columns e.g.
+  *StatementRestrictions.partitionKeyRestrictions
+  *  * in unit tests (in particular PrimaryKeyRestrictionSetTest which is 
primarily concerned with the correct
+  *generation of bounds when secondary indexes are not used).
+  */
+ private final CFMetaData cfm;
+ 
 -public 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/8bfe09f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bfe09f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bfe09f4

Branch: refs/heads/cassandra-3.0
Commit: 8bfe09f4660aee6401b36f43322adfca6273d786
Parents: f2afd04 3db30aa
Author: Marcus Eriksson 
Authored: Wed Apr 27 10:10:42 2016 +0200
Committer: Marcus Eriksson 
Committed: Wed Apr 27 10:10:42 2016 +0200

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/db/compaction/CompactionManager.java| 8 
 2 files changed, 1 insertion(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bfe09f4/CHANGES.txt
--
diff --cc CHANGES.txt
index f02d4f2,e8a301a..bc15d32
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -2.2.7
 +3.0.6
 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
 + * Ignore all LocalStrategy keyspaces for streaming and other related
 +   operations (CASSANDRA-11627)
 + * Ensure columnfilter covers indexed columns for thrift 2i queries 
(CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
+  * Remove unnescessary file existence check during anticompaction 
(CASSANDRA-11660)
   * Add missing files to debian packages (CASSANDRA-11642)
   * Avoid calling Iterables::concat in loops during 
ModificationStatement::getFunctions (CASSANDRA-11621)
   * cqlsh: COPY FROM should use regular inserts for single statement batches 
and

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bfe09f4/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[samt]

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/caae9870
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/caae9870
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/caae9870

Branch: refs/heads/cassandra-3.0
Commit: caae9870dd19c38251d14a3bcb7b5b2b9839ff79
Parents: bb68078 3244774
Author: Sam Tunnicliffe 
Authored: Thu Apr 21 18:42:43 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Thu Apr 21 18:42:43 2016 +0100

--

--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[stefania]

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/c568efee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c568efee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c568efee

Branch: refs/heads/cassandra-3.0
Commit: c568efee54fd118ee9039394391e911fe690a1f3
Parents: dab1d57 eb072a0
Author: Stefania Alborghetti 
Authored: Thu Apr 21 09:44:08 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Apr 21 09:45:49 2016 +0800

--
 CHANGES.txt|  2 ++
 pylib/cqlshlib/copyutil.py | 40 ++--
 2 files changed, 28 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c568efee/CHANGES.txt
--
diff --cc CHANGES.txt
index ae73437,6e6e17b..6fffe2a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,13 +1,17 @@@
 -2.2.7
 +3.0.6
 + * Ensure columnfilter covers indexed columns for thrift 2i queries 
(CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
+  * cqlsh: COPY FROM should use regular inserts for single statement batches 
and
+   report errors correctly if workers processes crash on 
initialization (CASSANDRA-11474)
   * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 -Merged from 2.1:
 - * (cqlsh) Fix potential COPY deadlock when parent process is terminating 
child
 -   processes (CASSANDRA-11505)
 -
 -
 -2.2.6
   * Allow only DISTINCT queries with partition keys restrictions 
(CASSANDRA-11339)
   * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
   * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c568efee/pylib/cqlshlib/copyutil.py
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/7f4b5e30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f4b5e30
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f4b5e30

Branch: refs/heads/cassandra-3.0
Commit: 7f4b5e3051ea1f314a517e6406e834efd4ee280b
Parents: 99ea2ee 77ab773
Author: Aleksey Yeschenko 
Authored: Mon Apr 18 15:26:26 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Apr 18 15:26:26 2016 +0100

--
 CHANGES.txt| 3 ++-
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4b5e30/CHANGES.txt
--
diff --cc CHANGES.txt
index c9538a8,baaf227..6586299
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,9 +1,14 @@@
 -2.2.7
 +3.0.6
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
-  * Allow only DISTINCT queries with partition keys or static columns 
restrictions (CASSANDRA-11339)
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
+  * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)
 -
 -
 -2.2.6
+  * Allow only DISTINCT queries with partition keys restrictions 
(CASSANDRA-11339)
   * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
   * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
   * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f4b5e30/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/4238cdd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4238cdd9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4238cdd9

Branch: refs/heads/cassandra-3.0
Commit: 4238cdd99fd58f96a1c933f1c8113cf349300982
Parents: 5dbeef3 19b4b63
Author: Aleksey Yeschenko 
Authored: Mon Apr 11 20:07:04 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Apr 11 20:07:04 2016 +0100

--
 CHANGES.txt |  2 +
 .../cassandra/hadoop/cql3/CqlConfigHelper.java  | 58 +---
 2 files changed, 41 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4238cdd9/CHANGES.txt
--
diff --cc CHANGES.txt
index 76c9d99,54013a3..ed4c412
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,7 +1,32 @@@
 -2.2.6
 +3.0.6
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
+  * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
   * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
   * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
 +
++
 +3.0.5
 + * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
 + * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
 + * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)
 + * Upgrade ohc to 0.4.3
 + * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
 + * Allocate merkletrees with the correct size (CASSANDRA-11390)
 + * Support streaming pre-3.0 sstables (CASSANDRA-10990)
 + * Add backpressure to compressed commit log (CASSANDRA-10971)
 + * SSTableExport supports secondary index tables (CASSANDRA-11330)
 + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
 + * Establish and implement canonical bulk reading workload(s) 
(CASSANDRA-10331)
 + * Fix paging for IN queries on tables without clustering columns 
(CASSANDRA-11208)
 + * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
 + * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
   * DatabaseDescriptor should log stacktrace in case of Eception during seed 
provider creation (CASSANDRA-11312)
   * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
   * Add cassandra-stress keystore option (CASSANDRA-9325)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4238cdd9/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/f0cd3261
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0cd3261
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0cd3261

Branch: refs/heads/cassandra-3.0
Commit: f0cd3261be946fd9835e8c978841bc930d1e07d9
Parents: 063b376 3557d2e
Author: Yuki Morishita 
Authored: Mon Apr 11 11:30:28 2016 -0500
Committer: Yuki Morishita 
Committed: Mon Apr 11 11:30:28 2016 -0500

--
 CHANGES.txt |   1 +
 .../apache/cassandra/repair/RepairRunnable.java |  10 ++
 .../cassandra/service/ActiveRepairService.java  |  11 ++
 .../cassandra/service/StorageService.java   |  28 -
 .../progress/jmx/LegacyJMXProgressSupport.java  | 107 +
 .../jmx/LegacyJMXProgressSupportTest.java   | 118 +++
 6 files changed, 269 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0cd3261/CHANGES.txt
--
diff --cc CHANGES.txt
index 47e6105,e935e57..8c40e63
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,6 +1,30 @@@
 -2.2.6
 +3.0.6
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
+  * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
   * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
 +
 +3.0.5
 + * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
 + * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
 + * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)
 + * Upgrade ohc to 0.4.3
 + * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
 + * Allocate merkletrees with the correct size (CASSANDRA-11390)
 + * Support streaming pre-3.0 sstables (CASSANDRA-10990)
 + * Add backpressure to compressed commit log (CASSANDRA-10971)
 + * SSTableExport supports secondary index tables (CASSANDRA-11330)
 + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
 + * Establish and implement canonical bulk reading workload(s) 
(CASSANDRA-10331)
 + * Fix paging for IN queries on tables without clustering columns 
(CASSANDRA-11208)
 + * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
 + * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
   * DatabaseDescriptor should log stacktrace in case of Eception during seed 
provider creation (CASSANDRA-11312)
   * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
   * Add cassandra-stress keystore option (CASSANDRA-9325)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0cd3261/src/java/org/apache/cassandra/repair/RepairRunnable.java
--
diff --cc src/java/org/apache/cassandra/repair/RepairRunnable.java
index eb25457,d2b6ab6..354cb2a
--- a/src/java/org/apache/cassandra/repair/RepairRunnable.java
+++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@@ -230,8 -227,13 +230,13 @@@ public class RepairRunnable extends Wra
  {
  public void onSuccess(RepairSessionResult result)
  {
+ /**
+  * If the success message below is modified, it must also 
be updated on
+  * {@link 
org.apache.cassandra.utils.progress.jmx.LegacyJMXProgressSupport}
+  * for backward-compatibility support.
+  */
  String message = String.format("Repair session %s for 
range %s finished", session.getId(),
 -   
session.getRange().toString());
 +   
session.getRanges().toString());
  logger.info(message);
  fireProgressEvent(tag, new 
ProgressEvent(ProgressEventType.PROGRESS,
   
progress.incrementAndGet(),
@@@ -241,8 -243,13 +246,13 @@@
  
  public void onFailure(Throwable t)
  {
+ /**
+  * If the failure message below is 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jmckenzie]

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/04a75a63
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04a75a63
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04a75a63

Branch: refs/heads/cassandra-3.0
Commit: 04a75a6344433c89531f1e5435566e8bf8d45286
Parents: 4245932 96c53e0
Author: Josh McKenzie 
Authored: Wed Apr 6 18:44:48 2016 -0400
Committer: Josh McKenzie 
Committed: Wed Apr 6 18:45:09 2016 -0400

--
 conf/cassandra-env.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/04a75a63/conf/cassandra-env.ps1
--
diff --cc conf/cassandra-env.ps1
index 5eefb04,321a9ca..a322a4d
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -332,57 -331,6 +332,57 @@@ Function SetCassandraEnvironmen
  CalculateHeapSizes
  
  ParseJVMInfo
 +
 +#GC log path has to be defined here since it needs to find CASSANDRA_HOME
- $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:$env:CASSANDRA_HOME/logs/gc.log"
++$env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log"""
 +
 +# Read user-defined JVM options from jvm.options file
 +$content = Get-Content "$env:CASSANDRA_CONF\jvm.options"
 +for ($i = 0; $i -lt $content.Count; $i++)
 +{
 +$line = $content[$i]
 +if ($line.StartsWith("-"))
 +{
 +$env:JVM_OPTS = "$env:JVM_OPTS $line"
 +}
 +}
 +
 +$defined_xmn = $env:JVM_OPTS -like '*Xmn*'
 +$defined_xmx = $env:JVM_OPTS -like '*Xmx*'
 +$defined_xms = $env:JVM_OPTS -like '*Xms*'
 +$using_cms = $env:JVM_OPTS -like '*UseConcMarkSweepGC*'
 +
 +# We only set -Xms and -Xmx if they were not defined on jvm.options file
 +# If defined, both Xmx and Xms should be defined together.
 +if (($defined_xmx -eq $false) -and ($defined_xms -eq $false))
 +{
 +$env:JVM_OPTS="$env:JVM_OPTS -Xms$env:MAX_HEAP_SIZE"
 +$env:JVM_OPTS="$env:JVM_OPTS -Xmx$env:MAX_HEAP_SIZE"
 +}
 +elseif (($defined_xmx -eq $false) -or ($defined_xms -eq $false))
 +{
 +echo "Please set or unset -Xmx and -Xms flags in pairs on jvm.options 
file."
 +exit
 +}
 +
 +# We only set -Xmn flag if it was not defined in jvm.options file
 +# and if the CMS GC is being used
 +# If defined, both Xmn and Xmx should be defined together.
 +if (($defined_xmn -eq $true) -and ($defined_xmx -eq $false))
 +{
 +echo "Please set or unset -Xmx and -Xmn flags in pairs on jvm.options 
file."
 +exit
 +}
 +elseif (($defined_xmn -eq $false) -and ($using_cms -eq $true))
 +{
 +$env:JVM_OPTS="$env:JVM_OPTS -Xmn$env:HEAP_NEWSIZE"
 +}
 +
 +if (($env:JVM_ARCH -eq "64-Bit") -and ($using_cms -eq $true))
 +{
 +$env:JVM_OPTS="$env:JVM_OPTS -XX:+UseCondCardMark"
 +}
 +
  # Add sigar env - see Cassandra-7838
  $env:JVM_OPTS = "$env:JVM_OPTS 
-Djava.library.path=""$env:CASSANDRA_HOME\lib\sigar-bin"""
  

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[snazy]

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/f52f299c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f52f299c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f52f299c

Branch: refs/heads/cassandra-3.0
Commit: f52f299cdf4cf5d2fea6253a41561d439cebcb3e
Parents: 736a0ce a33038b
Author: Robert Stupp 
Authored: Mon Apr 4 14:10:25 2016 +0200
Committer: Robert Stupp 
Committed: Mon Apr 4 14:10:25 2016 +0200

--
 CHANGES.txt | 5 +
 .../apache/cassandra/net/IncomingStreamingConnection.java   | 9 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f52f299c/CHANGES.txt
--
diff --cc CHANGES.txt
index 8305852,b6438b8..d03705a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,25 @@@
 -2.2.6
++3.0.6
++Merged from 2.2:
+  * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
++
++
 +3.0.5
 + * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
 + * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
 + * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)
 + * Upgrade ohc to 0.4.3
 + * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
 + * Allocate merkletrees with the correct size (CASSANDRA-11390)
 + * Support streaming pre-3.0 sstables (CASSANDRA-10990)
 + * Add backpressure to compressed commit log (CASSANDRA-10971)
 + * SSTableExport supports secondary index tables (CASSANDRA-11330)
 + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
 + * Establish and implement canonical bulk reading workload(s) 
(CASSANDRA-10331)
 + * Fix paging for IN queries on tables without clustering columns 
(CASSANDRA-11208)
 + * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
 + * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
   * DatabaseDescriptor should log stacktrace in case of Eception during seed 
provider creation (CASSANDRA-11312)
   * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
   * Add cassandra-stress keystore option (CASSANDRA-9325)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f52f299c/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
--
diff --cc src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
index 19e0671,79a814d..82ce18e
--- a/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
@@@ -57,11 -56,12 +57,12 @@@ public class IncomingStreamingConnectio
  {
  try
  {
- // streaming connections are per-session and have a fixed 
version.  we can't do anything with a wrong-version stream connection, so drop 
it.
+ // streaming connections are per-session and have a fixed version.
+ // we can't do anything with a wrong-version stream connection, 
so drop it.
  if (version != StreamMessage.CURRENT_VERSION)
- throw new IOException(String.format("Received stream using 
protocol version %d (my version %d). Terminating connection", version, 
MessagingService.current_version));
+ throw new IOException(String.format("Received stream using 
protocol version %d (my version %d). Terminating connection", version, 
StreamMessage.CURRENT_VERSION));
  
 -DataInput input = new DataInputStream(socket.getInputStream());
 +DataInputPlus input = new 
DataInputStreamPlus(socket.getInputStream());
  StreamInitMessage init = 
StreamInitMessage.serializer.deserialize(input, version);
  
  //Set SO_TIMEOUT on follower side

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[slebresne]

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/db10cb25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db10cb25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db10cb25

Branch: refs/heads/cassandra-3.0
Commit: db10cb25c036175ac51474ea1e1169524d0e98a6
Parents: 1dbfa4b b06bcf7
Author: Sylvain Lebresne 
Authored: Fri Mar 18 10:54:16 2016 +0100
Committer: Sylvain Lebresne 
Committed: Fri Mar 18 10:54:16 2016 +0100

--

--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/63285908
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63285908
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63285908

Branch: refs/heads/cassandra-3.0
Commit: 6328590808ff16fd026fd80cb28635d4313b8cc8
Parents: a20a0f7 a24bd6c
Author: Aleksey Yeschenko 
Authored: Mon Feb 29 17:19:19 2016 +
Committer: Aleksey Yeschenko 
Committed: Mon Feb 29 17:19:19 2016 +

--
 CHANGES.txt |   2 +-
 .../apache/cassandra/security/SSLFactory.java   |  41 ++
 .../thrift/CustomTThreadPoolServer.java |   4 +-
 .../org/apache/cassandra/transport/Server.java  |   3 +-
 .../cassandra/transport/SimpleClient.java   |   3 +-
 test/conf/keystore.jks  | Bin 0 -> 2191 bytes
 .../cassandra/security/SSLFactoryTest.java  |  75 +++
 7 files changed, 108 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/63285908/CHANGES.txt
--
diff --cc CHANGES.txt
index ba3d2fd,103ac16..a7b5c8a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -2.2.6
 +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)
@@@ -50,48 -30,12 +51,47 @@@ Merged from 2.1
   * Gossiper#isEnabled is not thread safe (CASSANDRA-6)
   * Avoid major compaction mixing repaired and unrepaired sstables in DTCS 
(CASSANDRA-3)
   * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
 - * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
   * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397)
 - * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
 + * (cqlsh) Display milliseconds when datetime overflows (CASSANDRA-10625)
  
  
 -2.2.5
 +3.0.3
 + * Remove double initialization of newly added tables (CASSANDRA-11027)
 + * Filter keys searcher results by target range (CASSANDRA-11104)
 + * Fix deserialization of legacy read commands (CASSANDRA-11087)
 + * Fix incorrect computation of deletion time in sstable metadata 
(CASSANDRA-11102)
 + * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
 + * Mutations do not block for completion under view lock contention 
(CASSANDRA-10779)
 + * Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
 + * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
 +   (CASSANDRA-11003)
 + * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)
 + * Migrate build status for indexes along with legacy schema (CASSANDRA-11046)
 + * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045)
 + * Added support for IBM zSystems architecture (CASSANDRA-11054)
 + * Update CQL documentation (CASSANDRA-10899)
 + * Check the column name, not cell name, for dropped columns when reading
 +   legacy sstables (CASSANDRA-11018)
 + * Don't attempt to index clustering values of static rows 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jasobrown]

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/d7cb6f61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7cb6f61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7cb6f61

Branch: refs/heads/cassandra-3.0
Commit: d7cb6f61adec951c082cdeea64ffe5f68b8f7651
Parents: 9961b69 ecbeb08
Author: Jason Brown 
Authored: Fri Feb 26 14:49:35 2016 -0800
Committer: Jason Brown 
Committed: Fri Feb 26 14:50:13 2016 -0800

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/dht/Range.java| 20 +++-
 .../org/apache/cassandra/dht/RangeTest.java | 15 +++
 3 files changed, 27 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7cb6f61/CHANGES.txt
--
diff --cc CHANGES.txt
index fbc1c8a,aa3adf5..2dacd3a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
 -2.2.6
 +3.0.4
 + * 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)
 +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)
   * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7cb6f61/src/java/org/apache/cassandra/dht/Range.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7cb6f61/test/unit/org/apache/cassandra/dht/RangeTest.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[snazy]

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/b0f2266b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0f2266b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0f2266b

Branch: refs/heads/cassandra-3.0
Commit: b0f2266b27e493b84dd61b59f1c926fc22754962
Parents: 70c8a53 61ac125
Author: Robert Stupp 
Authored: Sat Feb 20 11:01:19 2016 +0100
Committer: Robert Stupp 
Committed: Sat Feb 20 11:01:19 2016 +0100

--
 CHANGES.txt |  1 +
 .../apache/cassandra/schema/SchemaKeyspace.java |  8 ++-
 .../validation/operations/AggregationTest.java  | 60 +++-
 3 files changed, 65 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f2266b/CHANGES.txt
--
diff --cc CHANGES.txt
index f0aa996,9d0046b..0c01009
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
 -2.2.6
 +3.0.4
 + * 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)
 +Merged from 2.2:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0f2266b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
--
diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 62c78fd,000..9e05a73
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@@ -1,1408 -1,0 +1,1410 @@@
 +/*
 + * 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.
 + */
 +package org.apache.cassandra.schema;
 +
 +import java.nio.ByteBuffer;
 +import java.nio.charset.CharacterCodingException;
 +import java.security.MessageDigest;
 +import java.security.NoSuchAlgorithmException;
 +import java.util.*;
 +import java.util.concurrent.TimeUnit;
 +import java.util.stream.Collectors;
 +
 +import com.google.common.collect.ImmutableList;
 +import com.google.common.collect.MapDifference;
 +import com.google.common.collect.Maps;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import org.apache.cassandra.config.*;
 +import org.apache.cassandra.config.ColumnDefinition.ClusteringOrder;
 +import org.apache.cassandra.cql3.*;
 +import org.apache.cassandra.cql3.functions.*;
 +import org.apache.cassandra.cql3.statements.SelectStatement;
 +import org.apache.cassandra.db.*;
 +import org.apache.cassandra.db.marshal.*;
 +import org.apache.cassandra.db.partitions.*;
 +import org.apache.cassandra.db.rows.*;
 +import org.apache.cassandra.db.view.View;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.exceptions.InvalidRequestException;
 +import 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[carl]

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/65033350
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65033350
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65033350

Branch: refs/heads/cassandra-3.0
Commit: 65033350891aa58b772c026c46818bb300102872
Parents: 9b5df24 4985fcc
Author: Carl Yeksigian 
Authored: Thu Feb 18 15:50:44 2016 -0500
Committer: Carl Yeksigian 
Committed: Thu Feb 18 15:50:44 2016 -0500

--
 CHANGES.txt | 1 +
 bin/cqlsh   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/65033350/CHANGES.txt
--
diff --cc CHANGES.txt
index ae9cd75,d3dcdbc..275bc04
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.2.6
 +3.0.4
 + * 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)
 +Merged from 2.2:
+  * (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)

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[snazy]

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/9b5df24f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b5df24f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b5df24f

Branch: refs/heads/cassandra-3.0
Commit: 9b5df24f5a84c37be2a587322aae81ff07881195
Parents: 4354fb2 71f4406
Author: Robert Stupp 
Authored: Thu Feb 18 21:40:10 2016 +0100
Committer: Robert Stupp 
Committed: Thu Feb 18 21:40:10 2016 +0100

--
 CHANGES.txt |  1 +
 build.xml   | 15 +--
 2 files changed, 6 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5df24f/CHANGES.txt
--
diff --cc CHANGES.txt
index 1e69cd0,10f23af..ae9cd75
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.2.6
 +3.0.4
 + * 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)
 +Merged from 2.2:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5df24f/build.xml
--
diff --cc build.xml
index f9ff00d,361a057..d27b77a
--- a/build.xml
+++ b/build.xml
@@@ -394,13 -402,13 +394,11 @@@



--  
++  

 -  
 -  
 -
 +  
 +  
 +  



@@@ -447,14 -454,14 +445,12 @@@
  
  

 -

  
--
  
 -
 +
 +
  
  
  
@@@ -468,9 -475,18 +464,7 @@@
  artifactId="cassandra-parent"
  version="${version}"/>
  
 -
 -  
 -  
 -  
 -  
 -  
 -  
 -  
 -
--
  
  
  
@@@ -540,20 -559,25 +534,21 @@@
  
  
  
 -
--
  
---->
  
  
  
 -
 +
  
  
 -  
 -
 -  
 -  
  
 +
 +
  
- 
 -
+ 
+ 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/4354fb27
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4354fb27
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4354fb27

Branch: refs/heads/cassandra-3.0
Commit: 4354fb27dcb706cdb3e7cb611d3ff1b9b53f04e9
Parents: c64d3a5 37680ee
Author: Yuki Morishita 
Authored: Thu Feb 18 11:23:02 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Feb 18 11:23:02 2016 -0600

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 36 
 .../repair/RepairMessageVerbHandler.java| 43 ++--
 3 files changed, 68 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4354fb27/CHANGES.txt
--
diff --cc CHANGES.txt
index a79a411,53fc168..1e69cd0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.2.6
 +3.0.4
 + * 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)
 +Merged from 2.2:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4354fb27/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 3d7be4e,da4a84a..c564d8d
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -2322,4 -3043,72 +2322,40 @@@ public class ColumnFamilyStore implemen
  fileIndexGenerator.set(0);
  }
  
 -// returns the "canonical" version of any current sstable, i.e. if an 
sstable is being replaced and is only partially
 -// visible to reads, this sstable will be returned as its original 
entirety, and its replacement will not be returned
 -// (even if it completely replaces it)
 -public static final Function 
CANONICAL_SSTABLES = new Function()
 -{
 -public List apply(View view)
 -{
 -List sstables = new ArrayList<>();
 -for (SSTableReader sstable : view.compacting)
 -if (sstable.openReason != SSTableReader.OpenReason.EARLY)
 -sstables.add(sstable);
 -for (SSTableReader sstable : view.sstables)
 -if (!view.compacting.contains(sstable) && sstable.openReason 
!= SSTableReader.OpenReason.EARLY)
 -sstables.add(sstable);
 -return sstables;
 -}
 -};
 -
 -public static final Function 
UNREPAIRED_SSTABLES = new Function()
 -{
 -public List apply(View view)
 -{
 -List sstables = new ArrayList<>();
 -for (SSTableReader sstable : CANONICAL_SSTABLES.apply(view))
 -{
 -if (!sstable.isRepaired())
 -sstables.add(sstable);
 -}
 -return sstables;
 -}
 -};
 -
+ /**
+  * Returns a ColumnFamilyStore by cfId if it exists, null otherwise
+  * Differently from others, this method does not throw exception if the 
table does not exist.
+  */
+ public static ColumnFamilyStore getIfExists(UUID cfId)
+ {
+ Pair kscf = Schema.instance.getCF(cfId);
+ if (kscf == null)
+ return null;
+ 
+ Keyspace keyspace = Keyspace.open(kscf.left);
+ if (keyspace == null)
+ return null;
+ 
+ return keyspace.getColumnFamilyStore(cfId);
+ }
+ 
+ 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[marcuse]

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/15ac9e89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15ac9e89
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15ac9e89

Branch: refs/heads/cassandra-3.0
Commit: 15ac9e899bf0448c42e2cce9cf867556f161c186
Parents: 5dbab32 c003951
Author: Marcus Eriksson 
Authored: Thu Feb 18 12:51:32 2016 +0100
Committer: Marcus Eriksson 
Committed: Thu Feb 18 12:51:32 2016 +0100

--
 CHANGES.txt | 1 +
 .../apache/cassandra/db/compaction/CompactionManager.java   | 9 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15ac9e89/CHANGES.txt
--
diff --cc CHANGES.txt
index a1125f5,7cbfea7..f68eea5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,8 +1,20 @@@
 -2.2.6
 +3.0.4
 + * 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)
 +Merged from 2.2:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15ac9e89/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jmckenzie]

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/5dbab320
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5dbab320
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5dbab320

Branch: refs/heads/cassandra-3.0
Commit: 5dbab32042924787d333053baa5e4af2d31b475a
Parents: 39e966d 128d144
Author: Joshua McKenzie 
Authored: Wed Feb 17 19:23:10 2016 -0500
Committer: Joshua McKenzie 
Committed: Wed Feb 17 19:23:10 2016 -0500

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 38 ++-
 conf/cqlshrc.sample  |  3 +++
 pylib/cqlshlib/formatting.py | 14 ++
 pylib/cqlshlib/test/test_cqlsh_output.py | 18 +
 5 files changed, 68 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dbab320/CHANGES.txt
--
diff --cc CHANGES.txt
index 4bb5a5e,904a913..a1125f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -32,45 -18,10 +32,46 @@@ Merged from 2.1
   * Gossiper#isEnabled is not thread safe (CASSANDRA-6)
   * Avoid major compaction mixing repaired and unrepaired sstables in DTCS 
(CASSANDRA-3)
   * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
 - * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
+  * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397)
  
  
 +3.0.3
 + * Remove double initialization of newly added tables (CASSANDRA-11027)
 + * Filter keys searcher results by target range (CASSANDRA-11104)
 + * Fix deserialization of legacy read commands (CASSANDRA-11087)
 + * Fix incorrect computation of deletion time in sstable metadata 
(CASSANDRA-11102)
 + * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
 + * Mutations do not block for completion under view lock contention 
(CASSANDRA-10779)
 + * Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
 + * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
 +   (CASSANDRA-11003)
 + * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)
 + * Migrate build status for indexes along with legacy schema (CASSANDRA-11046)
 + * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045)
 + * Added support for IBM zSystems architecture (CASSANDRA-11054)
 + * Update CQL documentation (CASSANDRA-10899)
 + * Check the column name, not cell name, for dropped columns when reading
 +   legacy sstables (CASSANDRA-11018)
 + * Don't attempt to index clustering values of static rows (CASSANDRA-11021)
 + * Remove checksum files after replaying hints (CASSANDRA-10947)
 + * Support passing base table metadata to custom 2i validation 
(CASSANDRA-10924)
 + * Ensure stale index entries are purged during reads (CASSANDRA-11013)
 + * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
 + * Fix UnsupportedOperationException when reading old sstable with range
 +   tombstone (CASSANDRA-10743)
 + * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
 + * Fix potential assertion error during compaction (CASSANDRA-10944)
 + * Fix counting of received sstables in streaming (CASSANDRA-10949)
 + * Implement hints compression (CASSANDRA-9428)
 + * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 + * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 + * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-10837)
 + * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
 +Merged from 2.2:
  2.2.5
   * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
   * Apply change to compaction throughput in real time (CASSANDRA-10025)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dbab320/bin/cqlsh.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5dbab320/pylib/cqlshlib/test/test_cqlsh_output.py
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[snazy]

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/fcc40e58
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcc40e58
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcc40e58

Branch: refs/heads/cassandra-3.0
Commit: fcc40e58869df76cf8f6c6e066f9aef2bd9d4b1a
Parents: 7a3c3ab 97f3aa6
Author: Robert Stupp 
Authored: Wed Feb 17 13:42:54 2016 +0100
Committer: Robert Stupp 
Committed: Wed Feb 17 13:42:54 2016 +0100

--
 CHANGES.txt| 1 +
 bin/cqlsh.py   | 4 ++--
 pylib/cqlshlib/cqlhandling.py  | 3 ++-
 pylib/cqlshlib/test/cassconnect.py | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcc40e58/CHANGES.txt
--
diff --cc CHANGES.txt
index f1a9719,288f204..1d89446
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,7 +1,19 @@@
 -2.2.6
 +3.0.4
 + * 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)
 +Merged from 2.2:
+  * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcc40e58/bin/cqlsh.py
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/efbcd15d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efbcd15d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efbcd15d

Branch: refs/heads/cassandra-3.0
Commit: efbcd15d642008866f82d89f881b703c011dce19
Parents: f3b7599 1b201e9
Author: Aleksey Yeschenko 
Authored: Fri Feb 12 17:29:15 2016 +
Committer: Aleksey Yeschenko 
Committed: Fri Feb 12 17:31:21 2016 +

--
 CHANGES.txt | 5 -
 src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java | 6 --
 src/java/org/apache/cassandra/locator/TokenMetadata.java| 7 +++
 3 files changed, 11 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/efbcd15d/CHANGES.txt
--
diff --cc CHANGES.txt
index 15012b1,49bc581..a7669bb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,8 -5,9 +15,11 @@@ Merged from 2.2
   * (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)
++ * Use cloned TokenMetadata in size estimates to avoid race against 
membership check
++   (CASSANDRA-10736)
   * (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)
+  * Fix paging on DISTINCT queries repeats result when first row in partition 
changes
+(CASSANDRA-10010)
  Merged from 2.1:
   * Properly release sstable ref when doing offline scrub (CASSANDRA-10697)
   * Improve nodetool status performance for large cluster (CASSANDRA-7238)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/efbcd15d/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/efbcd15d/src/java/org/apache/cassandra/locator/TokenMetadata.java
--
diff --cc src/java/org/apache/cassandra/locator/TokenMetadata.java
index f6e9cf7,de16fda..97c5f10
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@@ -26,8 -26,8 +26,9 @@@ import java.util.concurrent.atomic.Atom
  import java.util.concurrent.locks.ReadWriteLock;
  import java.util.concurrent.locks.ReentrantReadWriteLock;
  
 +import com.google.common.annotations.VisibleForTesting;
  import com.google.common.collect.*;
+ import org.apache.commons.lang3.StringUtils;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  

[5/6] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

[blerer]

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/1aa97e30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1aa97e30
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1aa97e30

Branch: refs/heads/trunk
Commit: 1aa97e30ca075ad3c350d1b49aee94dffc62db19
Parents: 62f94b7 90fc896
Author: Benjamin Lerer 
Authored: Thu Feb 11 10:40:50 2016 +0100
Committer: Benjamin Lerer 
Committed: Thu Feb 11 10:42:17 2016 +0100

--
 CHANGES.txt |1 +
 .../cql3/restrictions/AbstractRestriction.java  |   14 +
 .../ForwardingPrimaryKeyRestrictions.java   |3 +-
 .../restrictions/MultiColumnRestriction.java|   76 +-
 .../restrictions/PrimaryKeyRestrictionSet.java  |   22 +-
 .../cql3/restrictions/Restriction.java  |4 +-
 .../cql3/restrictions/RestrictionSet.java   |4 +-
 .../restrictions/SingleColumnRestriction.java   |9 +-
 .../cql3/restrictions/TokenRestriction.java |2 +-
 .../org/apache/cassandra/db/MultiCBuilder.java  |   67 +-
 .../PrimaryKeyRestrictionSetTest.java   | 1174 +++---
 .../SelectMultiColumnRelationTest.java  |  859 -
 12 files changed, 2025 insertions(+), 210 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa97e30/CHANGES.txt
--
diff --cc CHANGES.txt
index 188cdd6,5674b9d..bca5fcd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.2.6
 +3.0.4
 + * 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)
 +Merged from 2.2.6:
+  * 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:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa97e30/src/java/org/apache/cassandra/cql3/restrictions/AbstractRestriction.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/restrictions/AbstractRestriction.java
index 023c2ac,dac7203..df04331
--- a/src/java/org/apache/cassandra/cql3/restrictions/AbstractRestriction.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/AbstractRestriction.java
@@@ -17,10 -17,19 +17,12 @@@
   */
  package org.apache.cassandra.cql3.restrictions;
  
 -import java.nio.ByteBuffer;
 -
 -import org.apache.cassandra.config.ColumnDefinition;
 -
 -import org.apache.cassandra.cql3.ColumnSpecification;
  import org.apache.cassandra.cql3.QueryOptions;
  import org.apache.cassandra.cql3.statements.Bound;
 -import org.apache.cassandra.db.composites.CompositesBuilder;
 -import org.apache.cassandra.exceptions.InvalidRequestException;
 -import static 
org.apache.cassandra.cql3.statements.RequestValidations.checkBindValueSet;
 -import static 
org.apache.cassandra.cql3.statements.RequestValidations.checkFalse;
 -import static 
org.apache.cassandra.cql3.statements.RequestValidations.checkNotNull;
 +import org.apache.cassandra.db.MultiCBuilder;
 +
++import org.apache.cassandra.config.ColumnDefinition;
+ 
  /**
   * Base class for Restrictions
   */
@@@ -85,4 -88,26 +87,16 @@@ abstract class AbstractRestriction  imp
  {
  return true;
  }
+ 
 -protected static ByteBuffer validateIndexedValue(ColumnSpecification 
columnSpec,
 - ByteBuffer value)
 - throws 
InvalidRequestException
 -{
 -checkNotNull(value, "Unsupported null value for indexed column %s", 
columnSpec.name);
 -checkBindValueSet(value, "Unsupported unset value for indexed column 
%s", columnSpec.name);
 -checkFalse(value.remaining() > 0x, "Index expression values may 
not be larger than 64K");
 -return value;
 -}
 -
+ /**
+  * Reverses the specified bound if the column type is a reversed one.
+  *
+  * @param columnDefinition the column definition
+  * @param bound the bound
+  * @return the bound reversed if the column type was a reversed one or 
the original bound
+  */
+ protected 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/23f62962
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23f62962
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23f62962

Branch: refs/heads/cassandra-3.0
Commit: 23f629628ecb00bc997b88c9ffcc296be5d4f701
Parents: 58821ce d295c7c
Author: Aleksey Yeschenko 
Authored: Mon Feb 8 12:19:38 2016 +
Committer: Aleksey Yeschenko 
Committed: Mon Feb 8 12:19:38 2016 +

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 41 -
 2 files changed, 37 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/23f62962/CHANGES.txt
--
diff --cc CHANGES.txt
index 0fb8f34,b0a5062..6302ce6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,7 +1,8 @@@
 -2.2.6
 +3.0.4
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
 +Merged from 2.2.6
+  * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
   * Gossiper#isEnabled is not thread safe (CASSANDRA-6)
 - * Fix paging on DISTINCT queries repeats result when first row in partition 
changes (CASSANDRA-10010)
  Merged from 2.1:
   * Avoid major compaction mixing repaired and unrepaired sstables in DTCS 
(CASSANDRA-3)
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/23f62962/bin/cqlsh.py
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[samt]

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/67fd42fd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67fd42fd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67fd42fd

Branch: refs/heads/cassandra-3.0
Commit: 67fd42fd3fb564585294c7b98d8cbca8a696cfdd
Parents: 11165f4 df49cec
Author: Sam Tunnicliffe 
Authored: Mon Dec 21 11:57:06 2015 +
Committer: Sam Tunnicliffe 
Committed: Mon Dec 21 11:57:06 2015 +

--
 NEWS.txt | 23 +++
 1 file changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/67fd42fd/NEWS.txt
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/2e095833
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e095833
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e095833

Branch: refs/heads/cassandra-3.0
Commit: 2e095833d9a45a6f1032b8beac2d94a47409a5e0
Parents: d877ba0 9dd2b5e
Author: Aleksey Yeschenko 
Authored: Fri Dec 18 22:48:12 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Dec 18 22:48:12 2015 +

--
 bin/cqlsh.py |   4 +-
 pylib/cqlshlib/test/run_cqlsh.py | 108 +++---
 pylib/cqlshlib/test/test_cqlsh_completion.py |   3 +
 pylib/cqlshlib/test/test_cqlsh_output.py |  22 +++--
 pylib/cqlshlib/test/winpty.py|  50 ++
 5 files changed, 144 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e095833/bin/cqlsh.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e095833/pylib/cqlshlib/test/test_cqlsh_completion.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e095833/pylib/cqlshlib/test/test_cqlsh_output.py
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/1deb0443
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1deb0443
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1deb0443

Branch: refs/heads/trunk
Commit: 1deb044321f1e729d99e731f94ead760deaf1898
Parents: 942e5e5 57d558f
Author: Aleksey Yeschenko 
Authored: Tue Dec 15 21:39:25 2015 +
Committer: Aleksey Yeschenko 
Committed: Tue Dec 15 21:39:25 2015 +

--
 CHANGES.txt|   2 +
 bin/cqlsh.py   | 329 ++-
 pylib/cqlshlib/copyutil.py | 912 ++--
 pylib/cqlshlib/util.py |  19 +
 4 files changed, 841 insertions(+), 421 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1deb0443/CHANGES.txt
--
diff --cc CHANGES.txt
index 4af7573,c969a4d..e167126
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,38 -10,12 +13,39 @@@ Merged from 2.1
   * Make Stress compiles within eclipse (CASSANDRA-10807)
   * Cassandra Daemon should print JVM arguments (CASSANDRA-10764)
   * Allow cancellation of index summary redistribution (CASSANDRA-8805)
 - * sstableloader will fail if there are collections in the schema tables 
(CASSANDRA-10700)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 - * Fix Stress profile parsing on Windows (CASSANDRA-10808)
  
+ 
 -2.2.4
 +3.0.1
 + * Avoid MV race during node decommission (CASSANDRA-10674)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Handle single-column deletions correction in materialized views
 +   when the column is part of the view primary key (CASSANDRA-10796)
 + * Fix issue with datadir migration on upgrade (CASSANDRA-10788)
 + * Fix bug with range tombstones on reverse queries and test coverage for
 +   AbstractBTreePartition (CASSANDRA-10059)
 + * Remove 64k limit on collection elements (CASSANDRA-10374)
 + * Remove unclear Indexer.indexes() method (CASSANDRA-10690)
 + * Fix NPE on stream read error (CASSANDRA-10771)
 + * Normalize cqlsh DESC output (CASSANDRA-10431)
 + * Rejects partition range deletions when columns are specified 
(CASSANDRA-10739)
 + * Fix error when saving cached key for old format sstable (CASSANDRA-10778)
 + * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
 + * Fix SELECT statement with IN restrictions on partition key,
 +   ORDER BY and LIMIT (CASSANDRA-10729)
 + * Improve stress performance over 1k threads (CASSANDRA-7217)
 + * Wait for migration responses to complete before bootstrapping 
(CASSANDRA-10731)
 + * Unable to create a function with argument of type Inet (CASSANDRA-10741)
 + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
 + * Correctly preserve deletion info on updated rows when notifying indexers
 +   of single-row deletions (CASSANDRA-10694)
 + * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
 + * Keep the file open in trySkipCache (CASSANDRA-10669)
 + * Updated trigger example (CASSANDRA-10257)
 +Merged from 2.2:
 + * Fix regression on split size in CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 + * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large 
buffers (CASSANDRA-10592)
   * Show CQL help in cqlsh in web browser (CASSANDRA-7225)
   * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
   * Reject index queries while the index is building (CASSANDRA-8505)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1deb0443/bin/cqlsh.py
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[tylerhobbs]

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/74070ee4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74070ee4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74070ee4

Branch: refs/heads/cassandra-3.1
Commit: 74070ee4aba7d8d735cbe2ce5453801a0563b043
Parents: 12fd5d2 d2f243e
Author: Tyler Hobbs 
Authored: Wed Nov 18 18:31:31 2015 -0600
Committer: Tyler Hobbs 
Committed: Wed Nov 18 18:31:31 2015 -0600

--
 CHANGES.txt  |   1 +
 bin/cqlsh.py | 153 +++--
 pylib/cqlshlib/copy.py   | 647 ++
 pylib/cqlshlib/displaying.py |  10 +
 pylib/cqlshlib/formatting.py |  32 +-
 5 files changed, 725 insertions(+), 118 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/74070ee4/CHANGES.txt
--
diff --cc CHANGES.txt
index 4510462,4e19b23..2a9fbe7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,8 -3,19 +9,9 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
 - * * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
 - * Don't remove level info when running upgradesstables (CASSANDRA-10692)
++ * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
   * Create compression chunk for sending file only (CASSANDRA-10680)
 - * Make buffered read size configurable (CASSANDRA-10249)
   * Forbid compact clustering column type changes in ALTER TABLE 
(CASSANDRA-8879)
   * Reject incremental repair with subrange repair (CASSANDRA-10422)
   * Add a nodetool command to refresh size_estimates (CASSANDRA-9579)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/74070ee4/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 33533c5,94c7af3..793afe5
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -2394,11 -2259,11 +2328,11 @@@ class ImportProcess(mp.Process)
  table_meta = new_cluster.metadata.keyspaces[self.ks].tables[self.cf]
  
  pk_cols = [col.name for col in table_meta.primary_key]
 -cqltypes = [table_meta.columns[name].typestring for name in 
self.columns]
 +cqltypes = [table_meta.columns[name].cql_type for name in 
self.columns]
  pk_indexes = [self.columns.index(col.name) for col in 
table_meta.primary_key]
  query = 'INSERT INTO %s.%s (%s) VALUES (%%s)' % (
- protect_name(table_meta.keyspace_name),
- protect_name(table_meta.name),
+ protect_name(self.ks),
+ protect_name(self.cf),
  ', '.join(protect_names(self.columns)))
  
  # we need to handle some types specially

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/1e64a9d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e64a9d0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e64a9d0

Branch: refs/heads/cassandra-3.1
Commit: 1e64a9d0369e07a195c6267d14438337773d9248
Parents: b408f9e ef0e447
Author: Aleksey Yeschenko 
Authored: Tue Nov 10 13:45:11 2015 +
Committer: Aleksey Yeschenko 
Committed: Tue Nov 10 13:46:21 2015 +

--
 CHANGES.txt |  2 +-
 .../cassandra/io/sstable/CQLSSTableWriter.java  |  2 ++
 .../io/sstable/CQLSSTableWriterTest.java| 22 
 3 files changed, 25 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e64a9d0/CHANGES.txt
--
diff --cc CHANGES.txt
index a1f66fa,5edad20..33adefb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,51 -1,16 +1,51 @@@
 -2.2.4
 +3.0.1
 +Merged from 2.1:
++ * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258)
 + * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
 +
 +
 +3.0
 + * Fix AssertionError while flushing memtable due to materialized views
 +   incorrectly inserting empty rows (CASSANDRA-10614)
 + * Store UDA initcond as CQL literal in the schema table, instead of a blob 
(CASSANDRA-10650)
 + * Don't use -1 for the position of partition key in schema (CASSANDRA-10491)
 + * Fix distinct queries in mixed version cluster (CASSANDRA-10573)
 + * Skip sstable on clustering in names query (CASSANDRA-10571)
 + * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
 + * Fix bootstrapping with MVs (CASSANDRA-10621)
 + * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
 + * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)
 + * (Hadoop) fix CIF describeSplits() not handling 0 size estimates 
(CASSANDRA-10600)
 + * Fix reading of legacy sstables (CASSANDRA-10590)
 + * Use CQL type names in schema metadata tables (CASSANDRA-10365)
 + * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
 + * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
 + * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
 + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
 + * Don't use 'names query' read path for counters (CASSANDRA-10572)
 + * Fix backward compatibility for counters (CASSANDRA-10470)
 + * Remove memory_allocator paramter from cassandra.yaml 
(CASSANDRA-10581,10628)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
   * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
   * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
   * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
 - * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258)
-- * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
 - * Improve json2sstable error reporting on nonexistent columns 
(CASSANDRA-10401)
   * (cqlsh) fix COPY using wrong variable name for time_format 
(CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[aleksey]

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/39bc5de6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39bc5de6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39bc5de6

Branch: refs/heads/trunk
Commit: 39bc5de68a53b5c7cea0fd778d33ef0687360fb0
Parents: e94032a cb42906
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 18:39:42 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 18:39:42 2015 +

--
 CHANGES.txt   |   1 +
 bin/cqlsh.py  |   6 +++---
 ...driver-internal-only-3.0.0a3.post0-3f15725.zip | Bin 0 -> 234113 bytes
 ...driver-internal-only-3.0.0a3.post0-a983923.zip | Bin 229492 -> 0 bytes
 pylib/cqlshlib/tracing.py |   8 
 5 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bc5de6/CHANGES.txt
--
diff --cc CHANGES.txt
index 9966bfd,f47e1dd..53e1e4a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,5 +1,38 @@@
 -2.2.4
 +3.0
 + * Store UDA initcond as CQL literal in the schema table, instead of a blob 
(CASSANDRA-10650)
 + * Don't use -1 for the position of partition key in schema (CASSANDRA-10491)
 + * Fix distinct queries in mixed version cluster (CASSANDRA-10573)
 + * Skip sstable on clustering in names query (CASSANDRA-10571)
 + * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
 + * Fix bootstrapping with MVs (CASSANDRA-10621)
 + * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
 + * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)
 + * (Hadoop) fix CIF describeSplits() not handling 0 size estimates 
(CASSANDRA-10600)
 + * Fix reading of legacy sstables (CASSANDRA-10590)
 + * Use CQL type names in schema metadata tables (CASSANDRA-10365)
 + * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
 + * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
 + * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
 + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
 + * Don't use 'names query' read path for counters (CASSANDRA-10572)
 + * Fix backward compatibility for counters (CASSANDRA-10470)
 + * Remove memory_allocator paramter from cassandra.yaml 
(CASSANDRA-10581,10628)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
+  * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
   * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
   * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
   * Expose phi values from failure detector via JMX and tweak debug

http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bc5de6/bin/cqlsh.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bc5de6/lib/cassandra-driver-internal-only-3.0.0a3.post0-3f15725.zip
--
diff --cc lib/cassandra-driver-internal-only-3.0.0a3.post0-3f15725.zip
index 000,000..b9afb58
new file mode 100644
Binary files differ

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jmckenzie]

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/97dc8d52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97dc8d52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97dc8d52

Branch: refs/heads/cassandra-3.0
Commit: 97dc8d525574a68a43fb05cf41d88c3342a68e72
Parents: 39bc5de f8783b7
Author: Joshua McKenzie 
Authored: Fri Nov 6 13:42:49 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 6 13:42:49 2015 -0500

--
 bin/cassandra.ps1 | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[snazy]

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/cf0c61b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf0c61b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf0c61b8

Branch: refs/heads/trunk
Commit: cf0c61b8eb162651c6f6120cd528348550b3f258
Parents: 6977521 0bfa26d
Author: Robert Stupp 
Authored: Mon Oct 19 14:56:59 2015 +0200
Committer: Robert Stupp 
Committed: Mon Oct 19 14:56:59 2015 +0200

--
 .../apache/cassandra/net/MessagingService.java  | 24 +++-
 1 file changed, 18 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf0c61b8/src/java/org/apache/cassandra/net/MessagingService.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jmckenzie]

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/5f5e9602
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f5e9602
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f5e9602

Branch: refs/heads/cassandra-3.0
Commit: 5f5e9602df803ba34260a62e12faec33a98dd428
Parents: 1415fa5 7875326
Author: Joshua McKenzie 
Authored: Wed Oct 14 14:44:24 2015 -0400
Committer: Joshua McKenzie 
Committed: Wed Oct 14 14:44:24 2015 -0400

--
 bin/cassandra.ps1 | 8 
 1 file changed, 8 insertions(+)
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/454268bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/454268bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/454268bc

Branch: refs/heads/cassandra-3.0
Commit: 454268bc8bd1633626e78463db7d87f518959823
Parents: dc61fa6 2d825a1
Author: Yuki Morishita 
Authored: Tue Oct 13 10:27:50 2015 -0500
Committer: Yuki Morishita 
Committed: Tue Oct 13 10:27:50 2015 -0500

--
 NEWS.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/454268bc/NEWS.txt
--
diff --cc NEWS.txt
index 61fb9ba,f9fbe43..b422453
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -44,79 -18,8 +44,76 @@@ New feature
  
  Upgrading
  -
 -- Nothing specific to this release, but please see 2.2 if you are 
upgrading
 -  from a previous version.
 +   - Upgrade to 3.0 is supported from Cassandra 2.1 versions greater or equal 
to 2.1.9,
 + or Cassandra 2.2 versions greater or equal to 2.2.1. Upgrade from 
Cassandra 2.0 and
 + older versions is not supported.
 +   - The 'memtable_allocation_type: offheap_objects' option has been removed. 
It should
 + be re-introduced in a future release and you can follow CASSANDRA-9472 
to know more.
 +   - The native protocol versions 1 and 2 are not supported anymore.
 +   - Max mutation size is now configurable via max_mutation_size_in_kb 
setting in
 + cassandra.yaml; the default is half the size 
commitlog_segment_size_in_mb * 1024.
 +   - 3.0 requires Java 8u40 or later.
 +   - The default JVM GC has been changed to G1GC.
-- The default JVM flag -XX:+PerfDisableSharedMem will cause the following 
tools JVM
-  to stop working: jps, jstack, jinfo, jmc, jcmd as well as 3rd party 
tools like Jolokia.
-  If you wish to use these tools you can comment this flag out in 
cassandra-env.{sh,ps1}
 +   - New transaction log files have been introduced to replace the 
compactions_in_progress
 + system table, temporary file markers (tmp and tmplink) and sstable 
ancerstors.
 + Therefore, compaction metadata no longer contains ancestors. Transaction 
log files
 + list sstable descriptors involved in compactions and other operations 
such as flushing
 + and streaming. Use the sstableutil tool to list any sstable files 
currently involved
 + in operations not yet completed, which previously would have been marked 
as temporary.
 + A transaction log file contains one sstable per line, with the prefix 
"add:" or "remove:".
 + They also contain a special line "commit", only inserted at the end when 
the transaction
 + is committed. On startup we use these files to cleanup any partial 
transactions that were
 + in progress when the process exited. If the commit line is found, we 
keep new sstables
 + (those with the "add" prefix) and delete the old sstables (those with 
the "remove" prefix),
 + vice-versa if the commit line is missing. Should you lose or delete 
these log files,
 + both old and new sstable files will be kept as live files, which will 
result in duplicated
 + sstables. These files are protected by incremental checksums so you 
should not manually
 + edit them. When restoring a full backup or moving sstable files, you 
should clean-up
 + any left over transactions and their temporary files first. You can use 
this command:
 +  ===> sstableutil -c ks table
 + See CASSANDRA-7066 for full details.
 +   - New write stages have been added for batchlog and materialized view 
mutations
 + you can set their size in cassandra.yaml
 +   - User defined functions are now executed in a sandbox.
 + To use UDFs and UDAs, you have to enable them in cassandra.yaml.
 +   - New SSTable version 'la' with improved bloom-filter false-positive 
handling
 + compared to previous version 'ka' used in 2.2 and 2.1. Running 
sstableupgrade
 + is not necessary but recommended.
 +   - Before upgrading to 3.0, make sure that your cluster is in complete 
agreement
 + (schema versions outputted by `nodetool describecluster` are all the 
same).
 +   - Schema metadata is now stored in the new `system_schema` keyspace, and
 + legacy `system.schema_*` tables are now gone; see CASSANDRA-6717 for 
details.
 +   - Pig's CassandraStorage has been removed. Use CqlNativeStorage instead.
 +   - Hadoop BulkOutputFormat and BulkRecordWriter have been removed; use
 + CqlBulkOutputFormat and CqlBulkRecordWriter instead.
 +   - Hadoop ColumnFamilyInputFormat and ColumnFamilyOutputFormat have been 
removed;
 + use CqlInputFormat and 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[samt]

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/b324759e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b324759e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b324759e

Branch: refs/heads/cassandra-3.0
Commit: b324759eada2cb4b60e3894ecefb2b8071716d7a
Parents: 50fae5d cccaa17
Author: Sam Tunnicliffe 
Authored: Mon Oct 12 12:00:34 2015 +0100
Committer: Sam Tunnicliffe 
Committed: Mon Oct 12 12:00:34 2015 +0100

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/cql3/Cql.g | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b324759e/CHANGES.txt
--
diff --cc CHANGES.txt
index fa74c69,215bd76..f40c12c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,25 +1,46 @@@
 -2.2.3
 +3.0
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only 
(CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
+  * Preserve case of quoted Role & User names (CASSANDRA-10394)
   * cqlsh pg-style-strings broken (CASSANDRA-10484)
 - * Make Hadoop CF splits more polite to custom orderered partitioners 
(CASSANDRA-10400)
 + * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
  Merged from 2.1:
 - * Fix mmap file segment seeking to EOF (CASSANDRA-10478)
   * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
   * Mark nodes as dead even if they've already left (CASSANDRA-10205)
 - * Update internal python driver used by cqlsh (CASSANDRA-10161)
  
 -2.2.2
 - * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
 +
 +3.0.0-rc1
 + * Fix mixed version read request compatibility for compact static tables
 +   (CASSANDRA-10373)
 + * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
 + * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
 +   columns (CASSANDRA-9664)
 + * Move crc_check_chance out of compression options (CASSANDRA-9839)
 + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
 + * Transfer hints to a different node on decommission (CASSANDRA-10198)
 + * Check partition keys for CAS operations during stmt validation 
(CASSANDRA-10338)
 + * Add custom query expressions to SELECT (CASSANDRA-10217)
 + * Fix minor bugs in MV handling (CASSANDRA-10362)
 + * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
 + * Improve MV schema representation (CASSANDRA-9921)
 + * Add flag to enable/disable coordinator batchlog for MV writes 
(CASSANDRA-10230)
 + * Update cqlsh COPY for new internal driver serialization interface 
(CASSANDRA-10318)
 + * Give index implementations more control over rebuild operations 
(CASSANDRA-10312)
 + * Update index file format (CASSANDRA-10314)
 + * Add "shadowable" row tombstones to deal with mv timestamp issues 
(CASSANDRA-10261)
 + * CFS.loadNewSSTables() broken for pre-3.0 sstables
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections 
(CASSANDRA-9590)
 +Merged from 2.2:
   * Configurable page size in cqlsh (CASSANDRA-9855)
   * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 - * Cancel transaction for sstables we wont redistribute index summary
 -   for (CASSANDRA-10270)
 - * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 - * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 - * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 - * Fix repair hang when snapshot failed (CASSANDRA-10057)
 - * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 -   (CASSANDRA-10199)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
  Merged from 2.1:
   * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347)
   * Avoid misleading pushed notifications when multiple nodes

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b324759e/src/java/org/apache/cassandra/cql3/Cql.g
--

[5/6] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

[blerer]

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/90661a32
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90661a32
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90661a32

Branch: refs/heads/trunk
Commit: 90661a325984b6d27fd979029435ad52ae782aca
Parents: 41a4a53 eecfb07
Author: blerer 
Authored: Thu Sep 17 22:16:47 2015 +0200
Committer: blerer 
Committed: Thu Sep 17 22:17:40 2015 +0200

--
 NEWS.txt|  8 
 bin/cqlsh.py|  2 +-
 doc/cql3/CQL.textile| 10 +++-
 pylib/cqlshlib/cql3handling.py  |  2 +-
 src/java/org/apache/cassandra/cql3/Cql.g|  2 +-
 .../apache/cassandra/cql3/QueryProcessor.java   |  2 +-
 .../validation/operations/TruncateTest.java | 48 
 7 files changed, 68 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/NEWS.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/bin/cqlsh.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/doc/cql3/CQL.textile
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/pylib/cqlshlib/cql3handling.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/src/java/org/apache/cassandra/cql3/Cql.g
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90661a32/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--

[5/6] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

[blerer]

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/0d4e0cd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d4e0cd2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d4e0cd2

Branch: refs/heads/trunk
Commit: 0d4e0cd22653ff7c3c1ef4a4b2c23c78524ecc42
Parents: af0678d e7c2952
Author: blerer 
Authored: Wed Sep 16 10:33:47 2015 +0200
Committer: blerer 
Committed: Wed Sep 16 10:34:00 2015 +0200

--
 build.xml|  1 +
 doc/cql3/CQL.textile | 20 ++--
 2 files changed, 15 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d4e0cd2/build.xml
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d4e0cd2/doc/cql3/CQL.textile
--
diff --cc doc/cql3/CQL.textile
index 0e04528,ce712be..60e3d5e
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -362,14 -361,22 +361,23 @@@ The @compaction@ property must at leas
  | @max_sstable_age_days@   | DateTieredCompactionStrategy| 365
  | SSTables only containing data that is older than this will never be 
compacted. |
  
  
- For the @compression@ property, the following default sub-options are 
available:
+ h4(#compressionOptions). Compression options
+ 
+ For the @compression@ property, the following sub-options are available:
  
 -|_. option  |_. default|_. description |
 -| @sstable_compression@ | LZ4Compressor| The compression algorithm to 
use. Default compressor are: LZ4Compressor, SnappyCompressor and 
DeflateCompressor. Use an empty string (@''@) to disable compression. Custom 
compressor can be provided by specifying the full class name as a "string 
constant":#constants.|
 -| @chunk_length_kb@ | 64KB | On disk SSTables are compressed 
by block (to allow random reads). This defines the size (in KB) of said block. 
Bigger values may improve the compression rate, but increases the minimum size 
of data to be read from disk for a read |
 -| @crc_check_chance@| 1.0  | When compression is enabled, 
each compressed block includes a checksum of that block for the purpose of 
detecting disk bitrot and avoiding the propagation of corruption to other 
replica. This option defines the probability with which those checksums are 
checked during read. By default they are always checked. Set to 0 to disable 
checksum checking and to 0.5 for instance to check them every other read|
 +|_. option |_. default|_. description |
 +| @class@  | LZ4Compressor| The compression algorithm to 
use. Default compressor are: LZ4Compressor, SnappyCompressor and 
DeflateCompressor. Use @'enabled' : false@ to disable compression. Custom 
compressor can be provided by specifying the full class name as a "string 
constant":#constants.|
 +| @enabled@| true | By default compression is 
enabled. To disable it, set @enabled@ to @false@
 +| @chunk_length_in_kb@ | 64KB | On disk SSTables are 
compressed by block (to allow random reads). This defines the size (in KB) of 
said block. Bigger values may improve the compression rate, but increases the 
minimum size of data to be read from disk for a read |
 +| @crc_check_chance@   | 1.0  | When compression is enabled, 
each compressed block includes a checksum of that block for the purpose of 
detecting disk bitrot and avoiding the propagation of corruption to other 
replica. This option defines the probability with which those checksums are 
checked during read. By default they are always checked. Set to 0 to disable 
checksum checking and to 0.5 for instance to check them every other read|
  
+ h4(#cachingOptions). Caching options
+ 
+ For the @caching@ property, the following sub-options are available:
+ 
+ |_. option  |_. default|_. description |
+ |@keys@ | ALL   | Whether to cache keys ("key cache") for 
this table. Valid values are: @ALL@ and @NONE@.|
+ |@rows_per_partition@   | NONE   | The amount of rows to cache per partition 
("row cache"). If an integer @n@ is specified, the first @n@ queried rows of a 
partition will be cached. Other possible options are @ALL@, to cache all rows 
of a queried partition, or @NONE@ to disable row caching.|
  
  h4. Other considerations:
  

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jbellis]

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/1d94dc2b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d94dc2b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d94dc2b

Branch: refs/heads/cassandra-3.0
Commit: 1d94dc2b5b1854926a585a7e0a108ac597c07be2
Parents: e8691d7 8b2dc1f
Author: Jonathan Ellis 
Authored: Wed Sep 16 10:39:46 2015 -0500
Committer: Jonathan Ellis 
Committed: Wed Sep 16 10:39:46 2015 -0500

--
 .../org/apache/cassandra/io/sstable/format/big/BigTableWriter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d94dc2b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[samt]

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/83248186
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83248186
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83248186

Branch: refs/heads/cassandra-3.0
Commit: 83248186ad7302d19a534310ea46ddd9b0d64b7f
Parents: d996c36 b22ad42
Author: Sam Tunnicliffe 
Authored: Thu Sep 10 12:48:14 2015 +0100
Committer: Sam Tunnicliffe 
Committed: Thu Sep 10 12:50:10 2015 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/auth/CassandraRoleManager.java| 91 +---
 .../apache/cassandra/net/MessagingService.java  | 33 ++-
 3 files changed, 95 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/83248186/CHANGES.txt
--
diff --cc CHANGES.txt
index 7b75b96,b927f95..cda5762
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,8 +1,39 @@@
 -2.2.2
 +3.0.0-rc1
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections 
(CASSANDRA-9590)
 +Merged from 2.2:
+  * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
 +Merged from 2.1:
 + * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282)
 + * Scrub, Cleanup and Upgrade do not unmark compacting until all operations
 +   have completed, regardless of the occurence of exceptions (CASSANDRA-10274)
 +
 +
 +3.0.0-beta2
 + * Fix columns returned by AbstractBtreePartitions (CASSANDRA-10220)
 + * Fix backward compatibility issue due to AbstractBounds serialization bug 
(CASSANDRA-9857)
 + * Fix startup error when upgrading nodes (CASSANDRA-10136)
 + * Base table PRIMARY KEY can be assumed to be NOT NULL in MV creation 
(CASSANDRA-10147)
 + * Improve batchlog write patch (CASSANDRA-9673)
 + * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164)
 + * Require AbstractType.isByteOrderComparable declaration in constructor 
(CASSANDRA-9901)
 + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)
 + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
 + * Choose better poolingOptions for protocol v4 in cassandra-stress 
(CASSANDRA-10182)
 + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197)
 + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
 + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
 + * Fix double flushing of secondary index tables (CASSANDRA-10180)
 + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
 + * Only use batchlog when paired materialized view replica is remote 
(CASSANDRA-10061)
 + * Reuse TemporalRow when updating multiple MaterializedViews 
(CASSANDRA-10060)
 + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
 + * Fix sstablerepairedset (CASSANDRA-10132)
 +Merged from 2.2:
   * Cancel transaction for sstables we wont redistribute index summary
 for (CASSANDRA-10270)
 - * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
   * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
   * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
   * Fix repair hang when snapshot failed (CASSANDRA-10057)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83248186/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--
diff --cc src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 802ae3c,9151958..1d44bf9
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@@ -149,22 -154,24 +154,16 @@@ public class CassandraRoleManager imple
   legacySelectUserStatement = (SelectStatement) prepare("SELECT * 
FROM %s.%s WHERE name = ?",
 
AuthKeyspace.NAME,
 
LEGACY_USERS_TABLE);
- scheduleSetupTask(new Runnable()
 -scheduleSetupTask(new Callable()
--{
- public void run()
 -public Void call() throws Exception
--{
--convertLegacyData();
 -return null;
--}
++scheduleSetupTask(() -> {
++

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[samt]

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/3818d30b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3818d30b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3818d30b

Branch: refs/heads/cassandra-3.0
Commit: 3818d30bd1a253e39a296efd50185fe4d5bb3f42
Parents: 60e45c0 0c0f1ff
Author: Sam Tunnicliffe 
Authored: Tue Sep 8 10:27:35 2015 +0100
Committer: Sam Tunnicliffe 
Committed: Tue Sep 8 10:27:35 2015 +0100

--
 CHANGES.txt   |  2 ++
 .../org/apache/cassandra/config/DatabaseDescriptor.java   |  6 +-
 src/java/org/apache/cassandra/service/ClientState.java| 10 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3818d30b/CHANGES.txt
--
diff --cc CHANGES.txt
index d6ebe7a,5dffb9b..b7c6669
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,5 +1,31 @@@
 -2.2.2
 - * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 +3.0.0-rc1
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections 
(CASSANDRA-9590)
++Merged from 2.2:
++ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
 +
 +
 +3.0.0-beta2
 + * Fix columns returned by AbstractBtreePartitions (CASSANDRA-10220)
 + * Fix backward compatibility issue due to AbstractBounds serialization bug 
(CASSANDRA-9857)
 + * Fix startup error when upgrading nodes (CASSANDRA-10136)
 + * Base table PRIMARY KEY can be assumed to be NOT NULL in MV creation 
(CASSANDRA-10147)
 + * Improve batchlog write patch (CASSANDRA-9673)
 + * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164)
 + * Require AbstractType.isByteOrderComparable declaration in constructor 
(CASSANDRA-9901)
 + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)
 + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
 + * Choose better poolingOptions for protocol v4 in cassandra-stress 
(CASSANDRA-10182)
 + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197)
 + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
 + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
 + * Fix double flushing of secondary index tables (CASSANDRA-10180)
 + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
 + * Only use batchlog when paired materialized view replica is remote 
(CASSANDRA-10061)
 + * Reuse TemporalRow when updating multiple MaterializedViews 
(CASSANDRA-10060)
 + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
 + * Fix sstablerepairedset (CASSANDRA-10132)
 +Merged from 2.2:
   * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
   * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
   * Fix repair hang when snapshot failed (CASSANDRA-10057)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3818d30b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3818d30b/src/java/org/apache/cassandra/service/ClientState.java
--
diff --cc src/java/org/apache/cassandra/service/ClientState.java
index f8d3939,a15fa5c..f2ed984
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@@ -60,14 -62,15 +61,17 @@@ public class ClientStat
  {
  // We want these system cfs to be always readable to authenticated 
users since many tools rely on them
  // (nodetool, cqlsh, bulkloader, etc.)
 -for (String cf : Iterables.concat(Arrays.asList(SystemKeyspace.LOCAL, 
SystemKeyspace.PEERS), LegacySchemaTables.ALL))
 +for (String cf : Arrays.asList(SystemKeyspace.LOCAL, 
SystemKeyspace.PEERS))
  
READABLE_SYSTEM_RESOURCES.add(DataResource.table(SystemKeyspace.NAME, cf));
  
 +SchemaKeyspace.ALL.forEach(table -> 
READABLE_SYSTEM_RESOURCES.add(DataResource.table(SchemaKeyspace.NAME, table)));
 +
- 
PROTECTED_AUTH_RESOURCES.addAll(DatabaseDescriptor.getAuthenticator().protectedResources());
- 
PROTECTED_AUTH_RESOURCES.addAll(DatabaseDescriptor.getAuthorizer().protectedResources());
- 
PROTECTED_AUTH_RESOURCES.addAll(DatabaseDescriptor.getRoleManager().protectedResources());
+ if (!Config.isClientMode())
+ {
+ 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[benedict]

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34bbb445
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34bbb445
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34bbb445

Branch: refs/heads/cassandra-3.0
Commit: 34bbb445cb14ba7159f735b0dee8c2f9dab45a77
Parents: 99d5c39 2a2394f
Author: Benedict Elliott Smith 
Authored: Tue Sep 8 13:55:03 2015 +0100
Committer: Benedict Elliott Smith 
Committed: Tue Sep 8 13:55:03 2015 +0100

--

--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jbellis]

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/796b0f26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/796b0f26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/796b0f26

Branch: refs/heads/cassandra-3.0
Commit: 796b0f26a9ebc061fe30b86f089237e82ec90199
Parents: 53a177a f7644f2
Author: Jonathan Ellis 
Authored: Wed Sep 2 09:36:02 2015 -0500
Committer: Jonathan Ellis 
Committed: Wed Sep 2 09:36:02 2015 -0500

--
 .../org/apache/cassandra/config/DatabaseDescriptor.java | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/796b0f26/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/44e19947
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44e19947
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44e19947

Branch: refs/heads/cassandra-3.0
Commit: 44e19947f451945788c6f8fbaa167255347389a6
Parents: 00f0feb 0a4ce44
Author: Yuki Morishita 
Authored: Tue Sep 1 09:22:52 2015 -0500
Committer: Yuki Morishita 
Committed: Tue Sep 1 09:22:52 2015 -0500

--
 CHANGES.txt   | 1 +
 .../org/apache/cassandra/repair/RepairMessageVerbHandler.java | 7 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/44e19947/CHANGES.txt
--
diff --cc CHANGES.txt
index 6a0b0b6,102..6539792
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.2.2
 +3.0.0-beta2
 + * Require AbstractType.isByteOrderComparable declaration in constructor 
(CASSANDRA-9901)
 + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)
 + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
 + * Choose better poolingOptions for protocol v4 in cassandra-stress 
(CASSANDRA-10182)
 + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197)
 + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
 + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
 + * Fix double flushing of secondary index tables (CASSANDRA-10180)
 + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
 + * Only use batchlog when paired materialized view replica is remote 
(CASSANDRA-10061)
 + * Reuse TemporalRow when updating multiple MaterializedViews 
(CASSANDRA-10060)
 + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
 + * Fix sstablerepairedset (CASSANDRA-10132)
 +Merged from 2.2:
+  * Fix repair hang when snapshot failed (CASSANDRA-10057)
   * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 (CASSANDRA-10199)
  Merged from 2.1:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44e19947/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[jbellis]

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/3bc585d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bc585d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bc585d5

Branch: refs/heads/cassandra-3.0
Commit: 3bc585d5d0e01dd4f855994add67d3d120857eec
Parents: 0828e24 0d2f403
Author: Jonathan Ellis 
Authored: Mon Aug 31 12:04:44 2015 -0500
Committer: Jonathan Ellis 
Committed: Mon Aug 31 12:04:44 2015 -0500

--
 .../org/apache/cassandra/config/DatabaseDescriptor.java | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3bc585d5/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/9cc48906
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9cc48906
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9cc48906

Branch: refs/heads/cassandra-3.0
Commit: 9cc489065212ee89dda7d95af16d3f27a8a1486d
Parents: e3baf28 408746c
Author: Yuki Morishita yu...@apache.org
Authored: Thu Aug 27 10:19:39 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Thu Aug 27 10:19:39 2015 -0500

--
 CHANGES.txt | 1 +
 .../db/compaction/LeveledCompactionStrategyTest.java| 9 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9cc48906/CHANGES.txt
--
diff --cc CHANGES.txt
index 2ab4263,6cffd18..ca2ded8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,8 +1,47 @@@
 -2.2.1
 +3.0.0-beta2
 + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
 + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
 + * Fix double flushing of secondary index tables (CASSANDRA-10180)
 + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
 + * Only use batchlog when paired materialized view replica is remote 
(CASSANDRA-10061)
 + * Reuse TemporalRow when updating multiple MaterializedViews 
(CASSANDRA-10060)
 + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
 + * Fix sstablerepairedset (CASSANDRA-10132)
 +Merged from 2.2:
+  * Fix LeveledCompactionStrategyTest (CASSANDRA-9757)
   * Fix broken UnbufferedDataOutputStreamPlus.writeUTF (CASSANDRA-10203)
 + * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
 + * Avoid returning Permission.NONE when failing to query users table 
(CASSANDRA-10168)
   * (cqlsh) add CLEAR command (CASSANDRA-10086)
   * Support string literals as Role names for compatibility (CASSANDRA-10135)
 +Merged from 2.1:
 + * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
 + * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
 +
 +
 +3.0.0-beta1
 + * Redesign secondary index API (CASSANDRA-9459, 7771, 9041)
 + * Fix throwing ReadFailure instead of ReadTimeout on range queries 
(CASSANDRA-10125)
 + * Rewrite hinted handoff (CASSANDRA-6230)
 + * Fix query on static compact tables (CASSANDRA-10093)
 + * Fix race during construction of commit log (CASSANDRA-10049)
 + * Add option to only purge repaired tombstones (CASSANDRA-6434)
 + * Change authorization handling for MVs (CASSANDRA-9927)
 + * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
 + * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
 + * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
 + * Fix multiple slices on RowSearchers (CASSANDRA-10002)
 + * Fix bug in merging of collections (CASSANDRA-10001)
 + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
 + * Repair improvements when using vnodes (CASSANDRA-5220)
 + * Disable scripted UDFs by default (CASSANDRA-9889)
 + * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
 + * Use byte to serialize MT hash length (CASSANDRA-9792)
 + * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
 + * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
 + * SequentialWriter should extend BufferedDataOutputStreamPlus 
(CASSANDRA-9500)
 + * Use the same repairedAt timestamp within incremental repair session 
(CASSANDRA-9111)
 +Merged from 2.2:
   * Allow count(*) and count(1) to be use as normal aggregation 
(CASSANDRA-10114)
   * An NPE is thrown if the column name is unknown for an IN relation 
(CASSANDRA-10043)
   * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9cc48906/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 8050b6c,6b3383e..f2ddb00
--- 
a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@@ -252,23 -265,22 +253,19 @@@ public class LeveledCompactionStrategyT
  // Adds enough data to trigger multiple sstable per level
  for (int r = 0; r  rows; r++)
  {
 -DecoratedKey key = Util.dk(String.valueOf(r));
 -Mutation rm = new Mutation(KEYSPACE1, key.getKey());
 +UpdateBuilder update = UpdateBuilder.create(cfs.metadata, 
String.valueOf(r));
 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[tylerhobbs]

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/f545a702
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f545a702
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f545a702

Branch: refs/heads/trunk
Commit: f545a7022da0111893bf84e376e68fc6cc46b55e
Parents: d1ff531 1dc19a6
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Tue Aug 25 12:48:25 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Tue Aug 25 12:48:25 2015 -0500

--

--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[benedict]

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/29d3d44d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29d3d44d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29d3d44d

Branch: refs/heads/cassandra-3.0
Commit: 29d3d44d2056e5ab84a2a5357cd782344683fc8e
Parents: 342e33f 941a5dd
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sun Aug 23 11:51:10 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sun Aug 23 11:51:10 2015 +0100

--
 test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/29d3d44d/test/unit/org/apache/cassandra/db/lifecycle/TrackerTest.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[benedict]

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/2923011b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2923011b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2923011b

Branch: refs/heads/cassandra-3.0
Commit: 2923011b7aadc2368b87065cee12dd428d8c875d
Parents: 6c69f07 d61c026
Author: Benedict Elliott Smith bened...@apache.org
Authored: Tue Aug 18 10:10:58 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Tue Aug 18 10:10:58 2015 +0100

--

--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[samt]

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/8b7caa13
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b7caa13
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b7caa13

Branch: refs/heads/cassandra-3.0
Commit: 8b7caa1361897aa387cde94f19ec7b24ab7a535e
Parents: 3413e55 2d8ccf0
Author: Sam Tunnicliffe s...@beobal.com
Authored: Fri Aug 14 14:35:12 2015 +0100
Committer: Sam Tunnicliffe s...@beobal.com
Committed: Fri Aug 14 14:35:12 2015 +0100

--
 .../cql3/selection/SelectionColumnMappingTest.java  | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b7caa13/test/unit/org/apache/cassandra/cql3/selection/SelectionColumnMappingTest.java
--

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[benedict]

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
test/unit/org/apache/cassandra/db/CommitLogTest.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da8d48a7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da8d48a7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da8d48a7

Branch: refs/heads/cassandra-3.0
Commit: da8d48a79abf031b6a4e7bfd381bd4689f2fc12c
Parents: b294058 c645b11
Author: Benedict Elliott Smith bened...@apache.org
Authored: Fri Aug 14 20:29:03 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Fri Aug 14 20:29:03 2015 +0100

--
 .../db/CommitLogFailurePolicyTest.java  | 112 ++
 .../org/apache/cassandra/db/CommitLogTest.java  | 147 ---
 2 files changed, 112 insertions(+), 147 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/da8d48a7/test/unit/org/apache/cassandra/db/CommitLogTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CommitLogTest.java
index 0c5093a,2764da4..6db29a8
--- a/test/unit/org/apache/cassandra/db/CommitLogTest.java
+++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java
@@@ -317,187 -319,32 +317,40 @@@ public class CommitLogTes
  }
  
  @Test
- public void testCommitFailurePolicy_stop() throws ConfigurationException
- {
- CassandraDaemon daemon = new CassandraDaemon();
- daemon.completeSetup(); //startup must be completed, otherwise commit 
log failure must kill JVM regardless of failure policy
- StorageService.instance.registerDaemon(daemon);
- 
- // Need storage service active so stop policy can shutdown gossip
- StorageService.instance.initServer();
- Assert.assertTrue(Gossiper.instance.isEnabled());
- 
- Config.CommitFailurePolicy oldPolicy = 
DatabaseDescriptor.getCommitFailurePolicy();
- try
- {
- 
DatabaseDescriptor.setCommitFailurePolicy(Config.CommitFailurePolicy.stop);
- CommitLog.handleCommitError(Test stop error, new Throwable());
- Assert.assertFalse(Gossiper.instance.isEnabled());
- }
- finally
- {
- DatabaseDescriptor.setCommitFailurePolicy(oldPolicy);
- }
- }
- 
- @Test
- public void testCommitFailurePolicy_die()
- {
- CassandraDaemon daemon = new CassandraDaemon();
- daemon.completeSetup(); //startup must be completed, otherwise commit 
log failure must kill JVM regardless of failure policy
- StorageService.instance.registerDaemon(daemon);
- 
- KillerForTests killerForTests = new KillerForTests();
- JVMStabilityInspector.Killer originalKiller = 
JVMStabilityInspector.replaceKiller(killerForTests);
- Config.CommitFailurePolicy oldPolicy = 
DatabaseDescriptor.getCommitFailurePolicy();
- try
- {
- 
DatabaseDescriptor.setCommitFailurePolicy(Config.CommitFailurePolicy.die);
- CommitLog.handleCommitError(Testing die policy, new 
Throwable());
- Assert.assertTrue(killerForTests.wasKilled());
- Assert.assertFalse(killerForTests.wasKilledQuietly()); //only 
killed quietly on startup failure
- }
- finally
- {
- DatabaseDescriptor.setCommitFailurePolicy(oldPolicy);
- JVMStabilityInspector.replaceKiller(originalKiller);
- }
- }
- 
- @Test
- public void testCommitFailurePolicy_mustDieIfNotStartedUp()
- {
- //startup was not completed successfuly (since method completeSetup() 
was not called)
- CassandraDaemon daemon = new CassandraDaemon();
- StorageService.instance.registerDaemon(daemon);
- 
- KillerForTests killerForTests = new KillerForTests();
- JVMStabilityInspector.Killer originalKiller = 
JVMStabilityInspector.replaceKiller(killerForTests);
- Config.CommitFailurePolicy oldPolicy = 
DatabaseDescriptor.getCommitFailurePolicy();
- try
- {
- //even though policy is ignore, JVM must die because Daemon has 
not finished initializing
- 
DatabaseDescriptor.setCommitFailurePolicy(Config.CommitFailurePolicy.ignore);
- CommitLog.handleCommitError(Testing die policy, new 
Throwable());
- Assert.assertTrue(killerForTests.wasKilled());
- Assert.assertTrue(killerForTests.wasKilledQuietly()); //killed 
quietly due to startup failure
- }
- finally
- {
- DatabaseDescriptor.setCommitFailurePolicy(oldPolicy);
- JVMStabilityInspector.replaceKiller(originalKiller);
- }
- }
- 
- @Test
- public void 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[blerer]

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:

src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java

src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e389dc42
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e389dc42
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e389dc42

Branch: refs/heads/trunk
Commit: e389dc421c0a4892388e99c1ada0b4c37f106b7b
Parents: f568a5d 6d0cf7d
Author: blerer benjamin.le...@datastax.com
Authored: Sun Aug 9 22:46:52 2015 +0200
Committer: blerer benjamin.le...@datastax.com
Committed: Sun Aug 9 22:46:52 2015 +0200

--
 .../restrictions/MultiColumnRestriction.java| 37 +++
 .../restrictions/SingleColumnRestriction.java   | 68 ++--
 .../SelectMultiColumnRelationTest.java  | 45 +
 .../SelectSingleColumnRelationTest.java | 28 
 4 files changed, 149 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e389dc42/src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java
index e48a22b,84a3952..b0f592c
--- 
a/src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java
+++ 
b/src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java
@@@ -329,7 -340,7 +336,7 @@@ public abstract class MultiColumnRestri
  this(columnDefs, TermSlice.newInstance(bound, inclusive, term));
  }
  
- private SliceRestriction(ListColumnDefinition columnDefs, TermSlice 
slice)
 -Slice(ListColumnDefinition columnDefs, TermSlice slice)
++SliceRestriction(ListColumnDefinition columnDefs, TermSlice slice)
  {
  super(columnDefs);
  this.slice = slice;
@@@ -409,8 -418,10 +414,10 @@@
 More than one restriction was found for the end bound 
on %s,
 getColumnsInCommons(otherRestriction));
  
 -Slice otherSlice = (Slice) otherRestriction;
++SliceRestriction otherSlice = (SliceRestriction) otherRestriction;
  ListColumnDefinition newColumnDefs = columnDefs.size() = 
otherSlice.columnDefs.size() ?  columnDefs : otherSlice.columnDefs;
+ 
 -return new Slice(newColumnDefs, slice.merge(otherSlice.slice));
 +return new SliceRestriction(newColumnDefs, 
slice.merge(otherSlice.slice));
  }
  
  @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e389dc42/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
index f96b7a0,afa0419..a6ed4b4
--- 
a/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
+++ 
b/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
@@@ -27,12 -27,12 +27,11 @@@ import org.apache.cassandra.cql3.*
  import org.apache.cassandra.cql3.Term.Terminal;
  import org.apache.cassandra.cql3.functions.Function;
  import org.apache.cassandra.cql3.statements.Bound;
 -import org.apache.cassandra.db.IndexExpression;
 -import org.apache.cassandra.db.composites.CompositesBuilder;
 +import org.apache.cassandra.db.MultiCBuilder;
 +import org.apache.cassandra.db.filter.RowFilter;
  import org.apache.cassandra.db.index.SecondaryIndex;
  import org.apache.cassandra.db.index.SecondaryIndexManager;
 -import org.apache.cassandra.db.marshal.CompositeType;
  import org.apache.cassandra.exceptions.InvalidRequestException;
- 
  import static 
org.apache.cassandra.cql3.statements.RequestValidations.checkBindValueSet;
  import static 
org.apache.cassandra.cql3.statements.RequestValidations.checkFalse;
  import static 
org.apache.cassandra.cql3.statements.RequestValidations.checkNotNull;
@@@ -119,11 -140,18 +139,17 @@@ public abstract class SingleColumnRestr
  }
  
  @Override
+ MultiColumnRestriction toMultiColumnRestriction()
+ {
 -return new 
MultiColumnRestriction.EQ(Collections.singletonList(columnDef), value);
++return new 
MultiColumnRestriction.EQRestriction(Collections.singletonList(columnDef), 
value);
+ }
+ 
+ @Override
 -public void addIndexExpressionTo(ListIndexExpression expressions,
 - SecondaryIndexManager indexManager,
 - QueryOptions options) throws 
InvalidRequestException
 

[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

[yukim]

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/0a94c7a3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a94c7a3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a94c7a3

Branch: refs/heads/cassandra-3.0
Commit: 0a94c7a36c778e7429c68ac23c018e2f6db1b27e
Parents: a472aa9 ed4fad1
Author: Yuki Morishita yu...@apache.org
Authored: Thu Aug 6 22:06:02 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Thu Aug 6 22:06:02 2015 -0500

--
 src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a94c7a3/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
--