[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 4b1d59e13143f5a55478a7cfcaca61ba22259f9f
Parents: b8b4eb7 257cdaa
Author: Aleksey Yeschenko 
Authored: Wed Sep 16 11:44:28 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Sep 16 11:44:28 2015 +0100

--
 CHANGES.txt |   1 +
 .../locator/GossipingPropertyFileSnitch.java|   1 +
 .../cassandra/locator/PropertyFileSnitch.java   |   1 +
 .../apache/cassandra/locator/TokenMetadata.java | 142 +
 .../locator/YamlFileNetworkTopologySnitch.java  |   1 +
 .../cassandra/service/StorageService.java   |  16 ++
 .../cassandra/locator/TokenMetadataTest.java| 209 ++-
 7 files changed, 333 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b1d59e1/CHANGES.txt
--
diff --cc CHANGES.txt
index 5f11049,3c47427..12523be
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,7 +1,47 @@@
 -2.0.17
 +2.1.10
 + * (Pig) support BulkOutputFormat as a URL parameter (CASSANDRA-7410)
 + * BATCH statement is broken in cqlsh (CASSANDRA-10272)
 + * Added configurable warning threshold for GC duration (CASSANDRA-8907)
 + * (cqlsh) Make cqlsh PEP8 compliant (CASSANDRA-10066)
 + * (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)
 + * Fix handling of streaming EOF (CASSANDRA-10206)
 + * Only check KeyCache when it is enabled
 + * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
 + * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
 +Merged from 2.0:
+  * Fix consolidating racks violating the RF contract (CASSANDRA-10238)
   * Disallow decommission when node is in drained state (CASSANDRA-8741)
 - * Backport CASSANDRA-8013 to 2.0 (CASSANDRA-10144)
 +
 +
 +2.1.9
 + * Avoid race condition during read repair (CASSANDRA-9460)
 + * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
 + * Avoid returning Permission.NONE when failing to query users table 
(CASSANDRA-10168)
 + * (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004)
 + * Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
 + * Write hints for paxos commits (CASSANDRA-7342)
 + * (cqlsh) Fix timestamps before 1970 on Windows, always
 +   use UTC for timestamp display (CASSANDRA-1)
 + * (cqlsh) Avoid overwriting new config file with old config
 +   when both exist (CASSANDRA-9777)
 + * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998)
 + * Cannot replace token does not exist - DN node removed as Fat Client 
(CASSANDRA-9871)
 + * Fix handling of enable/disable autocompaction (CASSANDRA-9899)
 + * Commit log segment recycling is disabled by default (CASSANDRA-9896)
 + * Add consistency level to tracing ouput (CASSANDRA-9827)
 + * Fix MarshalException when upgrading superColumn family (CASSANDRA-9582)
 + * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
 + * Handle corrupt files on startup (CASSANDRA-9686)
 + * Fix clientutil jar and tests (CASSANDRA-9760)
 + * (cqlsh) Allow the SSL protocol version to be specified through the
 +   config file or environment variables (CASSANDRA-9544)
 + * Remove repair snapshot leftover on startup (CASSANDRA-7357)
 + * Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
 + * Ensure atomicity inside thrift and stream session (CASSANDRA-7757)
 + * Fix nodetool info error when the node is not joined (CASSANDRA-9031)
 +Merged from 2.0:
   * Make getFullyExpiredSSTables less expensive (CASSANDRA-9882)
   * Add tool to find why expired sstables are not getting dropped 
(CASSANDRA-10015)
   * Remove erroneous pending HH tasks from tpstats/jmx (CASSANDRA-9129)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b1d59e1/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
--
diff --cc src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
index 2c0980a,dd1637d..da43600
--- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
@@@ -72,24 -62,7 +72,25 @@@ public class GossipingPropertyFileSnitc
  }
  catch (ConfigurationException e)
 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jake]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 6479d9495ca54bb450f46f527a795b687aad3d49
Parents: a7282e4 3aff449
Author: T Jake Luciani 
Authored: Wed Sep 16 13:40:51 2015 -0400
Committer: T Jake Luciani 
Committed: Wed Sep 16 13:40:51 2015 -0400

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: c2eb7bd7ddb83d0a4d4612adb0e3ebd773c8ba67
Parents: acdbdc2 0bb32f0
Author: Marcus Eriksson 
Authored: Mon Sep 7 07:56:58 2015 +0200
Committer: Marcus Eriksson 
Committed: Mon Sep 7 07:56:58 2015 +0200

--
 src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2eb7bd7/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: fe80052571079b2468dd5265504cd6caee92bc69
Parents: c457dce 517058f
Author: Tyler Hobbs 
Authored: Thu Sep 3 15:03:37 2015 -0500
Committer: Tyler Hobbs 
Committed: Thu Sep 3 15:03:37 2015 -0500

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: df9e798de6eb4b47eacab209f82bc7e72347946a
Parents: 755a6b2 500c035
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Aug 20 18:15:43 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Aug 20 18:15:43 2015 +0200

--
 doc/cql3/CQL.textile | 29 -
 1 file changed, 16 insertions(+), 13 deletions(-)
--


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

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:

src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java


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

Branch: refs/heads/cassandra-2.1
Commit: 755a6b244c7c0db34044f03b9a62c2070e033a78
Parents: 26ff150 17042f1
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Aug 18 10:51:38 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Aug 18 10:51:38 2015 +0200

--
 .../DateTieredCompactionStrategy.java   |  7 +++
 .../DateTieredCompactionStrategyOptions.java| 21 
 .../DateTieredCompactionStrategyTest.java   |  2 +-
 3 files changed, 25 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/755a6b24/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
