[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-08-15 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: de2c449b716e30ef28c9243b48dc1fb47388026c
Parents: e72dc29 6528fbf
Author: Aleksey Yeschenko 
Authored: Mon Aug 15 18:32:36 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Aug 15 18:32:36 2016 +0100

--

--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-08-11 Thread yukim 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 02f48c86591939e3cd20157af867dfec94ca443b
Parents: 6a846e6 19245e5
Author: Yuki Morishita 
Authored: Thu Aug 11 11:06:20 2016 -0500
Committer: Yuki Morishita 
Committed: Thu Aug 11 11:06:20 2016 -0500

--
 CHANGES.txt|  1 +
 .../cassandra/utils/RMIServerSocketFactoryImpl.java| 13 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02f48c86/CHANGES.txt
--
diff --cc CHANGES.txt
index bca8879,0a1d406..29a6c50
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,9 +1,13 @@@
 -3.0.9
 +3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 - * Backport CASSANDRA-12002 (CASSANDRA-12177)
   * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 - * Fix potential bad messaging service message for paged range reads
 -   within mixed-version 3.x clusters (CASSANDRA-12249)
   * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
   * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
   * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02f48c86/src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java
--
diff --cc src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java
index 4ac4a39,6444a65..9baf0c7
--- a/src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java
+++ b/src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java
@@@ -38,9 -33,18 +39,17 @@@ public class RMIServerSocketFactoryImp
  
  public ServerSocket createServerSocket(final int pPort) throws IOException
  {
 -ServerSocket socket = ServerSocketFactory.getDefault()
 - .createServerSocket(pPort, 
0, InetAddress.getLoopbackAddress());
 +ServerSocket socket = 
ServerSocketFactory.getDefault().createServerSocket(pPort, 0, bindAddress);
- socket.setReuseAddress(true);
- return socket;
+ try
+ {
+ socket.setReuseAddress(true);
+ return socket;
+ }
+ catch (SocketException e)
+ {
+ socket.close();
+ throw e;
+ }
  }
  
  public boolean equals(Object obj)

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-08-11 Thread yukim 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 6a846e6f8443280f41a121f318ca192c8d0d97ea
Parents: 15fd71f de86ab1
Author: Yuki Morishita 
Authored: Thu Aug 11 10:11:50 2016 -0500
Committer: Yuki Morishita 
Committed: Thu Aug 11 10:11:50 2016 -0500

--

--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-08-10 Thread stefania 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 15fd71f9a3b07bbac7a1182f2e6bffd32e79b955
Parents: 1fff069 05483a9
Author: Stefania Alborghetti 
Authored: Thu Aug 11 09:11:11 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Aug 11 09:11:11 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15fd71f9/CHANGES.txt
--
diff --cc CHANGES.txt
index 498868c,bd3bb75..bca8879
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,12 @@@
 -3.0.9
 +3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 - * Fix potential bad messaging service message for paged range reads
 -   within mixed-version 3.x clusters (CASSANDRA-12249)
   * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
   * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
   * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15fd71f9/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 86c8a8f,7e4ed41..2913dc9
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@@ -170,13 -164,14 +170,14 @@@ public class CompactionTask extends Abs
   AbstractCompactionStrategy.ScannerList scanners = 
strategy.getScanners(actuallyCompact);
   CompactionIterator ci = new 
CompactionIterator(compactionType, scanners.scanners, controller, nowInSec, 
taskId))
  {
- if (collector != null)
- collector.beginCompaction(ci);
  long lastCheckObsoletion = start;
  
 -if (!controller.cfs.getCompactionStrategyManager().isActive)
 +if (!controller.cfs.getCompactionStrategyManager().isActive())
  throw new 
CompactionInterruptedException(ci.getCompactionInfo());
  
+ if (collector != null)
+ collector.beginCompaction(ci);
+ 
  try (CompactionAwareWriter writer = 
getCompactionAwareWriter(cfs, getDirectories(), transaction, actuallyCompact))
  {
  estimatedKeys = writer.estimatedKeys();

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-08-08 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 02ebf875b1a07c79e18bc1f21878c51ed67cb9c4
Parents: ae816cb 676b6a8
Author: Aleksey Yeschenko 
Authored: Mon Aug 8 18:41:23 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Aug 8 18:41:23 2016 +0100

--

--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-08-05 Thread slebresne 
Merge branch 'cassandra-3.0' into cassandra-3.9

* cassandra-3.0:
  Ninja-fix test build


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

Branch: refs/heads/trunk
Commit: 4805108d849af722ea756eb5f15c02d6dee20f71
Parents: 7b10217 150307e
Author: Sylvain Lebresne 
Authored: Fri Aug 5 16:25:47 2016 +0200
Committer: Sylvain Lebresne 
Committed: Fri Aug 5 16:25:47 2016 +0200

--
 .../org/apache/cassandra/streaming/StreamTransferTaskTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4805108d/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-08-05 Thread slebresne 
Merge branch 'cassandra-3.0' into cassandra-3.9

* cassandra-3.0:
  NullPointerException during compaction on table with static columns


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

Branch: refs/heads/trunk
Commit: 21c92cab872d9dcbc2722c73555c9dddc4c30ece
Parents: 5e319bb b66e5a1
Author: Sylvain Lebresne 
Authored: Fri Aug 5 15:03:07 2016 +0200
Committer: Sylvain Lebresne 
Committed: Fri Aug 5 15:03:07 2016 +0200

--
 CHANGES.txt| 1 +
 .../cassandra/cql3/validation/entities/StaticColumnsTest.java  | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/21c92cab/CHANGES.txt
--
diff --cc CHANGES.txt
index bcfbdc9,046c8b3..289f370
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -3.0.9
 +3.9
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
   * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
   * Fix upgrade of super columns on thrift (CASSANDRA-12335)
   * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/21c92cab/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-08-03 Thread stefania 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 042e1f76a993bb8f14ce31a13bde421ed071
Parents: b603720 52be7ba
Author: Stefania Alborghetti 
Authored: Thu Aug 4 08:50:04 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Aug 4 08:50:04 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/042e1f76/CHANGES.txt
--
diff --cc CHANGES.txt
index 62a6e6f,f0ceb70..31d9434
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -3.0.9
 +3.9
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
   * Fix upgrade of super columns on thrift (CASSANDRA-12335)
   * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
   * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/042e1f76/src/java/org/apache/cassandra/metrics/TableMetrics.java
--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-08-03 Thread slebresne 
Merge branch 'cassandra-3.0' into cassandra-3.9

* cassandra-3.0:
  Super columns are broken after upgrading to 3.0 on thrift


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

Branch: refs/heads/trunk
Commit: 1323ad0fba0063b646eb0be5843956dd345159a4
Parents: 717c6d6 3431934
Author: Sylvain Lebresne 
Authored: Wed Aug 3 17:29:22 2016 +0200
Committer: Sylvain Lebresne 
Committed: Wed Aug 3 17:29:22 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1323ad0f/CHANGES.txt
--
diff --cc CHANGES.txt
index bb58e77,e8b8abb..0d79a9f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -3.0.9
 +3.9
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Fix upgrade of super columns on thrift (CASSANDRA-12335)
   * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
   * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
   * Exception when computing read-repair for range tombstones (CASSANDRA-12263)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1323ad0f/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-08-02 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 245fc2adee9351b187e14f115add2b9a9d879e83
Parents: f5078b1 c6cb31e
Author: Sam Tunnicliffe 
Authored: Tue Aug 2 09:14:15 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Tue Aug 2 09:14:15 2016 +0100

--
 .../apache/cassandra/index/CustomIndexTest.java | 38 
 1 file changed, 23 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/245fc2ad/test/unit/org/apache/cassandra/index/CustomIndexTest.java
--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-30 Thread snazy 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 5fb6f95859f3b08e1037439ce1fe1475434af1dd
Parents: 8e775ea 1823c84
Author: Robert Stupp 
Authored: Sat Jul 30 11:32:45 2016 +0200
Committer: Robert Stupp 
Committed: Sat Jul 30 11:32:45 2016 +0200

--
 .../apache/cassandra/db/ColumnFamilyStore.java  | 27 +---
 1 file changed, 18 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb6f958/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 62914a2,400fd36..9d31b60
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1337,15 -1224,24 +1337,24 @@@ public class ColumnFamilyStore implemen
  
  {
  long start = System.nanoTime();
- Memtable mt = data.getMemtableFor(opGroup, commitLogPosition);
- long timeDelta = mt.put(update, indexer, opGroup);
- DecoratedKey key = update.partitionKey();
- invalidateCachedPartition(key);
- metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), 
key.hashCode(), 1);
- StorageHook.instance.reportWrite(metadata.cfId, update);
- metric.writeLatency.addNano(System.nanoTime() - start);
- if(timeDelta < Long.MAX_VALUE)
- metric.colUpdateTimeDeltaHistogram.update(timeDelta);
 -Memtable mt = data.getMemtableFor(opGroup, replayPosition);
+ try
+ {
++Memtable mt = data.getMemtableFor(opGroup, commitLogPosition);
+ long timeDelta = mt.put(update, indexer, opGroup);
+ DecoratedKey key = update.partitionKey();
 -maybeUpdateRowCache(key);
++invalidateCachedPartition(key);
+ metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), 
key.hashCode(), 1);
++StorageHook.instance.reportWrite(metadata.cfId, update);
+ metric.writeLatency.addNano(System.nanoTime() - start);
+ if(timeDelta < Long.MAX_VALUE)
+ metric.colUpdateTimeDeltaHistogram.update(timeDelta);
+ }
+ catch (RuntimeException e)
+ {
+ throw new RuntimeException(e.getMessage()
 - + " for ks: "
 - + keyspace.getName() + 
", table: " + name, e);
++   + " for ks: "
++   + keyspace.getName() + ", table: " + 
name, e);
+ }
 -
  }
  
  /**

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-28 Thread slebresne 
Merge branch 'cassandra-3.0' into cassandra-3.9

* cassandra-3.0:
  Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness.


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

Branch: refs/heads/trunk
Commit: 68b3f6e71c37e343465884bebcc82c5866ea5b21
Parents: 561b07e a5cbb02
Author: Sylvain Lebresne 
Authored: Thu Jul 28 16:34:22 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jul 28 16:34:22 2016 +0200

--
 CHANGES.txt |  1 +
 .../ReplicationAwareTokenAllocatorTest.java | 15 ++
 test/unit/org/apache/cassandra/Util.java| 56 
 3 files changed, 72 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/68b3f6e7/CHANGES.txt
--
diff --cc CHANGES.txt
index 109411a,8f6997b..d6a9d16
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.9
 +3.9
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
   * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
   * Lost counter writes in compact table and static columns (CASSANDRA-12219)
   * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/68b3f6e7/test/unit/org/apache/cassandra/Util.java
--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-28 Thread slebresne 
Merge branch 'cassandra-3.0' into cassandra-3.9

* cassandra-3.0:
  Lost counter writes in compact table and static columns


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

Branch: refs/heads/trunk
Commit: f0fd9ad6c57fa21b145896c32c53540406e40a7d
Parents: d22e390 a11f210
Author: Sylvain Lebresne 
Authored: Thu Jul 28 10:21:58 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jul 28 10:21:58 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/cql3/UpdateParameters.java | 17 +
 .../apache/cassandra/db/CounterMutation.java|  3 ++-
 .../db/partitions/PartitionUpdate.java  | 20 
 4 files changed, 24 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0fd9ad6/CHANGES.txt
--
diff --cc CHANGES.txt
index 6ef9655,b966078..5740ca7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.9
 +3.9
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Lost counter writes in compact table and static columns (CASSANDRA-12219)
   * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
   * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
   * Add option to override compaction space check (CASSANDRA-12180)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0fd9ad6/src/java/org/apache/cassandra/cql3/UpdateParameters.java
--
diff --cc src/java/org/apache/cassandra/cql3/UpdateParameters.java
index 6b0ed59,0c58097..d2c01c8
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@@ -158,15 -158,16 +158,16 @@@ public class UpdateParameter
  {
  assert ttl == LivenessInfo.NO_TTL;
  
- // In practice, the actual CounterId (and clock really) that we use 
doesn't matter, because we will
- // ignore it in CounterMutation when we do the read-before-write to 
create the actual value that is
- // applied. In other words, this is not the actual value that will be 
written to the memtable
- // because this will be replaced in 
CounterMutation.updateWithCurrentValue().
- // As an aside, since we don't care about the CounterId/clock, we 
used to only send the incremement,
- // but that makes things a bit more complex as this means we need to 
be able to distinguish inside
- // PartitionUpdate between counter updates that has been processed by 
CounterMutation and those that
- // haven't.
+ // Because column is a counter, we need the value to be a 
CounterContext. However, we're only creating a
+ // "counter update", which is a temporary state until we run into 
'CounterMutation.updateWithCurrentValue()'
+ // which does the read-before-write and sets the proper CounterId, 
clock and updated value.
+ //
+ // We thus create a "fake" local shard here. The CounterId/clock used 
don't matter as this is just a temporary
+ // state that will be replaced when processing the mutation in 
CounterMutation, but the reason we use a 'local'
+ // shard is due to the merging rules: if a user includes multiple 
updates to the same counter in a batch, those
+ // multiple updates will be merged in the PartitionUpdate *before* 
they even reach CounterMutation. So we need
+ // such update to be added together, and that's what a local shard 
gives us.
 -builder.addCell(BufferCell.live(metadata, column, timestamp, 
CounterContext.instance().createLocal(increment)));
 +builder.addCell(BufferCell.live(column, timestamp, 
CounterContext.instance().createLocal(increment)));
  }
  
  public void setComplexDeletionTime(ColumnDefinition column)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0fd9ad6/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-27 Thread jmckenzie 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: d22e3908b6c5b0a51d33fb393e2fb5e625771c07
Parents: 04a0c00 d6232e0
Author: Josh McKenzie 
Authored: Wed Jul 27 12:16:23 2016 -0400
Committer: Josh McKenzie 
Committed: Wed Jul 27 12:16:23 2016 -0400

--
 conf/cassandra-env.ps1 | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d22e3908/conf/cassandra-env.ps1
--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-27 Thread jmckenzie 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 04a0c00ff30f86a7455401410748c8c31fb8bc9a
Parents: 247a56b 01d5fa8
Author: Josh McKenzie 
Authored: Wed Jul 27 11:42:18 2016 -0400
Committer: Josh McKenzie 
Committed: Wed Jul 27 11:42:18 2016 -0400

--

--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-27 Thread slebresne 
Merge branch 'cassandra-3.0' into cassandra-3.9

* cassandra-3.0:
  AssertionError with MVs on updating a row that isn't indexed due to a null 
value


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

Branch: refs/heads/trunk
Commit: e9e6a0d4e82f229f133b3f34826e5c585da7cac5
Parents: 5fe02b3 8d020e2
Author: Sylvain Lebresne 
Authored: Wed Jul 27 11:28:17 2016 +0200
Committer: Sylvain Lebresne 
Committed: Wed Jul 27 11:28:17 2016 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/db/view/ViewUpdateGenerator.java  |  4 +--
 .../org/apache/cassandra/cql3/ViewTest.java | 29 
 3 files changed, 32 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9e6a0d4/CHANGES.txt
--
diff --cc CHANGES.txt
index 50f7a6d,90f1ee9..6ef9655
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.9
 +3.9
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
   * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
   * Add option to override compaction space check (CASSANDRA-12180)
   * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9e6a0d4/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
--
diff --cc src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
index 4c6dbb7,3bdc380..a8af37b
--- a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
+++ b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java
@@@ -452,10 -452,10 +452,10 @@@ public class ViewUpdateGenerato
  
  ColumnDefinition baseColumn = view.baseNonPKColumnsInViewPK.get(0);
  Cell cell = baseRow.getCell(baseColumn);
- assert isLive(cell) : "We shouldn't have got there is the base row 
had no associated entry";
+ assert isLive(cell) : "We shouldn't have got there if the base row 
had no associated entry";
  
  long timestamp = Math.max(baseLiveness.timestamp(), cell.timestamp());
 -return LivenessInfo.create(timestamp, cell.ttl(), 
cell.localDeletionTime());
 +return LivenessInfo.withExpirationTime(timestamp, cell.ttl(), 
cell.localDeletionTime());
  }
  
  private long computeTimestampForEntryDeletion(Row baseRow)

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-26 Thread carl 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 67909ea84caf296a24a183d3fb86f9131ccef3d0
Parents: 79fbdbe 6105da3
Author: Carl Yeksigian 
Authored: Tue Jul 26 09:59:15 2016 -0400
Committer: Carl Yeksigian 
Committed: Tue Jul 26 09:59:15 2016 -0400

--
 CHANGES.txt   |  1 +
 .../apache/cassandra/service/AbstractReadExecutor.java| 10 --
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/67909ea8/CHANGES.txt
--
diff --cc CHANGES.txt
index 2f7d2d3,3c485dd..50f7a6d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.9
 +3.9
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
   * Add option to override compaction space check (CASSANDRA-12180)
   * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
   * Respond with v1/v2 protocol header when responding to driver that attempts

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-26 Thread carl 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 79fbdbe6c89cd3f78152b6a7149d184047f85091
Parents: 9501c64 0bb133e
Author: Carl Yeksigian 
Authored: Tue Jul 26 08:58:53 2016 -0400
Committer: Carl Yeksigian 
Committed: Tue Jul 26 08:58:53 2016 -0400

--
 CHANGES.txt |  2 ++
 src/java/org/apache/cassandra/config/Config.java|  1 +
 .../org/apache/cassandra/config/DatabaseDescriptor.java |  5 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 12 
 .../org/apache/cassandra/db/ColumnFamilyStoreMBean.java | 10 ++
 src/java/org/apache/cassandra/db/Directories.java   |  3 ++-
 .../apache/cassandra/db/compaction/CompactionTask.java  |  6 ++
 7 files changed, 38 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79fbdbe6/CHANGES.txt
--
diff --cc CHANGES.txt
index 5c27dc9,342382e..2f7d2d3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,47 -1,10 +1,49 @@@
 -3.0.9
 +3.9
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Add option to override compaction space check (CASSANDRA-12180)
   * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
   * Respond with v1/v2 protocol header when responding to driver that attempts
 to connect with too low of a protocol version (CASSANDRA-11464)
   * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
   * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 +Merged from 2.2:
 + * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 +Merged from 2.1:
 + * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
 +
++
 +3.8
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
   * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
   * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/79fbdbe6/src/java/org/apache/cassandra/config/DatabaseDescripto

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-21 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 5e111e64d065415c128d49086b0a91bfda6f2fca
Parents: 584eae3 864e009
Author: Aleksey Yeschenko 
Authored: Thu Jul 21 15:03:45 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Thu Jul 21 15:03:45 2016 +0100

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 --
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e111e64/CHANGES.txt
--
diff --cc CHANGES.txt
index dc7a76e,eb73da2..2b86935
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.9
 +3.9
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
   * Respond with v1/v2 protocol header when responding to driver that attempts
 to connect with too low of a protocol version (CASSANDRA-11464)
   * NullPointerExpception when reading/compacting table (CASSANDRA-11988)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e111e64/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 0a3ad52,f34a2d5..9088105
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -604,9 -578,10 +604,10 @@@ public class ColumnFamilyStore implemen
   * Removes unnecessary files from the cf directory at startup: these 
include temp files, orphans, zero-length files
   * and compacted sstables. Files that cannot be recognized will be 
ignored.
   */
 -public static void scrubDataDirectories(CFMetaData metadata)
 +public static void scrubDataDirectories(CFMetaData metadata) throws 