--
diff --cc 
src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
index 41c304b,2e43352..a8e2aff
--- 
a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
+++ 
b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
@@@ -36,11 -36,9 +36,10 @@@ public class DateTieredCompactionStrate
  {
  private static final Logger logger = 
LoggerFactory.getLogger(DateTieredCompactionStrategy.class);
  
 -protected DateTieredCompactionStrategyOptions options;
 +private final DateTieredCompactionStrategyOptions options;
  protected volatile int estimatedRemainingTasks;
 +private final SetSSTableReader sstables = new HashSet();
- @VisibleForTesting
- long lastExpiredCheck;
+ private long lastExpiredCheck;
  
  public DateTieredCompactionStrategy(ColumnFamilyStore cfs, MapString, 
String options)
  {
@@@ -79,14 -80,14 +78,14 @@@
   */
  private ListSSTableReader getNextBackgroundSSTables(final int gcBefore)
  {
 -if (!isEnabled() || cfs.getSSTables().isEmpty())
 +if (cfs.getSSTables().isEmpty())
  return Collections.emptyList();
  
 -SetSSTableReader uncompacting = cfs.getUncompactingSSTables();
 +SetSSTableReader uncompacting = Sets.intersection(sstables, 
cfs.getUncompactingSSTables());
  
  SetSSTableReader expired = Collections.emptySet();
- // we only check for expired sstables every 10 minutes due to it 
being an expensive operation
- if (System.currentTimeMillis() - lastExpiredCheck  
TimeUnit.MINUTES.toMillis(10))
+ // we only check for expired sstables every 10 minutes (by default) 
due to it being an expensive operation
+ if (System.currentTimeMillis() - lastExpiredCheck  
options.expiredSSTableCheckFrequency)
  {
  // Find fully expired SSTables. Those will be included no matter 
what.
  expired = CompactionController.getFullyExpiredSSTables(cfs, 
uncompacting, cfs.getOverlappingSSTables(uncompacting), gcBefore);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/755a6b24/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index cea835f,6d9bfc2..f05bf44
--- 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@@ -305,12 -305,10 +305,12 @@@ public class DateTieredCompactionStrate
  options.put(DateTieredCompactionStrategyOptions.BASE_TIME_KEY, 30);
  
options.put(DateTieredCompactionStrategyOptions.TIMESTAMP_RESOLUTION_KEY, 
MILLISECONDS);
  options.put(DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY, 
Double.toString((1d / (24 * 60 * 60;
+ 
options.put(DateTieredCompactionStrategyOptions.EXPIRED_SSTABLE_CHECK_FREQUENCY_SECONDS_KEY,
 0);
  DateTieredCompactionStrategy dtcs = new 
DateTieredCompactionStrategy(cfs, options);
 +for (SSTableReader sstable : cfs.getSSTables())
 +dtcs.addSSTable(sstable);
  dtcs.startup();
  assertNull(dtcs.getNextBackgroundTask((int) 
(System.currentTimeMillis() / 1000)));
- dtcs.lastExpiredCheck = 0;
  Thread.sleep(2000);
  AbstractCompactionTask t = dtcs.getNextBackgroundTask((int) 
(System.currentTimeMillis()/1000));
  assertNotNull(t);

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt

src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java


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

Branch: refs/heads/cassandra-2.1
Commit: 26ff15070eb67779050975a9ae07053f4b5e5b04
Parents: 7a6a509 f53aacb
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Aug 17 08:30:17 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Aug 17 08:30:17 2015 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 55 +---
 .../DateTieredCompactionStrategy.java   | 13 -
 .../DateTieredCompactionStrategyTest.java   |  1 +
 4 files changed, 60 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26ff1507/CHANGES.txt
--
diff --cc CHANGES.txt
index 5a76978,905445e..4626899
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
 -2.0.17
 +2.1.9
 + * (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004)
 + * Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
 + * Write hints for paxos commits (CASSANDRA-7342)
 + * (cqlsh) Fix timestamps before 1970 on Windows, always
 +   use UTC for timestamp display (CASSANDRA-1)
 + * (cqlsh) Avoid overwriting new config file with old config
 +   when both exist (CASSANDRA-9777)
 + * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998)
 + * Cannot replace token does not exist - DN node removed as Fat Client 
(CASSANDRA-9871)
 + * Fix handling of enable/disable autocompaction (CASSANDRA-9899)
 + * Commit log segment recycling is disabled by default (CASSANDRA-9896)
 + * Add consistency level to tracing ouput (CASSANDRA-9827)
 + * Fix MarshalException when upgrading superColumn family (CASSANDRA-9582)
 + * Fix broken logging for empty flushes in Memtable (CASSANDRA-9837)
 + * Handle corrupt files on startup (CASSANDRA-9686)
 + * Fix clientutil jar and tests (CASSANDRA-9760)
 + * (cqlsh) Allow the SSL protocol version to be specified through the
 +   config file or environment variables (CASSANDRA-9544)
 + * Remove repair snapshot leftover on startup (CASSANDRA-7357)
 + * Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
 + * Ensure atomicity inside thrift and stream session (CASSANDRA-7757)
 + * Fix nodetool info error when the node is not joined (CASSANDRA-9031)
 +Merged from 2.0:
+  * Make getFullyExpiredSSTables less expensive (CASSANDRA-9882)
   * Add tool to find why expired sstables are not getting dropped 
(CASSANDRA-10015)
   * Remove erroneous pending HH tasks from tpstats/jmx (CASSANDRA-9129)
   * Don't cast expected bf size to an int (CASSANDRA-9959)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26ff1507/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 7364528,eb688f7..25b3e57
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1367,20 -1025,59 +1367,59 @@@ public class ColumnFamilyStore implemen
  
  // a normal compaction won't ever have an empty sstables list, but we 
create a skeleton
  // compaction controller for streaming, and that passes an empty list.
 -if (sstables.isEmpty())
 +if (!sstables.iterator().hasNext())
  return ImmutableSet.of();
  
- DataTracker.SSTableIntervalTree tree = data.getView().intervalTree;
- 
- SetSSTableReader results = null;
- for (SSTableReader sstable : sstables)
 -ListSSTableReader sortedByFirst = new ArrayList(sstables);
++ListSSTableReader sortedByFirst = Lists.newArrayList(sstables);
+ Collections.sort(sortedByFirst, new ComparatorSSTableReader()
+ {
+ @Override
+ public int compare(SSTableReader o1, SSTableReader o2)
+ {
+ return o1.first.compareTo(o2.first);
+ }
+ });
+ ListIntervalRowPosition, SSTableReader intervals = new 
ArrayList();
+ DecoratedKey first = null, last = null;
+ /*
+ normalize the intervals covered by the sstables
+ assume we have sstables like this (brackets representing first/last 
key in the sstable);
+ [   ] [   ][   ]   [  ]
+[   ] [   ]
+ then we can, instead of 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java


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

Branch: refs/heads/cassandra-2.1
Commit: 012b987e267bdfb39b44c8afd4f4ccbb48a1ddf4
Parents: 76e8eb8 028e7cb
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Aug 11 09:46:33 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Aug 11 10:11:15 2015 +0200

--
 CHANGES.txt |   1 +
 .../cassandra/tools/SSTableExpiredBlockers.java | 136 +++
 .../cassandra/db/compaction/TTLExpiryTest.java  |  29 
 tools/bin/sstableexpiredblockers|  54 
 tools/bin/sstableexpiredblockers.bat|  23 
 5 files changed, 243 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/012b987e/CHANGES.txt
--
diff --cc CHANGES.txt
index 462de44,7d84538..f7fb63c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -2.0.17
 +2.1.9
 + * Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
 + * Write hints for paxos commits (CASSANDRA-7342)
 + * (cqlsh) Fix timestamps before 1970 on Windows, always
 +   use UTC for timestamp display (CASSANDRA-1)
 + * (cqlsh) Avoid overwriting new config file with old config
 +   when both exist (CASSANDRA-9777)
 + * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998)
 + * Cannot replace token does not exist - DN node removed as Fat Client 
(CASSANDRA-9871)
 + * Fix handling of enable/disable autocompaction (CASSANDRA-9899)
 + * Commit log segment recycling is disabled by default (CASSANDRA-9896)
 + * Add consistency level to tracing ouput (CASSANDRA-9827)
 + * Fix MarshalException when upgrading superColumn family (CASSANDRA-9582)
 + * Fix broken logging for empty flushes in Memtable (CASSANDRA-9837)
 + * Handle corrupt files on startup (CASSANDRA-9686)
 + * Fix clientutil jar and tests (CASSANDRA-9760)
 + * (cqlsh) Allow the SSL protocol version to be specified through the
 +   config file or environment variables (CASSANDRA-9544)
 + * Remove repair snapshot leftover on startup (CASSANDRA-7357)
 + * Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
 + * Ensure atomicity inside thrift and stream session (CASSANDRA-7757)
 + * Fix nodetool info error when the node is not joined (CASSANDRA-9031)
 +Merged from 2.0:
+  * Add tool to find why expired sstables are not getting dropped 
(CASSANDRA-10015)
   * Remove erroneous pending HH tasks from tpstats/jmx (CASSANDRA-9129)
   * Don't cast expected bf size to an int (CASSANDRA-9959)
   * Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/012b987e/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java
--
diff --cc src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java
index 000,b5fa779..b4f7063
mode 00,100644..100644
--- a/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java
+++ b/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java
@@@ -1,0 -1,135 +1,136 @@@
+ /*
+  * 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.tools;
+ 
+ import java.io.IOException;
+ import java.io.PrintStream;
+ import java.util.Collections;
+ import java.util.HashSet;
+ import java.util.Map;
+ import java.util.Set;
+ 
+ import com.google.common.base.Throwables;
+ import com.google.common.collect.ArrayListMultimap;
+ import com.google.common.collect.Multimap;
+ 
+ import org.apache.cassandra.config.CFMetaData;
+ import org.apache.cassandra.config.DatabaseDescriptor;
+ import 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[blerer]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 1ae58ef3acc187a3728ca0dda3e98be8b3580ec1
Parents: 07a7e80 de84a5c
Author: blerer benjamin.le...@datastax.com
Authored: Sun Aug 9 22:04:32 2015 +0200
Committer: blerer benjamin.le...@datastax.com
Committed: Sun Aug 9 22:04:56 2015 +0200

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
src/java/org/apache/cassandra/db/compaction/Scrubber.java


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

Branch: refs/heads/cassandra-2.1
Commit: 5c58af97a742e9d53b8ce4fe930d51b085259dc2
Parents: 8f9ca07 45bd07f
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Aug 3 14:48:52 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Aug 3 14:48:52 2015 +0200

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java  | 6 +++---
 src/java/org/apache/cassandra/db/compaction/Scrubber.java  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c58af97/CHANGES.txt
--
diff --cc CHANGES.txt
index f4e1832,a8cf796..de7cfa8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.0.17
 +2.1.9
 + * Cannot replace token does not exist - DN node removed as Fat Client 
(CASSANDRA-9871)
 + * Fix handling of enable/disable autocompaction (CASSANDRA-9899)
 + * Commit log segment recycling is disabled by default (CASSANDRA-9896)
 + * Add consistency level to tracing ouput (CASSANDRA-9827)
 + * Fix MarshalException when upgrading superColumn family (CASSANDRA-9582)
 + * Fix broken logging for empty flushes in Memtable (CASSANDRA-9837)
 + * Handle corrupt files on startup (CASSANDRA-9686)
 + * Fix clientutil jar and tests (CASSANDRA-9760)
 + * (cqlsh) Allow the SSL protocol version to be specified through the
 +   config file or environment variables (CASSANDRA-9544)
 + * Remove repair snapshot leftover on startup (CASSANDRA-7357)
 + * Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
 + * Ensure atomicity inside thrift and stream session (CASSANDRA-7757)
 +Merged from 2.0:
+  * Don't cast expected bf size to an int (CASSANDRA-9959)
   * Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793)
   * checkForEndpointCollision fails for legitimate collisions (CASSANDRA-9765)
   * Complete CASSANDRA-8448 fix (CASSANDRA-9519)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c58af97/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 1e4c54a,9d71dc7..3cfbe43
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -729,44 -531,90 +729,44 @@@ public class CompactionManager implemen
  return;
  }
  
 -boolean hasIndexes = cfs.indexManager.hasIndexes();
 -CleanupStrategy cleanupStrategy = CleanupStrategy.get(cfs, ranges, 
renewer);
 +long start = System.nanoTime();
  
 -for (SSTableReader sstable : sstables)
 -{
 -SetSSTableReader sstableAsSet = Collections.singleton(sstable);
 -if (!hasIndexes  !new BoundsToken(sstable.first.token, 
sstable.last.token).intersects(ranges))
 -{
 -cfs.replaceCompactedSSTables(sstableAsSet, 
Collections.SSTableReaderemptyList(), OperationType.CLEANUP);
 -continue;
 -}
 -if (!needsCleanup(sstable, ranges))
 -{
 -logger.debug(Skipping {} for cleanup; all rows should be 
kept, sstable);
 -continue;
 -}
 +long totalkeysWritten = 0;
  
- int expectedBloomFilterSize = 
Math.max(cfs.metadata.getMinIndexInterval(),
-(int) 
(SSTableReader.getApproximateKeyCount(sstableSet)));
 -CompactionController controller = new CompactionController(cfs, 
sstableAsSet, getDefaultGcBefore(cfs));
 -long start = System.nanoTime();
++long expectedBloomFilterSize = 
Math.max(cfs.metadata.getMinIndexInterval(),
++
SSTableReader.getApproximateKeyCount(sstableSet));
 +if (logger.isDebugEnabled())
 +logger.debug(Expected bloom filter size : {}, 
expectedBloomFilterSize);
  
 -long totalkeysWritten = 0;
 +logger.info(Cleaning up {}, sstable);
  
 -long expectedBloomFilterSize = 
Math.max(cfs.metadata.getIndexInterval(),
 -

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: c4b52603fb4f9bb78019ec3e018871f389960df2
Parents: 89d8134 52dbc3f
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Jul 8 14:13:12 2015 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Jul 8 14:13:12 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4b52603/CHANGES.txt
--
diff --cc CHANGES.txt
index 568571d,84d562c..7635227
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
 -2.0.17
 +2.1.9
 + * Fix clientutil jar and tests (CASSANDRA-9760)
 + * (cqlsh) Allow the SSL protocol version to be specified through the
 +   config file or environment variables (CASSANDRA-9544)
 +Merged from 2.0:
+  * Can't transition from write survey to normal mode (CASSANDRA-9740)
 + * Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591)
 + * Fix growing pending background compaction (CASSANDRA-9662)
 +
 +
 +2.1.8
 + * (cqlsh) Fix bad check for CQL compatibility when DESCRIBE'ing
 +   COMPACT STORAGE tables with no clustering columns
 + * Warn when an extra-large partition is compacted (CASSANDRA-9643)
 + * Eliminate strong self-reference chains in sstable ref tidiers 
(CASSANDRA-9656)
 + * Ensure StreamSession uses canonical sstable reader instances 
(CASSANDRA-9700) 
 + * Ensure memtable book keeping is not corrupted in the event we shrink usage 
(CASSANDRA-9681)
 + * Update internal python driver for cqlsh (CASSANDRA-9064)
 + * Fix IndexOutOfBoundsException when inserting tuple with too many
 +   elements using the string literal notation (CASSANDRA-9559)
 + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
 + * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
 + * Enable describe on indices (CASSANDRA-7814)
 + * ColumnFamilyStore.selectAndReference may block during compaction 
(CASSANDRA-9637)
 +Merged from 2.0:
   * Avoid NPE in AuthSuccess#decode (CASSANDRA-9727)
   * Add listen_address to system.local (CASSANDRA-9603)
   * Bug fixes to resultset metadata construction (CASSANDRA-9636)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4b52603/src/java/org/apache/cassandra/service/StorageService.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 31aa2a23c3cf7a45c6563d75b0a958d9e492c681
Parents: c65d81b 3504a50
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Jul 1 22:02:19 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Jul 1 22:02:19 2015 +0300

--
 CHANGES.txt  |  7 ---
 .../org/apache/cassandra/db/ColumnFamilyStore.java   |  2 +-
 src/java/org/apache/cassandra/db/DefsTables.java |  2 +-
 src/java/org/apache/cassandra/db/Keyspace.java   | 15 +--
 src/java/org/apache/cassandra/db/Mutation.java   |  2 +-
 test/unit/org/apache/cassandra/db/CommitLogTest.java |  2 +-
 6 files changed, 21 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/31aa2a23/CHANGES.txt
--
diff --cc CHANGES.txt
index 052ced1,391874b..5c55b9e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,6 +1,14 @@@
 -2.0.17
 +2.1.8
 + * Update internal python driver for cqlsh (CASSANDRA-9064)
-  * Avoids ballot clash in Paxos (CASSANDRA-9649)
 + * Fix IndexOutOfBoundsException when inserting tuple with too many
 +   elements using the string literal notation (CASSANDRA-9559)
 + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
 + * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
 + * Enable describe on indices (CASSANDRA-7814)
 + * ColumnFamilyStore.selectAndReference may block during compaction 
(CASSANDRA-9637)
- Merged from 2.0
++Merged from 2.0:
+  * Fix setting 'durable_writes' in ALTER KEYSPACE (CASSANDRA-9560)
+  * Avoid ballot clash in Paxos (CASSANDRA-9649)
   * Improve trace messages for RR (CASSANDRA-9479)
   * Fix suboptimal secondary index selection when restricted
 clustering column is also indexed (CASSANDRA-9631)
@@@ -15,12 -8,10 +16,12 @@@
   * Fix error message when attempting to create an index on a column
 in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
   * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
 - * Display min timestamp in sstablemetadata viewer (CASSANDRA-6767)
  
  
 -2.0.16:
 +2.1.7
 + * Fix bug in cardinality check when compacting (CASSANDRA-9580)
 + * Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour 
(CASSANDRA-9549)
- Merged from 2.0
++Merged from 2.0:
   * Expose some internals of SelectStatement for inspection (CASSANDRA-9532)
   * ArrivalWindow should use primitives (CASSANDRA-9496)
   * Periodically submit background compaction tasks (CASSANDRA-9592)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31aa2a23/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31aa2a23/src/java/org/apache/cassandra/db/DefsTables.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31aa2a23/src/java/org/apache/cassandra/db/Keyspace.java
--
diff --cc src/java/org/apache/cassandra/db/Keyspace.java
index cec1beb,915ccca..4f59c40
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@@ -71,11 -70,9 +71,11 @@@ public class Keyspac
  DatabaseDescriptor.createAllDirectories();
  }
  
- public final KSMetaData metadata;
 +public final OpOrder writeOrder = new OpOrder();
 +
  /* ColumnFamilyStore per column family */
  private final ConcurrentMapUUID, ColumnFamilyStore columnFamilyStores = 
new ConcurrentHashMapUUID, ColumnFamilyStore();
+ private volatile KSMetaData metadata;
  private volatile AbstractReplicationStrategy replicationStrategy;
  
  public static final FunctionString,Keyspace keyspaceTransformer = new 
FunctionString, Keyspace()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31aa2a23/src/java/org/apache/cassandra/db/Mutation.java
--
diff --cc src/java/org/apache/cassandra/db/Mutation.java
index a6d23cb,000..0424f5a
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/db/Mutation.java
+++ b/src/java/org/apache/cassandra/db/Mutation.java
@@@ -1,351 -1,0 +1,351 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 3491ab542cd93fafd21fd1bcf8cfd67f6fe76bbf
Parents: 31aa2a2 ccec307
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Jul 1 22:36:20 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Jul 1 22:36:20 2015 +0300

--
 CHANGES.txt | 32 +---
 1 file changed, 13 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3491ab54/CHANGES.txt
--
diff --cc CHANGES.txt
index 5c55b9e,beebaf3..762b88b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -603,83 -267,37 +603,77 @@@ Merged from 2.0
   * Fix wrong progress when streaming uncompressed (CASSANDRA-7878)
   * Fix possible infinite loop in creating repair range (CASSANDRA-7983)
   * Fix unit in nodetool for streaming throughput (CASSANDRA-7375)
 - * Do not exit nodetool repair when receiving JMX NOTIF_LOST (CASSANDRA-7909)
 - * Stream to private IP when available (CASSANDRA-8084)
  Merged from 1.2:
   * Don't index tombstones (CASSANDRA-7828)
 + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
  
  
 -2.0.10
 - * Don't send schema change responses and events for no-op DDL
 -   statements (CASSANDRA-7600)
 - * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
 +2.1.0
 + * (cqlsh) Removed ALTER TYPE name RENAME TO name from tab-completion
 +   (CASSANDRA-7895)
 + * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
 + * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
 + * Avoid exposing internal classes over JMX (CASSANDRA-7879)
 + * Add null check for keys when freezing collection (CASSANDRA-7869)
 + * Improve stress workload realism (CASSANDRA-7519)
++Merged from 2.0:
+  * Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753)
+  * Fix ALTER clustering column type from DateType to TimestampType when
+using DESC clustering order (CASSANRDA-7797)
 - * Stop inheriting liveRatio and liveRatioComputedAt from previous
 -   memtables (CASSANDRA-7796)
+  * Throw EOFException if we run out of chunks in compressed datafile
+(CASSANDRA-7664)
 - * Throw InvalidRequestException when queries contain relations on entire
 -   collection columns (CASSANDRA-7506)
+  * Fix PRSI handling of CQL3 row markers for row cleanup (CASSANDRA-7787)
 - * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
+  * Fix dropping collection when it's the last regular column (CASSANDRA-7744)
 - * Properly reject operations on list index with conditions (CASSANDRA-7499)
 - * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
++ * Make StreamReceiveTask thread safe and gc friendly (CASSANDRA-7795)
++ * Validate empty cell names from counter updates (CASSANDRA-7798)
++Merged from 1.2:
++ * Don't allow compacted sstables to be marked as compacting (CASSANDRA-7145)
++ * Track expired tombstones (CASSANDRA-7810)
 +
 +
 +2.1.0-rc7
 + * Add frozen keyword and require UDT to be frozen (CASSANDRA-7857)
 + * Track added sstable size correctly (CASSANDRA-7239)
 + * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
 + * Fix failure to stream ranges when moving (CASSANDRA-7836)
 + * Correctly remove tmplink files (CASSANDRA-7803)
 + * (cqlsh) Fix column name formatting for functions, CAS operations,
 +   and UDT field selections (CASSANDRA-7806)
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
 + * Forbid re-adding dropped counter columns (CASSANDRA-7831)
 + * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
 + * Always reject inequality on the partition key without token()
 +   (CASSANDRA-7722)
 + * Always send Paxos commit to all replicas (CASSANDRA-7479)
 + * Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
 + * Make repair no-op when RF=1 (CASSANDRA-7864)
 +
 +
- 2.0.10
-  * Don't send schema change responses and events for no-op DDL
-statements (CASSANDRA-7600)
-  * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
-  * Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753)
-  * Fix ALTER clustering column type from DateType to TimestampType when
-using DESC clustering order (CASSANRDA-7797)
-  * Throw EOFException if we run out of chunks in compressed datafile
-(CASSANDRA-7664)
-  * Fix PRSI handling of CQL3 row markers for row 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[snazy]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 8a56868bcaa7d58c907410a1821e83ada72ee0a9
Parents: 2c58581 353d4a0
Author: Robert Stupp sn...@snazy.de
Authored: Sun Jun 28 10:27:20 2015 +0200
Committer: Robert Stupp sn...@snazy.de
Committed: Sun Jun 28 10:33:59 2015 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/net/MessagingService.java  |  2 +-
 .../cassandra/net/OutboundTcpConnection.java|  2 +-
 .../cassandra/service/AbstractReadExecutor.java | 12 
 .../apache/cassandra/service/ReadCallback.java  | 20 ++--
 .../cassandra/service/RowDataResolver.java  |  2 ++
 6 files changed, 35 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a56868b/CHANGES.txt
--
diff --cc CHANGES.txt
index 0b0cf83,6a137a3..3e4fd36
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.0.17
 +2.1.8
 + * Fix IndexOutOfBoundsException when inserting tuple with too many
 +   elements using the string literal notation (CASSANDRA-9559)
 + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
 + * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
 + * Enable describe on indices (CASSANDRA-7814)
 + * ColumnFamilyStore.selectAndReference may block during compaction 
(CASSANDRA-9637)
 +Merged from 2.0
+  * Improve trace messages for RR (CASSANDRA-9479)
   * Fix suboptimal secondary index selection when restricted
 clustering column is also indexed (CASSANDRA-9631)
   * (cqlsh) Add min_threshold to DTCS option autocomplete (CASSANDRA-9385)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a56868b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a56868b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
--
diff --cc src/java/org/apache/cassandra/service/AbstractReadExecutor.java
index 0546e27,2f2370d..2d02e34
--- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
+++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java
@@@ -77,7 -81,23 +81,8 @@@ public abstract class AbstractReadExecu
  
  protected void makeDataRequests(IterableInetAddress endpoints)
  {
 -for (InetAddress endpoint : endpoints)
 -{
 -if (isLocalRequest(endpoint))
 -{
 -if (traceState != null)
 -traceState.trace(reading data locally);
 -logger.trace(reading data locally);
 -StageManager.getStage(Stage.READ).execute(new 
LocalReadRunnable(command, handler));
 -}
 -else
 -{
 -if (traceState != null)
 -traceState.trace(reading data from {}, endpoint);
 -logger.trace(reading data from {}, endpoint);
 -MessagingService.instance().sendRR(command.createMessage(), 
endpoint, handler);
 -}
 -}
 +makeRequests(command, endpoints);
++
  }
  
  protected void makeDigestRequests(IterableInetAddress endpoints)
@@@ -94,21 -109,18 +99,23 @@@
  {
  if (isLocalRequest(endpoint))
  {
 -if (traceState != null)
 -traceState.trace(reading digest locally);
 -logger.trace(reading digest locally);
 -StageManager.getStage(Stage.READ).execute(new 
LocalReadRunnable(digestCommand, handler));
 -}
 -else
 -{
 -if (traceState != null)
 -traceState.trace(reading digest from {}, endpoint);
 -logger.trace(reading digest from {}, endpoint);
 -MessagingService.instance().sendRR(message, endpoint, 
handler);
 +hasLocalEndpoint = true;
 +continue;
  }
 +
++if (traceState != null)
++traceState.trace(reading {} from {}, 
readCommand.isDigestQuery() ? digest : data, endpoint);
 +logger.trace(reading {} from {}, readCommand.isDigestQuery() ? 
digest : data, endpoint);
 +  

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: d5698f4ef5fd28a27b6b981e6e571ed610f8565b
Parents: 39c082f 5aaa5ca
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Fri Jun 26 13:32:17 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Fri Jun 26 13:32:17 2015 -0500

--
 CHANGES.txt| 7 ---
 pylib/cqlshlib/cql3handling.py | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5698f4e/CHANGES.txt
--
diff --cc CHANGES.txt
index 498218e,68a9bf4..0611bac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,12 +1,21 @@@
 -2.0.17
 +2.1.8
 + * Fix IndexOutOfBoundsException when inserting tuple with too many
 +   elements using the string literal notation (CASSANDRA-9559)
 + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
 + * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
 + * Enable describe on indices (CASSANDRA-7814)
 + * ColumnFamilyStore.selectAndReference may block during compaction 
(CASSANDRA-9637)
 +Merged from 2.0
-   * Fix error message when attempting to create an index on a column
- in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
-   * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
+  * (cqlsh) Add min_threshold to DTCS option autocomplete (CASSANDRA-9385)
+  * Fix error message when attempting to create an index on a column
+in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
+  * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
 - * Display min timestamp in sstablemetadata viewer (CASSANDRA-6767)
  
  
 -2.0.16:
 +2.1.7
 + * Fix bug in cardinality check when compacting (CASSANDRA-9580)
 + * Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour 
(CASSANDRA-9549)
 +Merged from 2.0
   * Expose some internals of SelectStatement for inspection (CASSANDRA-9532)
   * ArrivalWindow should use primitives (CASSANDRA-9496)
   * Periodically submit background compaction tasks (CASSANDRA-9592)

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

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 39c082ff92742aefdeb5df74d7726603f0741e25
Parents: c233270 54e58d8
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Fri Jun 26 12:48:11 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Fri Jun 26 12:48:11 2015 -0500

--
 CHANGES.txt |  2 ++
 .../cql3/statements/CreateIndexStatement.java   |  5 ++-
 .../cql3/validation/operations/CreateTest.java  | 32 
 3 files changed, 38 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/39c082ff/CHANGES.txt
--
diff --cc CHANGES.txt
index 874c8ee,80b4a8d..498218e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,11 +1,20 @@@
 -2.0.17
 - * Fix error message when attempting to create an index on a column
 -   in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
 - * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
 - * Display min timestamp in sstablemetadata viewer (CASSANDRA-6767)
 -
 -
 -2.0.16:
 +2.1.8
 + * Fix IndexOutOfBoundsException when inserting tuple with too many
 +   elements using the string literal notation (CASSANDRA-9559)
 + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
 + * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
 + * Enable describe on indices (CASSANDRA-7814)
 + * ColumnFamilyStore.selectAndReference may block during compaction 
(CASSANDRA-9637)
 +Merged from 2.0
++  * Fix error message when attempting to create an index on a column
++in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)
 +  * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565)
 +
 +
 +2.1.7
 + * Fix bug in cardinality check when compacting (CASSANDRA-9580)
 + * Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour 
(CASSANDRA-9549)
 +Merged from 2.0
   * Expose some internals of SelectStatement for inspection (CASSANDRA-9532)
   * ArrivalWindow should use primitives (CASSANDRA-9496)
   * Periodically submit background compaction tasks (CASSANDRA-9592)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/39c082ff/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
index 778ec78,f2d698a..72174fb
--- a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
@@@ -119,9 -85,13 +119,12 @@@ public class CreateIndexStatement exten
  properties.validate();
  
  // TODO: we could lift that limitation
- if ((cfm.comparator.isDense() || !cfm.comparator.isCompound())  
cd.kind != ColumnDefinition.Kind.REGULAR)
 -if ((cfm.getCfDef().isCompact || !cfm.getCfDef().isComposite)
 - (cd.type == ColumnDefinition.Type.PARTITION_KEY || cd.type 
== ColumnDefinition.Type.CLUSTERING_KEY))
++if ((cfm.comparator.isDense() || !cfm.comparator.isCompound())  
cd.isPrimaryKeyColumn())
  throw new InvalidRequestException(Secondary indexes are not 
supported on PRIMARY KEY columns in COMPACT STORAGE tables);
  
 -if (cd.type == ColumnDefinition.Type.COMPACT_VALUE)
++if (cd.kind == ColumnDefinition.Kind.COMPACT_VALUE)
+ throw new InvalidRequestException(Secondary indexes are not 
supported on COMPACT STORAGE tables that have clustering columns);
+ 
  // It would be possible to support 2ndary index on static columns 
(but not without modifications of at least ExtendedFilter and
  // CompositesIndex) and maybe we should, but that means a query like:
  // SELECT * FROM foo WHERE static_column = 'bar'

http://git-wip-us.apache.org/repos/asf/cassandra/blob/39c082ff/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java
--
diff --cc 
test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java
index 3240c06,000..fdb2ebb
mode 100644,00..100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java
@@@ -1,462 -1,0 +1,494 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 2c5858133a6cab8001e07b486e3de7da9b7cb231
Parents: d5698f4 f2db756
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Fri Jun 26 14:54:23 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Fri Jun 26 14:54:23 2015 -0500

--
 CHANGES.txt |  2 ++
 .../cql3/statements/SelectStatement.java|  2 +-
 .../SelectMultiColumnRelationTest.java  | 30 +++-
 .../SelectSingleColumnRelationTest.java |  7 +
 4 files changed, 39 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c585813/CHANGES.txt
--
diff --cc CHANGES.txt
index 0611bac,32f0873..0b0cf83
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,13 @@@
 -2.0.17
 +2.1.8
 + * Fix IndexOutOfBoundsException when inserting tuple with too many
 +   elements using the string literal notation (CASSANDRA-9559)
 + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
 + * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
 + * Enable describe on indices (CASSANDRA-7814)
 + * ColumnFamilyStore.selectAndReference may block during compaction 
(CASSANDRA-9637)
 +Merged from 2.0
+  * Fix suboptimal secondary index selection when restricted
+clustering column is also indexed (CASSANDRA-9631)
   * (cqlsh) Add min_threshold to DTCS option autocomplete (CASSANDRA-9385)
   * Fix error message when attempting to create an index on a column
 in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c585813/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 540cb8c,341ce81..6fea8cb
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -1571,20 -1598,16 +1571,20 @@@ public class SelectStatement implement
  if (stmt.isKeyRange  hasQueriableClusteringColumnIndex)
  stmt.usesSecondaryIndexing = true;
  
 -// The clustering columns that can be used to perform a slice 
filtering on the secondary index do not
 -// need to be converted into IndexExpressions. Therefore, if they 
are not indexed by an index that support
 -// the relation in which they have been specified, we can removes 
them from the restrictedNames map.
 -for (Name clusteringColumn : cfDef.clusteringColumns())
 +int numberOfRestrictionsEvaluatedWithSlices = 0;
 +
 +for (ColumnDefinition def : cfm.clusteringColumns())
  {
 -Boolean indexed = stmt.restrictedNames.get(clusteringColumn);
 +// Remove clustering column restrictions that can be handled 
by slices; the remainder will be
 +// handled by filters (which may require a secondary index).
 +Boolean indexed = stmt.restrictedColumns.get(def);
  if (indexed == null)
  break;
- if (!indexed  
stmt.columnRestrictions[def.position()].canEvaluateWithSlices())
 -if (!indexed || !stmt.usesSecondaryIndexing)
 -stmt.restrictedNames.remove(clusteringColumn);
++if (!(indexed  stmt.usesSecondaryIndexing)  
stmt.columnRestrictions[def.position()].canEvaluateWithSlices())
 +{
 +stmt.restrictedColumns.remove(def);
 +numberOfRestrictionsEvaluatedWithSlices++;
 +}
  }
  
  // Even if usesSecondaryIndexing is false at this point, we'll 
still have to use one if

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c585813/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java
--
diff --cc 
test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java
index b56ab8c,000..954f89d
mode 100644,00..100644
--- 
a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java
+++ 
b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java
@@@ -1,982 -1,0 +1,1010 @@@
 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: efebd8f172d19d3c325366201235882af7531244
Parents: 718c144 f778c1f
Author: Marcus Eriksson marc...@apache.org
Authored: Fri Jun 19 19:36:11 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Fri Jun 19 19:36:11 2015 +0200

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jake]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 83c0e01aa84a6cbfe36a89ef13027a78567df70a
Parents: 0452e74 23e66a9
Author: T Jake Luciani j...@apache.org
Authored: Thu Jun 18 14:32:10 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Thu Jun 18 14:32:10 2015 -0400

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jasobrown]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/utils/BoundedStatsDeque.java


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

Branch: refs/heads/cassandra-2.1
Commit: 4c15970119e021dd0fe4b2fe8b4f9c594d21f334
Parents: 7c5fc40 ad8047a
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Jun 17 14:36:59 2015 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Jun 17 14:36:59 2015 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/gms/FailureDetector.java   | 59 +++--
 .../cassandra/utils/BoundedStatsDeque.java  | 68 
 .../gms/ArrayBackedBoundedStatsTest.java| 57 
 .../cassandra/utils/BoundedStatsDequeTest.java  | 66 ---
 5 files changed, 111 insertions(+), 140 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c159701/CHANGES.txt
--
diff --cc CHANGES.txt
index 009d974,753fb1c..8f3f9f0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,51 -1,8 +1,52 @@@
 -2.0.16:
 +2.1.7
 + * Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour 
(CASSANDRA-9549)
 +Merged from 2.0
+  * ArrivalWindow should use primitives (CASSANDRA-9496)
   * Periodically submit background compaction tasks (CASSANDRA-9592)
   * Set HAS_MORE_PAGES flag to false when PagingState is null (CASSANDRA-9571)
 - * Backport indexed value validation fix from CASSANDRA-9057 (CASSANDRA-9564)
 +
 +
 +2.1.6
 + * (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083)
 + * Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487)
 + * Use ProtocolError code instead of ServerError code for native protocol
 +   error responses to unsupported protocol versions (CASSANDRA-9451)
 + * Default commitlog_sync_batch_window_in_ms changed to 2ms (CASSANDRA-9504)
 + * Fix empty partition assertion in unsorted sstable writing tools 
(CASSANDRA-9071)
 + * Ensure truncate without snapshot cannot produce corrupt responses 
(CASSANDRA-9388) 
 + * Consistent error message when a table mixes counter and non-counter
 +   columns (CASSANDRA-9492)
 + * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508)
 + * (cqlsh) Better float precision by default (CASSANDRA-9224)
 + * Improve estimated row count (CASSANDRA-9107)
 + * Optimize range tombstone memory footprint (CASSANDRA-8603)
 + * Use configured gcgs in anticompaction (CASSANDRA-9397)
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement 
(CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 + * Fix canonical view returning early opened SSTables (CASSANDRA-9396)
 +Merged from 2.0:
   * Don't accumulate more range than necessary in RangeTombstone.Tracker 
(CASSANDRA-9486)
   * Add broadcast and rpc addresses to system.local (CASSANDRA-9436)
   * Always mark sstable suspect when corrupted (CASSANDRA-9478)

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 69b7dd327443239b70a104dfe960bd0aa2ccf0a5
Parents: 16665ee 9e60611
Author: Marcus Eriksson marc...@apache.org
Authored: Fri Jun 12 18:51:39 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Fri Jun 12 18:51:39 2015 +0200

--
 .../apache/cassandra/db/compaction/CompactionController.java  | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69b7dd32/src/java/org/apache/cassandra/db/compaction/CompactionController.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 4bf80768729ae9596808cf72307b1b22da77eaed
Parents: a90c80d 8fcb620
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Jun 3 13:57:00 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Jun 3 13:57:00 2015 +0200

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: a90c80dda60cbe7c4101b000739900442af4ee82
Parents: c0f96e1 b6a31fb
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Jun 3 14:01:30 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Jun 3 14:01:30 2015 +0300

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/config/CFMetaData.java | 4 +++-
 src/java/org/apache/cassandra/db/SystemKeyspace.java | 6 --
 3 files changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c80dd/CHANGES.txt
--
diff --cc CHANGES.txt
index 4a7e174,c555a91..04650c1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,5 +1,38 @@@
 -2.0.16:
 +2.1.6
 + * Consistent error message when a table mixes counter and non-counter
 +   columns (CASSANDRA-9492)
 + * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508)
 + * (cqlsh) Better float precision by default (CASSANDRA-9224)
 + * Improve estimated row count (CASSANDRA-9107)
 + * Optimize range tombstone memory footprint (CASSANDRA-8603)
 + * Use configured gcgs in anticompaction (CASSANDRA-9397)
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement 
(CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 + * Fix canonical view returning early opened SSTables (CASSANDRA-9396)
 +Merged from 2.0:
+  * Add broadcast and rpc addresses to system.local (CASSANDRA-9436)
   * Always mark sstable suspect when corrupted (CASSANDRA-9478)
   * Add database users and permissions to CQL3 documentation (CASSANDRA-7558)
   * Allow JVM_OPTS to be passed to standalone tools (CASSANDRA-5969)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c80dd/src/java/org/apache/cassandra/config/CFMetaData.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c80dd/src/java/org/apache/cassandra/db/SystemKeyspace.java
--
diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java
index 5beb709,e439de7..882dbdf
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@@ -129,35 -125,20 +129,37 @@@ public class SystemKeyspac
  ksmd.toSchema(FBUtilities.timestampMicros() + 1).apply();
  }
  
 -// Starting with 2.0 (CASSANDRA-5125) we keep all the 'aliases' in 
system.schema_columns together with the regular columns,
 -// but only for the newly-created tables. This migration is for the 
pre-2.0 created tables.
 -private static void copyAllAliasesToColumnsProper()
 +private static void setupVersion()
  {
- String req = INSERT INTO system.%s (key, release_version, 
cql_version, thrift_version, native_protocol_version, data_center, rack, 
partitioner) VALUES (?, ?, ?, ?, ?, ?, ?, ?);
 -

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[slebresne]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/DeletionTime.java
src/java/org/apache/cassandra/db/RangeTombstone.java


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

Branch: refs/heads/cassandra-2.1
Commit: 655f0569874b7f1997214cb9fe0bda64c7cdf0d5
Parents: b9a89a3 b0dbea3
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Jun 3 14:22:44 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Jun 3 14:22:44 2015 +0200

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/db/DeletionTime.java   |   5 +
 .../org/apache/cassandra/db/RangeTombstone.java | 194 +--
 .../db/compaction/LazilyCompactedRow.java   |   3 +
 4 files changed, 148 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/655f0569/CHANGES.txt
--
diff --cc CHANGES.txt
index 57bbfcc,16ce060..f5c3b41
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,5 +1,39 @@@
 -2.0.16:
 +2.1.6
 + * Ensure truncate without snapshot cannot produce corrupt responses 
(CASSANDRA-9388) 
 + * Consistent error message when a table mixes counter and non-counter
 +   columns (CASSANDRA-9492)
 + * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508)
 + * (cqlsh) Better float precision by default (CASSANDRA-9224)
 + * Improve estimated row count (CASSANDRA-9107)
 + * Optimize range tombstone memory footprint (CASSANDRA-8603)
 + * Use configured gcgs in anticompaction (CASSANDRA-9397)
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement 
(CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 + * Fix canonical view returning early opened SSTables (CASSANDRA-9396)
 +Merged from 2.0:
+  * Don't accumulate more range than necessary in RangeTombstone.Tracker 
(CASSANDRA-9486)
   * Add broadcast and rpc addresses to system.local (CASSANDRA-9436)
   * Always mark sstable suspect when corrupted (CASSANDRA-9478)
   * Add database users and permissions to CQL3 documentation (CASSANDRA-7558)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/655f0569/src/java/org/apache/cassandra/db/DeletionTime.java
--
diff --cc src/java/org/apache/cassandra/db/DeletionTime.java
index 0e5f13f,b39d681..7165417
--- a/src/java/org/apache/cassandra/db/DeletionTime.java
+++ b/src/java/org/apache/cassandra/db/DeletionTime.java
@@@ -113,19 -109,25 +113,24 @@@ public class DeletionTime implements Co
  return localDeletionTime  gcBefore;
  }
  
 -public boolean isDeleted(Column column)
 +public boolean isDeleted(OnDiskAtom atom)
  {
 -return column.timestamp() = markedForDeleteAt;
 +return atom.timestamp() = markedForDeleteAt;
  }
  
+ public boolean supersedes(DeletionTime dt)
+ {
+ return this.markedForDeleteAt  dt.markedForDeleteAt;
+ }
+ 
 -public long memorySize()
 +public long 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[slebresne]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java

test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java


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

Branch: refs/heads/cassandra-2.1
Commit: c0f96e1d46d664a9d4ca7f982d21cdfcaed1a24a
Parents: 14a3324 9b10928
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Jun 2 14:51:20 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Jun 2 14:51:20 2015 +0200

--
 CHANGES.txt |  1 +
 .../io/sstable/SSTableIdentityIterator.java | 10 +++
 .../cassandra/io/sstable/SSTableReader.java | 68 ++--
 .../compaction/BlacklistingCompactionsTest.java | 17 +++--
 4 files changed, 69 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0f96e1d/CHANGES.txt
--
diff --cc CHANGES.txt
index 71ce442,1aad965..4a7e174
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,5 +1,38 @@@
 -2.0.16:
 +2.1.6
 + * Consistent error message when a table mixes counter and non-counter
 +   columns (CASSANDRA-9492)
 + * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508)
 + * (cqlsh) Better float precision by default (CASSANDRA-9224)
 + * Improve estimated row count (CASSANDRA-9107)
 + * Optimize range tombstone memory footprint (CASSANDRA-8603)
 + * Use configured gcgs in anticompaction (CASSANDRA-9397)
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement 
(CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 + * Fix canonical view returning early opened SSTables (CASSANDRA-9396)
 +Merged from 2.0:
+  * Always mark sstable suspect when corrupted (CASSANDRA-9478)
   * Add database users and permissions to CQL3 documentation (CASSANDRA-7558)
   * Allow JVM_OPTS to be passed to standalone tools (CASSANDRA-5969)
   * Fix bad condition in RangeTombstoneList (CASSANDRA-9485)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0f96e1d/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
index b784a7e,8b45005..498ad26
--- a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
@@@ -79,17 -95,18 +82,18 @@@ public class SSTableIdentityIterator im
  this.filename = filename;
  this.key = key;
  this.dataSize = dataSize;
 -this.expireBefore = (int)(System.currentTimeMillis() / 1000);
  this.flag = flag;
  this.validateColumns = checkData;
 -this.dataVersion = sstable == null ? Descriptor.Version.CURRENT : 
sstable.descriptor.version;
+ this.sstable = sstable;
  
 +Descriptor.Version dataVersion = sstable == null ? 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[slebresne]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java


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

Branch: refs/heads/cassandra-2.1
Commit: e1a67a4f5361b7f069110c2c9779705ca99db28a
Parents: eaeabff 173f255
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri May 29 11:05:02 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri May 29 11:05:02 2015 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/RangeTombstoneList.java |  4 +--
 .../cassandra/db/RangeTombstoneListTest.java| 27 +---
 3 files changed, 26 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1a67a4f/CHANGES.txt
--
diff --cc CHANGES.txt
index 0e759b7,b9a0131..422f66e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 -2.0.16:
 +2.1.6
 + * Avoid getting unreadable keys during anticompaction (CASSANDRA-9508)
 + * (cqlsh) Better float precision by default (CASSANDRA-9224)
 + * Improve estimated row count (CASSANDRA-9107)
 + * Optimize range tombstone memory footprint (CASSANDRA-8603)
 + * Use configured gcgs in anticompaction (CASSANDRA-9397)
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement 
(CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 + * Fix canonical view returning early opened SSTables (CASSANDRA-9396)
 +Merged from 2.0:
+  * Fix bad condition in RangeTombstoneList (CASSANDRA-9485)
   * Fix potential StackOverflow when setting CrcCheckChance over JMX 
(CASSANDRA-9488)
   * Fix null static columns in pages after the first, paged reversed
 queries (CASSANDRA-8502)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1a67a4f/src/java/org/apache/cassandra/db/RangeTombstoneList.java
--
diff --cc src/java/org/apache/cassandra/db/RangeTombstoneList.java
index c0ab42b,165718e..bd6e669
--- a/src/java/org/apache/cassandra/db/RangeTombstoneList.java
+++ b/src/java/org/apache/cassandra/db/RangeTombstoneList.java
@@@ -146,10 -116,10 +146,10 @@@ public class RangeTombstoneList impleme
  /**
   * Adds a new range tombstone.
   *
-  * This method will be faster if the new tombstone sort after all the 
currently existing ones (this is a common use case), 
+  * This method will be faster if the new tombstone sort after all the 
currently existing ones (this is a common use case),
   * but it doesn't assume it.
   */
 -public void add(ByteBuffer start, ByteBuffer end, long markedAt, int 
delTime)
 +public void add(Composite start, Composite end, long markedAt, int 
delTime)
  {
  if (isEmpty())
  {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1a67a4f/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java
--
diff --cc 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: a8dce228de443716556f59510b0494078bbe97a2
Parents: 74280b1 d075540
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Wed May 27 13:50:58 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Wed May 27 13:50:58 2015 -0500

--
 CHANGES.txt |  2 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  4 +-
 src/java/org/apache/cassandra/db/DataRange.java | 82 ---
 .../cassandra/db/SliceFromReadCommand.java  | 28 +++
 .../cassandra/db/filter/ColumnCounter.java  | 61 +-
 .../cassandra/db/filter/SliceQueryFilter.java   | 83 ++--
 .../service/pager/AbstractQueryPager.java   | 40 --
 .../service/pager/RangeSliceQueryPager.java |  4 +-
 .../service/pager/SliceQueryPager.java  |  6 +-
 .../service/pager/AbstractQueryPagerTest.java   |  8 +-
 10 files changed, 278 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8dce228/CHANGES.txt
--
diff --cc CHANGES.txt
index cea6135,054cf79..d00cc65
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,7 +1,36 @@@
 -2.0.16:
 +2.1.6
 + * (cqlsh) Better float precision by default (CASSANDRA-9224)
 + * Improve estimated row count (CASSANDRA-9107)
 + * Optimize range tombstone memory footprint (CASSANDRA-8603)
 + * Use configured gcgs in anticompaction (CASSANDRA-9397)
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement 
(CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 + * Fix canonical view returning early opened SSTables (CASSANDRA-9396)
 +Merged from 2.0:
+  * Fix null static columns in pages after the first, paged reversed
+queries (CASSANDRA-8502)
 - * Fix failing bound statement after adding a collection (CASSANDRA-9411)
   * Fix counting cache serialization in request metrics (CASSANDRA-9466)
   * (cqlsh) Add LOGIN command to switch users (CASSANDRA-7212)
   * Clone SliceQueryFilter in AbstractReadCommand implementations 
(CASSANDRA-8940)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8dce228/src/java/org/apache/cassandra/db/DataRange.java
--
diff --cc src/java/org/apache/cassandra/db/DataRange.java
index dd4fbe8,1be9469..08fdd14
--- a/src/java/org/apache/cassandra/db/DataRange.java
+++ b/src/java/org/apache/cassandra/db/DataRange.java
@@@ -22,11 -22,12 +22,13 @@@ import java.util.ArrayList
  import java.util.Comparator;
  import java.util.List;
  
+ import com.google.common.base.Objects;
+ import org.apache.cassandra.config.CFMetaData;
  import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
- import 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jake]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: fb1eaab4120e766162b2dc397274dc68a499a4dd
Parents: a8dce22 04eba90
Author: T Jake Luciani j...@apache.org
Authored: Wed May 27 16:19:51 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Wed May 27 16:19:51 2015 -0400

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/io/compress/CompressionParameters.java| 2 +-
 test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java| 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb1eaab4/CHANGES.txt
--
diff --cc CHANGES.txt
index d00cc65,58f3c53..ecd380d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,8 +1,37 @@@
 -2.0.16:
 +2.1.6
 + * (cqlsh) Better float precision by default (CASSANDRA-9224)
 + * Improve estimated row count (CASSANDRA-9107)
 + * Optimize range tombstone memory footprint (CASSANDRA-8603)
 + * Use configured gcgs in anticompaction (CASSANDRA-9397)
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement 
(CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 + * Fix canonical view returning early opened SSTables (CASSANDRA-9396)
 +Merged from 2.0:
+  * Fix potential StackOverflow when setting CrcCheckChance over JMX 
(CASSANDRA-9488)
   * Fix null static columns in pages after the first, paged reversed
 queries (CASSANDRA-8502)
 - * Fix failing bound statement after adding a collection (CASSANDRA-9411)
   * Fix counting cache serialization in request metrics (CASSANDRA-9466)
   * (cqlsh) Add LOGIN command to switch users (CASSANDRA-7212)
   * Clone SliceQueryFilter in AbstractReadCommand implementations 
(CASSANDRA-8940)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb1eaab4/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb1eaab4/test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java
--
diff --cc test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java
index f218c9d,000..bed3cdd
mode 100644,00..100644
--- a/test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java
+++ b/test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java
@@@ -1,157 -1,0 +1,159 @@@
 +/*
 + * 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
 + *
 + * 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[dbrosius]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 6bd08aee969e9ce4e99f01cb509ca63575a0fd08
Parents: 7f855d1 5a571c6
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue May 26 00:48:28 2015 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue May 26 00:48:28 2015 -0400

--
 src/java/org/apache/cassandra/db/compaction/Scrubber.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bd08aee/src/java/org/apache/cassandra/db/compaction/Scrubber.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/Scrubber.java
index ec0532c,ea10855..9143c8b
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@@ -186,13 -196,13 +186,13 @@@ public class Scrubber implements Closea
  }
  
  if (dataSize  dataFile.length())
 -throw new IOError(new IOException(Impossible row 
size (greater than file length):  + dataSize));
 +throw new IOError(new IOException(Impossible row 
size  + dataSize));
  
  if (dataStart != dataStartFromIndex)
- outputHandler.warn(String.format(Data file row 
position %d different from index file row position %d, dataStart, 
dataSizeFromIndex));
+ outputHandler.warn(String.format(Data file row 
position %d differs from index file row position %d, dataStart, 
dataStartFromIndex));
  
  if (dataSize != dataSizeFromIndex)
 -outputHandler.warn(String.format(Data file row size 
%d differs from index file row size %d, dataSize, dataSizeFromIndex));
 +outputHandler.warn(String.format(Data file row size 
%d different from index file row size %d, dataSize, dataSizeFromIndex));
  
  SSTableIdentityIterator atoms = new 
SSTableIdentityIterator(sstable, dataFile, key, dataSize, validateColumns);
  if (prevKey != null  prevKey.compareTo(key)  0)

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: adb88316ac7ec26be96751062615c3ad0c22aaff
Parents: 116de2b 37d81b9
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue May 19 16:41:41 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue May 19 16:41:41 2015 +0300

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 054f0a1580fb68a1e2ed0a921a0daf82806fad8a
Parents: 6544fb7 b2a2d46
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri May 15 17:31:39 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri May 15 17:31:39 2015 +0300

--
 CHANGES.txt |  1 +
 .../cql3/statements/DropIndexStatement.java | 27 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/054f0a15/CHANGES.txt
--
diff --cc CHANGES.txt
index 651f49a,c3e84db..fa050cd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,9 +1,31 @@@
 -2.0.16:
 +2.1.6
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement 
(CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 +Merged from 2.0:
+  * Push correct protocol notification for DROP INDEX (CASSANDRA-9310)
   * token-generator - generated tokens too long (CASSANDRA-9300)
 -
 -
 -2.0.15:
   * Fix counting of tombstones for TombstoneOverwhelmingException 
(CASSANDRA-9299)
   * Fix ReconnectableSnitch reconnecting to peers during upgrade 
(CASSANDRA-6702)
   * Include keyspace and table name in error log for collections over the size

http://git-wip-us.apache.org/repos/asf/cassandra/blob/054f0a15/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 3476a2554f96a3d0e9d2ec4b5fd2f174a20f23ba
Parents: 054f0a1 d475528
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri May 15 17:59:32 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri May 15 17:59:32 2015 +0300

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/db/PagedRangeCommand.java | 4 ++--
 src/java/org/apache/cassandra/db/RangeSliceCommand.java | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3476a255/CHANGES.txt
--
diff --cc CHANGES.txt
index fa050cd,00cc335..80619d0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,10 +1,32 @@@
 -2.0.16:
 +2.1.6
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement 
(CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 +Merged from 2.0:
+  * Clone SliceQueryFilter in AbstractReadCommand implementations 
(CASSANDRA-8940)
   * Push correct protocol notification for DROP INDEX (CASSANDRA-9310)
   * token-generator - generated tokens too long (CASSANDRA-9300)
 -
 -
 -2.0.15:
   * Fix counting of tombstones for TombstoneOverwhelmingException 
(CASSANDRA-9299)
   * Fix ReconnectableSnitch reconnecting to peers during upgrade 
(CASSANDRA-6702)
   * Include keyspace and table name in error log for collections over the size

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3476a255/src/java/org/apache/cassandra/db/PagedRangeCommand.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3476a255/src/java/org/apache/cassandra/db/RangeSliceCommand.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 9f8c45d6d6b8581bde536475d366b7783f9a7767
Parents: 7d6a60d 0b92967
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Fri May 15 11:41:25 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Fri May 15 11:41:25 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f8c45d6/CHANGES.txt
--
diff --cc CHANGES.txt
index 129f6a1,a9d04d6..c85d031
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,5 +1,31 @@@
 -2.0.16:
 +2.1.6
 + * Warn on misuse of unlogged batches (CASSANDRA-9282)
 + * Failure detector detects and ignores local pauses (CASSANDRA-9183)
 + * Add utility class to support for rate limiting a given log statement 
(CASSANDRA-9029)
 + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361)
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 + * Fix streaming not holding ref when stream error (CASSANDRA-9295)
 + * Fix canonical view returning early opened SSTables (CASSANDRA-9396)
 +Merged from 2.0:
+  * (cqlsh) Add LOGIN command to switch users (CASSANDRA-7212)
   * Clone SliceQueryFilter in AbstractReadCommand implementations 
(CASSANDRA-8940)
   * Push correct protocol notification for DROP INDEX (CASSANDRA-9310)
   * token-generator - generated tokens too long (CASSANDRA-9300)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f8c45d6/bin/cqlsh
--
diff --cc bin/cqlsh
index 9a6504a,fa0de7f..a4cc5d4
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -331,9 -292,9 +333,12 @@@ cqlsh_extra_syntax_rules = r''
  expandCommand ::= EXPAND ( switch=( ON | OFF ) )?
 ;
  
 +pagingCommand ::= PAGING ( switch=( ON | OFF ) )?
 +  ;
 +
+ loginCommand ::= LOGIN username=username (password=stringLiteral)?
+  ;
+ 
  exitCommand ::= exit | quit
  ;
  
@@@ -1941,38 -1824,41 +1946,75 @@@ class Shell(cmd.Cmd)
  
  level = parsed.get_binding('level')
  if level is None:
 -print 'Current consistency level is %s.' % 
(self.cursor.consistency_level,)
 +print 'Current consistency level is %s.' % 
(cassandra.ConsistencyLevel.value_to_name[self.consistency_level])
  return
  
 -self.cursor.consistency_level = level.upper()
 +self.consistency_level = 
cassandra.ConsistencyLevel.name_to_value[level.upper()]
  print 'Consistency level set to %s.' % (level.upper(),)
  
 +def do_serial(self, parsed):
 +
 +SERIAL CONSISTENCY [cqlsh only]
 +
 +   Overrides serial consistency level (default level is SERIAL).
 +
 +SERIAL CONSISTENCY level
 +
 +   Sets consistency level for future conditional updates.
 +
 +   Valid consistency levels:
 +
 +   SERIAL, LOCAL_SERIAL.
 +
 +SERIAL CONSISTENCY
 +
 +   SERIAL CONSISTENCY with no arguments shows the current consistency 
level.
 +
 +level = parsed.get_binding('level')
 +if level is None:
 +print 'Current serial consistency 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: bccd4a3ed34cab7c66f6a5469f6dd3b2c35574a9
Parents: 5e631a8 f4ec535
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu May 14 17:20:42 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu May 14 17:20:42 2015 +0300

--
 src/java/org/apache/cassandra/cli/CliClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bccd4a3e/src/java/org/apache/cassandra/cli/CliClient.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jake]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 48ffe535b508fb05e80773352983c1169044bbd1
Parents: 9f7ab09 418deaf
Author: T Jake Luciani j...@apache.org
Authored: Wed May 13 11:43:18 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Wed May 13 11:43:18 2015 -0400

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 9beeba3202716d26906b76feeff3bee3e16522d5
Parents: 2e7b088 bed42c2
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue May 12 21:01:39 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue May 12 21:01:39 2015 +0300

--
 CHANGES.txt |   1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |   2 +-
 .../cassandra/db/filter/ColumnCounter.java  |  29 ++--
 .../cassandra/db/filter/SliceQueryFilter.java   |  34 ++--
 .../SliceQueryFilterWithTombstonesTest.java | 166 +++
 5 files changed, 204 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9beeba32/CHANGES.txt
--
diff --cc CHANGES.txt
index aa5f235,d7d01cf..8794509
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
 -2.0.15:
 +2.1.6
 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339)
 + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564)
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 + * Repair waits for anticompaction to finish (CASSANDRA-9097)
 +Merged from 2.0:
+  * Fix counting of tombstones for TombstoneOverwhelmingException 
(CASSANDRA-9299)
   * Fix ReconnectableSnitch reconnecting to peers during upgrade 
(CASSANDRA-6702)
   * Include keyspace and table name in error log for collections over the size
 limit (CASSANDRA-9286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9beeba32/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9beeba32/src/java/org/apache/cassandra/db/filter/ColumnCounter.java
--
diff --cc src/java/org/apache/cassandra/db/filter/ColumnCounter.java
index 86cfc40,2d0df1f..8be26e1
--- a/src/java/org/apache/cassandra/db/filter/ColumnCounter.java
+++ b/src/java/org/apache/cassandra/db/filter/ColumnCounter.java
@@@ -37,17 -39,17 +37,17 @@@ public class ColumnCounte
  this.timestamp = timestamp;
  }
  
 -public void count(Column column, DeletionInfo.InOrderTester tester)
 +public void count(Cell cell, DeletionInfo.InOrderTester tester)
  {
- if (!isLive(cell, tester, timestamp))
- ignored++;
- else
- live++;
- }
+ // The cell is shadowed by a higher-level deletion, and won't be 
retained.
+ // For the purposes of this counter, we don't care if it's a 
tombstone or not.
 -if (tester.isDeleted(column))
++if (tester.isDeleted(cell))
+ return;
  
- protected static boolean isLive(Cell cell, DeletionInfo.InOrderTester 
tester, long timestamp)
- {
- return cell.isLive(timestamp)  !tester.isDeleted(cell);
 -if (column.isLive(timestamp))
++if (cell.isLive(timestamp))
+ live++;
+ else
+ tombstones++;
  }
  
  public int live()
@@@ -96,11 -99,14 +96,14 @@@
  assert toGroup == 0 || type != null;
  }
  
 -public void count(Column column, DeletionInfo.InOrderTester tester)
 +public void count(Cell cell, DeletionInfo.InOrderTester tester)
  {
- if (!isLive(cell, tester, timestamp))
 -if (tester.isDeleted(column))
++if 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 75e5b3b55ae4d2fd7bb958ecd8db33852bbee2bc
Parents: 98eb8ba 28cfbfa
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Tue May 12 16:23:32 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Tue May 12 16:23:32 2015 -0500

--
 doc/native_protocol_v1.spec | 10 +-
 doc/native_protocol_v2.spec | 10 +-
 doc/native_protocol_v3.spec | 10 +-
 3 files changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/75e5b3b5/doc/native_protocol_v1.spec
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/75e5b3b5/doc/native_protocol_v2.spec
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/75e5b3b5/doc/native_protocol_v3.spec
--
diff --cc doc/native_protocol_v3.spec
index 9894d76,000..312c8c1
mode 100644,00..100644
--- a/doc/native_protocol_v3.spec
+++ b/doc/native_protocol_v3.spec
@@@ -1,1031 -1,0 +1,1031 @@@
 +
 + CQL BINARY PROTOCOL v3
 +
 +
 +Table of Contents
 +
 +  1. Overview
 +  2. Frame header
 +2.1. version
 +2.2. flags
 +2.3. stream
 +2.4. opcode
 +2.5. length
 +  3. Notations
 +  4. Messages
 +4.1. Requests
 +  4.1.1. STARTUP
 +  4.1.2. AUTH_RESPONSE
 +  4.1.3. OPTIONS
 +  4.1.4. QUERY
 +  4.1.5. PREPARE
 +  4.1.6. EXECUTE
 +  4.1.7. BATCH
 +  4.1.8. REGISTER
 +4.2. Responses
 +  4.2.1. ERROR
 +  4.2.2. READY
 +  4.2.3. AUTHENTICATE
 +  4.2.4. SUPPORTED
 +  4.2.5. RESULT
 +4.2.5.1. Void
 +4.2.5.2. Rows
 +4.2.5.3. Set_keyspace
 +4.2.5.4. Prepared
 +4.2.5.5. Schema_change
 +  4.2.6. EVENT
 +  4.2.7. AUTH_CHALLENGE
 +  4.2.8. AUTH_SUCCESS
 +  5. Compression
 +  6. Data Type Serialization Formats
 +  7. User Defined Type Serialization
 +  8. Result paging
 +  9. Error codes
 +  10. Changes from v2
 +
 +
 +1. Overview
 +
 +  The CQL binary protocol is a frame based protocol. Frames are defined as:
 +
 +  0 8162432 40
 +  +-+-+-+-+-+
 +  | version |  flags  |  stream   | opcode  |
 +  +-+-+-+-+-+
 +  |length |
 +  +-+-+-+-+
 +  |   |
 +  ....  body ...  .
 +  .   .
 +  .   .
 +  +
 +
 +  The protocol is big-endian (network byte order).
 +
 +  Each frame contains a fixed size header (9 bytes) followed by a variable 
size
 +  body. The header is described in Section 2. The content of the body depends
 +  on the header opcode value (the body can in particular be empty for some
 +  opcode values). The list of allowed opcode is defined Section 2.3 and the
 +  details of each corresponding message is described Section 4.
 +
 +  The protocol distinguishes 2 types of frames: requests and responses. 
Requests
 +  are those frame sent by the clients to the server, response are the ones 
sent
 +  by the server. Note however that the protocol supports server pushes 
(events)
 +  so responses does not necessarily come right after a client request.
 +
 +  Note to client implementors: clients library should always assume that the
 +  body of a given frame may contain more data than what is described in this
 +  document. It will however always be safe to ignore the remaining of the 
frame
 +  body in such cases. The reason is that this may allow to sometimes extend 
the
 +  protocol with optional features without needing to change the protocol
 +  version.
 +
 +
 +
 +2. Frame header
 +
 +2.1. version
 +
 +  The version is a single byte that indicate both the direction of the message
 +  (request or response) and the version of the protocol in use. The up-most 
bit
 +  of version is used to define the direction of the message: 0 indicates a
 +  request, 1 indicates a responses. This can be useful for protocol analyzers 
to
 +  distinguish the nature of the packet from the direction which it is moving.
 +  The rest of that byte is the protocol version (3 for the protocol defined in

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: e2ad784c73f6084de072b01d4652812c226b19be
Parents: 09ccf60 917068d
Author: Marcus Eriksson marc...@apache.org
Authored: Fri May 8 10:44:34 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Fri May 8 10:44:34 2015 +0200

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/compaction/LeveledManifest.java | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ad784c/CHANGES.txt
--
diff --cc CHANGES.txt
index 098cfe0,1540d28..37f0117
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -2.0.15:
 +2.1.6
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 +Merged from 2.0:
+  * Avoid potential overlap in LCS with single-partition sstables 
(CASSANDRA-9322)
   * Log warning message when a table is queried before the schema has fully
 propagated (CASSANDRA-9136)
   * Overload SecondaryIndex#indexes to accept the column definition 
(CASSANDRA-9314)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ad784c/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: d8b79d5aff93b75198bb60e5140ff3fea912d387
Parents: a431d84 15235ee
Author: Tyler Hobbs tylerho...@apache.org
Authored: Fri May 8 13:36:10 2015 -0500
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Fri May 8 13:36:10 2015 -0500

--
 CHANGES.txt|  2 ++
 .../cassandra/cql3/statements/SelectStatement.java |  2 +-
 .../apache/cassandra/db/marshal/CollectionType.java| 13 -
 3 files changed, 11 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8b79d5a/CHANGES.txt
--
diff --cc CHANGES.txt
index 2b7a355,d3715c4..162b34f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,6 +1,23 @@@
 -2.0.15:
 +2.1.6
 + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 +Merged from 2.0:
+  * Include keyspace and table name in error log for collections over the size
+limit (CASSANDRA-9286)
   * Avoid potential overlap in LCS with single-partition sstables 
(CASSANDRA-9322)
   * Log warning message when a table is queried before the schema has fully
 propagated (CASSANDRA-9136)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8b79d5a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 07e60d4,8a4deb6..51f4941
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -1288,25 -1300,12 +1288,25 @@@ public class SelectStatement implement
  }
  }
  
 -private boolean hasValueForQuery(ColumnGroupMap staticGroup)
 +private static void addValue(Selection.ResultSetBuilder result, 
ColumnDefinition def, CQL3Row row, QueryOptions options)
  {
 -for (CFDefinition.Name name : 
Iterables.filter(selection.getColumns(), isStaticFilter))
 -if (staticGroup.hasValueFor(name.name.key))
 -return true;
 -return false;
 +if (row == null)
 +{
 +result.add((ByteBuffer)null);
 +return;
 +}
 +
 +if (def.type.isMultiCell())
 +{
 +ListCell cells = row.getMultiCellColumn(def.name);
 +ByteBuffer buffer = cells == null
 + ? null
-  : 
((CollectionType)def.type).serializeForNativeProtocol(cells, 
options.getProtocolVersion());
++ : 
((CollectionType)def.type).serializeForNativeProtocol(def, cells, 
options.getProtocolVersion());
 +result.add(buffer);
 +return;
 +}
 +
 +result.add(row.getColumn(def.name));
  }
  
  private boolean hasNoClusteringColumnsRestriction()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8b79d5a/src/java/org/apache/cassandra/db/marshal/CollectionType.java
--
diff --cc src/java/org/apache/cassandra/db/marshal/CollectionType.java
index 24ad533,d1ae130..8662c1e
--- a/src/java/org/apache/cassandra/db/marshal/CollectionType.java
+++ b/src/java/org/apache/cassandra/db/marshal/CollectionType.java
@@@ -20,8 -20,6 +20,9 @@@ package org.apache.cassandra.db.marshal
  import java.nio.ByteBuffer;
  import 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 049a965bf1e57d30cac13141bdf228268765ebeb
Parents: 2c8e810 58de86b
Author: Tyler Hobbs tylerho...@apache.org
Authored: Thu May 7 10:31:52 2015 -0500
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Thu May 7 10:31:52 2015 -0500

--
 CHANGES.txt   | 3 ++-
 src/java/org/apache/cassandra/db/PagedRangeCommand.java   | 7 +++
 src/java/org/apache/cassandra/db/RangeSliceCommand.java   | 7 +++
 src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java | 7 +++
 src/java/org/apache/cassandra/db/SliceFromReadCommand.java| 7 +++
 5 files changed, 30 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/049a965b/CHANGES.txt
--
diff --cc CHANGES.txt
index 41e0340,8473777..d512973
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,6 +1,22 @@@
 -2.0.15:
 +2.1.6
 + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
 + * Validate the indexed column rather than the cell's contents for 2i 
(CASSANDRA-9057)
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 +Merged from 2.0:
- 2.0.15:
+  * Log warning message when a table is queried before the schema has fully
+propagated (CASSANDRA-9136)
   * Overload SecondaryIndex#indexes to accept the column definition 
(CASSANDRA-9314)
   * (cqlsh) Add SERIAL and LOCAL_SERIAL consistency levels (CASSANDRA-8051)
   * Fix index selection during rebuild with certain table layouts 
(CASSANDRA-9281)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/049a965b/src/java/org/apache/cassandra/db/PagedRangeCommand.java
--
diff --cc src/java/org/apache/cassandra/db/PagedRangeCommand.java
index 614f0f7,3bc6539..70325a8
--- a/src/java/org/apache/cassandra/db/PagedRangeCommand.java
+++ b/src/java/org/apache/cassandra/db/PagedRangeCommand.java
@@@ -156,16 -154,23 +156,23 @@@ public class PagedRangeCommand extends 
  {
  String keyspace = in.readUTF();
  String columnFamily = in.readUTF();
 +long timestamp = in.readLong();
  
 -if (Schema.instance.getCFMetaData(keyspace, columnFamily) == null)
 +AbstractBoundsRowPosition keyRange = 
AbstractBounds.serializer.deserialize(in, version).toRowBounds();
 +
 +CFMetaData metadata = Schema.instance.getCFMetaData(keyspace, 
columnFamily);
++if (metadata == null)
+ {
+ String message = String.format(Got paged range command for 
nonexistent table %s.%s.  If the table was just  +
+ created, this is likely due to the schema not being 
fully propagated.  Please wait for schema  +
+ agreement on table creation. , keyspace, 
columnFamily);
+ throw new UnknownColumnFamilyException(message, null);
+ }
  
 -long timestamp = in.readLong();
 +SliceQueryFilter predicate = 
metadata.comparator.sliceQueryFilterSerializer().deserialize(in, version);
  
 -AbstractBoundsRowPosition keyRange = 
AbstractBounds.serializer.deserialize(in, version).toRowBounds();
 -
 -SliceQueryFilter predicate = 
SliceQueryFilter.serializer.deserialize(in, version);
 -
 -ByteBuffer start = ByteBufferUtil.readWithShortLength(in);
 -ByteBuffer stop = ByteBufferUtil.readWithShortLength(in);
 +Composite start = 
metadata.comparator.serializer().deserialize(in);
 +Composite stop =  
metadata.comparator.serializer().deserialize(in);
  

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/db/compaction/Scrubber.java


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

Branch: refs/heads/cassandra-2.1
Commit: 5bae5a313f2ee78d68abbea151c1eff1c2186d64
Parents: 1a0262f dbb36a4
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Tue May 5 11:20:49 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Tue May 5 11:20:49 2015 -0500

--
 src/java/org/apache/cassandra/db/compaction/Scrubber.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bae5a31/src/java/org/apache/cassandra/db/compaction/Scrubber.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/Scrubber.java
index 1f5c7de,f04df27..e8814e4
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@@ -177,10 -187,10 +177,10 @@@ public class Scrubber implements Closea
  if (key == null)
  throw new IOError(new IOException(Unable to read row 
key from data file));
  
- if (!key.getKey().equals(currentIndexKey))
 -if (currentIndexKey != null  
!key.key.equals(currentIndexKey))
++if (currentIndexKey != null  
!key.getKey().equals(currentIndexKey))
  {
  throw new IOError(new IOException(String.format(Key 
from data file (%s) does not match key from index file (%s),
 -ByteBufferUtil.bytesToHex(key.key), 
ByteBufferUtil.bytesToHex(currentIndexKey;
 +ByteBufferUtil.bytesToHex(key.getKey()), 
ByteBufferUtil.bytesToHex(currentIndexKey;
  }
  
  if (dataSize  dataFile.length())

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 22527730d3da6d8c17c645aa1cd9929be9431326
Parents: 233ef34 afe541a
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Tue May 5 14:45:40 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Tue May 5 14:45:40 2015 -0500

--
 CHANGES.txt  |   1 +
 bin/cqlsh|  42 --
 lib/cassandra-driver-internal-only-2.5.0.zip | Bin 189224 - 0 bytes
 lib/cassandra-driver-internal-only-2.5.1.zip | Bin 0 - 192609 bytes
 4 files changed, 41 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/22527730/CHANGES.txt
--
diff --cc CHANGES.txt
index da14ca3,45c0238..05728d8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.0.15:
 +2.1.6
 + * Add support for top-k custom 2i queries (CASSANDRA-8717)
 + * Fix error when dropping table during compaction (CASSANDRA-9251)
 + * cassandra-stress supports validation operations over user profiles 
(CASSANDRA-8773)
 + * Add support for rate limiting log messages (CASSANDRA-9029)
 + * Log the partition key with tombstone warnings (CASSANDRA-8561)
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
 + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
 +Merged from 2.0:
+  * (cqlsh) Add SERIAL and LOCAL_SERIAL consistency levels (CASSANDRA-8051)
   * Fix index selection during rebuild with certain table layouts 
(CASSANDRA-9281)
   * Fix partition-level-delete-only workload accounting (CASSANDRA-9194)
   * Allow scrub to handle corrupted compressed chunks (CASSANDRA-9140)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/22527730/bin/cqlsh
--
diff --cc bin/cqlsh
index 903cb72,a165dca..9a6504a
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -216,6 -192,6 +216,7 @@@ my_commands_ending_with_newline = 
  'help',
  '?',
  'consistency',
++'serial',
  'describe',
  'desc',
  'show',
@@@ -247,6 -218,6 +248,7 @@@ cqlsh_extra_syntax_rules = r''
  
  specialCommand ::= describeCommand
 | consistencyCommand
++   | serialConsistencyCommand
 | showCommand
 | sourceCommand
 | captureCommand
@@@ -286,6 -254,6 +288,13 @@@
   | LOCAL_ONE
   ;
  
++serialConsistencyCommand ::= SERIAL CONSISTENCY ( 
level=serialConsistencyLevel )?
++ ;
++
++serialConsistencyLevel ::= SERIAL
++   | LOCAL_SERIAL
++   ;
++
  showCommand ::= SHOW what=( VERSION | HOST | SESSION 
sessionid=uuid )
  ;
  
@@@ -642,13 -520,6 +651,14 @@@ class Shell(cmd.Cmd)
  self.show_line_nums = True
  self.stdin = stdin
  self.query_out = sys.stdout
 +self.consistency_level = cassandra.ConsistencyLevel.ONE
++self.serial_consistency_level = cassandra.ConsistencyLevel.SERIAL;
 +# the python driver returns BLOBs as string, but we expect them as 
bytearrays
 +cassandra.cqltypes.BytesType.deserialize = staticmethod(lambda byts, 
protocol_version: bytearray(byts))
 +cassandra.cqltypes.CassandraType.support_empty_values = True
 +
 +auto_format_udts()
 +
  self.empty_lines = 0
  self.statement_error = False
  self.single_statement = single_statement
@@@ -993,41 -900,57 +1003,41 @@@
  stop_tracing = ksname == 'system_traces' or (ksname is None and 
self.current_keyspace == 'system_traces')
  self.tracing_enabled = self.tracing_enabled and not stop_tracing
  statement = parsed.extract_orig()
 -with_default_limit = parsed.get_binding('limit') is None
 -if with_default_limit:
 -statement = %s LIMIT %d; % (statement[:-1], 
DEFAULT_SELECT_LIMIT)
 -self.perform_statement(statement,
 -   decoder=ErrorHandlingSchemaDecoder,
 -   

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 33c59132f730599859407a8460f1433e36f83fdf
Parents: 5fcf8df 1e35fa4
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri May 1 19:01:00 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri May 1 19:01:00 2015 +0300

--
 CHANGES.txt   |  5 +
 .../org/apache/cassandra/db/index/SecondaryIndex.java | 10 --
 .../apache/cassandra/db/index/SecondaryIndexManager.java  |  2 +-
 .../org/apache/cassandra/db/ColumnFamilyStoreTest.java| 10 +++---
 .../cassandra/db/index/PerRowSecondaryIndexTest.java  |  8 
 5 files changed, 13 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/33c59132/CHANGES.txt
--
diff --cc CHANGES.txt
index 55b474b,2dabbf9..b0e4fc6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,101 -1,13 +1,103 @@@
 -2.0.15:
 +2.1.6
 + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 +Merged from 2.0:
+  * Fix index selection during rebuild with certain table layouts 
(CASSANDRA-9281)
   * Fix partition-level-delete-only workload accounting (CASSANDRA-9194)
   * Allow scrub to handle corrupted compressed chunks (CASSANDRA-9140)
   * Fix assertion error when resetlocalschema is run during repair 
(CASSANDRA-9249)
   * Disable single sstable tombstone compactions for DTCS by default 
(CASSANDRA-9234)
 - * Do more agressive ttl expiration checks to be able to
 -   drop more sstables (CASSANDRA-8243)
   * IncomingTcpConnection thread is not named (CASSANDRA-9262)
   * Close incoming connections when MessagingService is stopped 
(CASSANDRA-9238)
 +
++
 +2.1.5
 + * Re-add deprecated cold_reads_to_omit param for backwards compat 
(CASSANDRA-9203)
 + * Make anticompaction visible in compactionstats (CASSANDRA-9098)
 + * Improve nodetool getendpoints documentation about the partition
 +   key parameter (CASSANDRA-6458)
 + * Don't check other keyspaces for schema changes when an user-defined
 +   type is altered (CASSANDRA-9187)
 + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348)
 + * Limit major sstable operations to their canonical representation 
(CASSANDRA-8669)
 + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
 + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
 + * Add generate-idea-files target to build.xml (CASSANDRA-9123)
 + * Do not load read meter for offline operations (CASSANDRA-9082)
 + * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
 + * cqlsh: Fix display of triggers (CASSANDRA-9081)
 + * Fix NullPointerException when deleting or setting an element by index on
 +   a null list collection (CASSANDRA-9077)
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: 6770281af00e73b7cc71115f97663918de4d998e
Parents: 54ea2f2 75e858a
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Apr 30 13:06:31 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Apr 30 13:06:31 2015 +0200

--
 CHANGES.txt  | 1 +
 .../cassandra/db/compaction/AbstractCompactionStrategy.java  | 3 +++
 .../db/compaction/DateTieredCompactionStrategy.java  | 8 
 3 files changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6770281a/CHANGES.txt
--
diff --cc CHANGES.txt
index 39bcc7c,8a3e5a9..481fb80
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,95 -1,9 +1,96 @@@
 -2.0.15:
 +2.1.6
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 +Merged from 2.0:
+  * Disable single sstable tombstone compactions for DTCS by default 
(CASSANDRA-9234)
 - * Do more agressive ttl expiration checks to be able to
 -   drop more sstables (CASSANDRA-8243)
   * IncomingTcpConnection thread is not named (CASSANDRA-9262)
   * Close incoming connections when MessagingService is stopped 
(CASSANDRA-9238)
 +
 +2.1.5
 + * Re-add deprecated cold_reads_to_omit param for backwards compat 
(CASSANDRA-9203)
 + * Make anticompaction visible in compactionstats (CASSANDRA-9098)
 + * Improve nodetool getendpoints documentation about the partition
 +   key parameter (CASSANDRA-6458)
 + * Don't check other keyspaces for schema changes when an user-defined
 +   type is altered (CASSANDRA-9187)
 + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348)
 + * Limit major sstable operations to their canonical representation 
(CASSANDRA-8669)
 + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
 + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
 + * Add generate-idea-files target to build.xml (CASSANDRA-9123)
 + * Do not load read meter for offline operations (CASSANDRA-9082)
 + * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
 + * cqlsh: Fix display of triggers (CASSANDRA-9081)
 + * Fix NullPointerException when deleting or setting an element by index on
 +   a null list collection (CASSANDRA-9077)
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Use long for key count in cfstats 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 54ea2f244505b7f5b6a623f7e7b8658c712018ac
Parents: 8f2a26c 13af597
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Apr 30 12:59:41 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Apr 30 12:59:41 2015 +0200

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: db127a1073cfec426019c06d8f33e6c44292949f
Parents: 80c5191 593a725
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Thu Apr 30 13:09:11 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Thu Apr 30 13:09:11 2015 -0500

--
 CHANGES.txt |   1 +
 .../cassandra/db/compaction/Scrubber.java   | 127 +++
 .../unit/org/apache/cassandra/SchemaLoader.java |  17 +-
 .../unit/org/apache/cassandra/db/ScrubTest.java | 156 +--
 4 files changed, 256 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/db127a10/CHANGES.txt
--
diff --cc CHANGES.txt
index cb235a4,4e7a5d0..c063368
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,98 -1,11 +1,99 @@@
 -2.0.15:
 +2.1.6
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 +Merged from 2.0:
+  * Allow scrub to handle corrupted compressed chunks (CASSANDRA-9140)
   * Fix assertion error when resetlocalschema is run during repair 
(CASSANDRA-9249)
   * Disable single sstable tombstone compactions for DTCS by default 
(CASSANDRA-9234)
 - * Do more agressive ttl expiration checks to be able to
 -   drop more sstables (CASSANDRA-8243)
   * IncomingTcpConnection thread is not named (CASSANDRA-9262)
   * Close incoming connections when MessagingService is stopped 
(CASSANDRA-9238)
 +
 +2.1.5
 + * Re-add deprecated cold_reads_to_omit param for backwards compat 
(CASSANDRA-9203)
 + * Make anticompaction visible in compactionstats (CASSANDRA-9098)
 + * Improve nodetool getendpoints documentation about the partition
 +   key parameter (CASSANDRA-6458)
 + * Don't check other keyspaces for schema changes when an user-defined
 +   type is altered (CASSANDRA-9187)
 + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348)
 + * Limit major sstable operations to their canonical representation 
(CASSANDRA-8669)
 + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
 + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
 + * Add generate-idea-files target to build.xml (CASSANDRA-9123)
 + * Do not load read meter for offline operations (CASSANDRA-9082)
 + * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
 + * cqlsh: Fix display of triggers (CASSANDRA-9081)
 + * Fix NullPointerException when deleting or setting an element by index on
 +   a null list collection (CASSANDRA-9077)
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jake]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: 80c51919b9bc5d20467c7c0bace982e16c30daac
Parents: 1f6bf36 a85e731
Author: T Jake Luciani j...@apache.org
Authored: Thu Apr 30 12:41:28 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Thu Apr 30 12:41:28 2015 -0400

--
 CHANGES.txt| 2 +-
 .../org/apache/cassandra/io/compress/CompressionParameters.java| 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/80c51919/CHANGES.txt
--
diff --cc CHANGES.txt
index a01e8ed,9f90cc2..cb235a4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,98 -1,10 +1,98 @@@
 -2.0.15:
 +2.1.6
 + * Fix PITR commitlog replay (CASSANDRA-9195)
 + * GCInspector logs very different times (CASSANDRA-9124)
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 +Merged from 2.0:
+  * Fix assertion error when resetlocalschema is run during repair 
(CASSANDRA-9249)
   * Disable single sstable tombstone compactions for DTCS by default 
(CASSANDRA-9234)
 - * Do more agressive ttl expiration checks to be able to
 -   drop more sstables (CASSANDRA-8243)
   * IncomingTcpConnection thread is not named (CASSANDRA-9262)
   * Close incoming connections when MessagingService is stopped 
(CASSANDRA-9238)
 +
- 
 +2.1.5
 + * Re-add deprecated cold_reads_to_omit param for backwards compat 
(CASSANDRA-9203)
 + * Make anticompaction visible in compactionstats (CASSANDRA-9098)
 + * Improve nodetool getendpoints documentation about the partition
 +   key parameter (CASSANDRA-6458)
 + * Don't check other keyspaces for schema changes when an user-defined
 +   type is altered (CASSANDRA-9187)
 + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348)
 + * Limit major sstable operations to their canonical representation 
(CASSANDRA-8669)
 + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
 + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
 + * Add generate-idea-files target to build.xml (CASSANDRA-9123)
 + * Do not load read meter for offline operations (CASSANDRA-9082)
 + * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
 + * cqlsh: Fix display of triggers (CASSANDRA-9081)
 + * Fix NullPointerException when deleting or setting an element by index on
 +   a null list collection (CASSANDRA-9077)
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: 7043a66d0fb8dd3e1c4a548b8cedd699efcd2b84
Parents: 1262889 35a4f7d
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Apr 27 09:23:01 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Apr 27 09:23:01 2015 +0200

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/compaction/LeveledManifest.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7043a66d/CHANGES.txt
--
diff --cc CHANGES.txt
index 677e594,2613901..b63c19c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,88 -1,5 +1,89 @@@
 -2.0.15:
 +2.1.5
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Re-add deprecated cold_reads_to_omit param for backwards compat 
(CASSANDRA-9203)
 + * Make anticompaction visible in compactionstats (CASSANDRA-9098)
 + * Improve nodetool getendpoints documentation about the partition
 +   key parameter (CASSANDRA-6458)
 + * Don't check other keyspaces for schema changes when an user-defined
 +   type is altered (CASSANDRA-9187)
 + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348)
 + * Limit major sstable operations to their canonical representation 
(CASSANDRA-8669)
 + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
 + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
 + * Add generate-idea-files target to build.xml (CASSANDRA-9123)
 + * Do not load read meter for offline operations (CASSANDRA-9082)
 + * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
 + * cqlsh: Fix display of triggers (CASSANDRA-9081)
 + * Fix NullPointerException when deleting or setting an element by index on
 +   a null list collection (CASSANDRA-9077)
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: 12628893c6907c62693a65fddee0908e04dc320e
Parents: 93b36d4 917fabe
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Apr 27 08:50:07 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Apr 27 08:50:07 2015 +0200

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/io/sstable/SSTableScanner.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/12628893/CHANGES.txt
--
diff --cc CHANGES.txt
index e36c67e,5f6a547..677e594
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,88 -1,5 +1,89 @@@
 -2.0.15:
 +2.1.5
 + * Fix deleting from an empty list (CASSANDRA-9198)
 + * Update tuple and collection types that use a user-defined type when that 
UDT
 +   is modified (CASSANDRA-9148, CASSANDRA-9192)
 + * Re-add deprecated cold_reads_to_omit param for backwards compat 
(CASSANDRA-9203)
 + * Make anticompaction visible in compactionstats (CASSANDRA-9098)
 + * Improve nodetool getendpoints documentation about the partition
 +   key parameter (CASSANDRA-6458)
 + * Don't check other keyspaces for schema changes when an user-defined
 +   type is altered (CASSANDRA-9187)
 + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348)
 + * Limit major sstable operations to their canonical representation 
(CASSANDRA-8669)
 + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
 + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
 + * Add generate-idea-files target to build.xml (CASSANDRA-9123)
 + * Do not load read meter for offline operations (CASSANDRA-9082)
 + * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
 + * cqlsh: Fix display of triggers (CASSANDRA-9081)
 + * Fix NullPointerException when deleting or setting an element by index on
 +   a null list collection (CASSANDRA-9077)
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: f18fb044527115d9dfe8586bf1615825463b1156
Parents: c6e4379 b325316
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Apr 21 14:41:08 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Apr 21 14:41:08 2015 +0300

--
 CHANGES.txt |  1 +
 .../cassandra/db/index/SecondaryIndex.java  | 10 +++
 .../db/index/SecondaryIndexManager.java | 19 +
 .../cassandra/db/ColumnFamilyStoreTest.java | 77 +---
 .../db/index/PerRowSecondaryIndexTest.java  | 11 ++-
 5 files changed, 74 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f18fb044/CHANGES.txt
--
diff --cc CHANGES.txt
index 2777d79,5e1e62c..a40530a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,86 -1,5 +1,87 @@@
 -2.0.15:
 +2.1.5
 + * Re-add deprecated cold_reads_to_omit param for backwards compat 
(CASSANDRA-9203)
 + * Make anticompaction visible in compactionstats (CASSANDRA-9098)
 + * Improve nodetool getendpoints documentation about the partition
 +   key parameter (CASSANDRA-6458)
 + * Don't check other keyspaces for schema changes when an user-defined
 +   type is altered (CASSANDRA-9187)
 + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348)
 + * Limit major sstable operations to their canonical representation 
(CASSANDRA-8669)
 + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
 + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
 + * Add generate-idea-files target to build.xml (CASSANDRA-9123)
 + * Do not load read meter for offline operations (CASSANDRA-9082)
 + * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
 + * cqlsh: Fix display of triggers (CASSANDRA-9081)
 + * Fix NullPointerException when deleting or setting an element by index on
 +   a null list collection (CASSANDRA-9077)
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 19eb5e2edfc1501a848b173be7340834ad8f9d46
Parents: dac5497 9bbcbf5
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Wed Apr 15 17:48:13 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Wed Apr 15 17:48:13 2015 -0500

--
 test/unit/org/apache/cassandra/db/ScrubTest.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/19eb5e2e/test/unit/org/apache/cassandra/db/ScrubTest.java
--
diff --cc test/unit/org/apache/cassandra/db/ScrubTest.java
index 571fe0e,632ce1c..383b1d0
--- a/test/unit/org/apache/cassandra/db/ScrubTest.java
+++ b/test/unit/org/apache/cassandra/db/ScrubTest.java
@@@ -88,8 -86,11 +89,11 @@@ public class ScrubTest extends SchemaLo
  }
  
  @Test
 -public void testScrubCorruptedCounterRow() throws IOException, 
InterruptedException, ExecutionException
 +public void testScrubCorruptedCounterRow() throws IOException, 
WriteTimeoutException
  {
+ // skip the test when compression is enabled until CASSANDRA-9140 is 
complete
+ 
assumeTrue(!Boolean.parseBoolean(System.getProperty(cassandra.test.compression,
 false)));
+ 
  CompactionManager.instance.disableAutoCompaction();
  Keyspace keyspace = Keyspace.open(KEYSPACE);
  ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(COUNTER_CF);

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/io/sstable/SSTable.java

test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java


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

Branch: refs/heads/cassandra-2.1
Commit: 306de09af024a516548eb1d2019a5bcff5327f59
Parents: ca07614 1fab099
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Apr 15 12:11:11 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Apr 15 12:11:11 2015 +0200

--
 .../cassandra/io/sstable/SSTableReader.java  | 11 +--
 .../LeveledCompactionStrategyTest.java   | 19 +--
 2 files changed, 22 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/306de09a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index c73d4a1,15808e8..43873a0
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@@ -600,37 -369,24 +600,44 @@@ public class SSTableReader extends SSTa
  this.dfile = dfile;
  this.indexSummary = indexSummary;
  this.bf = bloomFilter;
 +this.setup(false);
  }
  
 -/**
 - * Clean up all opened resources.
 - *
 - * @throws IOException
 - */
 -public void close() throws IOException
 +public static long getTotalBytes(IterableSSTableReader sstables)
 +{
 +long sum = 0;
 +for (SSTableReader sstable : sstables)
- {
 +sum += sstable.onDiskLength();
- }
++return sum;
++}
++
++public static long getTotalUncompressedBytes(IterableSSTableReader 
sstables)
+ {
 -if (readMeterSyncFuture != null)
 -readMeterSyncFuture.cancel(false);
++long sum = 0;
++for (SSTableReader sstable : sstables)
++sum += sstable.uncompressedLength();
+ 
 -// Force finalizing mmapping if necessary
 -ifile.cleanup();
 -dfile.cleanup();
 -// close the BF so it can be opened later.
 -bf.close();
 -indexSummary.close();
 +return sum;
 +}
 +
 +public boolean equals(Object that)
 +{
 +return that instanceof SSTableReader  ((SSTableReader) 
that).descriptor.equals(this.descriptor);
 +}
 +
 +public int hashCode()
 +{
 +return this.descriptor.hashCode();
 +}
 +
 +public String getFilename()
 +{
 +return dfile.path;
 +}
 +
 +public String getIndexFilename()
 +{
 +return ifile.path;
  }
  
  public void setTrackedBy(DataTracker tracker)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/306de09a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 4c2236b,33de6f5..da54eee
--- 
a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@@ -20,11 -20,13 +20,12 @@@ package org.apache.cassandra.db.compact
  import java.nio.ByteBuffer;
  import java.util.Arrays;
  import java.util.Collection;
 -import java.util.HashSet;
  import java.util.List;
+ import java.util.Random;
 -import java.util.Set;
 -import java.util.concurrent.ExecutionException;
  import java.util.UUID;
  
 +import org.junit.After;
 +import org.junit.Before;
  import org.junit.Test;
  import org.junit.runner.RunWith;
  
@@@ -76,7 -60,13 +77,9 @@@ public class LeveledCompactionStrategyT
  @Test
  public void testValidationMultipleSSTablePerLevel() throws Exception
  {
- ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB 
value, make it easy to have multiple files
 -String ksname = Keyspace1;
 -String cfname = StandardLeveled;
 -Keyspace keyspace = Keyspace.open(ksname);
 -ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
+ byte [] b = new byte[100 * 1024];
+ new Random().nextBytes(b);
+ ByteBuffer value = ByteBuffer.wrap(b); // 100 KB value, make it easy 
to have multiple files
  
  // Enough data to have a level 1 and 2
  int rows = 20;
@@@ -96,16 -86,14 +99,16 @@@
  }
  
  waitForLeveling(cfs);
 -

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:

test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java


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

Branch: refs/heads/cassandra-2.1
Commit: 9d3dfd04dbc1a79fb0ea0109bb6a23c2677e
Parents: 306de09 53848f7
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Apr 15 13:19:43 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Apr 15 13:24:04 2015 +0200

--
 .../db/compaction/DateTieredCompactionStrategyTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d3dfd04/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index 743a337,d7caf6b..14e22f0
--- 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@@ -287,8 -287,8 +287,8 @@@ public class DateTieredCompactionStrate
  
  // create 2 sstables
  DecoratedKey key = Util.dk(String.valueOf(expired));
 -RowMutation rm = new RowMutation(KEYSPACE1, key.key);
 -rm.add(CF_STANDARD1, ByteBufferUtil.bytes(column), value, 
System.currentTimeMillis(), 1);
 +Mutation rm = new Mutation(KEYSPACE1, key.getKey());
- rm.add(CF_STANDARD1, Util.cellname(column), value, 
System.currentTimeMillis(), 5);
++rm.add(CF_STANDARD1, Util.cellname(column), value, 
System.currentTimeMillis(), 1);
  rm.apply();
  cfs.forceBlockingFlush();
  SSTableReader expiredSSTable = cfs.getSSTables().iterator().next();
@@@ -306,11 -306,9 +306,11 @@@
  
options.put(DateTieredCompactionStrategyOptions.TIMESTAMP_RESOLUTION_KEY, 
MILLISECONDS);
  options.put(DateTieredCompactionStrategyOptions.MAX_SSTABLE_AGE_KEY, 
Double.toString((1d / (24 * 60 * 60;
  DateTieredCompactionStrategy dtcs = new 
DateTieredCompactionStrategy(cfs, options);
 +for (SSTableReader sstable : cfs.getSSTables())
 +dtcs.addSSTable(sstable);
  dtcs.startup();
  assertNull(dtcs.getNextBackgroundTask((int) 
(System.currentTimeMillis() / 1000)));
- Thread.sleep(7000);
+ Thread.sleep(2000);
  AbstractCompactionTask t = dtcs.getNextBackgroundTask((int) 
(System.currentTimeMillis()/1000));
  assertNotNull(t);
  assertEquals(1, Iterables.size(t.sstables));

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jake]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 28865c27c1bd0a473f0fd79fab300c38c332f130
Parents: 7b83334 def4835
Author: T Jake Luciani j...@apache.org
Authored: Thu Apr 9 09:27:17 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Thu Apr 9 09:27:17 2015 -0400

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cli/CliClient.java


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

Branch: refs/heads/cassandra-2.1
Commit: 459c48bae71e062bd7e7750a4aa6d1bbf609fbdb
Parents: 8fc61eb 4b43684
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Apr 8 13:11:46 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Apr 8 13:11:46 2015 -0500

--
 CHANGES.txt  | 2 ++
 src/java/org/apache/cassandra/cli/CliClient.java | 3 +++
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/459c48ba/CHANGES.txt
--
diff --cc CHANGES.txt
index 270c130,d52aac7..d90d068
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,78 -1,7 +1,80 @@@
 -2.0.15:
 +2.1.5
 + * Limit major sstable operations to their canonical representation 
(CASSANDRA-8669)
 + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
 + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
 + * Add generate-idea-files target to build.xml (CASSANDRA-9123)
 + * Do not load read meter for offline operations (CASSANDRA-9082)
 + * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
 + * cqlsh: Fix display of triggers (CASSANDRA-9081)
 + * Fix NullPointerException when deleting or setting an element by index on
 +   a null list collection (CASSANDRA-9077)
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 9324cd0c551eefcb987dfa834515968d372e2448
Parents: 459c48b b24bd08
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Apr 8 23:28:51 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Apr 8 23:28:51 2015 +0300

--
 CHANGES.txt  | 3 ++-
 src/java/org/apache/cassandra/db/SystemKeyspace.java | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9324cd0c/CHANGES.txt
--
diff --cc CHANGES.txt
index d90d068,772afd6..41118b5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,80 -1,8 +1,81 @@@
 -2.0.15:
 +2.1.5
 + * Limit major sstable operations to their canonical representation 
(CASSANDRA-8669)
 + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
 + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
 + * Add generate-idea-files target to build.xml (CASSANDRA-9123)
 + * Do not load read meter for offline operations (CASSANDRA-9082)
 + * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
 + * cqlsh: Fix display of triggers (CASSANDRA-9081)
 + * Fix NullPointerException when deleting or setting an element by index on
 +   a null list collection (CASSANDRA-9077)
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: e8cdaf127ae3c348557836f9b02398c49431de20
Parents: 2641424 922a2c4
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Apr 7 20:56:01 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Apr 7 20:56:01 2015 +0300

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java


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

Branch: refs/heads/cassandra-2.1
Commit: e4072cf09f92385eac1a64525e8ec8b2624d94cd
Parents: 9449a70 67038a3
Author: Marcus Eriksson marc...@apache.org
Authored: Fri Apr 3 20:58:15 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Fri Apr 3 20:58:15 2015 +0200

--
 CHANGES.txt   |  1 +
 .../apache/cassandra/tools/SSTableOfflineRelevel.java | 14 --
 2 files changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4072cf0/CHANGES.txt
--
diff --cc CHANGES.txt
index b1499c1,28f79f9..5cd914a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,73 -1,5 +1,74 @@@
 -2.0.15:
 +2.1.5
 + * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
 + * cqlsh: Fix display of triggers (CASSANDRA-9081)
 + * Fix NullPointerException when deleting or setting an element by index on
 +   a null list collection (CASSANDRA-9077)
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/compaction/CompactionTask.java


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

Branch: refs/heads/cassandra-2.1
Commit: 730cc60640a683ef455c1b8856e4ed8fc39a460f
Parents: 0ba5f27 2cf4ca3
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Apr 1 14:39:50 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Apr 1 14:39:50 2015 +0200

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 3 +++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/730cc606/CHANGES.txt
--
diff --cc CHANGES.txt
index ab5fb2d,b6b5caf..3b99c61
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,70 -1,8 +1,71 @@@
 -2.0.14:
 +2.1.4
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt

src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java


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

Branch: refs/heads/cassandra-2.1
Commit: 52191ebe33d82bf89a57f019c026c88a8d82ee55
Parents: c9b83e0 3d0c4e7
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Apr 1 12:34:01 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Apr 1 12:56:21 2015 +0200

--
 CHANGES.txt |  1 +
 .../DateTieredCompactionStrategy.java   | 31 ++
 .../DateTieredCompactionStrategyTest.java   | 43 
 3 files changed, 67 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/52191ebe/CHANGES.txt
--
diff --cc CHANGES.txt
index 7ded07b,1afe6fe..ab5fb2d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,69 -1,7 +1,70 @@@
 -2.0.14:
 +2.1.4
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[slebresne]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: 49d64c23ba2ee5b478aa97ba519ad5c72a58c966
Parents: 2fa18d3 c8ab96d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Apr 1 21:43:35 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Apr 1 21:43:35 2015 +0200

--
 CHANGES.txt |  2 ++
 src/java/org/apache/cassandra/service/StorageProxy.java | 10 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/49d64c23/CHANGES.txt
--
diff --cc CHANGES.txt
index 06d2112,c569de5..b1499c1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,75 -1,10 +1,77 @@@
 -2.0.15:
 +2.1.5
 + * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
 + * cqlsh: Fix display of triggers (CASSANDRA-9081)
 + * Fix NullPointerException when deleting or setting an element by index on
 +   a null list collection (CASSANDRA-9077)
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: 994eb2fa71f802f72fc1b06f36398e5a98467578
Parents: a2b66bf f7116c9
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Mar 31 12:53:03 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Mar 31 12:53:03 2015 +0200

--
 CHANGES.txt   |  1 +
 .../compaction/DateTieredCompactionStrategy.java  | 18 ++
 .../DateTieredCompactionStrategyTest.java |  7 +--
 3 files changed, 20 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/994eb2fa/CHANGES.txt
--
diff --cc CHANGES.txt
index e3b5363,0bcc5cb..e22c6b3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,71 -1,8 +1,72 @@@
 -2.0.14:
 +2.1.4
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
test/unit/org/apache/cassandra/cql3/AlterTableTest.java


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

Branch: refs/heads/cassandra-2.1
Commit: aaee407ddce83cfccb4bd83f6633b7ad2ceb0998
Parents: 963dd54 88b2f38
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Mar 31 11:26:23 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Mar 31 11:26:23 2015 -0500

--
 CHANGES.txt |  1 +
 .../apache/cassandra/cql3/AlterTableTest.java   | 20 
 .../org/apache/cassandra/cql3/CQLTester.java|  3 ++-
 3 files changed, 23 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aaee407d/CHANGES.txt
--
diff --cc CHANGES.txt
index e22c6b3,cdd2c77..7ded07b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,69 -1,5 +1,70 @@@
 -2.0.14:
 +2.1.4
 + * Buffer bloom filter serialization (CASSANDRA-9066)
 + * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
 + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
 + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
 + * Avoid overwriting index summaries for sstables with an older format that
 +   does not support downsampling; rebuild summaries on startup when this
 +   is detected (CASSANDRA-8993)
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: eed27ac3e58491f1e8e852059f3b66d95296881c
Parents: aaee407 ec958f0
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Mar 31 11:55:49 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Mar 31 11:55:49 2015 -0500

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 93156d761c46c7299f4f2d2056963fa0cdb17721
Parents: 14327e4 1b1acae
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Mar 26 13:23:11 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Mar 26 13:23:11 2015 -0500

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: 14327e4b9e120c1446573bfd121eabd14f16dc1a
Parents: f9c57a5 9625910
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Mar 25 10:41:04 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Mar 25 10:41:04 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14327e4b/CHANGES.txt
--
diff --cc CHANGES.txt
index a8eda63,293dc55..9bc314d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,62 -1,6 +1,64 @@@
 -2.0.14:
 +2.1.4
 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
 + * Add 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
bin/cqlsh


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

Branch: refs/heads/cassandra-2.1
Commit: 9d2b2730ebe3206bd594d07073e34fffa087fbf5
Parents: 6b979f3 061ea33
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Mar 24 11:42:38 2015 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Mar 24 11:42:38 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d2b2730/CHANGES.txt
--
diff --cc CHANGES.txt
index e85b622,2073b00..06a3c3f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,6 +1,63 @@@
 -2.0.14:
 +2.1.4
 + * Make PasswordAuthenticator number of hashing rounds configurable 
(CASSANDRA-8085)
 + * Fix AssertionError when binding nested collections in DELETE 
(CASSANDRA-8900)
 + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
 + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
 + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
 + * Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
 +Merged from 2.0:
+  * (cqlsh) 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 6c69f9a7c9fb412fbbbfaecb535eeb7eaeff3988
Parents: bbb3fc7 c6ba2be
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sun Mar 22 14:15:54 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sun Mar 22 14:15:54 2015 +0300

--
 CHANGES.txt   | 2 ++
 src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c69f9a7/CHANGES.txt
--
diff --cc CHANGES.txt
index c92623e,863f145..03f7e1c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,57 -1,6 +1,59 @@@
 -2.0.14:
 +2.1.4
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
 + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
 + * Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
 +Merged from 2.0:
+  * Stop logging range tombstones when exceeding the threshold
+(CASSANDRA-8559)
   * Fix NullPointerException when nodetool getendpoints is run
 against invalid keyspaces or tables (CASSANDRA-8950)
   * Allow specifying the tmp dir 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: bbb3fc7282f3ef34cb73a49201c8aa33442f7050
Parents: 7110904 37eb2a0
Author: Tyler Hobbs tylerho...@apache.org
Authored: Fri Mar 20 11:44:06 2015 -0500
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Fri Mar 20 11:44:06 2015 -0500

--
 CHANGES.txt   | 2 ++
 src/java/org/apache/cassandra/service/StorageService.java | 9 -
 2 files changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbb3fc72/CHANGES.txt
--
diff --cc CHANGES.txt
index a142999,25fbd74..c92623e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,57 -1,6 +1,59 @@@
 -2.0.14:
 +2.1.4
 + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
 + * IndexSummary effectiveIndexInterval is now a guideline, not a rule 
(CASSANDRA-8993)
 + * Use correct bounds for page cache eviction of compressed files 
(CASSANDRA-8746)
 + * SSTableScanner enforces its bounds (CASSANDRA-8946)
 + * Cleanup cell equality (CASSANDRA-8947)
 + * Introduce intra-cluster message coalescing (CASSANDRA-8692)
 + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
 + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
 + * Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
 +Merged from 2.0:
+  * Fix NullPointerException when nodetool getendpoints is run
+against invalid keyspaces or tables (CASSANDRA-8950)
   * Allow specifying the tmp dir (CASSANDRA-7712)
   * Improve compaction estimated tasks estimation (CASSANDRA-8904)
   * Fix duplicate 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 5cf61e718fc4baeb1c71fd2ae03e8dcc1b39bad9
Parents: 86b04ad 5fd4a01
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Mar 20 12:35:26 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Mar 20 12:35:26 2015 +0300

--
 .../cassandra/cql3/statements/DropIndexStatement.java | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cf61e71/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/compaction/LeveledManifest.java


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

Branch: refs/heads/cassandra-2.1
Commit: c0f159b82a9d805990818f60735623e2a7d8c517
Parents: 89f2c1d 0814737
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Mar 17 11:13:40 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Mar 17 11:13:40 2015 +0100

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/db/compaction/LeveledManifest.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0f159b8/CHANGES.txt
--
diff --cc CHANGES.txt
index a48787f,65f2da4..7b8e0ad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,49 -1,5 +1,50 @@@
 -2.0.14:
 +2.1.4
 + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
 + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
 + * Allow invalidating permissions and cache time (CASSANDRA-8722)
 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
 +   are executed (CASSANDRA-8418)
 + * Fix cassandra-stress so it respects the CL passed in user mode 
(CASSANDRA-8948)
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
 + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
 +Merged from 2.0:
+  * Improve compaction estimated tasks estimation (CASSANDRA-8904)
   * Fix duplicate up/down messages sent to native clients (CASSANDRA-7816)
   * Expose commit log archive status via JMX (CASSANDRA-8734)
   * Provide better exceptions for invalid replication strategy parameters

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0f159b8/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index f2af848,6554eb2..c076a64
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jake]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 89f2c1de63a75871367aee0f22985c8d2c4f9930
Parents: 1a77a69 31a1828
Author: T Jake Luciani j...@apache.org
Authored: Mon Mar 16 11:49:39 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Mon Mar 16 11:49:39 2015 -0400

--

--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jmckenzie]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
src/java/org/apache/cassandra/db/commitlog/CommitLog.java
src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java


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

Branch: refs/heads/cassandra-2.1
Commit: 8eea35863bd1e2bafdaabfb586348a034ae56ada
Parents: 2047b2a 77c66bf
Author: Joshua McKenzie jmcken...@apache.org
Authored: Wed Mar 11 11:23:09 2015 -0500
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Wed Mar 11 11:23:09 2015 -0500

--
 CHANGES.txt |  1 +
 .../cassandra/db/commitlog/CommitLog.java   | 30 +++
 .../db/commitlog/CommitLogArchiver.java |  6 ++--
 .../cassandra/db/commitlog/CommitLogMBean.java  | 31 
 4 files changed, 65 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8eea3586/CHANGES.txt
--
diff --cc CHANGES.txt
index 29e7541,382b3dd..24a8bb7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,43 -1,5 +1,44 @@@
 +2.1.4
 + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
 + * cassandra-stress reports per-operation statistics, plus misc 
(CASSANDRA-8769)
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
 + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
 +Merged from 2.0:
  2.0.14:
+  * Expose commit log archive status via JMX (CASSANDRA-8734)
   * Provide better exceptions for invalid replication strategy parameters
 (CASSANDRA-8909)
   * Fix regression in mixed single and multi-column relation support for

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8eea3586/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
--
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index 9b51a33,a3ce804..40b90ff
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@@ -311,9 -299,50 +311,39 @@@ public class CommitLog implements Commi
  return metrics.totalCommitLogSize.value();
  }
  
+ @Override
+ public String getArchiveCommand()
+ {
+ return archiver.archiveCommand;
+ }
+ 
+ @Override
+ public String getRestoreCommand()
+ {
+ return archiver.restoreCommand;
+ }
+ 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: ef6fa37337ac75586d3b12d5e9bc0565dc9a1ace
Parents: fc868c5 d6ea0ff
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Mar 9 20:20:16 2015 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Mar 9 20:20:16 2015 -0700

--
 CHANGES.txt| 3 +++
 .../apache/cassandra/locator/AbstractReplicationStrategy.java  | 6 ++
 2 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef6fa373/CHANGES.txt
--
diff --cc CHANGES.txt
index f5e1a1d,d240a10..b2ac1aa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,6 +1,43 @@@
 +2.1.4
 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
 + * Use long for key count in cfstats (CASSANDRA-8913)
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
 + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
 +Merged from 2.0:
+ 2.0.14:
+  * Provide better exceptions for invalid replication strategy parameters
+(CASSANDRA-8909)
   * Fix regression in mixed single and multi-column relation support for
 SELECT statements (CASSANDRA-8613)
   * Add ability to limit number of native connections (CASSANDRA-8086)

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: fc868c50308def3eb14c90209522cecbfc8329ad
Parents: 9ee34b6 b9de1d6
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Mar 9 20:07:06 2015 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Mar 9 20:07:06 2015 -0700

--
 CHANGES.txt | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc868c50/CHANGES.txt
--
diff --cc CHANGES.txt
index 31828fc,b8774fc..f5e1a1d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -38,6 -2,11 +38,8 @@@ Merged from 2.0
   * Fix regression in mixed single and multi-column relation support for
 SELECT statements (CASSANDRA-8613)
   * Add ability to limit number of native connections (CASSANDRA-8086)
+  * Fix CQLSSTableWriter throwing exception and spawning threads
+(CASSANDRA-8808)
 -
 -
 -2.0.13:
   * Add offline tool to relevel sstables (CASSANDRA-8301)
   * Preserve stream ID for more protocol errors (CASSANDRA-8848)
   * Fix combining token() function with multi-column relations on
@@@ -48,107 -17,10 +50,105 @@@
 table with ASC ordering and paging (CASSANDRA-8767)
   * AssertionError: Memory was freed when running cleanup (CASSANDRA-8716)
   * Make it possible to set max_sstable_age to fractional days (CASSANDRA-8406)
 - * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate()
 -   (CASSANDRA-8748)
   * Fix some multi-column relations with indexes on some clustering
 columns (CASSANDRA-8275)
 + * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate()
 +   (CASSANDRA-8748)
 + * Throw OOM if allocating memory fails to return a valid pointer 
(CASSANDRA-8726)
 + * Fix SSTableSimpleUnsortedWriter ConcurrentModificationException 
(CASSANDRA-8619)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableSimpleUnsortedWriter.close() terminates if
 +   disk writer has crashed (CASSANDRA-8807)
-  * Fix CQLSSTableWriter throwing exception and spawning threads
-(CASSANDRA-8808)
 +
 +
 +2.1.3
 + * Fix HSHA/offheap_objects corruption (CASSANDRA-8719)
 + * Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
 + * Don't use the shared ref in sstableloader (CASSANDRA-8704)
 + * Purge internal prepared statements if related tables or
 +   keyspaces are dropped (CASSANDRA-8693)
 + * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638)
 + * Stop compactions before exiting offline tools (CASSANDRA-8623)
 + * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933)
 + * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)
 + * Safer Resource Management (CASSANDRA-7705)
 + * Make sure we compact highly overlapping cold sstables with
 +   STCS (CASSANDRA-8635)
 + * rpc_interface and listen_interface generate NPE on startup when specified
 +   interface doesn't exist (CASSANDRA-8677)
 + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms 
(CASSANDRA-8514)
 + * Switch from yammer metrics for nodetool cf/proxy histograms 
(CASSANDRA-8662)
 + * Make sure we don't add tmplink files to the compaction
 +   strategy (CASSANDRA-8580)
 + * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
 + * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6706)
 + * Add tooling to detect hot partitions (CASSANDRA-7974)
 + * Fix cassandra-stress user-mode truncation of partition generation 
(CASSANDRA-8608)
 + * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)
 + * Don't allow starting multiple inc repairs on the same sstables 
(CASSANDRA-8316)
 + * Invalidate prepared BATCH statements when related tables
 +   or keyspaces are dropped (CASSANDRA-8652)
 + * Fix missing results in secondary index queries on collections
 +   with ALLOW FILTERING (CASSANDRA-8421)
 + * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627)
 + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
 + * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
 + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
 + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
 + * Fix case-sensitivity of index name on CREATE and DROP INDEX
 +   statements (CASSANDRA-8365)
 + * Better detection/logging for corruption in compressed sstables 
(CASSANDRA-8192)
 + * Use the correct repairedAt value when 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[jmckenzie]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: b1c2536ccb244be078cddc0da6c788d2b7c0f4ec
Parents: 7902568 e56d9ef
Author: Joshua McKenzie jmcken...@apache.org
Authored: Thu Mar 5 11:32:41 2015 -0600
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Thu Mar 5 11:32:41 2015 -0600

--
 CHANGES.txt |   1 +
 conf/cassandra.yaml |   8 ++
 .../org/apache/cassandra/config/Config.java |   2 +
 .../cassandra/config/DatabaseDescriptor.java|  19 
 .../apache/cassandra/service/StorageProxy.java  |   8 +-
 .../cassandra/service/StorageProxyMBean.java|   3 +
 .../transport/ConnectionLimitHandler.java   | 108 +++
 .../org/apache/cassandra/transport/Server.java  |   9 ++
 8 files changed, 157 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1c2536c/CHANGES.txt