StartupException
  {
  Directories directories = new Directories(metadata, 
initialDirectories);
+ Set cleanedDirectories = new HashSet<>();
  
   // clear ephemeral snapshots that were not properly cleared last 
session (CASSANDRA-7357)
  clearEphemeralSnapshots(directories);

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-20 Thread slebresne 
Merge branch 'cassandra-3.0' into cassandra-3.9

* cassandra-3.0:
  NullPointerExpception when reading/compacting table


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

Branch: refs/heads/trunk
Commit: 43d726be95b1e3cfdbe1452b2fd76f9a67dd59f6
Parents: 9eae8d3 979e559
Author: Sylvain Lebresne 
Authored: Wed Jul 20 14:29:16 2016 +0200
Committer: Sylvain Lebresne 
Committed: Wed Jul 20 14:29:16 2016 +0200

--
 CHANGES.txt |  1 +
 .../db/partitions/AbstractBTreePartition.java   |  2 +-
 .../cassandra/db/partitions/PurgeFunction.java  | 15 -
 .../cassandra/db/rows/BaseRowIterator.java  |  2 +-
 src/java/org/apache/cassandra/db/rows/Row.java  | 13 +---
 .../apache/cassandra/db/transform/BaseRows.java |  2 +-
 .../apache/cassandra/db/transform/Filter.java   | 12 +++
 .../validation/entities/StaticColumnsTest.java  | 22 
 8 files changed, 54 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d726be/CHANGES.txt
--
diff --cc CHANGES.txt
index c9dce65,6ea39cd..e4ef64c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,6 +1,41 @@@
 -3.0.9
 +3.9
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
   * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 +Merged from 2.2:
 + * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
 +
 +
 +3.8
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
   * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
   * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d726be/src/java/org/apache/cassandra/db/partitions/AbstractBTreePartition.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d726be/src/java/org/apache/cassandra/db/rows/Row.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d726be/src/java/org/apache/cassandra/db/transform/BaseRows.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d726be/test/unit/org/apache/cassandra/cql3/validation/entities/StaticColumnsTest.java
-

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-19 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 4bd4be867ebeecfd7bd0a67ebeb122923d5ff850
Parents: 9ed4877 0297cbe
Author: Sam Tunnicliffe 
Authored: Tue Jul 19 18:52:15 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Tue Jul 19 18:52:15 2016 +0100

--

--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-19 Thread slebresne 
Merge branch 'cassandra-3.0' into cassandra-3.9

* cassandra-3.0:
  Fix problem with undeleteable rows on upgrade to new sstable format.


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

Branch: refs/heads/trunk
Commit: d4ced245350d5745cc98d20ac2304fcafc628a32
Parents: 9659a38 c481e8d
Author: Sylvain Lebresne 
Authored: Tue Jul 19 12:03:08 2016 +0200
Committer: Sylvain Lebresne 
Committed: Tue Jul 19 12:03:08 2016 +0200

--
 CHANGES.txt |   3 +-
 .../org/apache/cassandra/db/LegacyLayout.java   |  19 +++-
 .../cassandra/db/compaction/Scrubber.java   |  50 +--
 .../io/sstable/SSTableIdentityIterator.java |   9 +-
 .../lb-1-big-CompressionInfo.db | Bin 0 -> 43 bytes
 .../cf_with_duplicates_2_0/lb-1-big-Data.db | Bin 0 -> 84 bytes
 .../lb-1-big-Digest.adler32 |   1 +
 .../cf_with_duplicates_2_0/lb-1-big-Filter.db   | Bin 0 -> 16 bytes
 .../cf_with_duplicates_2_0/lb-1-big-Index.db| Bin 0 -> 18 bytes
 .../lb-1-big-Statistics.db  | Bin 0 -> 4474 bytes
 .../cf_with_duplicates_2_0/lb-1-big-Summary.db  | Bin 0 -> 84 bytes
 .../cf_with_duplicates_2_0/lb-1-big-TOC.txt |   8 ++
 .../mb-3-big-CompressionInfo.db | Bin 0 -> 51 bytes
 .../cf_with_duplicates_3_0/mb-3-big-Data.db | Bin 0 -> 72 bytes
 .../mb-3-big-Digest.crc32   |   1 +
 .../cf_with_duplicates_3_0/mb-3-big-Filter.db   | Bin 0 -> 16 bytes
 .../cf_with_duplicates_3_0/mb-3-big-Index.db| Bin 0 -> 8 bytes
 .../mb-3-big-Statistics.db  | Bin 0 -> 4664 bytes
 .../cf_with_duplicates_3_0/mb-3-big-Summary.db  | Bin 0 -> 56 bytes
 .../cf_with_duplicates_3_0/mb-3-big-TOC.txt |   8 ++
 .../unit/org/apache/cassandra/db/ScrubTest.java |  88 ++-
 21 files changed, 174 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4ced245/CHANGES.txt
--
diff --cc CHANGES.txt
index ce58153,f205e0b..780ea96
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 -3.0.9
 +3.9
- 
++Merged from 3.0:
+  * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 +
 +3.8
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
   * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
   * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
   * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)

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

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-11 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 371a147945feeaea9d39a714d59847eed1b3dc22
Parents: 314f60a 4d7141f
Author: Aleksey Yeschenko 
Authored: Mon Jul 11 14:37:10 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 11 14:37:10 2016 +0100

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/db/CompactTables.java | 7 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/371a1479/CHANGES.txt
--
diff --cc CHANGES.txt
index 44fe26c,4241da8..f65b1f4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.9
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
  3.0.9