--
diff --cc CHANGES.txt
index 137c0f1,4e34c9e..aa2e1f9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,5 +1,37 @@@
 -2.0.13:
 +2.1.4
 + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
 + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
 + * Make EstimatedHistogram#percentile() use ceil instead of floor 
(CASSANDRA-8883)
 + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
 + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
 + * Pick sstables for validation as late as possible inc repairs 
(CASSANDRA-8366)
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 + * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
 + * IndexSummaryBuilder utilises offheap memory, and shares data between
 +   each IndexSummary opened from it (CASSANDRA-8757)
 + * markCompacting only succeeds if the exact SSTableReader instances being 
 +   marked are in the live set (CASSANDRA-8689)
 + * cassandra-stress support for varint (CASSANDRA-8882)
 +Merged from 2.0:
+  * Add ability to limit number of native connections (CASSANDRA-8086)
   * Add offline tool to relevel sstables (CASSANDRA-8301)
   * Preserve stream ID for more protocol errors (CASSANDRA-8848)
   * Fix combining token() function with multi-column relations on

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1c2536c/conf/cassandra.yaml
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1c2536c/src/java/org/apache/cassandra/config/Config.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1c2536c/src/java/org/apache/cassandra/service/StorageProxy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1c2536c/src/java/org/apache/cassandra/service/StorageProxyMBean.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1c2536c/src/java/org/apache/cassandra/transport/ConnectionLimitHandler.java

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 59ed491ac8dbc8e7a1dcfa6bf1cc1501f8dec72b
Parents: 9c7a601 d04602d
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Mar 5 12:54:40 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Mar 5 12:54:40 2015 -0600

--
 doc/cql3/CQL.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 7902568257dc0157ffe1bbdc3a82ed8f0736f290
Parents: 4176f9e 2428b9c
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Mar 4 16:34:02 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Mar 4 16:34:02 2015 -0600

--
 src/java/org/apache/cassandra/cql3/Cql.g | 1 +
 1 file changed, 1 insertion(+)
--


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

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 3f6ad3c9886c01c2cdaed6cad10c6f0672004473
Parents: 2f7077c 72c6ed2
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Mar 3 12:50:20 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Mar 3 12:50:20 2015 -0600

--
 doc/native_protocol_v1.spec | 7 +--
 doc/native_protocol_v2.spec | 8 ++--
 doc/native_protocol_v3.spec | 8 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f6ad3c9/doc/native_protocol_v1.spec
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f6ad3c9/doc/native_protocol_v2.spec
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f6ad3c9/doc/native_protocol_v3.spec
--
diff --cc doc/native_protocol_v3.spec
index 1d35d50,000..9894d76
mode 100644,00..100644
--- a/doc/native_protocol_v3.spec
+++ b/doc/native_protocol_v3.spec
@@@ -1,1027 -1,0 +1,1031 @@@
 +
 + CQL BINARY PROTOCOL v3
 +
 +
 +Table of Contents
 +
 +  1. Overview
 +  2. Frame header
 +2.1. version
 +2.2. flags
 +2.3. stream
 +2.4. opcode
 +2.5. length
 +  3. Notations
 +  4. Messages
 +4.1. Requests
 +  4.1.1. STARTUP
 +  4.1.2. AUTH_RESPONSE
 +  4.1.3. OPTIONS
 +  4.1.4. QUERY
 +  4.1.5. PREPARE
 +  4.1.6. EXECUTE
 +  4.1.7. BATCH
 +  4.1.8. REGISTER
 +4.2. Responses
 +  4.2.1. ERROR
 +  4.2.2. READY
 +  4.2.3. AUTHENTICATE
 +  4.2.4. SUPPORTED
 +  4.2.5. RESULT
 +4.2.5.1. Void
 +4.2.5.2. Rows
 +4.2.5.3. Set_keyspace
 +4.2.5.4. Prepared
 +4.2.5.5. Schema_change
 +  4.2.6. EVENT
 +  4.2.7. AUTH_CHALLENGE
 +  4.2.8. AUTH_SUCCESS
 +  5. Compression
 +  6. Data Type Serialization Formats
 +  7. User Defined Type Serialization
 +  8. Result paging
 +  9. Error codes
 +  10. Changes from v2
 +
 +
 +1. Overview
 +
 +  The CQL binary protocol is a frame based protocol. Frames are defined as:
 +
 +  0 8162432 40
 +  +-+-+-+-+-+
 +  | version |  flags  |  stream   | opcode  |
 +  +-+-+-+-+-+
 +  |length |
 +  +-+-+-+-+
 +  |   |
 +  ....  body ...  .
 +  .   .
 +  .   .
 +  +
 +
 +  The protocol is big-endian (network byte order).
 +
 +  Each frame contains a fixed size header (9 bytes) followed by a variable 