+  * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
   * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
   * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
  2.2.8

http://git-wip-us.apache.org/repos/asf/cassandra/blob/371a1479/src/java/org/apache/cassandra/db/CompactTables.java
--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-11 Thread aleksey 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 314f60a44e969fb7da62a21275d94524277c4eb3
Parents: d20c765 f37b6f1
Author: Aleksey Yeschenko 
Authored: Mon Jul 11 14:32:30 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Jul 11 14:32:30 2016 +0100

--
 CHANGES.txt |  2 +
 .../cassandra/schema/LegacySchemaMigrator.java  | 81 ++--
 2 files changed, 59 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/314f60a4/CHANGES.txt
--
diff --cc CHANGES.txt
index 9df49f3,f2d11b9..44fe26c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,11 @@@
 +3.9
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
+ 3.0.9
+  * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
   * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
  2.2.8
   * Use dedicated thread for JMX notifications (CASSANDRA-12146)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/314f60a4/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
--

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-06 Thread samt 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 5ad17634a1fb75d09ab5a6cb234d7460fed0c3e0
Parents: 262cd38 dd05e46
Author: Sam Tunnicliffe 
Authored: Wed Jul 6 12:10:41 2016 +0100
Committer: Sam Tunnicliffe 
Committed: Wed Jul 6 12:10:41 2016 +0100

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java | 16 +++-
 2 files changed, 8 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ad17634/CHANGES.txt