size
 +  body. The header is described in Section 2. The content of the body depends
 +  on the header opcode value (the body can in particular be empty for some
 +  opcode values). The list of allowed opcode is defined Section 2.3 and the
 +  details of each corresponding message is described Section 4.
 +
 +  The protocol distinguishes 2 types of frames: requests and responses. 
Requests
 +  are those frame sent by the clients to the server, response are the ones 
sent
 +  by the server. Note however that the protocol supports server pushes 
(events)
 +  so responses does not necessarily come right after a client request.
 +
 +  Note to client implementors: clients library should always assume that the
 +  body of a given frame may contain more data than what is described in this
 +  document. It will however always be safe to ignore the remaining of the 
frame
 +  body in such cases. The reason is that this may allow to sometimes extend 
the
 +  protocol with optional features without needing to change the protocol
 +  version.
 +
 +
 +
 +2. Frame header
 +
 +2.1. version
 +
 +  The version is a single byte that indicate both the direction of the message
 +  (request or response) and the version of the protocol in use. The up-most 
bit
 +  of version is used to define the direction of the message: 0 indicates a
 +  request, 1 indicates a responses. This can be useful for protocol analyzers 
to
 +  distinguish the nature of the packet from the direction which it is moving.
 +  The rest of that byte is the protocol version (3 for the protocol defined in
 +  this 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: f6d82a55fbf938286245c8ed510094715d0c4dc1
Parents: 3f6ad3c 6ee0c75
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Mar 3 14:02:47 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Mar 3 14:02:47 2015 -0600

--
 doc/cql3/CQL.textile | 2 ++
 1 file changed, 2 insertions(+)
--


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

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 2acd05d96778fc4d4f8ee8cef322f3624638bd8c
Parents: 2d1e46e a936d7e
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Mar 3 15:14:59 2015 -0800
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Mar 3 15:14:59 2015 -0800

--
 conf/commitlog_archiving.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: 1e74dd0d10320f2155e31a152bd669cf9b6140f1
Parents: e76ebce 33a3a09
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Mar 2 11:49:11 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Mar 2 12:49:12 2015 +0100

--
 CHANGES.txt |   1 +
 .../cassandra/tools/SSTableOfflineRelevel.java  | 193 +++
 tools/bin/sstableofflinerelevel |  54 ++
 3 files changed, 248 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e74dd0d/CHANGES.txt
--
diff --cc CHANGES.txt
index a3e52f7,f98bb3f..15a5a61
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
 -2.0.13:
 +2.1.4
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 +Merged from 2.0:
+  * Add offline tool to relevel sstables (CASSANDRA-8301)
   * Preserve stream ID for more protocol errors (CASSANDRA-8848)
   * Fix combining token() function with multi-column relations on
 clustering columns (CASSANDRA-8797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e74dd0d/src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java
--
diff --cc src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java
index 000,3fb2f7a..4c863c6
mode 00,100644..100644
--- a/src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java
+++ b/src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java
@@@ -1,0 -1,191 +1,193 @@@
+ /*
+  * 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.tools;
+ 
+ import java.io.IOException;
+ import java.io.PrintStream;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.Comparator;
+ import java.util.HashSet;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+ 
+ import org.apache.cassandra.config.DatabaseDescriptor;
+ import org.apache.cassandra.config.Schema;
++import org.apache.cassandra.db.ColumnFamilyStore;
+ import org.apache.cassandra.db.DecoratedKey;
+ import org.apache.cassandra.db.Directories;
+ import org.apache.cassandra.db.Keyspace;
+ import org.apache.cassandra.db.compaction.LeveledManifest;
+ import org.apache.cassandra.io.sstable.Component;
+ import org.apache.cassandra.io.sstable.Descriptor;
+ import org.apache.cassandra.io.sstable.SSTableReader;
+ import org.apache.cassandra.utils.Pair;
+ 
+ /**
+  * 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: e76ebcec14a4c88c2433bdc0a4e4cd656ba5af2a
Parents: 649a5cd 5654e73
Author: Tyler Hobbs tylerho...@apache.org
Authored: Fri Feb 27 16:11:37 2015 -0600
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Fri Feb 27 16:11:37 2015 -0600

--
 CHANGES.txt |   4 +-
 .../org/apache/cassandra/transport/Frame.java   |  18 +++-
 .../transport/messages/ErrorMessage.java|   9 +-
 .../cassandra/transport/ProtocolErrorTest.java  | 103 +++
 4 files changed, 129 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e76ebcec/CHANGES.txt
--
diff --cc CHANGES.txt
index ec5e233,3a8d824..a3e52f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
 -2.0.13:
 +2.1.4
 + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
 + * Fix parallelism adjustment in range and secondary index queries
 +   when the first fetch does not satisfy the limit (CASSANDRA-8856)
 + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
 + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 +Merged from 2.0:
+  * Preserve stream ID for more protocol errors (CASSANDRA-8848)
   * Fix combining token() function with multi-column relations on
 clustering columns (CASSANDRA-8797)
   * Make CFS.markReferenced() resistant to bad refcounting (CASSANDRA-8829)
@@@ -27,104 -8,10 +28,105 @@@
 table with ASC ordering and paging (CASSANDRA-8767)
   * AssertionError: Memory was freed when running cleanup (CASSANDRA-8716)
   * Make it possible to set max_sstable_age to fractional days (CASSANDRA-8406)
 - * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate()
 -   (CASSANDRA-8748)
   * Fix some multi-column relations with indexes on some clustering
 columns (CASSANDRA-8275)
-  * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate() 
(CASSANDRA-8748)
++ * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate()
++   (CASSANDRA-8748)
 + * Throw OOM if allocating memory fails to return a valid pointer 
(CASSANDRA-8726)
 + * Fix SSTableSimpleUnsortedWriter ConcurrentModificationException 
(CASSANDRA-8619)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableSimpleUnsortedWriter.close() terminates if
 +   disk writer has crashed (CASSANDRA-8807)
 +
 +
 +2.1.3
 + * Fix HSHA/offheap_objects corruption (CASSANDRA-8719)
 + * Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
 + * Don't use the shared ref in sstableloader (CASSANDRA-8704)
 + * Purge internal prepared statements if related tables or
 +   keyspaces are dropped (CASSANDRA-8693)
 + * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638)
 + * Stop compactions before exiting offline tools (CASSANDRA-8623)
 + * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933)
 + * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)
 + * Safer Resource Management (CASSANDRA-7705)
 + * Make sure we compact highly overlapping cold sstables with
 +   STCS (CASSANDRA-8635)
 + * rpc_interface and listen_interface generate NPE on startup when specified
 +   interface doesn't exist (CASSANDRA-8677)
 + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms 
(CASSANDRA-8514)
 + * Switch from yammer metrics for nodetool cf/proxy histograms 
(CASSANDRA-8662)
 + * Make sure we don't add tmplink files to the compaction
 +   strategy (CASSANDRA-8580)
 + * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
 + * (cqlsh) Handle 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
test/unit/org/apache/cassandra/cql3/SelectWithTokenFunctionTest.java


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

Branch: refs/heads/cassandra-2.1
Commit: e4980b3b8df0d15aef0f9f24159064c7be86d111
Parents: 6065f2c ee160a9
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Feb 19 13:21:02 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Feb 19 13:21:02 2015 -0600

--
 CHANGES.txt  |  2 ++
 src/java/org/apache/cassandra/cql3/Relation.java |  5 +
 .../org/apache/cassandra/cql3/SingleColumnRelation.java  |  5 +
 .../cassandra/cql3/statements/SelectStatement.java   |  6 +-
 .../cassandra/cql3/SelectWithTokenFunctionTest.java  | 11 +++
 5 files changed, 28 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4980b3b/CHANGES.txt
--
diff --cc CHANGES.txt
index 9458627,f2b4469..3b6ce5d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,6 +1,21 @@@
 -2.0.13:
 +2.1.4
 + * Fix CommitLog.forceRecycleAllSegments() memory access error 
(CASSANDRA-8812)
 + * Improve assertions in Memory (CASSANDRA-8792)
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 +Merged from 2.0:
+  * Fix combining token() function with multi-column relations on
+clustering columns (CASSANDRA-8797)
   * Make CFS.markReferenced() resistant to bad refcounting (CASSANDRA-8829)
   * Fix StreamTransferTask abort/complete bad refcounting (CASSANDRA-8815)
   * Fix AssertionError when querying a DESC clustering ordered

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4980b3b/src/java/org/apache/cassandra/cql3/Relation.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4980b3b/src/java/org/apache/cassandra/cql3/SingleColumnRelation.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4980b3b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 08777c7,59ed6e1..9099ba7
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -1933,18 -1898,22 +1933,22 @@@ public class SelectStatement implement
  /**
   * Checks that the column identifiers used as argument for the token 
function have been specified in the
   * partition key order.
 - * @param cfDef the Column Family Definition
 + * @param cfm the Column Family MetaData
   * @throws InvalidRequestException if the arguments have not been 
provided in the proper order.
   */
 -private void checkTokenFunctionArgumentsOrder(CFDefinition cfDef) 
throws InvalidRequestException
 +private void checkTokenFunctionArgumentsOrder(CFMetaData cfm) throws 
InvalidRequestException
  {
 -IteratorName iter = Iterators.cycle(cfDef.partitionKeys());
 +IteratorColumnDefinition iter = 
Iterators.cycle(cfm.partitionKeyColumns());
  for (Relation relation : whereClause)
  {
+ if (!relation.isOnToken())
+ continue;
+ 
+ assert !relation.isMultiColumn() : Unexpectedly got 
multi-column token relation;
  SingleColumnRelation singleColumnRelation = 
(SingleColumnRelation) relation;
- if (singleColumnRelation.onToken  

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: 8df6c93bc50b694c67c8c631904d1cae469331ce
Parents: cd9da44 58e6a1d
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Feb 18 11:31:42 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Feb 18 11:31:42 2015 -0600

--
 CHANGES.txt   | 3 +++
 src/java/org/apache/cassandra/db/ColumnFamily.java| 7 ++-
 .../apache/cassandra/service/pager/AbstractQueryPager.java| 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8df6c93b/CHANGES.txt
--
diff --cc CHANGES.txt
index 5ef5376,48751d9..2666eb6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,113 -1,11 +1,116 @@@
 -2.0.13:
 +2.1.4
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 +Merged from 2.0:
+  * Fix AssertionError when querying a DESC clustering ordered
+table with ASC ordering and paging (CASSANDRA-8767)
+  * AssertionError: Memory was freed when running cleanup (CASSANDRA-8716)
   * Make it possible to set max_sstable_age to fractional days (CASSANDRA-8406)
 - * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate() 
(CASSANDRA-8748)
   * Fix some multi-column relations with indexes on some clustering
 columns (CASSANDRA-8275)
 + * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate() 
(CASSANDRA-8748)
 + * Throw OOM if allocating memory fails to return a valid pointer 
(CASSANDRA-8726)
 + * Fix SSTableSimpleUnsortedWriter ConcurrentModificationException 
(CASSANDRA-8619)
 +
 +
 +2.1.3
 + * Fix HSHA/offheap_objects corruption (CASSANDRA-8719)
 + * Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
 + * Don't use the shared ref in sstableloader (CASSANDRA-8704)
 + * Purge internal prepared statements if related tables or
 +   keyspaces are dropped (CASSANDRA-8693)
 + * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638)
 + * Stop compactions before exiting offline tools (CASSANDRA-8623)
 + * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933)
 + * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)
 + * Safer Resource Management (CASSANDRA-7705)
 + * Make sure we compact highly overlapping cold sstables with
 +   STCS (CASSANDRA-8635)
 + * rpc_interface and listen_interface generate NPE on startup when specified
 +   interface doesn't exist (CASSANDRA-8677)
 + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms 
(CASSANDRA-8514)
 + * Switch from yammer metrics for nodetool cf/proxy histograms 
(CASSANDRA-8662)
 + * Make sure we don't add tmplink files to the compaction
 +   strategy (CASSANDRA-8580)
 + * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
 + * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6706)
 + * Add tooling to detect hot partitions (CASSANDRA-7974)
 + * Fix cassandra-stress user-mode truncation of partition generation 
(CASSANDRA-8608)
 + * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)
 + * Don't allow starting multiple inc repairs on the same sstables 
(CASSANDRA-8316)
 + * Invalidate prepared BATCH statements when related tables
 +   or keyspaces are dropped (CASSANDRA-8652)
 + * Fix missing results in secondary index queries on collections
 +   with ALLOW FILTERING (CASSANDRA-8421)
 + * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627)
 + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
 + * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
 + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
 + * Don't reuse the same cleanup strategy 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: 9ad79786372980cc7a4ef22d67b2bdedf0f3e88d
Parents: 7747463 93769b3
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Feb 17 10:29:15 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Feb 17 10:29:15 2015 +0100

--
 CHANGES.txt |  1 +
 .../DateTieredCompactionStrategyOptions.java| 11 +++
 .../DateTieredCompactionStrategyTest.java   | 31 
 3 files changed, 38 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ad79786/CHANGES.txt
--
diff --cc CHANGES.txt
index a35fa42,2052f70..5ef5376
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,112 -1,8 +1,113 @@@
 -2.0.13:
 +2.1.4
 + * Fix SSTableRewriter cleanup (CASSANDRA-8802)
 + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
 + * 'nodetool info' prints exception against older node (CASSANDRA-8796)
 + * Ensure SSTableReader.last corresponds exactly with the file end 
(CASSANDRA-8750)
 + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
 + * Enforce SSTableReader.first/last (CASSANDRA-8744)
 + * Cleanup SegmentedFile API (CASSANDRA-8749)
 + * Avoid overlap with early compaction replacement (CASSANDRA-8683)
 + * Safer Resource Management++ (CASSANDRA-8707)
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
 +Merged from 2.0:
+  * Make it possible to set max_sstable_age to fractional days (CASSANDRA-8406)
 - * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate() 
(CASSANDRA-8748)
   * Fix some multi-column relations with indexes on some clustering
 columns (CASSANDRA-8275)
 + * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate() 
(CASSANDRA-8748)
 + * Throw OOM if allocating memory fails to return a valid pointer 
(CASSANDRA-8726)
 + * Fix SSTableSimpleUnsortedWriter ConcurrentModificationException 
(CASSANDRA-8619)
 +
 +
 +2.1.3
 + * Fix HSHA/offheap_objects corruption (CASSANDRA-8719)
 + * Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
 + * Don't use the shared ref in sstableloader (CASSANDRA-8704)
 + * Purge internal prepared statements if related tables or
 +   keyspaces are dropped (CASSANDRA-8693)
 + * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638)
 + * Stop compactions before exiting offline tools (CASSANDRA-8623)
 + * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933)
 + * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)
 + * Safer Resource Management (CASSANDRA-7705)
 + * Make sure we compact highly overlapping cold sstables with
 +   STCS (CASSANDRA-8635)
 + * rpc_interface and listen_interface generate NPE on startup when specified
 +   interface doesn't exist (CASSANDRA-8677)
 + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms 
(CASSANDRA-8514)
 + * Switch from yammer metrics for nodetool cf/proxy histograms 
(CASSANDRA-8662)
 + * Make sure we don't add tmplink files to the compaction
 +   strategy (CASSANDRA-8580)
 + * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
 + * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6706)
 + * Add tooling to detect hot partitions (CASSANDRA-7974)
 + * Fix cassandra-stress user-mode truncation of partition generation 
(CASSANDRA-8608)
 + * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)
 + * Don't allow starting multiple inc repairs on the same sstables 
(CASSANDRA-8316)
 + * Invalidate prepared BATCH statements when related tables
 +   or keyspaces are dropped (CASSANDRA-8652)
 + * Fix missing results in secondary index queries on collections
 +   with ALLOW FILTERING (CASSANDRA-8421)
 + * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627)
 + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
 + * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
 + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
 + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
 + * Fix case-sensitivity of index name on CREATE and DROP INDEX
 +   statements (CASSANDRA-8365)
 + * Better detection/logging for corruption in compressed sstables 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 77474639818246ee4a72ea5b2211ddc11c484567
Parents: 26c2049 782b0b6
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Feb 13 17:05:27 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Feb 13 17:05:27 2015 -0600

--
 doc/native_protocol_v1.spec | 136 +-
 doc/native_protocol_v2.spec | 137 +-
 doc/native_protocol_v3.spec | 155 +--
 3 files changed, 372 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/77474639/doc/native_protocol_v1.spec
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/77474639/doc/native_protocol_v2.spec
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/77474639/doc/native_protocol_v3.spec
--
diff --cc doc/native_protocol_v3.spec
index 89a99ad,000..1d35d50
mode 100644,00..100644
--- a/doc/native_protocol_v3.spec
+++ b/doc/native_protocol_v3.spec
@@@ -1,916 -1,0 +1,1027 @@@
 +
 + CQL BINARY PROTOCOL v3
 +
 +
 +Table of Contents
 +
 +  1. Overview
 +  2. Frame header
 +2.1. version
 +2.2. flags
 +2.3. stream
 +2.4. opcode
 +2.5. length
 +  3. Notations
 +  4. Messages
 +4.1. Requests
 +  4.1.1. STARTUP
 +  4.1.2. AUTH_RESPONSE
 +  4.1.3. OPTIONS
 +  4.1.4. QUERY
 +  4.1.5. PREPARE
 +  4.1.6. EXECUTE
 +  4.1.7. BATCH
 +  4.1.8. REGISTER
 +4.2. Responses
 +  4.2.1. ERROR
 +  4.2.2. READY
 +  4.2.3. AUTHENTICATE
 +  4.2.4. SUPPORTED
 +  4.2.5. RESULT
 +4.2.5.1. Void
 +4.2.5.2. Rows
 +4.2.5.3. Set_keyspace
 +4.2.5.4. Prepared
 +4.2.5.5. Schema_change
 +  4.2.6. EVENT
 +  4.2.7. AUTH_CHALLENGE
 +  4.2.8. AUTH_SUCCESS
 +  5. Compression
-   6. Collection types
-   7. User Defined and tuple types
++  6. Data Type Serialization Formats
++  7. User Defined Type Serialization
 +  8. Result paging
 +  9. Error codes
 +  10. Changes from v2
 +
 +
 +1. Overview
 +
 +  The CQL binary protocol is a frame based protocol. Frames are defined as:
 +
 +  0 8162432 40
 +  +-+-+-+-+-+
 +  | version |  flags  |  stream   | opcode  |
 +  +-+-+-+-+-+
 +  |length |
 +  +-+-+-+-+
 +  |   |
 +  ....  body ...  .
 +  .   .
 +  .   .
 +  +
 +
 +  The protocol is big-endian (network byte order).
 +
 +  Each frame contains a fixed size header (9 bytes) followed by a variable 
size
 +  body. The header is described in Section 2. The content of the body depends
 +  on the header opcode value (the body can in particular be empty for some
 +  opcode values). The list of allowed opcode is defined Section 2.3 and the
 +  details of each corresponding message is described Section 4.
 +
 +  The protocol distinguishes 2 types of frames: requests and responses. 
Requests
 +  are those frame sent by the clients to the server, response are the ones 
sent
 +  by the server. Note however that the protocol supports server pushes 
(events)
 +  so responses does not necessarily come right after a client request.
 +
 +  Note to client implementors: clients library should always assume that the
 +  body of a given frame may contain more data than what is described in this
 +  document. It will however always be safe to ignore the remaining of the 
frame
 +  body in such cases. The reason is that this may allow to sometimes extend 
the
 +  protocol with optional features without needing to change the protocol
 +  version.
 +
 +
 +
 +2. Frame header
 +
 +2.1. version
 +
 +  The version is a single byte that indicate both the direction of the message
 +  (request or response) and the version of the protocol in use. The up-most 
bit
 +  of version is used to define the direction of the message: 0 indicates a
 +  request, 1 indicates a responses. This can be useful for protocol analyzers 
to
 +  distinguish the nature 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 07ffe1b12eb68cd51fdfc8715ffa7df14381df3a
Parents: ad91d41 9649594
Author: Tyler Hobbs tylerho...@apache.org
Authored: Tue Feb 10 15:09:39 2015 -0600
Committer: Tyler Hobbs tylerho...@apache.org
Committed: Tue Feb 10 15:09:39 2015 -0600

--
 CHANGES.txt |  3 +
 .../cql3/statements/SelectStatement.java| 58 ++--
 .../cassandra/cql3/MultiColumnRelationTest.java | 94 
 .../cql3/SingleColumnRelationTest.java  | 40 +
 4 files changed, 170 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/07ffe1b1/CHANGES.txt
--
diff --cc CHANGES.txt
index 92ee5d1,861730f..2113349
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,96 -1,6 +1,99 @@@
 -2.0.13:
 +2.1.4
 + * Write partition size estimates into a system table (CASSANDRA-7688)
 + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
 +   (CASSANDRA-8154)
++Merged from 2.0:
+  * Fix some multi-column relations with indexes on some clustering
+columns (CASSANDRA-8275)
 +
 +
 +2.1.3
 + * Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
 + * Don't use the shared ref in sstableloader (CASSANDRA-8704)
 + * Purge internal prepared statements if related tables or
 +   keyspaces are dropped (CASSANDRA-8693)
 + * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638)
 + * Stop compactions before exiting offline tools (CASSANDRA-8623)
 + * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933)
 + * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)
 + * Safer Resource Management (CASSANDRA-7705)
 + * Make sure we compact highly overlapping cold sstables with
 +   STCS (CASSANDRA-8635)
 + * rpc_interface and listen_interface generate NPE on startup when specified
 +   interface doesn't exist (CASSANDRA-8677)
 + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms 
(CASSANDRA-8514)
 + * Switch from yammer metrics for nodetool cf/proxy histograms 
(CASSANDRA-8662)
 + * Make sure we don't add tmplink files to the compaction
 +   strategy (CASSANDRA-8580)
 + * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
 + * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6706)
 + * Add tooling to detect hot partitions (CASSANDRA-7974)
 + * Fix cassandra-stress user-mode truncation of partition generation 
(CASSANDRA-8608)
 + * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)
 + * Don't allow starting multiple inc repairs on the same sstables 
(CASSANDRA-8316)
 + * Invalidate prepared BATCH statements when related tables
 +   or keyspaces are dropped (CASSANDRA-8652)
 + * Fix missing results in secondary index queries on collections
 +   with ALLOW FILTERING (CASSANDRA-8421)
 + * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627)
 + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
 + * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
 + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
 + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
 + * Fix case-sensitivity of index name on CREATE and DROP INDEX
 +   statements (CASSANDRA-8365)
 + * Better detection/logging for corruption in compressed sstables 
(CASSANDRA-8192)
 + * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
 + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
 + * Properly calculate expected write size during compaction (CASSANDRA-8532)
 + * Invalidate affected prepared statements when a table's columns
 +   are altered (CASSANDRA-7910)
 + * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
 + * Fix regression in SSTableRewriter causing some rows to become unreadable 
 +   during compaction (CASSANDRA-8429)
 + * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)
 + * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
 +   is disabled (CASSANDRA-8288)
 + * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
 + * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
 + * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
 + * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
 + * Make sstablescrub check leveled 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 1512264703bc460baa804201a348f6ae82154157