--
diff --cc CHANGES.txt
index afeef2c,02786c5..2861cf7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
 -3.0.9
 +3.9
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 +Merged from 3.0:
+  * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
   * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
   * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
   * Fix column ordering of results with static columns for Thrift requests in

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ad17634/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index caa2059,5678ada..4708033
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -22,10 -22,8 +22,9 @@@ import java.lang.reflect.Constructor
  import java.lang.reflect.InvocationTargetException;
  import java.nio.ByteBuffer;
  import java.util.*;
- import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ThreadLocalRandom;
  import java.util.concurrent.TimeUnit;
 +import java.util.regex.Pattern;
  import java.util.stream.Collectors;
  
  import com.google.common.annotations.VisibleForTesting;

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-05 Thread carl 
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 237330ad2046ad4367a63db8e9bfb7a1abee9c26
Parents: f8cf5b5 a9a6e5f
Author: Carl Yeksigian 
Authored: Tue Jul 5 12:25:09 2016 -0400
Committer: Carl Yeksigian 
Committed: Tue Jul 5 12:25:09 2016 -0400

--
 .../cql3/statements/CreateViewStatement.java|  2 +-
 .../org/apache/cassandra/cql3/ViewTest.java | 31 
 2 files changed, 32 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/237330ad/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java
index 3ea88eb,13e528c..013adbc
--- a/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java
@@@ -310,11 -311,12 +310,11 @@@ public class CreateViewStatement extend
 List columns,
 StatementRestrictions 