Parents: 5e95684 08deff7
Author: Tyler Hobbs ty...@datastax.com
Authored: Fri Feb 6 16:38:06 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Fri Feb 6 16:38:06 2015 -0600

--
 doc/cql3/CQL.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
NEWS.txt
src/java/org/apache/cassandra/cql3/Lists.java


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

Branch: refs/heads/cassandra-2.1
Commit: dc74ae67a6d56ada214d5296ea01efe0ece54a70
Parents: 8c003a2 2d8bddb
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Feb 4 10:54:52 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Feb 4 10:54:52 2015 -0600

--
 CHANGES.txt   | 1 +
 NEWS.txt  | 9 +
 src/java/org/apache/cassandra/cql3/Lists.java | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc74ae67/CHANGES.txt
--
diff --cc CHANGES.txt
index b95fd3a,375dcfe..f70db7a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,90 -1,5 +1,91 @@@
 -2.0.13:
 +2.1.3
 + * Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
 + * Don't use the shared ref in sstableloader (CASSANDRA-8704)
 + * Purge internal prepared statements if related tables or
 +   keyspaces are dropped (CASSANDRA-8693)
 + * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638)
 + * Stop compactions before exiting offline tools (CASSANDRA-8623)
 + * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933)
 + * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)
 + * Safer Resource Management (CASSANDRA-7705)
 + * Make sure we compact highly overlapping cold sstables with
 +   STCS (CASSANDRA-8635)
 + * rpc_interface and listen_interface generate NPE on startup when specified
 +   interface doesn't exist (CASSANDRA-8677)
 + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms 
(CASSANDRA-8514)
 + * Switch from yammer metrics for nodetool cf/proxy histograms 
(CASSANDRA-8662)
 + * Make sure we don't add tmplink files to the compaction
 +   strategy (CASSANDRA-8580)
 + * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
 + * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Add tooling to detect hot partitions (CASSANDRA-7974)
 + * Fix cassandra-stress user-mode truncation of partition generation 
(CASSANDRA-8608)
 + * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)
 + * Don't allow starting multiple inc repairs on the same sstables 
(CASSANDRA-8316)
 + * Invalidate prepared BATCH statements when related tables
 +   or keyspaces are dropped (CASSANDRA-8652)
 + * Fix missing results in secondary index queries on collections
 +   with ALLOW FILTERING (CASSANDRA-8421)
 + * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627)
 + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
 + * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
 + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
 + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
 + * Fix case-sensitivity of index name on CREATE and DROP INDEX
 +   statements (CASSANDRA-8365)
 + * Better detection/logging for corruption in compressed sstables 
(CASSANDRA-8192)
 + * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
 + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
 + * Properly calculate expected write size during compaction (CASSANDRA-8532)
 + * Invalidate affected prepared statements when a table's columns
 +   are altered (CASSANDRA-7910)
 + * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
 + * Fix regression in SSTableRewriter causing some rows to become unreadable 
 +   during compaction (CASSANDRA-8429)
 + * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)
 + * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
 +   is disabled (CASSANDRA-8288)
 + * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
 + * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
 + * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
 + * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
 + * Make sstablescrub check leveled manifest again (CASSANDRA-8432)
 + * Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
 + * Disable mmap on Windows (CASSANDRA-6993)
 + * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253)
 + * Add auth support to cassandra-stress (CASSANDRA-7985)
 + * Fix 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
pylib/cqlshlib/cql3handling.py


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

Branch: refs/heads/cassandra-2.1
Commit: bcfb652b1a6dece77cce3e09ece2d0ef6fec9598
Parents: dc74ae6 0f5ab57
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Feb 4 11:26:55 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Feb 4 11:26:55 2015 -0600

--
 CHANGES.txt  | 1 +
 pylib/cqlshlib/cql3handling.py   | 2 +-
 pylib/cqlshlib/helptopics.py | 3 ++-
 src/java/org/apache/cassandra/cql3/Cql.g | 6 --
 .../apache/cassandra/cql3/statements/UpdateStatement.java| 8 +---
 5 files changed, 13 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcfb652b/CHANGES.txt
--
diff --cc CHANGES.txt
index f70db7a,f4c96dc..192939b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,90 -1,5 +1,91 @@@
 -2.0.13:
 +2.1.3
 + * Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
 + * Don't use the shared ref in sstableloader (CASSANDRA-8704)
 + * Purge internal prepared statements if related tables or
 +   keyspaces are dropped (CASSANDRA-8693)
 + * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638)
 + * Stop compactions before exiting offline tools (CASSANDRA-8623)
 + * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933)
 + * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)
 + * Safer Resource Management (CASSANDRA-7705)
 + * Make sure we compact highly overlapping cold sstables with
 +   STCS (CASSANDRA-8635)
 + * rpc_interface and listen_interface generate NPE on startup when specified
 +   interface doesn't exist (CASSANDRA-8677)
 + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms 
(CASSANDRA-8514)
 + * Switch from yammer metrics for nodetool cf/proxy histograms 
(CASSANDRA-8662)
 + * Make sure we don't add tmplink files to the compaction
 +   strategy (CASSANDRA-8580)
 + * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
 + * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Add tooling to detect hot partitions (CASSANDRA-7974)
 + * Fix cassandra-stress user-mode truncation of partition generation 
(CASSANDRA-8608)
 + * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)
 + * Don't allow starting multiple inc repairs on the same sstables 
(CASSANDRA-8316)
 + * Invalidate prepared BATCH statements when related tables
 +   or keyspaces are dropped (CASSANDRA-8652)
 + * Fix missing results in secondary index queries on collections
 +   with ALLOW FILTERING (CASSANDRA-8421)
 + * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627)
 + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
 + * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
 + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
 + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
 + * Fix case-sensitivity of index name on CREATE and DROP INDEX
 +   statements (CASSANDRA-8365)
 + * Better detection/logging for corruption in compressed sstables 
(CASSANDRA-8192)
 + * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
 + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
 + * Properly calculate expected write size during compaction (CASSANDRA-8532)
 + * Invalidate affected prepared statements when a table's columns
 +   are altered (CASSANDRA-7910)
 + * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
 + * Fix regression in SSTableRewriter causing some rows to become unreadable 
 +   during compaction (CASSANDRA-8429)
 + * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)
 + * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
 +   is disabled (CASSANDRA-8288)
 + * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
 + * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
 + * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
 + * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
 + * Make sstablescrub check leveled manifest again (CASSANDRA-8432)
 + * Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
 + * Disable mmap on Windows 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 90144989fe49ee0a1c91bcec4c6ad9fc8ce9136b
Parents: bcfb652 1467b9f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Feb 5 02:54:32 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Feb 5 02:54:32 2015 +0300

--
 doc/cql3/CQL.textile | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90144989/doc/cql3/CQL.textile
--
diff --cc doc/cql3/CQL.textile
index 3b322d5,ab7da50..8f0f511
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -327,7 -327,9 +327,8 @@@ Table creation supports the following o
  |@bloom_filter_fp_chance@ | _simple_ | 0.00075 | The target 
probability of false positive of the sstable bloom filters. Said bloom filters 
will be sized to provide the provided probability (thus lowering this value 
impact the size of bloom filters in-memory and on-disk)|
  |@compaction@ | _map_| _see below_ | The compaction 
options to use, see below.|
  |@compression@| _map_| _see below_ | Compression options, 
see below. |
 -|@replicate_on_write@ | _simple_ | true| Whether to replicate 
data on write. This can only be set to false for tables with counters values. 
Disabling this is dangerous and can result in random lose of counters, don't 
disable unless you are sure to know what you are doing|
  |@caching@| _simple_ | keys_only   | Whether to cache 
keys (key cache) and/or rows (row cache) for this table. Valid values are: 
@all@, @keys_only@, @rows_only@ and @none@. |
+ |@default_time_to_live@   | _simple_ | 0   | The default 
expiration time (TTL) in seconds for a table.|
  
  
  h4(#compactionOptions). @compaction@ options

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java


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

Branch: refs/heads/cassandra-2.1
Commit: 33297bad040c660c8cd5ea6378189fffb100b0ab
Parents: 1bb0c14 b077cda
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jan 27 01:44:54 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jan 27 01:44:54 2015 +0300

--
 CHANGES.txt |  2 +-
 .../cassandra/db/ArrayBackedSortedColumns.java  | 54 +++-
 2 files changed, 20 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/33297bad/CHANGES.txt
--
diff --cc CHANGES.txt
index 7673a3b,792f8c1..4d50496
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,77 -1,9 +1,77 @@@
 -2.0.13:
 - * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
 +2.1.3
 + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms 
(CASSANDRA-8514)
 + * Switch from yammer metrics for nodetool cf/proxy histograms 
(CASSANDRA-8662)
 + * Make sure we don't add tmplink files to the compaction
 +   strategy (CASSANDRA-8580)
 + * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
 + * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Add tooling to detect hot partitions (CASSANDRA-7974)
 + * Fix cassandra-stress user-mode truncation of partition generation 
(CASSANDRA-8608)
 + * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)
 + * Don't allow starting multiple inc repairs on the same sstables 
(CASSANDRA-8316)
 + * Invalidate prepared BATCH statements when related tables
 +   or keyspaces are dropped (CASSANDRA-8652)
 + * Fix missing results in secondary index queries on collections
 +   with ALLOW FILTERING (CASSANDRA-8421)
 + * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627)
 + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
 + * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
 + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
 + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
 + * Fix case-sensitivity of index name on CREATE and DROP INDEX
 +   statements (CASSANDRA-8365)
 + * Better detection/logging for corruption in compressed sstables 
(CASSANDRA-8192)
 + * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
 + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
 + * Properly calculate expected write size during compaction (CASSANDRA-8532)
 + * Invalidate affected prepared statements when a table's columns
 +   are altered (CASSANDRA-7910)
 + * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
 + * Fix regression in SSTableRewriter causing some rows to become unreadable 
 +   during compaction (CASSANDRA-8429)
 + * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)
 + * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
 +   is disabled (CASSANDRA-8288)
 + * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
 + * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
 + * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
 + * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
 + * Make sstablescrub check leveled manifest again (CASSANDRA-8432)
 + * Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
 + * Disable mmap on Windows (CASSANDRA-6993)
 + * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253)
 + * Add auth support to cassandra-stress (CASSANDRA-7985)
 + * Fix ArrayIndexOutOfBoundsException when generating error message
 +   for some CQL syntax errors (CASSANDRA-8455)
 + * Scale memtable slab allocation logarithmically (CASSANDRA-7882)
 + * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
 + * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
 + * Ensure memtable flush cannot expire commit log entries from its future 
(CASSANDRA-8383)
 + * Make read defrag async to reclaim memtables (CASSANDRA-8459)
 + * Remove tmplink files for offline compactions (CASSANDRA-8321)
 + * Reduce maxHintsInProgress (CASSANDRA-8415)
 + * BTree updates may call provided update function twice (CASSANDRA-8018)
 + * Release sstable references after 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java


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

Branch: refs/heads/cassandra-2.1
Commit: 06cd494c1496ec96886ed41ff3207847631986c9
Parents: 0c2eaa9 cc5fb19
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Jan 22 03:17:55 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Jan 22 03:17:55 2015 +0300

--
 CHANGES.txt |  1 +
 .../cassandra/db/ArrayBackedSortedColumns.java  | 96 +--
 .../apache/cassandra/db/AtomicBTreeColumns.java |  5 +
 .../org/apache/cassandra/db/ColumnFamily.java   |  6 ++
 .../apache/cassandra/db/ColumnFamilyStore.java  |  7 +-
 .../cassandra/utils/BatchRemoveIterator.java| 32 +++
 .../db/ArrayBackedSortedColumnsTest.java| 99 +++-
 7 files changed, 236 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/06cd494c/CHANGES.txt
--
diff --cc CHANGES.txt
index 9cd8189,0d08cce..a94ca04
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,70 -1,9 +1,71 @@@
 -2.0.13:
 - * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
 +2.1.3
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Add tooling to detect hot partitions (CASSANDRA-7974)
 + * Fix cassandra-stress user-mode truncation of partition generation 
(CASSANDRA-8608)
 + * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267)
 + * Don't allow starting multiple inc repairs on the same sstables 
(CASSANDRA-8316)
 + * Invalidate prepared BATCH statements when related tables
 +   or keyspaces are dropped (CASSANDRA-8652)
 + * Fix missing results in secondary index queries on collections
 +   with ALLOW FILTERING (CASSANDRA-8421)
 + * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627)
 + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
 + * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
 + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
 + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
 + * Fix case-sensitivity of index name on CREATE and DROP INDEX
 +   statements (CASSANDRA-8365)
 + * Better detection/logging for corruption in compressed sstables 
(CASSANDRA-8192)
 + * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
 + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
 + * Properly calculate expected write size during compaction (CASSANDRA-8532)
 + * Invalidate affected prepared statements when a table's columns
 +   are altered (CASSANDRA-7910)
 + * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
 + * Fix regression in SSTableRewriter causing some rows to become unreadable 
 +   during compaction (CASSANDRA-8429)
 + * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)
 + * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
 +   is disabled (CASSANDRA-8288)
 + * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
 + * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
 + * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
 + * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
 + * Make sstablescrub check leveled manifest again (CASSANDRA-8432)
 + * Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
 + * Disable mmap on Windows (CASSANDRA-6993)
 + * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253)
 + * Add auth support to cassandra-stress (CASSANDRA-7985)
 + * Fix ArrayIndexOutOfBoundsException when generating error message
 +   for some CQL syntax errors (CASSANDRA-8455)
 + * Scale memtable slab allocation logarithmically (CASSANDRA-7882)
 + * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
 + * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
 + * Ensure memtable flush cannot expire commit log entries from its future 
(CASSANDRA-8383)
 + * Make read defrag async to reclaim memtables (CASSANDRA-8459)
 + * Remove tmplink files for offline compactions (CASSANDRA-8321)
 + * Reduce maxHintsInProgress (CASSANDRA-8415)
 + * BTree updates may call provided update function twice 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/tools/BulkLoader.java


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

Branch: refs/heads/cassandra-2.1
Commit: cc0831c608d14747b809027144710003cf38a98a
Parents: d469b4b ae380da
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jan 20 00:46:52 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jan 20 00:46:52 2015 +0300

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/tools/BulkLoader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc0831c6/CHANGES.txt
--
diff --cc CHANGES.txt
index 0ff62d2,6604783..494376d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,59 -1,8 +1,60 @@@
 -2.0.13:
 +2.1.3
 + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618)
 + * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
 + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
 + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
 + * Fix case-sensitivity of index name on CREATE and DROP INDEX
 +   statements (CASSANDRA-8365)
 + * Better detection/logging for corruption in compressed sstables 
(CASSANDRA-8192)
 + * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
 + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
 + * Properly calculate expected write size during compaction (CASSANDRA-8532)
 + * Invalidate affected prepared statements when a table's columns
 +   are altered (CASSANDRA-7910)
 + * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
 + * Fix regression in SSTableRewriter causing some rows to become unreadable 
 +   during compaction (CASSANDRA-8429)
 + * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)
 + * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
 +   is disabled (CASSANDRA-8288)
 + * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
 + * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
 + * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
 + * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
 + * Make sstablescrub check leveled manifest again (CASSANDRA-8432)
 + * Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
 + * Disable mmap on Windows (CASSANDRA-6993)
 + * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253)
 + * Add auth support to cassandra-stress (CASSANDRA-7985)
 + * Fix ArrayIndexOutOfBoundsException when generating error message
 +   for some CQL syntax errors (CASSANDRA-8455)
 + * Scale memtable slab allocation logarithmically (CASSANDRA-7882)
 + * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
 + * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
 + * Ensure memtable flush cannot expire commit log entries from its future 
(CASSANDRA-8383)
 + * Make read defrag async to reclaim memtables (CASSANDRA-8459)
 + * Remove tmplink files for offline compactions (CASSANDRA-8321)
 + * Reduce maxHintsInProgress (CASSANDRA-8415)
 + * BTree updates may call provided update function twice (CASSANDRA-8018)
 + * Release sstable references after anticompaction (CASSANDRA-8386)
 + * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
 + * Fix high size calculations for prepared statements (CASSANDRA-8231)
 + * Centralize shared executors (CASSANDRA-8055)
 + * Fix filtering for CONTAINS (KEY) relations on frozen collection
 +   clustering columns when the query is restricted to a single
 +   partition (CASSANDRA-8203)
 + * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
 + * Add more log info if readMeter is null (CASSANDRA-8238)
 + * add check of the system wall clock time at startup (CASSANDRA-8305)
 + * Support for frozen collections (CASSANDRA-7859)
 + * Fix overflow on histogram computation (CASSANDRA-8028)
 + * Have paxos reuse the timestamp generation of normal queries 
(CASSANDRA-7801)
 + * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
 + * Improve JBOD disk utilization (CASSANDRA-7386)
 + * Log failed host when preparing incremental repair (CASSANDRA-8228)
 + * Force config client mode in CQLSSTableWriter (CASSANDRA-8281)
 +Merged from 2.0:
+  * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
 -
 -
 -2.0.12:
   * Use 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: e4e3fd91cdcb6cdad9c72bdb3214f4105971e964
Parents: a3234e1 61bd688
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Jan 17 03:41:34 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Jan 17 03:41:34 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4e3fd91/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4e3fd91/src/java/org/apache/cassandra/service/StorageProxy.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[aleksey]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: f88864cc6b56c95008896b6cb3e70cb2b8303a9a
Parents: e4e3fd9 ce207cb
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Jan 17 04:07:15 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Jan 17 04:07:15 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f88864cc/src/java/org/apache/cassandra/service/StorageProxy.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[slebresne]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 686b8104ca7469aee18b9ad4fa8b181e84dca427
Parents: 064144b e16d76d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Jan 14 18:15:36 2015 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Jan 14 18:15:36 2015 +0100

--
 .../db/columniterator/IndexedSliceReader.java   | 20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/686b8104/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
--

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/cassandra-2.1
Commit: 7804a53c90b24820570cbc5c82043517489abbe5
Parents: 686b810 90780b5
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Jan 14 11:34:28 2015 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Jan 14 11:34:28 2015 -0600

--
 CHANGES.txt  |  2 ++
 .../db/index/composites/CompositesSearcher.java  | 11 +--
 2 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7804a53c/CHANGES.txt
--
diff --cc CHANGES.txt
index 8f312a7,45b2b9c..d2802ad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,59 -1,8 +1,61 @@@
 -2.0.12:
 +2.1.3
 + * Fix NPE when passing wrong argument in ALTER TABLE statement 
(CASSANDRA-8355)
 + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599)
 + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537)
 + * Fix case-sensitivity of index name on CREATE and DROP INDEX
 +   statements (CASSANDRA-8365)
 + * Better detection/logging for corruption in compressed sstables 
(CASSANDRA-8192)
 + * Use the correct repairedAt value when closing writer (CASSANDRA-8570)
 + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512)
 + * Properly calculate expected write size during compaction (CASSANDRA-8532)
 + * Invalidate affected prepared statements when a table's columns
 +   are altered (CASSANDRA-7910)
 + * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
 + * Fix regression in SSTableRewriter causing some rows to become unreadable 
 +   during compaction (CASSANDRA-8429)
 + * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)
 + * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
 +   is disabled (CASSANDRA-8288)
 + * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
 + * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
 + * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
 + * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
 + * Make sstablescrub check leveled manifest again (CASSANDRA-8432)
 + * Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
 + * Disable mmap on Windows (CASSANDRA-6993)
 + * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253)
 + * Add auth support to cassandra-stress (CASSANDRA-7985)
 + * Fix ArrayIndexOutOfBoundsException when generating error message
 +   for some CQL syntax errors (CASSANDRA-8455)
 + * Scale memtable slab allocation logarithmically (CASSANDRA-7882)
 + * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
 + * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
 + * Ensure memtable flush cannot expire commit log entries from its future 
(CASSANDRA-8383)
 + * Make read defrag async to reclaim memtables (CASSANDRA-8459)
 + * Remove tmplink files for offline compactions (CASSANDRA-8321)
 + * Reduce maxHintsInProgress (CASSANDRA-8415)
 + * BTree updates may call provided update function twice (CASSANDRA-8018)
 + * Release sstable references after anticompaction (CASSANDRA-8386)
 + * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
 + * Fix high size calculations for prepared statements (CASSANDRA-8231)
 + * Centralize shared executors (CASSANDRA-8055)
 + * Fix filtering for CONTAINS (KEY) relations on frozen collection
 +   clustering columns when the query is restricted to a single
 +   partition (CASSANDRA-8203)
 + * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
 + * Add more log info if readMeter is null (CASSANDRA-8238)
 + * add check of the system wall clock time at startup (CASSANDRA-8305)
 + * Support for frozen collections (CASSANDRA-7859)
 + * Fix overflow on histogram computation (CASSANDRA-8028)
 + * Have paxos reuse the timestamp generation of normal queries 
(CASSANDRA-7801)
 + * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
 + * Improve JBOD disk utilization (CASSANDRA-7386)
 + * Log failed host when preparing incremental repair (CASSANDRA-8228)
 + * Force config client mode in CQLSSTableWriter (CASSANDRA-8281)
 +Merged from 2.0:
+  * Use more efficient slice size for querying internal secondary
+index tables (CASSANDRA-8550)
   * Fix potentially returning deleted rows with range tombstone 
(CASSANDRA-8558)
 - * Make sure we unmark 

[2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[marcuse]

Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 739f9ce380917be5c1a839d132903479c4c7aa0c
Parents: 7e6d9eb c5ccdb7
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Jan 14 09:50:12 2015 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Jan 14 09:50:12 2015 +0100

--

--