restrictions)
  {
 -ColumnIdentifier identifier = raw.prepare(cfm);
 -ColumnDefinition def = cfm.getColumnDefinition(identifier);
 +ColumnDefinition def = raw.prepare(cfm);
  
 -boolean isPk = basePK.contains(identifier);
 +boolean isPk = basePK.contains(def.name);
  if (!isPk && hasNonPKColumn)
- throw new InvalidRequestException(String.format("Cannot include 
more than one non-primary key column '%s' in materialized view partition key", 
def.name));
 -throw new InvalidRequestException(String.format("Cannot include 
more than one non-primary key column '%s' in materialized view primary key", 
identifier));
++throw new InvalidRequestException(String.format("Cannot include 
more than one non-primary key column '%s' in materialized view primary key", 
def.name));
  
  // We don't need to include the "IS NOT NULL" filter on a 
non-composite partition key
  // because we will never allow a single partition key to be NULL

[4/6] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.9

2016-07-04 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 118f1a0d698eddedd70bcd72193bf3796219b9a7
Parents: c86b3e1 9244531
Author: Benjamin Lerer 
Authored: Mon Jul 4 14:33:20 2016 +0200
Committer: Benjamin Lerer 
Committed: Mon Jul 4 14:34:32 2016 +0200

--
 CHANGES.txt |  1 +
 .../ClusteringColumnRestrictions.java   | 20 ++--
 .../restrictions/MultiColumnRestriction.java|  2 +-
 .../SelectMultiColumnRelationTest.java  | 27 ++
 .../cql3/validation/operations/SelectTest.java  | 54 
 5 files changed, 86 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/118f1a0d/CHANGES.txt
--
diff --cc CHANGES.txt
index 475365f,2df77e1..1a03b89
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -5,34 -4,11 +5,35 @@@ Merged from 3.0
  Merged from 2.2:
   * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)
  Merged from 2.1:
+  * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
 + * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
 + * Remove finished incoming streaming connections from MessagingService 
(CASSANDRA-11854)
  
  
 -3.0.8
 - * Fix potential race in schema during new table creation (CASSANDRA-12083)
 +3.8
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
   * cqlsh: fix error handling in rare COPY FROM failure scenario 
(CASSANDRA-12070)
   * Disable autocompaction during drain (CASSANDRA-11878)
   * Add a metrics timer to MemtablePool and use it to track time spent blocked 
on memory in MemtableAllocator (CASSANDRA-11327)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/118f1a0d/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java
index 837ee13,000..dc349d9
mode 100644,00..100644
--- 
a/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java
+++ 
b/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java
@@@ -1,229 -1,0 +1,215 @@@
 +/*
 + * 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 CONDITION

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-06-30 Thread slebresne 
Merge branch 'cassandra-3.0' into cassandra-3.9

* cassandra-3.0:
  Exclude static columns from digest on empty static row


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

Branch: refs/heads/trunk
Commit: 3dceaaba80b9f7cd364424558f77c1128907b632
Parents: 2df345a 4f14bc5
Author: Sylvain Lebresne 
Authored: Thu Jun 30 16:53:48 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jun 30 16:53:48 2016 +0200

--
 CHANGES.txt   |  1 +
 .../org/apache/cassandra/db/PartitionColumns.java |  7 ---
 .../cassandra/db/partitions/PartitionIterators.java   | 11 ---
 .../org/apache/cassandra/db/rows/RowIterators.java|  9 ++---
 .../cassandra/db/rows/UnfilteredRowIterators.java | 14 +-
 5 files changed, 20 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dceaaba/CHANGES.txt
--
diff --cc CHANGES.txt
index ed884a9,f12d704..475365f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.9
 +3.9
 +Merged from 3.0:
+  * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
   * Fix EOF exception when altering column type (CASSANDRA-11820)
  Merged from 2.2:
   * MemoryUtil.getShort() should return an unsigned short also for 
architectures not supporting unaligned memory accesses (CASSANDRA-11973)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dceaaba/src/java/org/apache/cassandra/db/rows/RowIterators.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dceaaba/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterators.java
--